poppler 0.18.4

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

245 files changed, 2129 insertions, 359 deletions

diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 69f8bb38612..2707fb57aef 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import poppler-0.18.4.
+	* version.ac: Adjust.
+
 2012-01-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am (AM_CPPFLAGS): Drop `-DPDF_PARSER_ONLY'.
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index 7a28273d6f9..b268220c4f6 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.68 for poppler for TeX Live 0.18.0.
+# Generated by GNU Autoconf 2.68 for poppler for TeX Live 0.18.4.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -560,12 +560,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='poppler for TeX Live'
 PACKAGE_TARNAME='poppler-for-tex-live'
-PACKAGE_VERSION='0.18.0'
-PACKAGE_STRING='poppler for TeX Live 0.18.0'
+PACKAGE_VERSION='0.18.4'
+PACKAGE_STRING='poppler for TeX Live 0.18.4'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="poppler-0.18.0/poppler/Array.cc"
+ac_unique_file="poppler-0.18.4/poppler/Array.cc"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures poppler for TeX Live 0.18.0 to adapt to many kinds of systems.
+\`configure' configures poppler for TeX Live 0.18.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1344,7 +1344,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of poppler for TeX Live 0.18.0:";;
+     short | recursive ) echo "Configuration of poppler for TeX Live 0.18.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1452,7 +1452,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-poppler for TeX Live configure 0.18.0
+poppler for TeX Live configure 0.18.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1859,7 +1859,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by poppler for TeX Live $as_me 0.18.0, which was
+It was created by poppler for TeX Live $as_me 0.18.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2678,7 +2678,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='poppler-for-tex-live'
- VERSION='0.18.0'
+ VERSION='0.18.4'
 
 
 # Some tools Automake needs.
@@ -5212,7 +5212,7 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_config_headers="$ac_config_headers poppler/poppler-config.h:poppler-0.18.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler/poppler-config.h:poppler-0.18.4/poppler/poppler-config.h.in"
 
 
 
@@ -5315,7 +5315,7 @@ fi
 $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
 
 
-POPPLER_TREE=poppler-0.18.0
+POPPLER_TREE=poppler-0.18.4
 
 
 ac_config_files="$ac_config_files Makefile poppler/Makefile goo/Makefile fofi/Makefile"
@@ -5867,7 +5867,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by poppler for TeX Live $as_me 0.18.0, which was
+This file was extended by poppler for TeX Live $as_me 0.18.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5933,7 +5933,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-poppler for TeX Live config.status 0.18.0
+poppler for TeX Live config.status 0.18.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -6064,7 +6064,7 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "poppler/poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler/poppler-config.h:poppler-0.18.0/poppler/poppler-config.h.in" ;;
+    "poppler/poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler/poppler-config.h:poppler-0.18.4/poppler/poppler-config.h.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "poppler/Makefile") CONFIG_FILES="$CONFIG_FILES poppler/Makefile" ;;
     "goo/Makefile") CONFIG_FILES="$CONFIG_FILES goo/Makefile" ;;
diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY
deleted file mode 100644
index 925a7f9eb31..00000000000
--- a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur poppler-0.18.0.orig/poppler/Page.cc poppler-0.18.0/poppler/Page.cc
---- poppler-0.18.0.orig/poppler/Page.cc	2011-03-12 11:49:45.000000000 +0100
-+++ poppler-0.18.0/poppler/Page.cc	2011-10-07 20:07:46.000000000 +0200
-@@ -45,13 +45,11 @@
- #include "XRef.h"
- #include "Link.h"
- #include "OutputDev.h"
--#ifndef PDF_PARSER_ONLY
- #include "Gfx.h"
- #include "GfxState.h"
- #include "Annot.h"
- #include "TextOutputDev.h"
- #include "Form.h"
--#endif
- #include "Error.h"
- #include "Page.h"
- #include "Catalog.h"
diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.18.4-PATCHES/ChangeLog
index 31926933ef4..a29bd3dfe3d 100644
--- a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.18.4-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported poppler-0.18.4 source tree from:
+	  http://poppler.freedesktop.org/
+	* patch-01-PDF_PARSER_ONLY (removed): Obsolete.
+	* patch-0[23]-*: Adapted.
+
 2011-10-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-04-mingw (removed): Instead add `-lgdi32'.
diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.18.4-PATCHES/TL-Changes
index 86309979a7a..93e58622d4e 100644
--- a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.18.4-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.18.0 tree as obtained from:
+Changes applied to the poppler-0.18.4 tree as obtained from:
 	http://poppler.freedesktop.org/
 
 Removed:
diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-02-warnings b/Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-02-warnings
index 73c514909dd..26c4739b40d 100644
--- a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-02-warnings
+++ b/Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-02-warnings
@@ -1,6 +1,6 @@
-diff -ur poppler-0.18.0.orig/poppler/Annot.cc poppler-0.18.0/poppler/Annot.cc
---- poppler-0.18.0.orig/poppler/Annot.cc	2011-08-25 23:25:21.000000000 +0200
-+++ poppler-0.18.0/poppler/Annot.cc	2011-10-07 20:45:57.000000000 +0200
+diff -ur poppler-0.18.4.orig/poppler/Annot.cc poppler-0.18.4/poppler/Annot.cc
+--- poppler-0.18.4.orig/poppler/Annot.cc	2011-11-22 22:33:10.000000000 +0100
++++ poppler-0.18.4/poppler/Annot.cc	2012-02-23 11:07:25.726255602 +0100
 @@ -2643,7 +2643,7 @@
  	y3 = quadrilaterals->getY3(i);
  	x4 = quadrilaterals->getX4(i);
@@ -10,10 +10,10 @@ diff -ur poppler-0.18.0.orig/poppler/Annot.cc poppler-0.18.0/poppler/Annot.cc
  
  	appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x3, y3);
  	appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
-diff -ur poppler-0.18.0.orig/poppler/GfxState.cc poppler-0.18.0/poppler/GfxState.cc
---- poppler-0.18.0.orig/poppler/GfxState.cc	2011-07-28 12:58:37.000000000 +0200
-+++ poppler-0.18.0/poppler/GfxState.cc	2011-10-07 20:52:53.000000000 +0200
-@@ -2997,7 +2997,7 @@
+diff -ur poppler-0.18.4.orig/poppler/GfxState.cc poppler-0.18.4/poppler/GfxState.cc
+--- poppler-0.18.4.orig/poppler/GfxState.cc	2012-01-30 20:32:08.000000000 +0100
++++ poppler-0.18.4/poppler/GfxState.cc	2012-02-23 11:07:25.730261537 +0100
+@@ -3009,7 +3009,7 @@
  
    getParameterRange(&sMin, &sMax, xMin, yMin, xMax, yMax);
    upperBound = ctm->norm() * getDistance(sMin, sMax);
@@ -22,9 +22,9 @@ diff -ur poppler-0.18.0.orig/poppler/GfxState.cc poppler-0.18.0/poppler/GfxState
    maxSize = std::max<int>(maxSize, 2);
  
    {
-diff -ur poppler-0.18.0.orig/poppler/GfxState.h poppler-0.18.0/poppler/GfxState.h
---- poppler-0.18.0.orig/poppler/GfxState.h	2011-07-29 00:25:02.000000000 +0200
-+++ poppler-0.18.0/poppler/GfxState.h	2011-10-07 20:43:42.000000000 +0200
+diff -ur poppler-0.18.4.orig/poppler/GfxState.h poppler-0.18.4/poppler/GfxState.h
+--- poppler-0.18.4.orig/poppler/GfxState.h	2011-11-22 22:33:12.000000000 +0100
++++ poppler-0.18.4/poppler/GfxState.h	2012-02-23 11:07:25.730261537 +0100
 @@ -100,7 +100,7 @@
  }
  
@@ -34,9 +34,9 @@ diff -ur poppler-0.18.0.orig/poppler/GfxState.h poppler-0.18.0/poppler/GfxState.
  }
  
  static inline double byteToDbl(Guchar x) {
-diff -ur poppler-0.18.0.orig/poppler/Hints.cc poppler-0.18.0/poppler/Hints.cc
---- poppler-0.18.0.orig/poppler/Hints.cc	2011-06-30 23:41:10.000000000 +0200
-+++ poppler-0.18.0/poppler/Hints.cc	2011-10-07 21:51:39.000000000 +0200
+diff -ur poppler-0.18.4.orig/poppler/Hints.cc poppler-0.18.4/poppler/Hints.cc
+--- poppler-0.18.4.orig/poppler/Hints.cc	2011-11-22 22:33:13.000000000 +0100
++++ poppler-0.18.4/poppler/Hints.cc	2012-02-23 11:07:25.730261537 +0100
 @@ -413,7 +413,7 @@
  {
    Guint bit, bits;
@@ -60,10 +60,10 @@ diff -ur poppler-0.18.0.orig/poppler/Hints.cc poppler-0.18.0/poppler/Hints.cc
  
    return bit | bits;
  }
-diff -ur poppler-0.18.0.orig/poppler/Lexer.cc poppler-0.18.0/poppler/Lexer.cc
---- poppler-0.18.0.orig/poppler/Lexer.cc	2010-07-16 00:43:51.000000000 +0200
-+++ poppler-0.18.0/poppler/Lexer.cc	2011-10-07 20:52:58.000000000 +0200
-@@ -215,7 +215,7 @@
+diff -ur poppler-0.18.4.orig/poppler/Lexer.cc poppler-0.18.4/poppler/Lexer.cc
+--- poppler-0.18.4.orig/poppler/Lexer.cc	2012-02-15 18:10:57.000000000 +0100
++++ poppler-0.18.4/poppler/Lexer.cc	2012-02-23 11:07:25.730261537 +0100
+@@ -216,7 +216,7 @@
  	      overflownUnsignedInteger = gTrue;
  	      xf = xi * 10.0 + (c - '0');
  	    } else {
@@ -72,9 +72,9 @@ diff -ur poppler-0.18.0.orig/poppler/Lexer.cc poppler-0.18.0/poppler/Lexer.cc
  	    }
  	  } else {
  	    xi = xi * 10 + (c - '0');
-diff -ur poppler-0.18.0.orig/poppler/Stream.cc poppler-0.18.0/poppler/Stream.cc
---- poppler-0.18.0.orig/poppler/Stream.cc	2011-07-19 00:17:56.000000000 +0200
-+++ poppler-0.18.0/poppler/Stream.cc	2011-10-07 20:52:50.000000000 +0200
+diff -ur poppler-0.18.4.orig/poppler/Stream.cc poppler-0.18.4/poppler/Stream.cc
+--- poppler-0.18.4.orig/poppler/Stream.cc	2011-11-22 22:33:16.000000000 +0100
++++ poppler-0.18.4/poppler/Stream.cc	2012-02-23 11:07:25.730261537 +0100
 @@ -474,7 +474,7 @@
    } else if (nBits == 8) {
      Guchar *line = imgLine;
diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-03-POPPLER_VERSION b/Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-03-POPPLER_VERSION
index c556ee45ace..e936c70ad72 100644
--- a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-03-POPPLER_VERSION
+++ b/Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-03-POPPLER_VERSION
@@ -1,6 +1,6 @@
-diff -ur poppler-0.18.0.orig/poppler/poppler-config.h.in poppler-0.18.0/poppler/poppler-config.h.in
---- poppler-0.18.0.orig/poppler/poppler-config.h.in	2011-09-27 00:24:08.000000000 +0200
-+++ poppler-0.18.0/poppler/poppler-config.h.in	2011-10-10 19:08:51.000000000 +0200
+diff -ur poppler-0.18.4.orig/poppler/poppler-config.h.in poppler-0.18.4/poppler/poppler-config.h.in
+--- poppler-0.18.4.orig/poppler/poppler-config.h.in	2012-02-15 18:23:06.000000000 +0100
++++ poppler-0.18.4/poppler/poppler-config.h.in	2012-02-23 11:09:01.791684462 +0100
 @@ -14,6 +14,11 @@
  // around #undef look odd, but it's to silence warnings about
  // redefining those symbols.
diff --git a/Build/source/libs/poppler/poppler-0.18.0/AUTHORS b/Build/source/libs/poppler/poppler-0.18.4/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.18.4/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.18.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.18.4/CMakeLists.txt
index 499ff23c432..1ba9e62b15e 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.18.4/CMakeLists.txt
@@ -16,7 +16,7 @@ test_big_endian(WORDS_BIGENDIAN)
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "18")
-set(POPPLER_MICRO_VERSION "0")
+set(POPPLER_MICRO_VERSION "4")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
@@ -34,7 +34,7 @@ option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF)
 option(USE_FIXEDPOINT "Use fixed point arithmetic in the Splash backend" OFF)
 option(USE_FLOAT "Use single precision arithmetic in the Splash backend" OFF)
 if(WIN32)
-  option(ENABLE_RELOCATABLE "Hardcode the poppler library location (on Windows)." ON)
+  option(ENABLE_RELOCATABLE "Do not hardcode the poppler library location (on Windows)." ON)
 else(WIN32)
   set(ENABLE_RELOCATABLE OFF)
 endif(WIN32)
@@ -93,7 +93,6 @@ if(CAIRO_FOUND)
     # Check for introspection
     macro_optional_find_package(GObjectIntrospection 0.9.12)
     set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND})
-    set(GLIB_REQ "glib-2.0 >= ${GLIB_REQUIRED} gobject-2.0 >= ${GLIB_REQUIRED} cairo >= ${CAIRO_VERSION}")
     set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED")
     set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES")
     macro_optional_find_package(GTK)
@@ -131,6 +130,7 @@ endif(ENABLE_LIBCURL)
 add_definitions(-DHAVE_CONFIG_H=1)
 if(FONTCONFIG_FOUND)
   add_definitions(${FONTCONFIG_DEFINITIONS})
+  include_directories(${FONTCONFIG_INCLUDE_DIR})
 endif(FONTCONFIG_FOUND)
 if(WITH_FONTCONFIGURATION_WIN32)
   if(MINGW)
@@ -347,11 +347,12 @@ endif(TIFF_FOUND)
 
 if(MSVC)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+set(CMAKE_CXX_FLAGS "/Zc:wchar_t- ${CMAKE_CXX_FLAGS}")
 add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 18.0.0 SOVERSION 18)
+set_target_properties(poppler PROPERTIES VERSION 19.0.0 SOVERSION 19)
 target_link_libraries(poppler ${poppler_LIBS})
 target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
 install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/Build/source/libs/poppler/poppler-0.18.0/COPYING b/Build/source/libs/poppler/poppler-0.18.4/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/COPYING
+++ b/Build/source/libs/poppler/poppler-0.18.4/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.18.0/ChangeLog b/Build/source/libs/poppler/poppler-0.18.4/ChangeLog
index e71d29c2682..553f526eb9a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.18.4/ChangeLog
@@ -1,3 +1,991 @@
+commit f61fa12e5a1ed4a775753aec9bb9e769b55aeb08
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed Feb 15 18:12:59 2012 +0100
+
+    New copyrights
+
+ goo/JpegWriter.cc          |    2 +-
+ poppler/CairoFontEngine.cc |    1 +
+ poppler/CairoOutputDev.cc  |    2 +-
+ poppler/CairoOutputDev.h   |    2 +-
+ poppler/CairoRescaleBox.cc |   14 ++++++++++++++
+ poppler/Lexer.cc           |    1 +
+ splash/SplashXPath.cc      |    1 +
+ 7 files changed, 20 insertions(+), 3 deletions(-)
+
+commit 203cbb1dc317a6d7884d2708e938804ceb4617cb
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Sun Feb 12 23:16:41 2012 +0100
+
+    Improve moc detection when cross compiling
+    (cherry picked from commit 9250449aaa279840d789b3a7cef75d06a0fd88e7)
+
+ configure.ac |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit d7e73dd353fd4c3c24f1f7bb04e7a2760c6b60c2
+Author: Pino Toscano <pino@kde.org>
+Date:   Sun Feb 12 22:27:58 2012 +0100
+
+    qt4: remove non-existing 'qt' include dirs
+
+    (cherry picked from commit 66cf1fdb3ba6894f61d9078f5c30046b464347ae)
+
+ qt4/demos/Makefile.am |    1 -
+ qt4/src/Makefile.am   |    1 -
+ qt4/tests/Makefile.am |    1 -
+ 3 files changed, 0 insertions(+), 3 deletions(-)
+
+commit 106c3dffc8d3139d121b7df9dc9fce6f5ba87166
+Author: Pino Toscano <pino@kde.org>
+Date:   Sun Feb 12 17:36:55 2012 +0100
+
+    man pages: fix minor issues with hypens and %
+
+    (cherry picked from commit 53d8fc4d2978b70e8926e3df71facd1f39de9348)
+
+ utils/pdfseparate.1 |    6 +++---
+ utils/pdftocairo.1  |    4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit bf81250ff7d0968852fc7559fafb6389cd695b91
+Author: Igor Slepchin <igor.slepchin@gmail.com>
+Date:   Wed Feb 8 19:22:13 2012 -0500
+
+    Close li tags in generated outlines.
+
+    Also, add newlines after ul tags for better readability.
+    Bug #45807
+
+ utils/HtmlOutputDev.cc |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 53a0c2043dfd56f6da7780f1a049f75af368b84b
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed Feb 8 23:58:27 2012 +0100
+
+    Fix memory leak when using HtmlOutputDev::mapEncodingToHtml
+
+    Bug #45805
+
+ utils/HtmlOutputDev.cc |   47
+ ++++++++++++++++++++++++-----------------------
+ utils/HtmlOutputDev.h  |    7 ++++---
+ 2 files changed, 28 insertions(+), 26 deletions(-)
+
+commit 4afe4d827a342a847e8b89aba5b4164ed3b4cc32
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed Feb 8 23:47:46 2012 +0100
+
+    Fix leak in pdftohtml getInfoString
+
+    Bug #45805
+
+ utils/pdftohtml.cc |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 40f7289ab04787734b856c53d5c0139445b52635
+Author: Igor Slepchin <igor.redhat@gmail.com>
+Date:   Sun Feb 5 15:55:39 2012 +0100
+
+    Proper unicode support when dumping PDF outline.
+
+    Also use of already existing Outline class rather than parsing the
+    outline anew.
+
+    Bug 45572
+
+ utils/HtmlOutputDev.cc |  196
+ ++++++++++++++++++++++++++----------------------
+ utils/HtmlOutputDev.h  |    6 +-
+ utils/pdftohtml.cc     |    3 +-
+ 3 files changed, 112 insertions(+), 93 deletions(-)
+
+commit fb629ac684a7f05d95d10285807c2cf1602d28ca
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Sat Feb 4 17:13:30 2012 +1030
+
+    Lexer: convert integer to real when overflow occurs
+
+    Bug 45605
+    (cherry picked from commit 38ec58ed1cb54722aece875287b847643aa2c4b8)
+
+ poppler/Lexer.cc |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 24bbe62fa09bd4609bbf59c2b78c3aab20c09cdf
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Tue Jan 31 20:01:30 2012 +0100
+
+    glib: Exclude poppler-private.h from introspection files
+
+    Fixes bug #45455.
+
+ glib/CMakeLists.txt |    2 +-
+ glib/Makefile.am    |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 19cee7961d01e59adfdd47fb311707e55f4d70c3
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Wed Feb 1 10:44:17 2012 +0100
+
+    gtk-doc: Fix build when builddir != srcdir
+
+    Bug #45549.
+
+ glib/reference/Makefile.am |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit b834425c56eb4e783419351888cf586525d12476
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Thu Feb 2 13:01:45 2012 +0100
+
+    gtk-doc: Fix API documentation for poppler_page_free_annot_mapping()
+
+    Remove reference to non existent method poppler_annot_free() and use
+    ref/unref instead of copy/free.
+
+    Bug #45549.
+
+ glib/poppler-page.cc |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 283fa96871027719ad40db653a71e7e889f2f67f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sat Feb 4 11:51:34 2012 +0100
+
+    gtk-doc: Remove reference to non existent method poppler_layer_free()
+
+    Bug #45549.
+
+ glib/poppler-document.cc |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit 1b3e07155fbc627ef13fcb885ebda7644a65ff9a
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Thu Feb 2 15:59:47 2012 +0100
+
+    gtk-doc: Add more glib API documentation for poppler-document
+
+    Fixes several gtk-doc warnings.
+
+    Bug #45549.
+
+ glib/poppler-document.h |   26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+commit ff7c42a8c04cf98e8d7e7c23bddb65781a7d9b8c
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Thu Feb 2 15:45:37 2012 +0100
+
+    gtk-doc: remove references to removed pixbuf functions
+
+    Bug #45549.
+
+ glib/poppler-page.cc                |    6 ++----
+ glib/reference/poppler-sections.txt |    4 ----
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+commit 5dc10c5564d5cd072e37deffbbfcbf6cea25af98
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Thu Feb 2 15:43:30 2012 +0100
+
+    gtk-doc: do not build doc for glib-demo
+
+    Fixes glib-demo symbols in poppler-unused.txt
+
+    Bug #45549.
+
+ glib/reference/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ecbdea38d4c35935a69e5fbd5268be86ee716a53
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Sat Feb 4 11:32:50 2012 +0100
+
+    gtk-doc: Fix typo's
+
+    Bug #45549.
+
+ glib/poppler-annot.cc               |    6 +++---
+ glib/poppler-annot.h                |    2 +-
+ glib/poppler-document.cc            |    2 +-
+ glib/poppler-media.cc               |    2 +-
+ glib/poppler-page.cc                |    3 +--
+ glib/poppler-page.h                 |    4 ++--
+ glib/reference/poppler-sections.txt |    4 +++-
+ 7 files changed, 12 insertions(+), 11 deletions(-)
+
+commit 01a53a1dcaeaf81fbe5f1630cfe86f0d0b55b24b
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Tue Jan 31 12:49:01 2012 +0100
+
+    cairo: Remove unused variable in CairoFontEngine.cc
+
+    Fixes bug #45442.
+
+ poppler/CairoFontEngine.cc |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 7bb42f045abaef2f10fe83b8c04a55ec0a34d55d
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Tue Jan 31 14:42:04 2012 +0100
+
+    Fix return value of downscale_box_filter()
+
+    Fixes bug #45441.
+
+ poppler/CairoRescaleBox.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f6131e05f1e81f062c77377650bcd0746b8fc04f
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Tue Jan 31 13:02:16 2012 +0100
+
+    Fix return value of poppler_attachment_save
+
+    Fixes bug #45440.
+
+ glib/poppler-attachment.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5aedb2378b9e4aa438d39ac92e53bac02d3e176a
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Tue Jan 31 12:15:51 2012 +0100
+
+    Fix build for builddir != srcdir
+
+    Fixes bug #45434.
+
+ glib/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 58c17c3a61f18a6808ec9ba37e82734a655090ac
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Mon Jan 30 17:07:28 2012 +0100
+
+    Fix build with latest mingw-w64 headers
+
+    Fixes bug #45407.
+
+ glib/poppler-annot.cc    |    1 +
+ glib/poppler-document.cc |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 650644c3ab581f8cde2593ae87c3e408c4ebc57e
+Author: Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
+Date:   Mon Jan 30 20:46:04 2012 +1030
+
+    pdftocairo/automake: link with lcms
+    (cherry picked from commit acbc63348ce5e279e4d66ed4f240dc8d61df4e57)
+
+ utils/Makefile.am |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit dedc68a137aacd5f1641d7478e6c531a7dbd3e30
+Author: Pino Toscano <pino@kde.org>
+Date:   Mon Jan 30 00:32:52 2012 +0100
+
+    glib/cmake: various minor introspection improvements
+
+    "port" to CMake of the automake equivalents of
+    5ab46f9881067ce8aa203a330e2ddbe75744c50e
+
+ glib/CMakeLists.txt |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 8c3dfa26fdc4587b4a88a769806dcf38b2c5b395
+Author: Pino Toscano <pino@kde.org>
+Date:   Mon Jan 30 00:21:31 2012 +0100
+
+    cmake: support $(gir_name)_EXPORT_PACKAGES for g-ir-scanner
+
+ cmake/modules/GObjectIntrospectionMacros.cmake |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit de6415af1a39ec7dfa4f149c6c5e311b86352cec
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Jan 27 00:36:18 2012 +0100
+
+    Set OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG if you have it
+
+    Fixes/workarounds bug 43414 with openjpeg 1.5 (unreleased)
+
+ cmake/modules/FindLIBOPENJPEG.cmake |   13 +++++++++++++
+ config.h.cmake                      |    3 +++
+ configure.ac                        |    8 ++++++++
+ poppler/JPEG2000Stream.cc           |    7 ++++++-
+ 4 files changed, 30 insertions(+), 1 deletions(-)
+
+commit c6429072f9ce9a934b24d3c42ae03e2b34d35873
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Wed Jan 25 22:44:27 2012 +1030
+
+    jpeg: set image parameters after jpeg_set_defaults()
+
+    so the resolution does not get overwritten by the defaults.
+
+    The libjpeg documentation for jpeg_set_defaults() states: "This
+    routine sets all JPEG parameters to reasonable defaults, using only
+    the input image's color space (field in_color_space, which must
+    already be set in cinfo)"
+
+    Bug 45224
+
+ goo/JpegWriter.cc |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit c003fd927835f269d42a7c8637d560c5c9c41b8a
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Thu Jan 26 11:33:28 2012 +1030
+
+    glib: add section in docs for new symbols in 0.18
+
+ glib/reference/poppler-docs.sgml |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit e411789041d63ced663981523f73f029e632348d
+Author: Alexander Saprykin <xelfium@gmail.com>
+Date:   Mon Jan 23 22:07:15 2012 +0100
+
+    Do not use 50Kb of stack in SplashXPath::addCurve
+
+    Bug 44905
+
+ splash/SplashXPath.cc |   69
+ ++++++++++++++++++++++++++++++++++--------------
+ 1 files changed, 49 insertions(+), 20 deletions(-)
+
+commit 41711a6e1a1d53130d0accc6cdc8f014687db5b2
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Sat Jan 21 09:43:10 2012 +1030
+
+    cairo: Use fabs when comparing the transformed line width
+
+    as the transform may cause a negative width
+
+    Bug 43441
+
+ poppler/CairoOutputDev.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5ab46f9881067ce8aa203a330e2ddbe75744c50e
+Author: Evan Nemerson <evan@coeus-group.com>
+Date:   Sun Jan 15 11:02:50 2012 -0800
+
+    glib: various minor introspection and documentation improvements
+
+    Bug 44790
+
+ glib/Makefile.am          |    4 +++-
+ glib/poppler-annot.cc     |    8 ++++----
+ glib/poppler-attachment.h |    7 ++++---
+ glib/poppler-document.cc  |    6 ++++--
+ glib/poppler-media.h      |    7 ++++---
+ glib/poppler-page.cc      |   23 +++++++++++++++--------
+ 6 files changed, 34 insertions(+), 21 deletions(-)
+
+commit 8006ed0beb4348e5ad94c547d7bf0d7a59da1b2f
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Mon Jan 16 21:25:19 2012 +1030
+
+    cairo: ensure paintTransparencyGroup uses same ctm as
+    beginTransparencyGroup
+
+    Bug 29968
+
+ poppler/CairoOutputDev.cc |    8 ++++++--
+ poppler/CairoOutputDev.h  |    1 +
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit a40b398a10b7d8e0af88c23b3706b93656482eff
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Sun Jan 15 23:52:28 2012 +1030
+
+    cairo: restore temporary clip used in CairoOutputDev::fill when
+    painting a mask
+
+    The clip is only used to clip the paint to the fill path so it should
+    be moved inside the save/restore.
+    (cherry picked from commit 100488ec7db2d1f3e25bfda42c1603ca86696195)
+
+ poppler/CairoOutputDev.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit be59afb19e83c5040ea0d993cfb238aefc06abb1
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jan 15 15:21:06 2012 +0100
+
+    0.18.3
+
+ CMakeLists.txt   |    2 +-
+ NEWS             |   15 +++++++++++++++
+ configure.ac     |    2 +-
+ cpp/Doxyfile     |    2 +-
+ qt4/src/Doxyfile |    2 +-
+ 5 files changed, 19 insertions(+), 4 deletions(-)
+
+commit d4bff411d0d42064a617812d4e1bf2353fd79e1c
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jan 15 15:13:59 2012 +0100
+
+    Add copyrights since last release
+
+ poppler/GfxFont.cc      |    1 +
+ poppler/GlobalParams.cc |    1 +
+ utils/parseargs.cc      |    2 +-
+ 3 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 7d171e19257023cda55d0040257e8f0a2008271f
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Sun Jan 15 15:07:18 2012 +0100
+
+    Fix stack overflow in PDFDoc::markObject()
+
+    Bug 44660
+
+ poppler/PDFDoc.cc |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 81c989d905b6ba053c87d2a661d71853ddf96b99
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Sun Jan 15 15:04:51 2012 +0100
+
+    Correctly initialize globalParams
+
+ utils/pdfseparate.cc |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit bd1ed2ea35a653e20f45eebe3dff9ecf98ba4674
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Sun Jan 15 22:18:30 2012 +1030
+
+    parseargs: don't use arg->size with GooString argument
+
+    40b56994 added GooString arguments but incorrectly used arg->size as
+    the string length. arg->size is always 0 for GooString arguments. This
+    worked because the arg->size - 1 string length passed to
+    GooString::Set() just happened to be the the same value as the
+    CALC_STRING_LEN default argument indicating the string length is to be
+    calculated with strlen.
+    (cherry picked from commit 4e205a6625431dcf95375de009b4354746a4f0b7)
+
+ utils/parseargs.cc |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 310a10b6c6be2fc96b6f549645f38fe8ffae35a3
+Author: Arseny Solokha <asolokha@gmx.com>
+Date:   Fri Jan 13 18:52:17 2012 +0100
+
+    Properly initialize globalParams
+
+    Bug 44659
+
+ utils/pdfunite.cc |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit fb1ffd2bf8a74e2cd08ee77f7813dfcf594a59ad
+Author: Thomas Freitag <thomas.freitag@kabelmail.de>
+Date:   Sat Jan 7 11:47:19 2012 +0100
+
+    regtest: read stderr output before calling wait to fix a possible
+    deadlock
+
+    In the way the scripts starts it subprocesses, stderr becomes buffered
+    for the subprocesses. And unforunately, when the buffer limit is
+    reached, the subprocess suspends it work until it can print again on
+    stderr. That's why the python script runs into a deadlock when the
+    subprocess produces a lot of error messages. A small rearrange of the
+    commands, first read the stderr output and then wait that the
+    subprocess
+    ends, will remove this deadlock.
+
+ regtest/backends/__init__.py |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 12e91b1e25fd6c913c63c4e683dde33b583d6fc5
+Author: Yi Yang <ahyangyi@gmail.com>
+Date:   Sat Jan 7 09:44:42 2012 +1030
+
+    Include .otf fonts when finding substitute fonts
+
+    Bug 44412
+    (cherry picked from commit 9979b1b3e36dc8085d8c684692fece463fa474b1)
+
+ poppler/GfxFont.cc      |    2 +-
+ poppler/GlobalParams.cc |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e91e70f5a2084c16d664d49c6d30cfc244710db5
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Fri Dec 23 09:55:20 2011 +1030
+
+    autoconf: Check for cairo-ft and other cairo backends
+
+    so that CAIRO_LIBS includes the freetype dependency and pdftocairo
+    includes the dependencies for optional cairo backends.
+
+    Bug 43969
+    (cherry picked from commit ebfab832ab4f2642b9ab2ededd25de670a3c7147)
+
+ configure.ac      |   14 ++++++++++++--
+ utils/Makefile.am |    4 ++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+commit 03544e2f602319f0b381f5f357e14cc2cc77d2c1
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Dec 6 23:21:15 2011 +0100
+
+    include strings.h as we use memcpy
+
+    Fixes bug 43558
+    (cherry picked from commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b)
+
+ goo/PNGWriter.cc |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 74f4299e8f9e2d204979479f6579dd784db678a4
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Dec 4 17:29:45 2011 +0100
+
+    Do not fail if we are trying to save a file with Encrypt but that
+    we have not modified at all
+
+    Fixes KDE bug #288045
+    (cherry picked from commit 63c942a45227ef28fb94ef4765171d9812fffafa)
+
+ poppler/PDFDoc.cc |   49
+ +++++++++++++++++++++++++++++--------------------
+ 1 files changed, 29 insertions(+), 20 deletions(-)
+
+commit 447a958ce43b697ab99084ba1371b989331c6ccc
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Dec 4 15:44:52 2011 +0100
+
+    0.18.2
+
+ CMakeLists.txt   |    2 +-
+ NEWS             |   17 +++++++++++++++++
+ configure.ac     |    2 +-
+ cpp/Doxyfile     |    2 +-
+ qt4/src/Doxyfile |    2 +-
+ 5 files changed, 21 insertions(+), 4 deletions(-)
+
+commit 22601c2a64f094ede8085a3ccca3de9daaa556e7
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Dec 4 15:37:20 2011 +0100
+
+    update name and copyright
+
+ utils/pdftocairo.cc |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 51e5a67c913c0d6c83f5f6b358b7fca7bb5584e1
+Author: Axel Strübing <axel.struebing@freenet.de>
+Date:   Thu Nov 24 22:32:57 2011 +0100
+
+    Fix typo/regression introduced in
+    f6d026bfa18624ccd321e102bb39ba744998de1e
+    (cherry picked from commit bdb439ac5a751d6146204ae0d61fdbf7828c89c3)
+
+ poppler/Gfx.cc |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit a44d572f38ae5994ceeba8272f38cb51eb583da5
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Nov 24 18:54:27 2011 +0100
+
+    Fix typo
+    (cherry picked from commit 74e11d8c912dd95d235e44e7b34b8ea1be082b9f)
+
+ qt4/src/poppler-qt4.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f7d79774460697ca5665eb8b711a7bae0d2eacfc
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Nov 21 23:40:12 2011 +0100
+
+    qt4: Include QFile
+
+    We use it and the include is not there, WAndre reported it did not
+    compile for him without it
+
+ qt4/src/poppler-private.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 8bd54e8fcb3ef202fb985bca4c2c4a355594e11c
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Nov 14 13:22:53 2011 +0100
+
+    Make GfxColorSpace::parse accept dicts too
+    (cherry picked from commit a4c78946bc1fc3d52152af2e319051050ab05e28)
+
+ poppler/GfxState.cc |   14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+commit 8b4d6056e0a56fec31ff648a01d88d5942f36b0b
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Nov 11 16:37:27 2011 +0100
+
+    Do not crash if failing to parse the colorspace
+
+    Fixes bug 42793
+    (cherry picked from commit f6d026bfa18624ccd321e102bb39ba744998de1e)
+
+ poppler/Gfx.cc |   52
+ +++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 29 insertions(+), 23 deletions(-)
+
+commit 105142ed49d82ab8f3593fcd36769fab29b7a432
+Author: Kenji Uno <ku@digitaldolphins.jp>
+Date:   Wed Nov 9 12:39:41 2011 +0100
+
+    Fix leak in GooString when resizing
+
+    If resizing from "long" to shorter
+    (cherry picked from commit e7dbd17ff07afa465636a90f526cd7ac8c731862)
+
+ goo/GooString.cc |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 145c9ae835bd5b0bdc97739c9b096121e3e7d43e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Nov 6 15:44:06 2011 +0100
+
+    regtest: Skip tests with results when creating refs
+
+    Not only tests that have md5, but also crashed or failed tests.
+
+ regtest/TestReferences.py    |    4 ++--
+ regtest/backends/__init__.py |    3 +++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit d4da0fc45cf36c481570b37bf6c6938a45f70303
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed Nov 2 20:20:41 2011 +0100
+
+    Compile with MSVC needed for last change in the qt4 frontend
+    (cherry picked from commit 955cd0c7bd3a72340deba098f4242a4904adc60f)
+
+ CMakeLists.txt |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 5294d0b017ce6643207fce5cc9e85ba4e29f4d86
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Tue Nov 1 14:15:09 2011 +0100
+
+    qt4: Use PDFDoc(wchar_t *, ...) on Windows
+
+    Bug 35378
+    (cherry picked from commit e0f5bc1deebaa9861baffd7c9ba31ea31585cd1d)
+
+ qt4/src/poppler-document.cc |    6 +++---
+ qt4/src/poppler-private.h   |   17 +++++++++++++++--
+ 2 files changed, 18 insertions(+), 5 deletions(-)
+
+commit 372dc1ef79983f51c1eac52d211d7569a305a273
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Tue Nov 1 14:13:10 2011 +0100
+
+    regtest: Add --update-refs command line option to run-tests command
+
+    It allows to update the references of failing tests.
+
+ regtest/TestRun.py            |    2 +-
+ regtest/backends/__init__.py  |   34 ++++++++++++++++++++++++++++++++--
+ regtest/commands/run-tests.py |    4 ++++
+ 3 files changed, 37 insertions(+), 3 deletions(-)
+
+commit ebf7fbc74da10d1bc423d33b26e30166870642e4
+Author: Rex Dieter <rdieter@math.unl.edu>
+Date:   Tue Nov 1 09:40:53 2011 +0100
+
+    Fix pkg-config files
+
+    We were using $FOO_REQUIRED instead of @FOO_REQUIRED@
+
+ configure.ac                   |    1 +
+ poppler-glib-uninstalled.pc.in |    2 +-
+ poppler-glib.pc.cmake          |    2 +-
+ poppler-glib.pc.in             |    2 +-
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Oct 30 16:08:46 2011 +0100
+
+    pdftocairo: Use fisrtPage instead of uninitialized pg variable
+
+    This fixes an error in my previous commit.
+
+ utils/pdftocairo.cc |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e4a2adb02969e872e37e408ced4c39131c6751ea
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Oct 30 16:02:19 2011 +0100
+
+    pdftocairo: Make sure beginDocument() is always called
+
+    This fixes a crash when rendering only odd/even pages in a printing
+    format.
+
+ utils/pdftocairo.cc |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 124a5a471ebae8c268c6b920722be6b22b8c1c2d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed Oct 26 15:30:27 2011 +0200
+
+    0.18.1
+
+ CMakeLists.txt      |    4 +-
+ NEWS                |   21 ++++++++++
+ configure.ac        |    2 +-
+ cpp/Doxyfile        |    2 +-
+ gtk-doc.make        |  112
+ +++++++++++++++++++++++++++++----------------------
+ m4/gtk-doc.m4       |    6 +++
+ poppler/Makefile.am |    2 +-
+ qt4/src/Doxyfile    |    2 +-
+ 8 files changed, 97 insertions(+), 54 deletions(-)
+
+commit 6d571cc2ce129c4477d394de3ee2c8ad83f18535
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed Oct 26 14:26:38 2011 +0200
+
+    Add Adrian's (C)
+
+ utils/parseargs.cc |    1 +
+ utils/parseargs.h  |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit d87450db448502ce0c58f7a51e6af18e0865d3ac
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Oct 17 13:42:06 2011 +0200
+
+    remove useless #if
+    (cherry picked from commit e71088dc5087303b1ae5f3e72af287ec4e0a1342)
+
+ poppler/Page.cc |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 080905c3badc7ef2e35688c7020b24c6ea0b8c54
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Mon Oct 17 20:33:03 2011 +1030
+
+    utils: Add GooString arg to parseargs and use for paths in pdftocairo
+
+    <sys/param.h> and MAXPATHLEN is not available on windows. Avoid the
+    need to know the max path length by using GooString for the path.
+    (cherry picked from commit 40b56994dda79653c902977423f349efa55cf21e)
+
+ utils/parseargs.cc  |   12 ++++++++++++
+ utils/parseargs.h   |    2 ++
+ utils/pdftocairo.cc |   17 ++++++++---------
+ 3 files changed, 22 insertions(+), 9 deletions(-)
+
+commit f2313b772037916ad770a9c4d7e3fb3db0954684
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Mon Sep 19 21:11:44 2011 +0930
+
+    cairo: fix setSoftMask bugs
+
+    - Getting the clip extents in device space requires transforming all
+      four corners of the clip extents and translating by the group device
+      offset other wise the device extents will not be correct for rotated
+      ctm.
+
+    - Adjust matrix to include translation of the clip extents origin
+      since the mask surface does not start at (0,0).
+
+    - the ctm when called cairo_mask() needs to be the same as the
+    ctm when
+      the mask was created.
+
+    - implement transfer function in setSoftMask
+
+    Bug 41005
+    (cherry picked from commit 4bb34757dbbff780baba053371274c05b29771e1)
+
+ poppler/CairoOutputDev.cc |   97
+ ++++++++++++++++++++++++++++-----------------
+ poppler/CairoOutputDev.h  |    6 ++-
+ 2 files changed, 65 insertions(+), 38 deletions(-)
+
+commit 185ed4f3c98f162fe3ddb00d4aa0b637988dfad9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Oct 16 12:40:27 2011 +0200
+
+    Remove poppler-cairo dependency from poppler-glib pkg-config file
+
+    poppler-glib links to poppler-cairo statically, so it doesn'tm
+    depend on
+    the dynamic library.
+
+ CMakeLists.txt                 |    1 -
+ configure.ac                   |    2 --
+ poppler-glib-uninstalled.pc.in |    2 +-
+ poppler-glib.pc.cmake          |    2 +-
+ poppler-glib.pc.in             |    2 +-
+ 5 files changed, 3 insertions(+), 6 deletions(-)
+
+commit 0339b098f1b00f5ad1bb21bfda14c9c72cb1b058
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Sat Oct 8 15:03:24 2011 +1030
+
+    ps: fix uncolored tiling patterns
+
+    Uncolored patterns and type 3 chars must not use color setting
+    operators. When emitting an uncolored pattern:
+     - disable the update color space functions
+     - disable the update color functions
+     - set pdfLastFill and pdfLastStroke to true to ensure the the sCol
+       and fCol procedures that is used by some of the PS procedures that
+       emulate PDF operators do not update the color.
+
+    Bug 41462
+    (cherry picked from commit acd8ecc9121db58851f73764f046a4f54bd80581)
+
+ poppler/PSOutputDev.cc |   41 +++++++++++++++++++++++++++++++++++++++++
+ poppler/PSOutputDev.h  |    1 +
+ 2 files changed, 42 insertions(+), 0 deletions(-)
+
+commit e0e1b848aad2232adcd54943cb92b317f02da11d
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Fri Oct 7 20:29:36 2011 +1030
+
+    ps: emit non repeating patterns in PSOutput with inType3Char = true
+
+    instead of falling back to Gfx. This avoids emitting the image data
+    twice.
+    (cherry picked from commit 6e1326b11f98f2b277e53a6cdbcb373ce6c29958)
+
+ poppler/PSOutputDev.cc |   23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
+
+commit 2ec41e76624eb7aab0368d76fac99bcbc8bc1879
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Sat Oct 1 20:19:19 2011 +0930
+
+    ps: fix tiling pattern fill matrix
+
+    In PS the pattern matrix maps the pattern space to user space. In PDF
+    the pattern matrix maps the pattern space to the default ctm of the
+    content stream (baseMatrix in Gfx). The matrix mat already contains
+    the
+    correct pattern->baseMatrix so use it instead of pmat.
+
+    Bug 41374
+    (cherry picked from commit ed05fcb8c442b716c5e382c98f2625701926c86a)
+
+ poppler/PSOutputDev.cc |    9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+commit 14f9ff2b149c932b52ac88d7cd3f189e3b98257c
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Thu Oct 6 14:49:19 2011 +0200
+
+    Okular moved to git, fix docs
+
+    Fix URLs in poppler-qt4 documentation
+
+ qt4/src/Mainpage.dox |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit d0e4ba50d101c165106e0dc3b08249dba2ea0465
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Thu Oct 6 14:49:08 2011 +0200
+
+    Explicitly include fontconfig include dir
+
+    This fixes cmake-driven build on systems where fontconfig is
+    installed in
+    non-standard location.
+
+ CMakeLists.txt |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 17ac6b96aa99213f85006a37d10c927fe2e3f06d
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Thu Oct 6 14:48:46 2011 +0200
+
+    Fix typo in cmake option documentation
+
+    Relocatable build does *not* (was missing in docs) hardcode library
+    location.
+
+ CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ae22992b13ad3d9a51bcd3e2e1f187a8edd655f7
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Thu Oct 6 14:21:10 2011 +0200
+
+    close the file or flush stdout
+    (cherry picked from commit ab8616dcb637ac1aeb4d5f142c3c4bff9aecd041)
+
+ utils/pdftocairo.cc |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 8cf3868edf3ef15b4ca3e53e1c3b597e99870070
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Oct 1 15:33:15 2011 +0200
+
+    Another typo fix
+
+ qt4/src/poppler-qt4.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1346caac6c564035d368617a329b361d0253fbf6
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Oct 1 14:34:50 2011 +0200
+
+    Fix typo in documentation
+
+    Reported by Glad Deschrijver
+
+ qt4/src/poppler-qt4.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b5fa040666764407fabed32fde09aa0a98308b46
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Oct 1 14:27:44 2011 +0200
+
+    Remove space after % as it confuses libspectre
+
+    Discussed with Adrian Johnson
+    Problem found by Glad Deschrijver
+    (cherry picked from commit 9855529e8e1a83c6d77a9e4221ea2132d44e9fb1)
+
+ poppler/PSOutputDev.cc |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 66ab373365b8f9060ff3d117bb677520e32c7e8e
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Wed Sep 28 21:20:23 2011 +0930
+
+    cairo: fix crash when using poppler_page_get_image()
+
+ poppler/CairoOutputDev.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 0c0591fa23441c54c9443072615273ea65482d76
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Sep 27 00:45:59 2011 +0200
+
+    0.18.0
+
+ CMakeLists.txt      |    6 +-
+ NEWS                |   14 +++++++
+ configure.ac        |    4 +-
+ cpp/Doxyfile        |    2 +-
+ gtk-doc.make        |  102
+ +++++++++++++++++++++------------------------------
+ poppler/Makefile.am |    2 +-
+ qt4/src/Doxyfile    |    2 +-
+ 7 files changed, 64 insertions(+), 68 deletions(-)
+
 commit 19f5db7acd64330d198f18695175df02141794d7
 Author: Albert Astals Cid <aacid@kde.org>
 Date:   Tue Sep 27 00:15:15 2011 +0200
diff --git a/Build/source/libs/poppler/poppler-0.18.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.18.4/ConfigureChecks.cmake
index 04de970c4e1..04de970c4e1 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.4/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.18.0/INSTALL b/Build/source/libs/poppler/poppler-0.18.4/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.18.4/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.18.0/Makefile.am b/Build/source/libs/poppler/poppler-0.18.4/Makefile.am
index 60c82dca908..60c82dca908 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.18.4/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.18.0/Makefile.in b/Build/source/libs/poppler/poppler-0.18.4/Makefile.in
index a86154e84aa..1f4f007bb2a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/Makefile.in
@@ -196,8 +196,11 @@ FREETYPE_CONFIG = @FREETYPE_CONFIG@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQ = @GLIB_REQ@
+GLIB_REQUIRED = @GLIB_REQUIRED@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
@@ -255,6 +258,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PC_REQUIRES = @PC_REQUIRES@
 PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
+PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@
+PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
diff --git a/Build/source/libs/poppler/poppler-0.18.0/NEWS b/Build/source/libs/poppler/poppler-0.18.4/NEWS
index 2df22081c48..99df10bd829 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/NEWS
+++ b/Build/source/libs/poppler/poppler-0.18.4/NEWS
@@ -1,3 +1,88 @@
+Release 0.18.4
+        core:
+         * CairoOutputDev: Restore temporary clip used in CairoOutputDev::fill when painting a mask
+         * CairoOutputDev: Ensure paintTransparencyGroup uses same ctm as beginTransparencyGroup. Bug #29968
+         * CairoOutputDev: Use fabs when comparing the transformed line width. Bug #43441
+         * CairoOutputDev: Remove unused variable in CairoFontEngine.cc. Bug #45442
+         * SplashOutputDev: Do not use 50Kb of stack in SplashXPath::addCurve. Bug #44905
+         * JpegWriter: set image parameters after jpeg_set_defaults(). Bug #45224
+         * OpenJPEG decoder: Set OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG if you have it. Bug #43414
+         * Lexer: convert integer to real when overflow occurs. Bug #45605
+
+        glib:
+         * Various minor introspection and documentation improvements. Bug #44790
+         * Fix return values. Bug #45440. Bug #45441
+         * gtk-doc improvements. Bug #45549
+         * Introspection improvements. Bug #45455
+        
+        utils:
+         * HtmlOutputDev: Proper unicode support when dumping PDF outline. Bug #45572
+         * HtmlOutputDev: Fix leaks. Bug #45805
+         * HtmlOutputDev: Close li tags in generated outlines. Bug #45807
+         * man pages: fix minor issues with hypens and %
+
+        build system:
+         * automake: Link to lcms if needed
+         * automake: Fix build for builddir != srcdir. Bug #45434
+         * automake: Improve moc detection when cross compiling
+         * Fix build with latest mingw-w64 headers. Bug #45407
+        
+        qt4:
+         * remove non-existing 'qt' include dirs
+        
+Release 0.18.3
+        core:
+         * Do not fail if we are trying to save a file with Encrypt that has not been modified. KDE Bug #288045
+         * Include .otf fonts when finding substitute fonts. Bug #44412
+         * Fix stack overflow in PDFDoc::markObject(). Bug #44660
+         * Include strings.h as we use memcpy. Bug #43558
+
+        utils:
+         * pdfunite: Properly initialize globalParams. Bug #44659
+         * pdfseparate: Properly initialize globalParams
+         * Fix iniliazialization of GooString arguments
+
+        build system:
+         * autoconf: Check for cairo-ft and other cairo backends. Bug #43969
+        
+Release 0.18.2
+        core:
+         * Fix leak in GooString when resizing to a smaller string
+         * Fix crash if failing to parse the colorspace. Bug #42793
+         * Make GfxColorSpace::parse accept dicts
+
+        qt4:
+         * Use PDFDoc(wchar_t *, ...) on Windows. Bug #35378
+         * Add missing include
+         * Minor fixes in documentation
+
+        utils:
+         * pdftocairo: Fix crash when rendering only odd/even pages in a printing format
+        
+        build system:
+         * Fix pkg-config files
+        
+Release 0.18.1
+        core:
+         * PSOutputDev: Output PS that does not confuse libspectre
+         * PSOutputDev: Fix tiling pattern fill matrix. Bug #41374
+         * PSOutputDev: Emit non repeating patterns just once
+         * PSOutputDev: Fix uncolored tiling patterns. Bug #41462
+         * CairoOutputDev: Fix crash when using poppler_page_get_image()
+         * CairoOutputDev: Fix various setSoftMask bugs. Bug #41005
+        
+        utils:
+         * pdftocairo: Flush/close files one we are done using them
+         * pdftocairo: Compile in Windows
+        
+        build system:
+         * CMake: Fix typo in option description
+         * CMake: Correctly include fontconfig include dir
+         * Remove poppler-cairo dependency from poppler-glib pkg-config file
+        
+        qt4:
+         * Minor fixes in documentation
+
 Release 0.18.0
         core:
          * Fix small memory leak when dealing with marked content
diff --git a/Build/source/libs/poppler/poppler-0.18.0/README b/Build/source/libs/poppler/poppler-0.18.4/README
index e5b30a6d9ca..e5b30a6d9ca 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/README
+++ b/Build/source/libs/poppler/poppler-0.18.4/README
diff --git a/Build/source/libs/poppler/poppler-0.18.0/README-XPDF b/Build/source/libs/poppler/poppler-0.18.4/README-XPDF
index ff674a2a7b7..ff674a2a7b7 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.18.4/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.18.0/TODO b/Build/source/libs/poppler/poppler-0.18.4/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/TODO
+++ b/Build/source/libs/poppler/poppler-0.18.4/TODO
diff --git a/Build/source/libs/poppler/poppler-0.18.0/aclocal.m4 b/Build/source/libs/poppler/poppler-0.18.4/aclocal.m4
index 33d6b62ddbd..33d6b62ddbd 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/aclocal.m4
+++ b/Build/source/libs/poppler/poppler-0.18.4/aclocal.m4
diff --git a/Build/source/libs/poppler/poppler-0.18.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.18.4/config.h.cmake
index cae2e71f18a..7dcb1f70a09 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.4/config.h.cmake
@@ -189,6 +189,9 @@
 /* Use win32 font configuration backend */
 #cmakedefine WITH_FONTCONFIGURATION_WIN32 1
 
+/* OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag */
+#cmakedefine WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG 1
+
 /* Define to 1 if the X Window System is missing or not being used. */
 /* #undef X_DISPLAY_MISSING */
 
diff --git a/Build/source/libs/poppler/poppler-0.18.0/config.h.in b/Build/source/libs/poppler/poppler-0.18.4/config.h.in
index 6150ad72a08..abf412c24f0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/config.h.in
@@ -203,6 +203,9 @@
 /* Use win32 font configuration backend */
 #undef WITH_FONTCONFIGURATION_WIN32
 
+/* OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag. */
+#undef WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG
+
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/Build/source/libs/poppler/poppler-0.18.0/configure b/Build/source/libs/poppler/poppler-0.18.4/configure
index 2898d089882..43961509b4c 100755
--- a/Build/source/libs/poppler/poppler-0.18.0/configure
+++ b/Build/source/libs/poppler/poppler-0.18.4/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for poppler 0.18.0.
+# Generated by GNU Autoconf 2.68 for poppler 0.18.4.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>.
 #
@@ -571,8 +571,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='poppler'
 PACKAGE_TARNAME='poppler'
-PACKAGE_VERSION='0.18.0'
-PACKAGE_STRING='poppler 0.18.0'
+PACKAGE_VERSION='0.18.4'
+PACKAGE_STRING='poppler 0.18.4'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler'
 PACKAGE_URL=''
 
@@ -654,6 +654,8 @@ GTK_DOC_BUILD_HTML_FALSE
 GTK_DOC_BUILD_HTML_TRUE
 ENABLE_GTK_DOC_FALSE
 ENABLE_GTK_DOC_TRUE
+GTKDOC_DEPS_LIBS
+GTKDOC_DEPS_CFLAGS
 HTML_DIR
 GTKDOC_MKPDF
 GTKDOC_REBASE
@@ -676,8 +678,11 @@ INTROSPECTION_COMPILER
 INTROSPECTION_SCANNER
 POPPLER_GLIB_LIBS
 POPPLER_GLIB_CFLAGS
+GLIB_REQUIRED
 CAIRO_REQ
 CAIRO_FEATURE
+PDFTOCAIRO_LIBS
+PDFTOCAIRO_CFLAGS
 BUILD_CAIRO_OUTPUT_FALSE
 BUILD_CAIRO_OUTPUT_TRUE
 CAIRO_LIBS
@@ -915,8 +920,12 @@ FONTCONFIG_CFLAGS
 FONTCONFIG_LIBS
 CAIRO_CFLAGS
 CAIRO_LIBS
+PDFTOCAIRO_CFLAGS
+PDFTOCAIRO_LIBS
 POPPLER_GLIB_CFLAGS
 POPPLER_GLIB_LIBS
+GTKDOC_DEPS_CFLAGS
+GTKDOC_DEPS_LIBS
 POPPLER_QT4_CFLAGS
 POPPLER_QT4_LIBS
 POPPLER_QT4_TEST_CFLAGS
@@ -1467,7 +1476,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures poppler 0.18.0 to adapt to many kinds of systems.
+\`configure' configures poppler 0.18.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1541,7 +1550,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of poppler 0.18.0:";;
+     short | recursive ) echo "Configuration of poppler 0.18.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1589,7 +1598,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1637,10 +1646,18 @@ Some influential environment variables:
   CAIRO_CFLAGS
               C compiler flags for CAIRO, overriding pkg-config
   CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
+  PDFTOCAIRO_CFLAGS
+              C compiler flags for PDFTOCAIRO, overriding pkg-config
+  PDFTOCAIRO_LIBS
+              linker flags for PDFTOCAIRO, overriding pkg-config
   POPPLER_GLIB_CFLAGS
               C compiler flags for POPPLER_GLIB, overriding pkg-config
   POPPLER_GLIB_LIBS
               linker flags for POPPLER_GLIB, overriding pkg-config
+  GTKDOC_DEPS_CFLAGS
+              C compiler flags for GTKDOC_DEPS, overriding pkg-config
+  GTKDOC_DEPS_LIBS
+              linker flags for GTKDOC_DEPS, overriding pkg-config
   POPPLER_QT4_CFLAGS
               C compiler flags for POPPLER_QT4, overriding pkg-config
   POPPLER_QT4_LIBS
@@ -1722,7 +1739,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-poppler configure 0.18.0
+poppler configure 0.18.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2416,7 +2433,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by poppler $as_me 0.18.0, which was
+It was created by poppler $as_me 0.18.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3232,7 +3249,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='poppler'
- VERSION='0.18.0'
+ VERSION='0.18.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5273,8 +5290,8 @@ esac
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -5918,6 +5935,11 @@ else
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5957,7 +5979,7 @@ else
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -6383,7 +6405,7 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -7020,13 +7042,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -7173,6 +7195,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -7561,7 +7584,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7572,7 +7595,20 @@ sparc*-*solaris*)
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -8212,7 +8248,13 @@ else
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -8223,6 +8265,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -8255,6 +8298,7 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -8276,7 +8320,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -8412,7 +8458,22 @@ fi
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -8490,6 +8551,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -8949,7 +9014,9 @@ lt_prog_compiler_static=
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -9040,18 +9107,33 @@ lt_prog_compiler_static=
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -9413,7 +9495,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9663,8 +9744,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10043,6 +10123,7 @@ fi
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -10088,6 +10169,7 @@ fi
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -10116,10 +10198,6 @@ fi
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10132,7 +10210,7 @@ fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10171,7 +10249,6 @@ fi
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -10795,11 +10872,6 @@ esac
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -10889,7 +10961,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10898,7 +10970,7 @@ aix3*)
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10963,7 +11035,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -11102,7 +11174,7 @@ darwin* | rhapsody*)
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -11110,10 +11182,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11121,7 +11189,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11139,7 +11207,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -11159,17 +11227,18 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -11230,7 +11299,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -11246,7 +11315,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -11283,9 +11352,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11367,7 +11436,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -11436,7 +11505,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11461,7 +11530,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11485,7 +11554,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -11516,7 +11585,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11526,7 +11595,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12308,6 +12377,8 @@ CC="$lt_save_CC"
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -13533,7 +13604,6 @@ export_dynamic_flag_spec_CXX=
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -14117,6 +14187,7 @@ fi
   hardcode_shlibpath_var_CXX=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec_CXX=''
   fi
@@ -14161,7 +14232,7 @@ fi
         esac
         ;;
 
-      freebsd[12]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -14837,6 +14908,7 @@ _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -15626,7 +15698,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
       exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
@@ -15779,8 +15853,6 @@ esac
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -15806,7 +15878,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -15815,7 +15887,7 @@ aix3*)
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -15880,7 +15952,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -16017,7 +16089,7 @@ darwin* | rhapsody*)
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -16025,10 +16097,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -16036,7 +16104,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -16054,7 +16122,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -16074,17 +16142,18 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -16145,7 +16214,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -16161,7 +16230,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -16198,9 +16267,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16282,7 +16351,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -16351,7 +16420,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16376,7 +16445,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -16400,7 +16469,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -16431,7 +16500,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16441,7 +16510,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -19054,6 +19123,32 @@ if test x$enable_libopenjpeg = xyes; then
 
   $as_echo "#define ENABLE_LIBOPENJPEG 1" >>confdefs.h
 
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <openjpeg.h>
+
+int
+main ()
+{
+
+  int foo = OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  have_openjpeg_flag="yes"
+else
+  am_cv_proto_iconv_arg1="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  if test x$have_openjpeg_flag = xyes; then
+
+$as_echo "#define WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG 1" >>confdefs.h
+
+  fi
 fi
 
  if test x$enable_libopenjpeg = xyes; then
@@ -20388,12 +20483,12 @@ if test -n "$CAIRO_CFLAGS"; then
     pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION cairo-ft >= \$CAIRO_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION" 2>/dev/null`
+  pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -20405,12 +20500,12 @@ if test -n "$CAIRO_LIBS"; then
     pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION cairo-ft >= \$CAIRO_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_VERSION" 2>/dev/null`
+  pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -20431,14 +20526,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1`
+	        CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>&1`
         else
-	        CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1`
+	        CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CAIRO_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (cairo >= $CAIRO_VERSION) were not met:
+	as_fn_error $? "Package requirements (cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION) were not met:
 
 $CAIRO_PKG_ERRORS
 
@@ -20480,12 +20575,12 @@ if test -n "$CAIRO_CFLAGS"; then
     pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION cairo-ft >= \$CAIRO_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION" 2>/dev/null`
+  pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -20497,12 +20592,12 @@ if test -n "$CAIRO_LIBS"; then
     pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION cairo-ft >= \$CAIRO_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_VERSION" 2>/dev/null`
+  pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -20523,9 +20618,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1`
+	        CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>&1`
         else
-	        CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1`
+	        CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CAIRO_PKG_ERRORS" >&5
@@ -20557,6 +20652,126 @@ fi
 
 
 if test x$enable_cairo_output = xyes; then
+  PDFTOCAIRO_DEPS="cairo cairo-ft"
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-pdf\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "cairo-pdf") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-pdf"
+fi
+  if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-ps\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "cairo-ps") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-ps"
+fi
+  if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-svg\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "cairo-svg") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-svg"
+fi
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDFTOCAIRO" >&5
+$as_echo_n "checking for PDFTOCAIRO... " >&6; }
+
+if test -n "$PDFTOCAIRO_CFLAGS"; then
+    pkg_cv_PDFTOCAIRO_CFLAGS="$PDFTOCAIRO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$PDFTOCAIRO_DEPS\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$PDFTOCAIRO_DEPS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PDFTOCAIRO_CFLAGS=`$PKG_CONFIG --cflags "$PDFTOCAIRO_DEPS" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$PDFTOCAIRO_LIBS"; then
+    pkg_cv_PDFTOCAIRO_LIBS="$PDFTOCAIRO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$PDFTOCAIRO_DEPS\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$PDFTOCAIRO_DEPS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PDFTOCAIRO_LIBS=`$PKG_CONFIG --libs "$PDFTOCAIRO_DEPS" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        PDFTOCAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$PDFTOCAIRO_DEPS" 2>&1`
+        else
+	        PDFTOCAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$PDFTOCAIRO_DEPS" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PDFTOCAIRO_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements ($PDFTOCAIRO_DEPS) were not met:
+
+$PDFTOCAIRO_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables PDFTOCAIRO_CFLAGS
+and PDFTOCAIRO_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PDFTOCAIRO_CFLAGS
+and PDFTOCAIRO_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	PDFTOCAIRO_CFLAGS=$pkg_cv_PDFTOCAIRO_CFLAGS
+	PDFTOCAIRO_LIBS=$pkg_cv_PDFTOCAIRO_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+
   $as_echo "#define HAVE_CAIRO 1" >>confdefs.h
 
   CAIRO_FEATURE="#define POPPLER_HAS_CAIRO 1"
@@ -20587,6 +20802,7 @@ if test x$enable_cairo_output = xyes; then
   POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
 
   GLIB_REQUIRED=2.18
+
   # Check whether --enable-poppler-glib was given.
 if test "${enable_poppler_glib+set}" = set; then :
   enableval=$enable_poppler_glib; enable_poppler_glib=$enableval
@@ -20855,7 +21071,6 @@ fi
 
 
 
-    GLIB_REQ="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION"
     # Extract the first word of "glib-mkenums", so it can be a program name with args.
 set dummy glib-mkenums; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -20904,7 +21119,6 @@ else
     as_fn_error $? "\"Cairo output is required to build glib frontend\"" "$LINENO" 5
   fi
   enable_poppler_glib="no"
-  GLIB_REQ=""
 fi
  if test x$enable_poppler_glib = xyes; then
   BUILD_POPPLER_GLIB_TRUE=
@@ -20928,6 +21142,7 @@ fi
 
 
 
+
     # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 set dummy gtkdoc-check; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -21085,6 +21300,99 @@ fi
 else
   as_fn_error $? "You need to have gtk-doc >= 1.14 installed to build $PACKAGE_NAME" "$LINENO" 5
 fi
+        if test "x$PACKAGE_NAME" != "xglib"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5
+$as_echo_n "checking for GTKDOC_DEPS... " >&6; }
+
+if test -n "$GTKDOC_DEPS_CFLAGS"; then
+    pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GTKDOC_DEPS_LIBS"; then
+    pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
+        else
+	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0) were not met:
+
+$GTKDOC_DEPS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
+and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
+and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
+	GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+    fi
   fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
@@ -21497,14 +21805,200 @@ fi
 
 
 if test x$enable_poppler_qt4 = xyes; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}moc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}moc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MOCQT4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MOCQT4"; then
+  ac_cv_prog_MOCQT4="$MOCQT4" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MOCQT4="${ac_tool_prefix}moc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MOCQT4=$ac_cv_prog_MOCQT4
+if test -n "$MOCQT4"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOCQT4" >&5
+$as_echo "$MOCQT4" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MOCQT4"; then
+  ac_ct_MOCQT4=$MOCQT4
+  # Extract the first word of "moc", so it can be a program name with args.
+set dummy moc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MOCQT4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MOCQT4"; then
+  ac_cv_prog_ac_ct_MOCQT4="$ac_ct_MOCQT4" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_MOCQT4="moc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MOCQT4=$ac_cv_prog_ac_ct_MOCQT4
+if test -n "$ac_ct_MOCQT4"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MOCQT4" >&5
+$as_echo "$ac_ct_MOCQT4" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MOCQT4" = x; then
+    MOCQT4=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MOCQT4=$ac_ct_MOCQT4
+  fi
+else
+  MOCQT4="$ac_cv_prog_MOCQT4"
+fi
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc" >&5
 $as_echo_n "checking for Qt4 moc... " >&6; }
-  MOCQT4=`which moc`
   mocversion=`$MOCQT4 -v 2>&1`
   mocversiongrep=`echo $mocversion | grep "Qt 4"`
   if test x"$mocversiongrep" != x"$mocversion"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     # moc was not the qt4 one, try with moc-qt4
-    MOCQT4=`which moc-qt4`
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}moc-qt4", so it can be a program name with args.
+set dummy ${ac_tool_prefix}moc-qt4; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MOCQT4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MOCQT4"; then
+  ac_cv_prog_MOCQT4="$MOCQT4" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_MOCQT4="${ac_tool_prefix}moc-qt4"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MOCQT4=$ac_cv_prog_MOCQT4
+if test -n "$MOCQT4"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOCQT4" >&5
+$as_echo "$MOCQT4" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MOCQT4"; then
+  ac_ct_MOCQT4=$MOCQT4
+  # Extract the first word of "moc-qt4", so it can be a program name with args.
+set dummy moc-qt4; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MOCQT4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MOCQT4"; then
+  ac_cv_prog_ac_ct_MOCQT4="$ac_ct_MOCQT4" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_MOCQT4="moc-qt4"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MOCQT4=$ac_cv_prog_ac_ct_MOCQT4
+if test -n "$ac_ct_MOCQT4"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MOCQT4" >&5
+$as_echo "$ac_ct_MOCQT4" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MOCQT4" = x; then
+    MOCQT4=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MOCQT4=$ac_ct_MOCQT4
+  fi
+else
+  MOCQT4="$ac_cv_prog_MOCQT4"
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc-qt4" >&5
+$as_echo_n "checking for Qt4 moc-qt4... " >&6; }
     mocversion=`$MOCQT4 -v 2>&1`
     mocversiongrep=`echo $mocversion | grep "Qt 4"`
     if test x"$mocversiongrep" != x"$mocversion"; then
@@ -22771,9 +23265,9 @@ POPPLER_MAJOR_VERSION=0
 
 POPPLER_MINOR_VERSION=18
 
-POPPLER_MICRO_VERSION=0
+POPPLER_MICRO_VERSION=4
 
-POPPLER_VERSION=0.18.0
+POPPLER_VERSION=0.18.4
 
 
 ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile cpp/Makefile cpp/poppler-version.h cpp/tests/Makefile poppler.pc poppler-uninstalled.pc poppler-cairo.pc poppler-cairo-uninstalled.pc poppler-splash.pc poppler-splash-uninstalled.pc poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc poppler-qt4-uninstalled.pc poppler-cpp.pc poppler-cpp-uninstalled.pc"
@@ -23417,7 +23911,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by poppler $as_me 0.18.0, which was
+This file was extended by poppler $as_me 0.18.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23483,7 +23977,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-poppler config.status 0.18.0
+poppler config.status 0.18.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -23623,6 +24117,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -23703,7 +24198,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -23775,7 +24269,6 @@ with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -23817,6 +24310,7 @@ DLLTOOL \
 OBJDUMP \
 SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -23865,7 +24359,6 @@ with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -23899,7 +24392,6 @@ with_gnu_ld_CXX \
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
@@ -24737,8 +25229,8 @@ $as_echo X"$file" |
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -24801,6 +25293,9 @@ SHELL=$lt_SHELL
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -25096,10 +25591,6 @@ no_undefined_flag=$lt_no_undefined_flag
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -25442,10 +25933,6 @@ no_undefined_flag=$lt_no_undefined_flag_CXX
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
diff --git a/Build/source/libs/poppler/poppler-0.18.0/configure.ac b/Build/source/libs/poppler/poppler-0.18.4/configure.ac
index 7293d1f4082..cff8e7bfd02 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.18.4/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[18])
-m4_define([poppler_version_micro],[0])
+m4_define([poppler_version_micro],[4])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
 AC_PREREQ(2.59)
@@ -168,6 +168,14 @@ if test x$enable_libopenjpeg = xyes; then
   LIBOPENJPEG_LIBS="-lopenjpeg"
   AC_SUBST(LIBOPENJPEG_LIBS)
   AC_DEFINE(ENABLE_LIBOPENJPEG)
+  AC_TRY_COMPILE([
+#include <openjpeg.h>
+], [
+  int foo = OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
+], have_openjpeg_flag="yes", am_cv_proto_iconv_arg1="no")
+  if test x$have_openjpeg_flag = xyes; then
+    AC_DEFINE(WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG, 1, [OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag.])
+  fi
 fi
 
 AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$enable_libopenjpeg = xyes)
@@ -379,9 +387,9 @@ AC_ARG_ENABLE(cairo-output,
               enable_cairo_output=$enableval,
               enable_cairo_output="try")
 if test x$enable_cairo_output = xyes; then
-  PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION)
+  PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION)
 elif test x$enable_cairo_output = xtry; then
-  PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION,
+  PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION,
                     [enable_cairo_output="yes"],
                     [enable_cairo_output="no"])
 fi
@@ -392,6 +400,16 @@ AC_SUBST(CAIRO_LIBS)
 AM_CONDITIONAL(BUILD_CAIRO_OUTPUT, test x$enable_cairo_output = xyes)
 AH_TEMPLATE([HAVE_CAIRO], [Use cairo for rendering.])
 if test x$enable_cairo_output = xyes; then
+  PDFTOCAIRO_DEPS="cairo cairo-ft"
+  dnl Check for optional cairo backends used by pdftocairo
+  PKG_CHECK_EXISTS(cairo-pdf, [PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-pdf"], [])
+  PKG_CHECK_EXISTS(cairo-ps,  [PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-ps"],  [])
+  PKG_CHECK_EXISTS(cairo-svg, [PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-svg"], [])
+
+  PKG_CHECK_MODULES(PDFTOCAIRO, $PDFTOCAIRO_DEPS)
+  AC_SUBST(PDFTOCAIRO_CFLAGS)
+  AC_SUBST(PDFTOCAIRO_LIBS)
+
   AC_DEFINE(HAVE_CAIRO)
   CAIRO_FEATURE="#define POPPLER_HAS_CAIRO 1"
   CAIRO_REQ="cairo"
@@ -409,6 +427,7 @@ if test x$enable_cairo_output = xyes; then
   POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
 
   GLIB_REQUIRED=2.18
+  AC_SUBST(GLIB_REQUIRED)
   AC_ARG_ENABLE(poppler-glib,
 	        AC_HELP_STRING([--disable-poppler-glib],
 		               [Don't compile poppler glib wrapper.]),
@@ -425,7 +444,6 @@ if test x$enable_cairo_output = xyes; then
     # Check for introspection
     GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
-    GLIB_REQ="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION"
     AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
     POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
     POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
@@ -435,7 +453,6 @@ else
     AC_MSG_ERROR("Cairo output is required to build glib frontend")
   fi
   enable_poppler_glib="no"
-  GLIB_REQ=""
 fi
 AM_CONDITIONAL(BUILD_POPPLER_GLIB, test x$enable_poppler_glib = xyes)
 AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
@@ -477,13 +494,15 @@ AC_SUBST(POPPLER_QT4_LIBS)
 AC_SUBST(POPPLER_QT4_TEST_LIBS)
 
 if test x$enable_poppler_qt4 = xyes; then
+  AC_CHECK_TOOL(MOCQT4, moc)
   AC_MSG_CHECKING([for Qt4 moc])
-  MOCQT4=`which moc`
   mocversion=`$MOCQT4 -v 2>&1`
   mocversiongrep=`echo $mocversion | grep "Qt 4"`
   if test x"$mocversiongrep" != x"$mocversion"; then
+    AC_MSG_RESULT([no])
     # moc was not the qt4 one, try with moc-qt4
-    MOCQT4=`which moc-qt4`
+    AC_CHECK_TOOL(MOCQT4, moc-qt4)
+    AC_MSG_CHECKING([for Qt4 moc-qt4])
     mocversion=`$MOCQT4 -v 2>&1`
     mocversiongrep=`echo $mocversion | grep "Qt 4"`
     if test x"$mocversiongrep" != x"$mocversion"; then
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiBase.cc
index 52808386e76..52808386e76 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiBase.h
index e2550017aac..e2550017aac 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiEncodings.cc
index 946b56c19d0..946b56c19d0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiEncodings.h
index fb4eca86d9f..fb4eca86d9f 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiTrueType.cc
index d716638c7ec..d716638c7ec 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiTrueType.h
index 4ba9b1fe924..4ba9b1fe924 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiType1.cc
index 3fe7f4f7169..3fe7f4f7169 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiType1.h
index 85e67b1c82b..85e67b1c82b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiType1C.cc
index 9c5b10cf433..9c5b10cf433 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiType1C.h
index 694d5cc7a30..694d5cc7a30 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.18.4/fofi/Makefile.am
index 7a302486505..7a302486505 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.18.0/fofi/Makefile.in b/Build/source/libs/poppler/poppler-0.18.4/fofi/Makefile.in
index f5e00e62c1a..0c545492d4a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/fofi/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/fofi/Makefile.in
@@ -175,8 +175,11 @@ FREETYPE_CONFIG = @FREETYPE_CONFIG@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQ = @GLIB_REQ@
+GLIB_REQUIRED = @GLIB_REQUIRED@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
@@ -234,6 +237,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PC_REQUIRES = @PC_REQUIRES@
 PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
+PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@
+PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/FixedPoint.cc
index 79a6a9ae1f4..79a6a9ae1f4 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.18.4/goo/FixedPoint.h
index 08936bc6f2a..08936bc6f2a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/GooHash.cc
index 5da9d69f82c..5da9d69f82c 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.18.4/goo/GooHash.h
index bdcf1c43ece..bdcf1c43ece 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.18.4/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/GooList.cc
index dc6e4e21e00..dc6e4e21e00 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.18.4/goo/GooList.h
index 576f3e8142d..576f3e8142d 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.18.4/goo/GooMutex.h
index 3f53a626a67..3f53a626a67 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/GooString.cc
index a96b792466f..31c95b1ac9b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/GooString.cc
@@ -19,6 +19,7 @@
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2008-2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2011 Kenji Uno <ku@digitaldolphins.jp>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -129,6 +130,8 @@ void inline GooString::resize(int newLength) {
       } else {
 	memcpy(s1, s, length);
       }
+      if (s != sStatic)
+	gfree(s);
     }
 
   }
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.18.4/goo/GooString.h
index e77308dcdf9..e77308dcdf9 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.18.4/goo/GooTimer.h
index d700e501c07..d700e501c07 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.18.4/goo/ImgWriter.h
index 185c230ef48..185c230ef48 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/JpegWriter.cc
index 7ed5d524ce8..9b6645b82a0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/JpegWriter.cc
@@ -5,7 +5,7 @@
 // This file is licensed under the GPLv2 or later
 //
 // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
-// Copyright (C) 2010 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2010, 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2010 Harry Roberts <harry.roberts@midnight-labs.org>
 // Copyright (C) 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
@@ -53,6 +53,10 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
 	// Initialize libjpeg
 	jpeg_create_compress(&cinfo);
 	
+        // Set colorspace and initialise defaults
+	cinfo.in_color_space = colorMode; /* colorspace of input image */
+	jpeg_set_defaults(&cinfo);
+
 	// Set destination file
 	jpeg_stdio_dest(&cinfo, f);
 	
@@ -62,7 +66,6 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
 	cinfo.density_unit = 1; // dots per inch
 	cinfo.X_density = hDPI;
 	cinfo.Y_density = vDPI;
-	cinfo.in_color_space = colorMode; /* colorspace of input image */
 	/* # of color components per pixel */
 	switch (colorMode) {
 		case JCS_GRAYSCALE:
@@ -77,7 +80,6 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
 		default:
 			return false;
 	}
-	jpeg_set_defaults(&cinfo);
 	if (cinfo.in_color_space == JCS_CMYK) {
 		jpeg_set_colorspace(&cinfo, JCS_YCCK);
 		cinfo.write_JFIF_header = TRUE;
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.18.4/goo/JpegWriter.h
index 7af6870f6b8..7af6870f6b8 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.18.4/goo/Makefile.am
index 1921b1ea4ea..1921b1ea4ea 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/Makefile.in b/Build/source/libs/poppler/poppler-0.18.4/goo/Makefile.in
index 8e5464d79fc..5c39c6ea55f 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/Makefile.in
@@ -178,8 +178,11 @@ FREETYPE_CONFIG = @FREETYPE_CONFIG@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQ = @GLIB_REQ@
+GLIB_REQUIRED = @GLIB_REQUIRED@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
@@ -237,6 +240,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PC_REQUIRES = @PC_REQUIRES@
 PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
+PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@
+PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/PNGWriter.cc
index f88c3a77a7b..1fb8cabcb54 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/PNGWriter.cc
@@ -6,7 +6,7 @@
 //
 // Copyright (C) 2009 Warren Toomey <wkt@tuhs.org>
 // Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com>
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
 // Copyright (C) 2010, 2011 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2011 Thomas Klausner <wiz@danbala.tuwien.ac.at>
@@ -19,6 +19,7 @@
 
 #include <zlib.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "poppler/Error.h"
 #include "goo/gmem.h"
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.18.4/goo/PNGWriter.h
index f22495d0d00..f22495d0d00 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/TiffWriter.cc
index f63b2450029..f63b2450029 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.18.4/goo/TiffWriter.h
index b2b0ea99cf9..b2b0ea99cf9 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/gfile.cc
index f48f9f3fbca..f48f9f3fbca 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.18.4/goo/gfile.h
index 0bc010e7b58..0bc010e7b58 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/gmem.cc
index 3e9adb0582c..3e9adb0582c 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.18.4/goo/gmem.h
index 405c8291fd4..405c8291fd4 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.18.4/goo/gstrtod.cc
index e6c3a00741f..e6c3a00741f 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.18.4/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.18.4/goo/gtypes.h
index b7a2dd2d268..b7a2dd2d268 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.18.4/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.18.4/gtk-doc.make
index 4450835f085..9841de47922 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.18.4/gtk-doc.make
@@ -5,12 +5,12 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN =
 endif
 
@@ -30,11 +30,12 @@ SETUP_FILES = \
 	$(DOC_MODULE)-overrides.txt
 
 EXTRA_DIST = 				\
+	$(HTML_IMAGES)			\
 	$(SETUP_FILES)
 
 DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	setup.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -75,36 +76,41 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	   echo 'gtk-doc: Preparing build'; \
-	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
-	   if test "x$$files" != "x" ; then \
-	       for file in $$files ; do \
-	           test -f $(abs_srcdir)/$$file && \
-	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
-	       done \
-	   fi \
+	    echo '  DOC   Preparing build'; \
+	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    if test "x$$files" != "x" ; then \
+	        for file in $$files ; do \
+	            test -f $(abs_srcdir)/$$file && \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	        done; \
+	    fi; \
 	fi
 	@touch setup-build.stamp
 
 
-setup.stamp: setup-build.stamp
-	@true
-
-
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
+	@echo '  DOC   Scanning header files'
 	@_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
+	    echo "  DOC   Introspecting gobjects"; \
+	    scanobj_options=""; \
+	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	    if test "$(?)" = "0"; then \
+	        if test "x$(V)" = "x1"; then \
+	            scanobj_options="--verbose"; \
+	        fi; \
+	    fi; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
 	    for i in $(SCANOBJ_FILES) ; do \
-                 test -f $$i || touch $$i ; \
+	        test -f $$i || touch $$i ; \
 	    done \
 	fi
 	@touch scan-build.stamp
@@ -114,8 +120,8 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 
 #### xml ####
 
-sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	@echo '  DOC   Building XML'
 	@_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -129,13 +135,19 @@ sgml.stamp: sgml-build.stamp
 #### html ####
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
+	@echo '  DOC   Building HTML'
 	@rm -rf html
 	@mkdir html
 	@mkhtml_options=""; \
+	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkhtml_options="$$mkhtml_options --verbose"; \
+	  fi; \
+	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(abs_srcdir)"; \
+	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	-@test "x$(HTML_IMAGES)" = "x" || \
@@ -147,48 +159,54 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo 'gtk-doc: Fixing cross-references'
+	@echo '  DOC   Fixing cross-references'
 	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	@touch html-build.stamp
 
 #### pdf ####
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building PDF'
-	@rm -rf $(DOC_MODULE).pdf
-	@mkpdf_imgdirs=""; \
+	@echo '  DOC   Building PDF'
+	@rm -f $(DOC_MODULE).pdf
+	@mkpdf_options=""; \
+	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkpdf_options="$$mkpdf_options --verbose"; \
+	  fi; \
+	fi; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
 	    part=`dirname $$img`; \
-	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+	    echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
 	    if test $$? != 0; then \
-	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+	      mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
 	    fi; \
 	  done; \
 	fi; \
-	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
 
 clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
+	@rm -f *~ *.bak
+	@rm -rf .libs
 
 distclean-local:
-	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local: clean
-	rm -rf xml html
+	@rm -rf xml html
 
 install-data-local:
 	@installfiles=`echo $(builddir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
+	if test "$$installfiles" = '$(builddir)/html/*'; \
+	then echo 1>&2 'Nothing to install' ; \
 	else \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
@@ -197,14 +215,12 @@ install-data-local:
 	  fi; \
 	  $(mkinstalldirs) $${installdir} ; \
 	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
+	    echo ' $(INSTALL_DATA) '$$i ; \
 	    $(INSTALL_DATA) $$i $${installdir}; \
 	  done; \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 	  fi; \
 	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 	fi
@@ -229,12 +245,12 @@ dist-check-gtkdoc:
 endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/html
-	cp $(builddir)/html/* $(distdir)/html
-	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(builddir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(builddir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+	@mkdir $(distdir)/html
+	@cp ./html/* $(distdir)/html
+	@-cp ./$(DOC_MODULE).pdf $(distdir)/
+	@-cp ./$(DOC_MODULE).types $(distdir)/
+	@-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+	@cd $(distdir) && rm -f $(DISTCLEANFILES)
+	@$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.18.4/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.18.4/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-glib-uninstalled.pc.in
index d0d63f4ae6f..5fcb6f24b9a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-glib-uninstalled.pc.in
@@ -1,7 +1,7 @@
 Name: poppler-glib
 Description: GLib wrapper for poppler - uninstalled
 Version: @VERSION@
-Requires: poppler-cairo = @VERSION@ @GLIB_REQ@
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
 
 Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.18.4/poppler-glib.pc.cmake
index 5e940155c2d..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-glib.pc.cmake
@@ -6,7 +6,7 @@ includedir=${prefix}/include
 Name: poppler-glib
 Description: GLib wrapper for poppler
 Version: @POPPLER_VERSION@
-Requires: poppler-cairo = @POPPLER_VERSION@ @GLIB_REQ@
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
 @PC_REQUIRES_PRIVATE@
 
 Libs: -L${libdir} -lpoppler-glib
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-glib.pc.in
index 05b9a771914..9ba8978f6ec 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-glib.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: poppler-glib
 Description: GLib wrapper for poppler
 Version: @VERSION@
-Requires: poppler-cairo = @VERSION@ @GLIB_REQ@
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
 @PC_REQUIRES_PRIVATE@
 
 Libs: -L${libdir} -lpoppler-glib
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.18.4/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.18.4/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.18.4/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.18.4/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Annot.cc
index 664a6c16fd5..664a6c16fd5 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Annot.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Annot.h
index 59d610ba40b..59d610ba40b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Array.cc
index e7ec4e7dc5f..e7ec4e7dc5f 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Array.h
index a6aca260b9f..a6aca260b9f 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/ArthurOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/ArthurOutputDev.cc
index 68a1c7163da..68a1c7163da 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/ArthurOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/ArthurOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/ArthurOutputDev.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/ArthurOutputDev.h
index ed631a053ef..ed631a053ef 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/ArthurOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/ArthurOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/BuiltinFont.cc
index 329ff62fc39..329ff62fc39 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/BuiltinFont.h
index 8652034fd63..8652034fd63 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/CMap.cc
index 0e861c017f8..0e861c017f8 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/CMap.h
index 9de0a8702c9..9de0a8702c9 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/CachedFile.cc
index 393383006b0..393383006b0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoFontEngine.cc
index 95ac60d1a36..63462522e35 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoFontEngine.cc
@@ -25,6 +25,7 @@
 // Copyright (C) 2009 Darren Kenny <darren.kenny@sun.com>
 // Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 // Copyright (C) 2010 Jan Kümmel <jan+freedesktop@snorc.org>
+// Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
 //
 // 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
@@ -106,7 +107,7 @@ CairoFont::getGlyph(CharCode code,
 double
 CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
 {
-  double w1, w2,w3;
+  double w1, w2;
   CharCode code;
   char *name;
 
@@ -134,7 +135,6 @@ CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
 
 	cairo_scaled_font_destroy(scaled_font);
 	cairo_font_options_destroy(options);
-	w3 = extents.width;
 	w2 = extents.x_advance;
       }
       if (!gfxFont->isSymbolic()) {
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoFontEngine.h
index 552b5e649fa..552b5e649fa 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoOutputDev.cc
index 30c69f12451..9374822dae3 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoOutputDev.cc
@@ -20,7 +20,7 @@
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
 // Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2008 Carl Worth <cworth@cworth.org>
-// Copyright (C) 2008-2011 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008-2012 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 Hib Eris <hib@hiberis.nl>
@@ -78,6 +78,11 @@ static inline void printMatrix(cairo_matrix_t *matrix){
 			matrix->x0, matrix->y0);
 }
 
+
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+
+
 //------------------------------------------------------------------------
 // CairoImage
 //------------------------------------------------------------------------
@@ -261,6 +266,7 @@ void CairoOutputDev::saveState(GfxState *state) {
 
   MaskStack *ms = new MaskStack;
   ms->mask = cairo_pattern_reference(mask);
+  ms->mask_matrix = mask_matrix;
   ms->next = maskStack;
   maskStack = ms;
 }
@@ -284,6 +290,7 @@ void CairoOutputDev::restoreState(GfxState *state) {
     if (mask)
       cairo_pattern_destroy(mask);
     mask = ms->mask;
+    mask_matrix = ms->mask_matrix;
     maskStack = ms->next;
     delete ms;
   }
@@ -410,8 +417,6 @@ void CairoOutputDev::updateMiterLimit(GfxState *state) {
     cairo_set_miter_limit (cairo_shape, state->getMiterLimit());
 }
 
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-
 void CairoOutputDev::updateLineWidth(GfxState *state) {
   LOG(printf ("line width: %f\n", state->getLineWidth()));
   adjusted_stroke_width = gFalse;
@@ -434,7 +439,7 @@ void CairoOutputDev::updateLineWidth(GfxState *state) {
 
       /* find out line width in device units */
       cairo_user_to_device_distance(cairo, &x, &y);
-      if (x <= 1.0 && y <= 1.0) {
+      if (fabs(x) <= 1.0 && fabs(y) <= 1.0) {
 	/* adjust width to at least one device pixel */
 	x = y = 1.0;
 	cairo_device_to_user_distance(cairo, &x, &y);
@@ -724,8 +729,11 @@ void CairoOutputDev::fill(GfxState *state) {
   LOG(printf ("fill\n"));
   //XXX: how do we get the path
   if (mask) {
+    cairo_save (cairo);
     cairo_clip (cairo);
+    cairo_set_matrix (cairo, &mask_matrix);
     cairo_mask (cairo, mask);
+    cairo_restore (cairo);
   } else if (strokePathClip) {
     fillToStrokePathClip();
   } else {
@@ -1388,6 +1396,7 @@ void CairoOutputDev::beginTransparencyGroup(GfxState * /*state*/, double * /*bbo
   ColorSpaceStack* css = new ColorSpaceStack;
   css->cs = blendingColorSpace;
   css->knockout = knockout;
+  cairo_get_matrix(cairo, &css->group_matrix);
   css->next = groupColorSpaceStack;
   groupColorSpaceStack = css;
 
@@ -1444,10 +1453,12 @@ void CairoOutputDev::endTransparencyGroup(GfxState * /*state*/) {
 }
 
 void CairoOutputDev::paintTransparencyGroup(GfxState * /*state*/, double * /*bbox*/) {
-  cairo_set_source (cairo, group);
-
   LOG(printf ("paint transparency group\n"));
 
+  cairo_save (cairo);
+  cairo_set_matrix (cairo, &groupColorSpaceStack->group_matrix);
+  cairo_set_source (cairo, group);
+
   if (!mask) {
     //XXX: deal with mask && shape case
     if (shape) {
@@ -1477,23 +1488,27 @@ void CairoOutputDev::paintTransparencyGroup(GfxState * /*state*/, double * /*bbo
     if (status)
       printf("BAD status: %s\n", cairo_status_to_string(status));
   } else {
+    cairo_save(cairo);
+    cairo_set_matrix(cairo, &mask_matrix);
     cairo_mask(cairo, mask);
+    cairo_restore(cairo);
 
     cairo_pattern_destroy(mask);
     mask = NULL;
   }
 
   popTransparencyGroup();
+  cairo_restore(cairo);
 }
 
-static uint32_t luminocity(uint32_t x)
+static int luminocity(uint32_t x)
 {
   int r = (x >> 16) & 0xff;
   int g = (x >>  8) & 0xff;
   int b = (x >>  0) & 0xff;
   // an arbitrary integer approximation of .3*r + .59*g + .11*b
   int y = (r*19661+g*38666+b*7209 + 32829)>>16;
-  return y << 24;
+  return y;
 }
 
 
@@ -1509,24 +1524,39 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
      * So we paint the group to an image surface convert it to a luminocity map
      * and then use that as the mask. */
 
-    double x1, y1, x2, y2, tmp;
+    /* Get clip extents in device space */
+    double x1, y1, x2, y2, x_min, y_min, x_max, y_max;
     cairo_clip_extents(cairo, &x1, &y1, &x2, &y2);
     cairo_user_to_device(cairo, &x1, &y1);
     cairo_user_to_device(cairo, &x2, &y2);
-    if (x1 > x2) {
-      tmp = x1;
-      x1 = x2;
-      x2 = tmp;
-    }
+    x_min = MIN(x1, x2);
+    y_min = MIN(y1, y2);
+    x_max = MAX(x1, x2);
+    y_max = MAX(y1, y2);
+    cairo_clip_extents(cairo, &x1, &y1, &x2, &y2);
+    cairo_user_to_device(cairo, &x1, &y2);
+    cairo_user_to_device(cairo, &x2, &y1);
+    x_min = MIN(x_min,MIN(x1, x2));
+    y_min = MIN(y_min,MIN(y1, y2));
+    x_max = MAX(x_max,MAX(x1, x2));
+    y_max = MAX(y_max,MAX(y1, y2));
+
+    int width = (int)(ceil(x_max) - floor(x_min));
+    int height = (int)(ceil(y_max) - floor(y_min));
 
-    if (y1 > y2) {
-      tmp = y1;
-      y1 = y2;
-      y2 = tmp;
+    /* Get group device offset */
+    double x_offset, y_offset;
+    if (cairo_get_group_target(cairo) == cairo_get_target(cairo)) {
+      cairo_surface_get_device_offset(cairo_get_group_target(cairo), &x_offset, &y_offset);
+    } else {
+      cairo_surface_t *pats;
+      cairo_pattern_get_surface(group, &pats);
+      cairo_surface_get_device_offset(pats, &x_offset, &y_offset);
     }
 
-    int width = (int)(ceil(x2) - floor(x1));
-    int height = (int)(ceil(y2) - floor(y1));
+    /* Adjust extents by group offset */
+    x_min += x_offset;
+    y_min += y_offset;
 
     cairo_surface_t *source = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
     cairo_t *maskCtx = cairo_create(source);
@@ -1541,19 +1571,15 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
 			 colToDbl(backdropColorRGB.b));
     cairo_paint(maskCtx);
 
-    cairo_matrix_t mat;
+    /* Copy source ctm to mask ctm and translate origin so that the
+     * mask appears it the same location on the source surface.  */
+    cairo_matrix_t mat, tmat;
+    cairo_matrix_init_translate(&tmat, -x_min, -y_min);
     cairo_get_matrix(cairo, &mat);
+    cairo_matrix_multiply(&mat, &mat, &tmat);
     cairo_set_matrix(maskCtx, &mat);
 
     /* make the device offset of the new mask match that of the group */
-    double x_offset, y_offset;
-    if (cairo_get_group_target(cairo) == cairo_get_target(cairo)) {
-      cairo_surface_get_device_offset(cairo_get_group_target(cairo), &x_offset, &y_offset);
-    } else {
-      cairo_surface_t *pats;
-      cairo_pattern_get_surface(group, &pats);
-      cairo_surface_get_device_offset(pats, &x_offset, &y_offset);
-    }
     cairo_surface_set_device_offset(source, x_offset, y_offset);
 
     /* paint the group */
@@ -1569,37 +1595,37 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
     int stride = cairo_image_surface_get_stride(source)/4;
     for (int y=0; y<height; y++) {
       for (int x=0; x<width; x++) {
-	source_data[y*stride + x] = luminocity(source_data[y*stride + x]);
-
-#if 0
-	here is how splash deals with the transferfunction we should deal with this
-	  at some point
+	int lum;
+	lum = luminocity(source_data[y*stride + x]);
 	if (transferFunc) {
-	  transferFunc->transform(&lum, &lum2);
-	} else {
-	  lum2 = lum;
+	  double lum_in, lum_out;
+	  lum_in = lum/256.0;
+	  transferFunc->transform(&lum_in, &lum_out);
+	  lum = (int)(lum_out * 255.0 + 0.5);
 	}
-	p[x] = (int)(lum2 * 255.0 + 0.5);
-#endif
-
+	source_data[y*stride + x] = lum << 24;
       }
     }
     cairo_surface_mark_dirty (source);
 
     /* setup the new mask pattern */
     mask = cairo_pattern_create_for_surface(source);
+    cairo_get_matrix(cairo, &mask_matrix);
 
     if (cairo_get_group_target(cairo) == cairo_get_target(cairo)) {
       cairo_pattern_set_matrix(mask, &mat);
     } else {
       cairo_matrix_t patMatrix;
       cairo_pattern_get_matrix(group, &patMatrix);
+      /* Apply x_min, y_min offset to it appears in the same location as source. */
+      cairo_matrix_multiply(&patMatrix, &patMatrix, &tmat);
       cairo_pattern_set_matrix(mask, &patMatrix);
     }
 
     cairo_surface_destroy(source);
   } else {
     mask = cairo_pattern_reference(group);
+    cairo_get_matrix(cairo, &mask_matrix);
   }
 
   popTransparencyGroup();
@@ -1818,6 +1844,7 @@ void CairoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
     if (mask)
       cairo_pattern_destroy (mask);
     mask = cairo_pop_group (cairo);
+    cairo_get_matrix (cairo, &mask_matrix);
   }
 }
 
@@ -1897,6 +1924,7 @@ void CairoOutputDev::drawImageMaskRegular(GfxState *state, Object *ref, Stream *
 
   if (state->getFillColorSpace()->getMode() == csPattern) {
     mask = cairo_pattern_reference (pattern);
+    cairo_get_matrix (cairo, &mask_matrix);
   } else if (!printing) {
     cairo_save (cairo);
     cairo_rectangle (cairo, 0., 0., 1., 1.);
@@ -2169,6 +2197,7 @@ void CairoOutputDev::drawImageMaskPrescaled(GfxState *state, Object *ref, Stream
     }
 
     mask = cairo_pattern_reference (pattern);
+    cairo_get_matrix (cairo, &mask_matrix);
   } else {
     cairo_save (cairo);
 
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoOutputDev.h
index effa9ddd856..5f115748767 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoOutputDev.h
@@ -18,7 +18,7 @@
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
 // Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2008, 2009, 2011 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008, 2009, 2011, 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2010, 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
@@ -341,18 +341,21 @@ protected:
   cairo_pattern_t *group;
   cairo_pattern_t *shape;
   cairo_pattern_t *mask;
+  cairo_matrix_t mask_matrix;
   cairo_surface_t *cairo_shape_surface;
   cairo_t *cairo_shape;
   int knockoutCount;
   struct ColorSpaceStack {
     GBool knockout;
     GfxColorSpace *cs;
+    cairo_matrix_t group_matrix;
     struct ColorSpaceStack *next;
   } * groupColorSpaceStack;
 
   struct MaskStack {
-      cairo_pattern_t *mask;
-      struct MaskStack *next;
+    cairo_pattern_t *mask;
+    cairo_matrix_t mask_matrix;
+    struct MaskStack *next;
   } *maskStack;
 
   GBool haveCSPattern;	// set if text has been drawn with a
@@ -434,6 +437,7 @@ public:
   virtual void stroke(GfxState *state) { }
   virtual void fill(GfxState *state) { }
   virtual void eoFill(GfxState *state) { }
+  virtual void clipToStrokePath(GfxState *state) { }
   virtual GBool tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
 				  double *pmat, int paintType, int tilingType, Dict *resDict,
 				  double *mat, double *bbox,
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoRescaleBox.cc
index 234322ad85a..e4a50aab177 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoRescaleBox.cc
@@ -23,6 +23,20 @@
  * Author: Jeff Muizelaar, Mozilla Corp.
  */
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
+//
+// 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
+//
+//========================================================================
+
 /* This implements a box filter that supports non-integer box sizes */
 
 #ifdef HAVE_CONFIG_H
@@ -347,5 +361,5 @@ cleanup:
     free (y_coverage);
     free (temp_buf);
 
-    return gTrue;
+    return retval;
 }
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoRescaleBox.h
index 5349c87f306..5349c87f306 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Catalog.cc
index a8c2e39621b..a8c2e39621b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Catalog.h
index 41be3b6fc8a..41be3b6fc8a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/CharCodeToUnicode.cc
index 3cfa4020b50..3cfa4020b50 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/CharCodeToUnicode.h
index 3fdbf0f7216..3fdbf0f7216 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/CurlCachedFile.cc
index 26e59e396b7..26e59e396b7 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/DCTStream.cc
index c0ef81df2f4..c0ef81df2f4 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/DCTStream.h
index ad864cadd52..ad864cadd52 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Decrypt.cc
index 2373a66abf0..2373a66abf0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Decrypt.h
index feb701444e2..feb701444e2 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Dict.cc
index 1428113b7ed..1428113b7ed 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Dict.h
index f4ed64a5dbf..f4ed64a5dbf 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Error.cc
index fc2bef4371c..fc2bef4371c 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Error.h
index 07f3d1f92ad..07f3d1f92ad 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/FileSpec.cc
index 7807864b295..7807864b295 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/FileSpec.h
index e26cdcf8b0a..e26cdcf8b0a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/FlateStream.cc
index ef477b36077..ef477b36077 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/FlateStream.h
index dba00d0a89a..dba00d0a89a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/FontEncodingTables.cc
index cd8d8926542..cd8d8926542 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/FontEncodingTables.h
index 8b0a1e7e993..8b0a1e7e993 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/FontInfo.cc
index 440e6f5aee9..440e6f5aee9 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/FontInfo.h
index 733194db6a3..733194db6a3 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Form.cc
index 1f8b064b807..1f8b064b807 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Form.h
index 0cfc95bd722..0cfc95bd722 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Function.cc
index b63ae8180a9..b63ae8180a9 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Function.h
index d6ac893e494..d6ac893e494 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Gfx.cc
index bca60e2f45f..1667460b2f0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Gfx.cc
@@ -33,6 +33,7 @@
 // Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
 // Copyright (C) 2010 Nils Höglund <nils.hoglund@gmail.com>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
+// Copyright (C) 2011 Axel Strübing <axel.struebing@freenet.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
@@ -1319,7 +1320,7 @@ void Gfx::opSetRenderingIntent(Object args[], int numArgs) {
 
 void Gfx::opSetFillGray(Object args[], int numArgs) {
   GfxColor color;
-  GfxColorSpace *colorSpace;
+  GfxColorSpace *colorSpace = NULL;
   Object obj;
 
   if (textHaveCSPattern && drawText) {
@@ -1332,11 +1333,12 @@ void Gfx::opSetFillGray(Object args[], int numArgs) {
   }
   state->setFillPattern(NULL);
   res->lookupColorSpace("DefaultGray", &obj);
-  if (obj.isNull()) {
-    colorSpace = new GfxDeviceGrayColorSpace();
-  } else {
+  if (!obj.isNull()) {
     colorSpace = GfxColorSpace::parse(&obj, this);
   }
+  if (colorSpace == NULL) {
+    colorSpace = new GfxDeviceGrayColorSpace();
+  }
   obj.free();
   state->setFillColorSpace(colorSpace);
   out->updateFillColorSpace(state);
@@ -1354,16 +1356,17 @@ void Gfx::opSetFillGray(Object args[], int numArgs) {
 
 void Gfx::opSetStrokeGray(Object args[], int numArgs) {
   GfxColor color;
-  GfxColorSpace *colorSpace;
+  GfxColorSpace *colorSpace = NULL;
   Object obj;
 
   state->setStrokePattern(NULL);
   res->lookupColorSpace("DefaultGray", &obj);
-  if (obj.isNull()) {
-    colorSpace = new GfxDeviceGrayColorSpace();
-  } else {
+  if (!obj.isNull()) {
     colorSpace = GfxColorSpace::parse(&obj, this);
   }
+  if (colorSpace == NULL) {
+    colorSpace = new GfxDeviceGrayColorSpace();
+  }
   obj.free();
   state->setStrokeColorSpace(colorSpace);
   out->updateStrokeColorSpace(state);
@@ -1374,7 +1377,7 @@ void Gfx::opSetStrokeGray(Object args[], int numArgs) {
 
 void Gfx::opSetFillCMYKColor(Object args[], int numArgs) {
   GfxColor color;
-  GfxColorSpace *colorSpace;
+  GfxColorSpace *colorSpace = NULL;
   Object obj;
   int i;
 
@@ -1387,11 +1390,12 @@ void Gfx::opSetFillCMYKColor(Object args[], int numArgs) {
     out->restoreState(state);
   }
   res->lookupColorSpace("DefaultCMYK", &obj);
-  if (obj.isNull()) {
-    colorSpace = new GfxDeviceCMYKColorSpace();
-  } else {
+  if (!obj.isNull()) {
     colorSpace = GfxColorSpace::parse(&obj, this);
   }
+  if (colorSpace == NULL) {
+    colorSpace = new GfxDeviceCMYKColorSpace();
+  }
   obj.free();
   state->setFillPattern(NULL);
   state->setFillColorSpace(colorSpace);
@@ -1412,17 +1416,18 @@ void Gfx::opSetFillCMYKColor(Object args[], int numArgs) {
 
 void Gfx::opSetStrokeCMYKColor(Object args[], int numArgs) {
   GfxColor color;
-  GfxColorSpace *colorSpace;
+  GfxColorSpace *colorSpace = NULL;
   Object obj;
   int i;
 
   state->setStrokePattern(NULL);
   res->lookupColorSpace("DefaultCMYK", &obj);
-  if (obj.isNull()) {
-    colorSpace = new GfxDeviceCMYKColorSpace();
-  } else {
+  if (!obj.isNull()) {
     colorSpace = GfxColorSpace::parse(&obj, this);
   }
+  if (colorSpace == NULL) {
+    colorSpace = new GfxDeviceCMYKColorSpace();
+  }
   obj.free();
   state->setStrokeColorSpace(colorSpace);
   out->updateStrokeColorSpace(state);
@@ -1435,7 +1440,7 @@ void Gfx::opSetStrokeCMYKColor(Object args[], int numArgs) {
 
 void Gfx::opSetFillRGBColor(Object args[], int numArgs) {
   Object obj;
-  GfxColorSpace *colorSpace;
+  GfxColorSpace *colorSpace = NULL;
   GfxColor color;
   int i;
 
@@ -1449,11 +1454,12 @@ void Gfx::opSetFillRGBColor(Object args[], int numArgs) {
   }
   state->setFillPattern(NULL);
   res->lookupColorSpace("DefaultRGB", &obj);
-  if (obj.isNull()) {
-    colorSpace = new GfxDeviceRGBColorSpace();
-  } else {
+  if (!obj.isNull()) {
     colorSpace = GfxColorSpace::parse(&obj, this);
   }
+  if (colorSpace == NULL) {
+    colorSpace = new GfxDeviceRGBColorSpace();
+  }
   obj.free();
   state->setFillColorSpace(colorSpace);
   out->updateFillColorSpace(state);
@@ -1473,17 +1479,18 @@ void Gfx::opSetFillRGBColor(Object args[], int numArgs) {
 
 void Gfx::opSetStrokeRGBColor(Object args[], int numArgs) {
   Object obj;
-  GfxColorSpace *colorSpace;
+  GfxColorSpace *colorSpace = NULL;
   GfxColor color;
   int i;
 
   state->setStrokePattern(NULL);
   res->lookupColorSpace("DefaultRGB", &obj);
-  if (obj.isNull()) {
-    colorSpace = new GfxDeviceRGBColorSpace();
-  } else {
+  if (!obj.isNull()) {
     colorSpace = GfxColorSpace::parse(&obj, this);
   }
+  if (colorSpace == NULL) {
+    colorSpace = new GfxDeviceRGBColorSpace();
+  }
   obj.free();
   state->setStrokeColorSpace(colorSpace);
   out->updateStrokeColorSpace(state);
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Gfx.h
index ce7b2d87260..ce7b2d87260 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/GfxFont.cc
index 114c7971d80..33c894cad79 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/GfxFont.cc
@@ -27,6 +27,7 @@
 // Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
 // Copyright (C) 2011 Axel Strübing <axel.struebing@freenet.de>
 // Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2012 Yi Yang <ahyangyi@gmail.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
@@ -449,7 +450,7 @@ CharCodeToUnicode *GfxFont::readToUnicodeCMap(Dict *fontDict, int nBits,
 
 void GfxFont::findExtFontFile() {
   static char *type1Exts[] = { ".pfa", ".pfb", ".ps", "", NULL };
-  static char *ttExts[] = { ".ttf", ".ttc", NULL };
+  static char *ttExts[] = { ".ttf", ".ttc", ".otf", NULL };
 
   if (name) {
     if (type == fontType1) {
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/GfxFont.h
index fe4f7ea5027..fe4f7ea5027 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/GfxState.cc
index 78951c316a2..8efa62ea187 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/GfxState.cc
@@ -257,8 +257,20 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, Gfx *gfx) {
       error(-1, "Bad color space");
     }
     obj1.free();
+  } else if (csObj->isDict()) {
+    csObj->dictLookup("ColorSpace", &obj1);
+    if (obj1.isName("DeviceGray")) {
+      cs = new GfxDeviceGrayColorSpace();
+    } else if (obj1.isName("DeviceRGB")) {
+      cs = new GfxDeviceRGBColorSpace();
+    } else if (obj1.isName("DeviceCMYK")) {
+      cs = new GfxDeviceCMYKColorSpace();
+    } else {
+      error(-1, "Bad color space '%s'", csObj->getName());
+    }
+    obj1.free();
   } else {
-    error(-1, "Bad color space - expected name or array");
+    error(-1, "Bad color space - expected name, array or dict");
   }
   return cs;
 }
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/GfxState.h
index d8f0972ef7b..d8f0972ef7b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/GlobalParams.cc
index 2e11bb08c11..687fd2508f8 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/GlobalParams.cc
@@ -30,6 +30,7 @@
 // Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net>
 // Copyright (C) 2011 Pino Toscano <pino@kde.org>
 // Copyright (C) 2011 Koji Otani <sho@bbr.jp>
+// Copyright (C) 2012 Yi Yang <ahyangyi@gmail.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
@@ -1247,7 +1248,7 @@ DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
         ext = strrchr((char*)s,'.');
         if (!ext)
           continue;
-        if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4))
+        if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4) || !strncasecmp(ext, ".otf", 4))
         {
           dfp = new DisplayFontParam(fontName->copy(), displayFontTT);  
           dfp->tt.fileName = new GooString((char*)s);
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/GlobalParams.h
index 5fff49d5553..5fff49d5553 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/GlobalParamsWin.cc
index f989fb89434..f989fb89434 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Hints.cc
index 7a1e4ee9968..7a1e4ee9968 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Hints.h
index d598e796beb..d598e796beb 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/JArithmeticDecoder.cc
index ec0778e64f4..ec0778e64f4 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/JArithmeticDecoder.h
index 0f091b7bd84..0f091b7bd84 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/JBIG2Stream.cc
index bfb1994ed9d..bfb1994ed9d 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/JBIG2Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/JBIG2Stream.h
index 23d3d92d961..23d3d92d961 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/JPEG2000Stream.cc
index b7a29bf2285..5ea6406e2b9 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/JPEG2000Stream.cc
@@ -4,7 +4,7 @@
 //
 // A JPX stream decoder using OpenJPEG
 //
-// Copyright 2008-2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
 // Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
 //
 // Licensed under GPLv2 or later
@@ -13,6 +13,8 @@
 
 #include "JPEG2000Stream.h"
 
+#include "config.h"
+
 JPXStream::JPXStream(Stream *strA) : FilterStream(strA)
 {
   inited = gFalse;
@@ -127,6 +129,9 @@ void JPXStream::init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format)
   /* Use default decompression parameters */
   opj_dparameters_t parameters;
   opj_set_default_decoder_parameters(&parameters);
+#ifdef WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG
+  parameters.flags = OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
+#endif
 
   /* Configure the event manager to receive errors and warnings */
   opj_event_mgr_t event_mgr;
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/JPEG2000Stream.h
index bb4085a63f7..bb4085a63f7 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/JPXStream.cc
index 3b8c05d27b0..3b8c05d27b0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/JPXStream.h
index 2e0bda32eb3..2e0bda32eb3 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Lexer.cc
index bdc6d08861c..880e066e20b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Lexer.cc
@@ -16,6 +16,7 @@
 // Copyright (C) 2006-2010 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.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
@@ -228,11 +229,13 @@ Object *Lexer::getObj(Object *obj, int objNum) {
 	break;
       }
     }
-    if (neg)
+    if (neg) {
       xi = -xi;
+      xf = -xf;
+    }
     if (unlikely(overflownInteger)) {
       if (overflownUnsignedInteger) {
-        obj->initError();
+        obj->initReal(xf);
       } else {
         obj->initUint(xui);
       }
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Lexer.h
index 284479dfbfa..284479dfbfa 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Linearization.cc
index 73dc5adc3b3..73dc5adc3b3 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Link.cc
index 971accf2810..971accf2810 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Link.h
index 84e58018554..84e58018554 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.18.4/poppler/Makefile.am
index 37fbb1b5f18..80cbf811e0f 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Makefile.am
@@ -171,7 +171,7 @@ libpoppler_la_LIBADD =				\
 	$(PTHREAD_LIBS)				\
 	$(win32_libs)
 
-libpoppler_la_LDFLAGS = -version-info 18:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 19:0:0 @create_shared_lib@ @auto_import_flags@
 
 if ENABLE_XPDF_HEADERS
 
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Makefile.in b/Build/source/libs/poppler/poppler-0.18.4/poppler/Makefile.in
index 2ef494f0aac..30166698dc5 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Makefile.in
@@ -273,8 +273,11 @@ FREETYPE_CONFIG = @FREETYPE_CONFIG@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQ = @GLIB_REQ@
+GLIB_REQUIRED = @GLIB_REQUIRED@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
@@ -332,6 +335,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PC_REQUIRES = @PC_REQUIRES@
 PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
+PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@
+PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -546,7 +551,7 @@ libpoppler_la_LIBADD = \
 	$(PTHREAD_LIBS)				\
 	$(win32_libs)
 
-libpoppler_la_LDFLAGS = -version-info 18:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 19:0:0 @create_shared_lib@ @auto_import_flags@
 @ENABLE_XPDF_HEADERS_TRUE@poppler_includedir = $(includedir)/poppler
 @ENABLE_XPDF_HEADERS_TRUE@poppler_include_HEADERS = \
 @ENABLE_XPDF_HEADERS_TRUE@	$(splash_headers)	\
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Movie.cc
index 3e764ac1590..3e764ac1590 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/NameToCharCode.cc
index efe1c4de0bd..efe1c4de0bd 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/NameToCharCode.h
index bc57c3736c1..bc57c3736c1 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/NameToUnicodeTable.h
index 650f62ea88d..650f62ea88d 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Object.cc
index 4f7da80ecac..4f7da80ecac 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Object.h
index 72ff667858b..72ff667858b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/OptionalContent.cc
index c8b5c97222b..c8b5c97222b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/OptionalContent.h
index 7add4a3c11e..7add4a3c11e 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/OutputDev.cc
index 5adc7b87c4c..5adc7b87c4c 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/OutputDev.h
index bf984fc31ab..bf984fc31ab 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDoc.cc
index 01d2759a193..1c8538534d5 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/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 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.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
@@ -707,35 +707,44 @@ int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) {
 
 int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
 
-  // we don't support files with Encrypt at the moment
+  // find if we have updated objects
+  GBool updated = gFalse;
+  for(int i=0; i<xref->getNumObjects(); i++) {
+    if (xref->getEntry(i)->updated) {
+      updated = gTrue;
+      break;
+    }
+  }
+
+  // we don't support rewriting files with Encrypt at the moment
   Object obj;
   xref->getTrailerDict()->getDict()->lookupNF("Encrypt", &obj);
   if (!obj.isNull())
   {
     obj.free();
-    return errEncrypted;
+    if (!updated && mode == writeStandard) {
+      // simply copy the original file
+      saveWithoutChangesAs (outStr);
+    } else {
+      return errEncrypted;
+    }
   }
-  obj.free();
+  else
+  {
+    obj.free();
 
-  if (mode == writeForceRewrite) {
-    saveCompleteRewrite(outStr);
-  } else if (mode == writeForceIncremental) {
-    saveIncrementalUpdate(outStr); 
-  } else { // let poppler decide
-    // find if we have updated objects
-    GBool updated = gFalse;
-    for(int i=0; i<xref->getNumObjects(); i++) {
-      if (xref->getEntry(i)->updated) {
-        updated = gTrue;
-        break;
+    if (mode == writeForceRewrite) {
+      saveCompleteRewrite(outStr);
+    } else if (mode == writeForceIncremental) {
+      saveIncrementalUpdate(outStr); 
+    } else { // let poppler decide
+      if(updated) { 
+        saveIncrementalUpdate(outStr);
+      } else {
+        // simply copy the original file
+        saveWithoutChangesAs (outStr);
       }
     }
-    if(updated) { 
-      saveIncrementalUpdate(outStr);
-    } else {
-      // simply copy the original file
-      saveWithoutChangesAs (outStr);
-    }
   }
 
   return errNone;
@@ -1225,6 +1234,8 @@ void PDFDoc::markObject (Object* obj, XRef *xRef, XRef *countRef, Guint numOffse
         } else {
           XRefEntry *entry = countRef->getEntry(obj->getRef().num + numOffset);
           entry->gen++;
+          if (entry->gen > 9)
+            break;
         } 
         Object obj1;
         getXRef()->fetch(obj->getRef().num, obj->getRef().gen, &obj1);
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDoc.h
index 92cee78c5f2..92cee78c5f2 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDocEncoding.cc
index 628d3666d09..628d3666d09 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDocFactory.cc
index 7829b3e9958..7829b3e9958 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/PSOutputDev.cc
index 3e5cf081934..8fd310734cd 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PSOutputDev.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2006-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2009, 2011 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2007, 2008 Brad Hards <bradh@kde.org>
 // Copyright (C) 2008, 2009 Koji Otani <sho@bbr.jp>
@@ -1149,6 +1149,7 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
   }
   processColors = 0;
   inType3Char = gFalse;
+  inUncoloredPattern = gFalse;
 
 #if OPI_SUPPORT
   // initialize OPI nesting levels
@@ -1315,7 +1316,7 @@ void PSOutputDev::writeHeader(int firstPage, int lastPage,
     writePS("%!PS-Adobe-3.0 Resource-Form\n");
     break;
   }
-  writePSFmt("% Produced by poppler pdftops version: {0:s} (http://poppler.freedesktop.org)\n", PACKAGE_VERSION);
+  writePSFmt("%Produced by poppler pdftops version: {0:s} (http://poppler.freedesktop.org)\n", PACKAGE_VERSION);
   xref->getDocInfo(&info);
   if (info.isDict() && info.dictLookup("Creator", &obj1)->isString()) {
     writePS("%%Creator: ");
@@ -3688,6 +3689,9 @@ void PSOutputDev::updateLineWidth(GfxState *state) {
 }
 
 void PSOutputDev::updateFillColorSpace(GfxState *state) {
+  if (inUncoloredPattern) {
+    return;
+  }
   switch (level) {
   case psLevel1:
   case psLevel1Sep:
@@ -3706,6 +3710,9 @@ void PSOutputDev::updateFillColorSpace(GfxState *state) {
 }
 
 void PSOutputDev::updateStrokeColorSpace(GfxState *state) {
+  if (inUncoloredPattern) {
+    return;
+  }
   switch (level) {
   case psLevel1:
   case psLevel1Sep:
@@ -3732,6 +3739,9 @@ void PSOutputDev::updateFillColor(GfxState *state) {
   double c, m, y, k;
   int i;
 
+  if (inUncoloredPattern) {
+    return;
+  }
   switch (level) {
   case psLevel1:
     state->getFillGray(&gray);
@@ -3795,6 +3805,9 @@ void PSOutputDev::updateStrokeColor(GfxState *state) {
   double c, m, y, k;
   int i;
 
+  if (inUncoloredPattern) {
+    return;
+  }
   switch (level) {
   case psLevel1:
     state->getStrokeGray(&gray);
@@ -4052,9 +4065,21 @@ GBool PSOutputDev::tilingPatternFillL1(GfxState *state, Catalog *cat, Object *st
     }
   }
   inType3Char = gTrue;
+  if (paintType == 2) {
+    inUncoloredPattern = gTrue;
+    // ensure any PS procedures that contain sCol or fCol do not change the color
+    writePS("/pdfLastFill true def\n");
+    writePS("/pdfLastStroke true def\n");
+  }
   ++numTilingPatterns;
   gfx->display(str);
   --numTilingPatterns;
+  if (paintType == 2) {
+    inUncoloredPattern = gFalse;
+    // ensure the next PS procedures that uses sCol or fCol will update the color
+    writePS("/pdfLastFill false def\n");
+    writePS("/pdfLastStroke false def\n");
+  }
   inType3Char = gFalse;
   writePS("} def\n");
   delete gfx;
@@ -4080,8 +4105,11 @@ GBool PSOutputDev::tilingPatternFillL2(GfxState *state, Catalog *cat, Object *st
 				       double xStep, double yStep) {
   PDFRectangle box;
   Gfx *gfx;
-  double cxMin, cyMin, cxMax, cyMax;
 
+  if (paintType == 2) {
+    // setpattern with PaintType 2 needs the paint color
+    writePS("currentcolor\n");
+  }
   writePS("<<\n  /PatternType 1\n");
   writePSFmt("  /PaintType {0:d}\n", paintType);
   writePSFmt("  /TilingType {0:d}\n", tilingType);
@@ -4095,15 +4123,26 @@ GBool PSOutputDev::tilingPatternFillL2(GfxState *state, Catalog *cat, Object *st
   box.y2 = bbox[3];
   gfx = new Gfx(xref, this, resDict, m_catalog, &box, NULL);
   inType3Char = gTrue;
+  if (paintType == 2) {
+    inUncoloredPattern = gTrue;
+    // ensure any PS procedures that contain sCol or fCol do not change the color
+    writePS("/pdfLastFill true def\n");
+    writePS("/pdfLastStroke true def\n");
+  }
   gfx->display(str);
+  if (paintType == 2) {
+    inUncoloredPattern = gFalse;
+    // ensure the next PS procedures that uses sCol or fCol will update the color
+    writePS("/pdfLastFill false def\n");
+    writePS("/pdfLastStroke false def\n");
+  }
   inType3Char = gFalse;
   delete gfx;
   writePS("  }\n");
   writePS(">>\n");
-  writePSFmt("[{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}]\n", pmat[0], pmat[1], pmat[2], pmat[3], pmat[4], pmat[5]);
+  writePSFmt("[{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}]\n", mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
   writePS("makepattern setpattern\n");
-  state->getClipBBox(&cxMin, &cyMin, &cxMax, &cyMax);
-  writePSFmt("{0:.6g} {1:.6g} {2:.6g} {3:.6g} rectfill\n", cxMin, cyMin, cxMax - cxMin, cyMax - cyMin);
+  writePS("clippath fill\n"); // Gfx sets up a clip before calling out->tilingPatternFill()
 
   return gTrue;
 }
@@ -4113,8 +4152,28 @@ GBool PSOutputDev::tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
 				     double *mat, double *bbox,
 				     int x0, int y0, int x1, int y1,
 				     double xStep, double yStep) {
-  if (x1 - x0 == 1 && y1 - y0 == 1)
-    return gFalse; // Don't need to use patterns if only one instance of the pattern is used
+  if (x1 - x0 == 1 && y1 - y0 == 1) {
+    // Don't need to use patterns if only one instance of the pattern is used
+    PDFRectangle box;
+    Gfx *gfx;
+    double x, y, tx, ty;
+
+    x = x0 * xStep;
+    y = y0 * yStep;
+    tx = x * mat[0] + y * mat[2] + mat[4];
+    ty = x * mat[1] + y * mat[3] + mat[5];
+    box.x1 = bbox[0];
+    box.y1 = bbox[1];
+    box.x2 = bbox[2];
+    box.y2 = bbox[3];
+    gfx = new Gfx(xref, this, resDict, m_catalog, &box, NULL);
+    writePSFmt("[{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}] cm\n", mat[0], mat[1], mat[2], mat[3], tx, ty);
+    inType3Char = gTrue;
+    gfx->display(str);
+    inType3Char = gFalse;
+    delete gfx;
+    return gTrue;
+  }
 
   if (level == psLevel1 || level == psLevel1Sep) {
     return tilingPatternFillL1(state, cat, str, pmat, paintType, tilingType, resDict,
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/PSOutputDev.h
index a1e0a2957cb..8112bc4e73d 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PSOutputDev.h
@@ -450,6 +450,7 @@ private:
 				//   clipping render mode because of pattern colorspace
 
   GBool inType3Char;		// inside a Type 3 CharProc
+  GBool inUncoloredPattern;     // inside a uncolored pattern (PaintType = 2)
   GooString *t3String;		// Type 3 content string
   double t3WX, t3WY,		// Type 3 character parameters
          t3LLX, t3LLY, t3URX, t3URY;
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Page.cc
index 04d307bd213..9bae123dd38 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Page.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2005-2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2011 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006-2008 Pino Toscano <pino@kde.org>
 // Copyright (C) 2006 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Page.h
index 1ab69f396f0..1ab69f396f0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/PageLabelInfo.cc
index 1330988ccf0..1330988ccf0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/PageTransition.cc
index 3fbd0de2802..3fbd0de2802 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Parser.cc
index 34a828653e8..34a828653e8 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Parser.h
index 3d8a831f9d2..3d8a831f9d2 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/PreScanOutputDev.cc
index f8df6a1d34a..f8df6a1d34a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/PreScanOutputDev.h
index 464fbbf26a2..464fbbf26a2 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Rendition.cc
index b81e169ea21..b81e169ea21 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/SecurityHandler.cc
index 630c753691c..630c753691c 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/SecurityHandler.h
index 5278a6cf10d..5278a6cf10d 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/SplashOutputDev.cc
index 7bacdba7ed9..7bacdba7ed9 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/SplashOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/SplashOutputDev.h
index f19c5425874..f19c5425874 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Stream-CCITT.h
index 43405b67751..43405b67751 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/Stream.cc
index 376f617a597..376f617a597 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/Stream.h
index cb08e3ad3fc..cb08e3ad3fc 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/TextOutputDev.cc
index 3d7ba6de0c1..3d7ba6de0c1 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/TextOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/TextOutputDev.h
index 63f3670e427..63f3670e427 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeMap.cc
index fda0758bc00..fda0758bc00 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeMap.h
index 6f031634e03..6f031634e03 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeMapTables.h
index 9c510346164..9c510346164 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeTypeTable.cc
index f18930f38de..f18930f38de 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeTypeTable.h
index 19cd75d17f2..19cd75d17f2 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/XRef.cc
index 970a00bf25a..970a00bf25a 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/XRef.h
index 8b77b6c0be1..8b77b6c0be1 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.18.4/poppler/XpdfPluginAPI.cc
index a4e0f0e7799..a4e0f0e7799 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.18.4/poppler/XpdfPluginAPI.h
index 22540f728bd..22540f728bd 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.18.4/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.18.4/poppler/poppler-config.h.cmake
index ca4de776a33..ca4de776a33 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.18.4/poppler/poppler-config.h.in
index 071d2fcc5ac..071d2fcc5ac 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.18.4/poppler/strtok_r.cpp
index 30e2196aa13..30e2196aa13 100644
--- a/Build/source/libs/poppler/poppler-0.18.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.18.4/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler/Makefile.in b/Build/source/libs/poppler/poppler/Makefile.in
index d24f692b0b3..e2ee66df7a9 100644
--- a/Build/source/libs/poppler/poppler/Makefile.in
+++ b/Build/source/libs/poppler/poppler/Makefile.in
@@ -33,7 +33,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/hdrs.am \
-	$(top_srcdir)/poppler-0.18.0/poppler/poppler-config.h.in
+	$(top_srcdir)/poppler-0.18.4/poppler/poppler-config.h.in
 subdir = poppler
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -190,10 +190,10 @@ poppler-config.h: stamp-h2
 	@if test ! -f $@; then rm -f stamp-h2; else :; fi
 	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi
 
-stamp-h2: $(top_srcdir)/poppler-0.18.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.18.4/poppler/poppler-config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h2
 	cd $(top_builddir) && $(SHELL) ./config.status poppler/poppler-config.h
-$(top_srcdir)/poppler-0.18.0/poppler/poppler-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+$(top_srcdir)/poppler-0.18.4/poppler/poppler-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h2
 	touch $@
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index 77978a97930..13cf3eb675e 100644
--- a/Build/source/libs/poppler/version.ac
+++ b/Build/source/libs/poppler/version.ac
@@ -1,5 +1,5 @@
 dnl
-dnl   Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2011-2012 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.18.0])
+m4_define([poppler_version], [0.18.4])