poppler 0.23.3

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

248 files changed, 1346 insertions, 1284 deletions

diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 8434c4dc21b..ade2f878ea8 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import poppler-0.23.3.
+	* version.ac: Adjust.
+
 2013-06-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Ensure existence of zlib headers.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 6f62219de2d..b6135a38875 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -80,7 +80,7 @@ subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/config.h.in \
-	$(top_srcdir)/poppler-0.23.2/poppler/poppler-config.h.in \
+	$(top_srcdir)/poppler-0.23.3/poppler/poppler-config.h.in \
 	$(top_srcdir)/../../build-aux/depcomp ChangeLog \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
@@ -563,7 +563,7 @@ poppler-config.h: stamp-h2
 	@test -f $@ || rm -f stamp-h2
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
 
-stamp-h2: $(top_srcdir)/poppler-0.23.2/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.23.3/poppler/poppler-config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h2
 	cd $(top_builddir) && $(SHELL) ./config.status poppler-config.h
 
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index 7fe4c7175f0..21f8a574e31 100755
--- a/Build/source/libs/poppler/configure
+++ b/Build/source/libs/poppler/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.23.2.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.23.3.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,12 +580,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='poppler (TeX Live)'
 PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.23.2'
-PACKAGE_STRING='poppler (TeX Live) 0.23.2'
+PACKAGE_VERSION='0.23.3'
+PACKAGE_STRING='poppler (TeX Live) 0.23.3'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="poppler-0.23.2/poppler/Array.cc"
+ac_unique_file="poppler-0.23.3/poppler/Array.cc"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1304,7 +1304,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures poppler (TeX Live) 0.23.2 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.23.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1371,7 +1371,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of poppler (TeX Live) 0.23.2:";;
+     short | recursive ) echo "Configuration of poppler (TeX Live) 0.23.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1484,7 +1484,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-poppler (TeX Live) configure 0.23.2
+poppler (TeX Live) configure 0.23.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2074,7 +2074,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by poppler (TeX Live) $as_me 0.23.2, which was
+It was created by poppler (TeX Live) $as_me 0.23.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3997,7 +3997,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='poppler--tex-live-'
- VERSION='0.23.2'
+ VERSION='0.23.3'
 
 
 # Some tools Automake needs.
@@ -6473,12 +6473,12 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.23.2/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.23.3/poppler/poppler-config.h.in"
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.23.2"
+#define POPPLER_VERSION "0.23.3"
 _ACEOF
 
 
@@ -6571,7 +6571,7 @@ fi
 $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
 
 
-POPPLER_TREE=poppler-0.23.2
+POPPLER_TREE=poppler-0.23.3
 
 
 ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7131,7 +7131,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.23.2, which was
+This file was extended by poppler (TeX Live) $as_me 0.23.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7197,7 +7197,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-poppler (TeX Live) config.status 0.23.2
+poppler (TeX Live) config.status 0.23.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7328,7 +7328,7 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.23.2/poppler/poppler-config.h.in" ;;
+    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.23.3/poppler/poppler-config.h.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "include/goo/Makefile") CONFIG_FILES="$CONFIG_FILES include/goo/Makefile" ;;
diff --git a/Build/source/libs/poppler/poppler-0.23.2-PATCHES/patch-01-MINGW_PRINTF_FORMAT b/Build/source/libs/poppler/poppler-0.23.2-PATCHES/patch-01-MINGW_PRINTF_FORMAT
deleted file mode 100644
index efc2af465b7..00000000000
--- a/Build/source/libs/poppler/poppler-0.23.2-PATCHES/patch-01-MINGW_PRINTF_FORMAT
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur poppler-0.23.2.orig/poppler/poppler-config.h.in poppler-0.23.2/poppler/poppler-config.h.in
---- poppler-0.23.2.orig/poppler/poppler-config.h.in	2013-06-01 14:03:14.000000000 +0200
-+++ poppler-0.23.2/poppler/poppler-config.h.in	2013-06-11 09:39:07.244609303 +0200
-@@ -158,7 +158,7 @@
- //------------------------------------------------------------------------
- 
- #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
--#ifdef __USE_MINGW_ANSI_STDIO
-+#ifdef __MINGW_PRINTF_FORMAT
- #define GCC_PRINTF_FORMAT(fmt_index, va_index) \
- 	__attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))
- #else
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/ArthurOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.2/poppler/ArthurOutputDev.cc
deleted file mode 100644
index 5d57e9334d7..00000000000
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/ArthurOutputDev.cc
+++ /dev/null
@@ -1,816 +0,0 @@
-//========================================================================
-//
-// ArthurOutputDev.cc
-//
-// Copyright 2003 Glyph & Cog, LLC
-//
-//========================================================================
-
-//========================================================================
-//
-// 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) 2005 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2005-2009, 2011, 2012 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2008, 2010 Pino Toscano <pino@kde.org>
-// Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2010 Matthias Fauconneau <matthias.fauconneau@gmail.com>
-// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
-// Copyright (C) 2013 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
-//
-//========================================================================
-
-#include <config.h>
-
-#ifdef USE_GCC_PRAGMAS
-#pragma implementation
-#endif
-
-#include <string.h>
-#include <math.h>
-
-#include "goo/gfile.h"
-#include "GlobalParams.h"
-#include "Error.h"
-#include "Object.h"
-#include "GfxState.h"
-#include "GfxFont.h"
-#include "Link.h"
-#include "FontEncodingTables.h"
-#include <fofi/FoFiTrueType.h>
-#include "ArthurOutputDev.h"
-
-#include <QtCore/QtDebug>
-#include <QtGui/QPainterPath>
-//------------------------------------------------------------------------
-
-#ifdef HAVE_SPLASH
-#include "splash/SplashFontFileID.h"
-#include "splash/SplashFontFile.h"
-#include "splash/SplashFontEngine.h"
-#include "splash/SplashFont.h"
-#include "splash/SplashMath.h"
-#include "splash/SplashPath.h"
-#include "splash/SplashGlyphBitmap.h"
-//------------------------------------------------------------------------
-// SplashOutFontFileID
-//------------------------------------------------------------------------
-
-class SplashOutFontFileID: public SplashFontFileID {
-public:
-
-  SplashOutFontFileID(Ref *rA) { r = *rA; }
-
-  ~SplashOutFontFileID() {}
-
-  GBool matches(SplashFontFileID *id) {
-    return ((SplashOutFontFileID *)id)->r.num == r.num &&
-           ((SplashOutFontFileID *)id)->r.gen == r.gen;
-  }
-
-private:
-
-  Ref r;
-};
-
-#endif
-
-//------------------------------------------------------------------------
-// ArthurOutputDev
-//------------------------------------------------------------------------
-
-ArthurOutputDev::ArthurOutputDev(QPainter *painter):
-  m_painter(painter),
-  m_fontHinting(NoHinting)
-{
-  m_currentBrush = QBrush(Qt::SolidPattern);
-  m_fontEngine = 0;
-  m_font = 0;
-}
-
-ArthurOutputDev::~ArthurOutputDev()
-{
-#ifdef HAVE_SPLASH
-  delete m_fontEngine;
-#endif
-}
-
-void ArthurOutputDev::startDoc(XRef *xrefA) {
-  xref = xrefA;
-#ifdef HAVE_SPLASH
-  delete m_fontEngine;
-
-  const bool isHintingEnabled = m_fontHinting != NoHinting;
-  const bool isSlightHinting = m_fontHinting == SlightHinting;
-
-  m_fontEngine = new SplashFontEngine(
-#if HAVE_T1LIB_H
-  globalParams->getEnableT1lib(),
-#endif
-#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
-  globalParams->getEnableFreeType(),
-  isHintingEnabled,
-  isSlightHinting,
-#endif
-  m_painter->testRenderHint(QPainter::TextAntialiasing));
-#endif
-}
-
-void ArthurOutputDev::startPage(int pageNum, GfxState *state, XRef *xref)
-{
-  // fill page with white background.
-  int w = static_cast<int>(state->getPageWidth());
-  int h = static_cast<int>(state->getPageHeight());
-  QColor fillColour(Qt::white);
-  QBrush fill(fillColour);
-  m_painter->save();
-  m_painter->setPen(fillColour);
-  m_painter->setBrush(fill);
-  m_painter->drawRect(0, 0, w, h);
-  m_painter->restore();
-}
-
-void ArthurOutputDev::endPage() {
-}
-
-void ArthurOutputDev::saveState(GfxState *state)
-{
-  m_painter->save();
-}
-
-void ArthurOutputDev::restoreState(GfxState *state)
-{
-  m_painter->restore();
-}
-
-void ArthurOutputDev::updateAll(GfxState *state)
-{
-  OutputDev::updateAll(state);
-  m_needFontUpdate = gTrue;
-}
-
-// This looks wrong - why aren't adjusting the matrix?
-void ArthurOutputDev::updateCTM(GfxState *state, double m11, double m12,
-				double m21, double m22,
-				double m31, double m32)
-{
-  updateLineDash(state);
-  updateLineJoin(state);
-  updateLineCap(state);
-  updateLineWidth(state);
-}
-
-void ArthurOutputDev::updateLineDash(GfxState *state)
-{
-  double *dashPattern;
-  int dashLength;
-  double dashStart;
-  state->getLineDash(&dashPattern, &dashLength, &dashStart);
-  QVector<qreal> pattern(dashLength);
-  for (int i = 0; i < dashLength; ++i) {
-    pattern[i] = dashPattern[i];
-  }
-  m_currentPen.setDashPattern(pattern);
-  m_currentPen.setDashOffset(dashStart);
-  m_painter->setPen(m_currentPen);
-}
-
-void ArthurOutputDev::updateFlatness(GfxState *state)
-{
-  // qDebug() << "updateFlatness";
-}
-
-void ArthurOutputDev::updateLineJoin(GfxState *state)
-{
-  switch (state->getLineJoin()) {
-  case 0:
-    m_currentPen.setJoinStyle(Qt::MiterJoin);
-    break;
-  case 1:
-    m_currentPen.setJoinStyle(Qt::RoundJoin);
-    break;
-  case 2:
-    m_currentPen.setJoinStyle(Qt::BevelJoin);
-    break;
-  }
-  m_painter->setPen(m_currentPen);
-}
-
-void ArthurOutputDev::updateLineCap(GfxState *state)
-{
-  switch (state->getLineCap()) {
-  case 0:
-    m_currentPen.setCapStyle(Qt::FlatCap);
-    break;
-  case 1:
-    m_currentPen.setCapStyle(Qt::RoundCap);
-    break;
-  case 2:
-    m_currentPen.setCapStyle(Qt::SquareCap);
-    break;
-  }
-  m_painter->setPen(m_currentPen);
-}
-
-void ArthurOutputDev::updateMiterLimit(GfxState *state)
-{
-  m_currentPen.setMiterLimit(state->getMiterLimit());
-  m_painter->setPen(m_currentPen);
-}
-
-void ArthurOutputDev::updateLineWidth(GfxState *state)
-{
-  m_currentPen.setWidthF(state->getLineWidth());
-  m_painter->setPen(m_currentPen);
-}
-
-void ArthurOutputDev::updateFillColor(GfxState *state)
-{
-  GfxRGB rgb;
-  QColor brushColour = m_currentBrush.color();
-  state->getFillRGB(&rgb);
-  brushColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), brushColour.alphaF());
-  m_currentBrush.setColor(brushColour);
-}
-
-void ArthurOutputDev::updateStrokeColor(GfxState *state)
-{
-  GfxRGB rgb;
-  QColor penColour = m_currentPen.color();
-  state->getStrokeRGB(&rgb);
-  penColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), penColour.alphaF());
-  m_currentPen.setColor(penColour);
-  m_painter->setPen(m_currentPen);
-}
-
-void ArthurOutputDev::updateFillOpacity(GfxState *state)
-{
-  QColor brushColour= m_currentBrush.color();
-  brushColour.setAlphaF(state->getFillOpacity());
-  m_currentBrush.setColor(brushColour);
-}
-
-void ArthurOutputDev::updateStrokeOpacity(GfxState *state)
-{
-  QColor penColour= m_currentPen.color();
-  penColour.setAlphaF(state->getStrokeOpacity());
-  m_currentPen.setColor(penColour);
-  m_painter->setPen(m_currentPen);
-}
-
-void ArthurOutputDev::updateFont(GfxState *state)
-{
-#ifdef HAVE_SPLASH
-  GfxFont *gfxFont;
-  GfxFontLoc *fontLoc;
-  GfxFontType fontType;
-  SplashOutFontFileID *id;
-  SplashFontFile *fontFile;
-  SplashFontSrc *fontsrc = NULL;
-  FoFiTrueType *ff;
-  Object refObj, strObj;
-  GooString *fileName;
-  char *tmpBuf;
-  int tmpBufLen;
-  int *codeToGID;
-  double *textMat;
-  double m11, m12, m21, m22, fontSize;
-  SplashCoord mat[4];
-  int n;
-  int faceIndex = 0;
-  SplashCoord matrix[6];
-
-  m_needFontUpdate = false;
-  m_font = NULL;
-  fileName = NULL;
-  tmpBuf = NULL;
-  fontLoc = NULL;
-
-  if (!(gfxFont = state->getFont())) {
-    goto err1;
-  }
-  fontType = gfxFont->getType();
-  if (fontType == fontType3) {
-    goto err1;
-  }
-
-  // check the font file cache
-  id = new SplashOutFontFileID(gfxFont->getID());
-  if ((fontFile = m_fontEngine->getFontFile(id))) {
-    delete id;
-
-  } else {
-
-    if (!(fontLoc = gfxFont->locateFont(xref, gFalse))) {
-      error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
-	    gfxFont->getName() ? gfxFont->getName()->getCString()
-	                       : "(unnamed)");
-      goto err2;
-    }
-
-    // embedded font
-    if (fontLoc->locType == gfxFontLocEmbedded) {
-      // if there is an embedded font, read it to memory
-      tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
-      if (! tmpBuf)
-	goto err2;
-
-    // external font
-    } else { // gfxFontLocExternal
-      fileName = fontLoc->path;
-      fontType = fontLoc->fontType;
-    }
-
-    fontsrc = new SplashFontSrc;
-    if (fileName)
-      fontsrc->setFile(fileName, gFalse);
-    else
-      fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
-    
-    // load the font file
-    switch (fontType) {
-    case fontType1:
-      if (!(fontFile = m_fontEngine->loadType1Font(
-			   id,
-			   fontsrc,
-			   (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) {
-	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-	      gfxFont->getName() ? gfxFont->getName()->getCString()
-	                         : "(unnamed)");
-	goto err2;
-      }
-      break;
-    case fontType1C:
-      if (!(fontFile = m_fontEngine->loadType1CFont(
-			   id,
-			   fontsrc,
-			   (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) {
-	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-	      gfxFont->getName() ? gfxFont->getName()->getCString()
-	                         : "(unnamed)");
-	goto err2;
-      }
-      break;
-    case fontType1COT:
-      if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(
-			   id,
-			   fontsrc,
-			   (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) {
-	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-	      gfxFont->getName() ? gfxFont->getName()->getCString()
-	                         : "(unnamed)");
-	goto err2;
-      }
-      break;
-    case fontTrueType:
-    case fontTrueTypeOT:
-	if (fileName)
-	 ff = FoFiTrueType::load(fileName->getCString());
-	else
-	ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
-      if (ff) {
-	codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
-	n = 256;
-	delete ff;
-      } else {
-	codeToGID = NULL;
-	n = 0;
-      }
-      if (!(fontFile = m_fontEngine->loadTrueTypeFont(
-			   id,
-			   fontsrc,
-			   codeToGID, n))) {
-	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-	      gfxFont->getName() ? gfxFont->getName()->getCString()
-	                         : "(unnamed)");
-	goto err2;
-      }
-      break;
-    case fontCIDType0:
-    case fontCIDType0C:
-      if (!(fontFile = m_fontEngine->loadCIDFont(
-			   id,
-			   fontsrc))) {
-	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-	      gfxFont->getName() ? gfxFont->getName()->getCString()
-	                         : "(unnamed)");
-	goto err2;
-      }
-      break;
-    case fontCIDType0COT:
-      if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
-	n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
-	codeToGID = (int *)gmallocn(n, sizeof(int));
-	memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
-	       n * sizeof(int));
-      } else {
-	codeToGID = NULL;
-	n = 0;
-      }      
-      if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(
-			   id,
-			   fontsrc,
-			   codeToGID, n))) {
-	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-	      gfxFont->getName() ? gfxFont->getName()->getCString()
-	                         : "(unnamed)");
-	goto err2;
-      }
-      break;
-    case fontCIDType2:
-    case fontCIDType2OT:
-      codeToGID = NULL;
-      n = 0;
-      if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
-	n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
-	if (n) {
-	  codeToGID = (int *)gmallocn(n, sizeof(int));
-	  memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
-		  n * sizeof(Gushort));
-	}
-      } else {
-	if (fileName)
-	  ff = FoFiTrueType::load(fileName->getCString());
-	else
-	  ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
-	if (! ff)
-	  goto err2;
-	codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
-	delete ff;
-      }
-      if (!(fontFile = m_fontEngine->loadTrueTypeFont(
-			   id,
-			   fontsrc,
-			   codeToGID, n, faceIndex))) {
-	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
-	      gfxFont->getName() ? gfxFont->getName()->getCString()
-	                         : "(unnamed)");
-	goto err2;
-      }
-      break;
-    default:
-      // this shouldn't happen
-      goto err2;
-    }
-  }
-
-  // get the font matrix
-  textMat = state->getTextMat();
-  fontSize = state->getFontSize();
-  m11 = textMat[0] * fontSize * state->getHorizScaling();
-  m12 = textMat[1] * fontSize * state->getHorizScaling();
-  m21 = textMat[2] * fontSize;
-  m22 = textMat[3] * fontSize;
-
-  {
-  QMatrix painterMatrix = m_painter->worldMatrix();
-  matrix[0] = painterMatrix.m11();
-  matrix[1] = painterMatrix.m12();
-  matrix[2] = painterMatrix.m21();
-  matrix[3] = painterMatrix.m22();
-  matrix[4] = painterMatrix.dx();
-  matrix[5] = painterMatrix.dy();
-  }
-
-  // create the scaled font
-  mat[0] = m11;  mat[1] = -m12;
-  mat[2] = m21;  mat[3] = -m22;
-  m_font = m_fontEngine->getFont(fontFile, mat, matrix);
-
-  delete fontLoc;
-  if (fontsrc && !fontsrc->isFile)
-      fontsrc->unref();
-  return;
-
- err2:
-  delete id;
-  delete fontLoc;
- err1:
-  if (fontsrc && !fontsrc->isFile)
-      fontsrc->unref();
-  return;
-#endif
-}
-
-static QPainterPath convertPath(GfxState *state, GfxPath *path, Qt::FillRule fillRule)
-{
-  GfxSubpath *subpath;
-  double x1, y1, x2, y2, x3, y3;
-  int i, j;
-
-  QPainterPath qPath;
-  qPath.setFillRule(fillRule);
-  for (i = 0; i < path->getNumSubpaths(); ++i) {
-    subpath = path->getSubpath(i);
-    if (subpath->getNumPoints() > 0) {
-      state->transform(subpath->getX(0), subpath->getY(0), &x1, &y1);
-      qPath.moveTo(x1, y1);
-      j = 1;
-      while (j < subpath->getNumPoints()) {
-	if (subpath->getCurve(j)) {
-	  state->transform(subpath->getX(j), subpath->getY(j), &x1, &y1);
-	  state->transform(subpath->getX(j+1), subpath->getY(j+1), &x2, &y2);
-	  state->transform(subpath->getX(j+2), subpath->getY(j+2), &x3, &y3);
-	  qPath.cubicTo( x1, y1, x2, y2, x3, y3);
-	  j += 3;
-	} else {
-	  state->transform(subpath->getX(j), subpath->getY(j), &x1, &y1);
-	  qPath.lineTo(x1, y1);
-	  ++j;
-	}
-      }
-      if (subpath->isClosed()) {
-	qPath.closeSubpath();
-      }
-    }
-  }
-  return qPath;
-}
-
-void ArthurOutputDev::stroke(GfxState *state)
-{
-  m_painter->strokePath( convertPath( state, state->getPath(), Qt::OddEvenFill ), m_currentPen );
-}
-
-void ArthurOutputDev::fill(GfxState *state)
-{
-  m_painter->fillPath( convertPath( state, state->getPath(), Qt::WindingFill ), m_currentBrush );
-}
-
-void ArthurOutputDev::eoFill(GfxState *state)
-{
-  m_painter->fillPath( convertPath( state, state->getPath(), Qt::OddEvenFill ), m_currentBrush );
-}
-
-void ArthurOutputDev::clip(GfxState *state)
-{
-  m_painter->setClipPath(convertPath( state, state->getPath(), Qt::WindingFill ) );
-}
-
-void ArthurOutputDev::eoClip(GfxState *state)
-{
-  m_painter->setClipPath(convertPath( state, state->getPath(), Qt::OddEvenFill ) );
-}
-
-void ArthurOutputDev::drawChar(GfxState *state, double x, double y,
-			       double dx, double dy,
-			       double originX, double originY,
-			       CharCode code, int nBytes, Unicode *u, int uLen) {
-#ifdef HAVE_SPLASH
-  double x1, y1;
-  double x2, y2;
-//   SplashPath *path;
-  int render;
-
-  if (m_needFontUpdate) {
-    updateFont(state);
-  }
-  if (!m_font) {
-    return;
-  }
-
-  // check for invisible text -- this is used by Acrobat Capture
-  render = state->getRender();
-  if (render == 3) {
-    return;
-  }
-
-  x -= originX;
-  y -= originY;
-
-  // fill
-  if (!(render & 1)) {
-    SplashPath * fontPath;
-    fontPath = m_font->getGlyphPath(code);
-    if (fontPath) {
-      QPainterPath qPath;
-      qPath.setFillRule(Qt::WindingFill);
-      for (int i = 0; i < fontPath->length; ++i) {
-        if (fontPath->flags[i] & splashPathFirst) {
-            state->transform(fontPath->pts[i].x+x, -fontPath->pts[i].y+y, &x1, &y1);
-            qPath.moveTo(x1,y1);
-        } else if (fontPath->flags[i] & splashPathCurve) {
-            state->transform(fontPath->pts[i].x+x, -fontPath->pts[i].y+y, &x1, &y1);
-            state->transform(fontPath->pts[i+1].x+x, -fontPath->pts[i+1].y+y, &x2, &y2);
-            qPath.quadTo(x1,y1,x2,y2);
-            ++i;
-        }
-        // FIXME fix this
-        // 	else if (fontPath->flags[i] & splashPathArcCW) {
-        // 	  qDebug() << "Need to implement arc";
-        // 	}
-        else {
-            state->transform(fontPath->pts[i].x+x, -fontPath->pts[i].y+y, &x1, &y1);
-            qPath.lineTo(x1,y1);
-        }
-        if (fontPath->flags[i] & splashPathLast) {
-            qPath.closeSubpath();
-        }
-      }
-      GfxRGB rgb;
-      QColor brushColour = m_currentBrush.color();
-      state->getFillRGB(&rgb);
-      brushColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), state->getFillOpacity());
-      m_painter->setBrush(brushColour);
-      QColor penColour = m_currentPen.color();
-      state->getStrokeRGB(&rgb);
-      penColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), state->getStrokeOpacity());
-      m_painter->setPen(penColour);
-      m_painter->drawPath( qPath );
-      delete fontPath;
-    }
-  }
-
-  // stroke
-  if ((render & 3) == 1 || (render & 3) == 2) {
-    qDebug() << "no stroke";
-    /*
-    if ((path = m_font->getGlyphPath(code))) {
-      path->offset((SplashCoord)x1, (SplashCoord)y1);
-      splash->stroke(path);
-      delete path;
-    }
-    */
-  }
-
-  // clip
-  if (render & 4) {
-    qDebug() << "no clip";
-    /*
-    path = m_font->getGlyphPath(code);
-    path->offset((SplashCoord)x1, (SplashCoord)y1);
-    if (textClipPath) {
-      textClipPath->append(path);
-      delete path;
-    } else {
-      textClipPath = path;
-    }
-    */
-  }
-#endif
-}
-
-GBool ArthurOutputDev::beginType3Char(GfxState *state, double x, double y,
-				      double dx, double dy,
-				      CharCode code, Unicode *u, int uLen)
-{
-  return gFalse;
-}
-
-void ArthurOutputDev::endType3Char(GfxState *state)
-{
-}
-
-void ArthurOutputDev::type3D0(GfxState *state, double wx, double wy)
-{
-}
-
-void ArthurOutputDev::type3D1(GfxState *state, double wx, double wy,
-			      double llx, double lly, double urx, double ury)
-{
-}
-
-void ArthurOutputDev::endTextObject(GfxState *state)
-{
-}
-
-
-void ArthurOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
-				    int width, int height, GBool invert,
-				    GBool interpolate, GBool inlineImg)
-{
-  qDebug() << "drawImageMask";
-#if 0
-  unsigned char *buffer;
-  unsigned char *dest;
-  cairo_surface_t *image;
-  cairo_pattern_t *pattern;
-  int x, y;
-  ImageStream *imgStr;
-  Guchar *pix;
-  double *ctm;
-  cairo_matrix_t matrix;
-  int invert_bit;
-  int row_stride;
-
-  row_stride = (width + 3) & ~3;
-  buffer = (unsigned char *) malloc (height * row_stride);
-  if (buffer == NULL) {
-    error(-1, "Unable to allocate memory for image.");
-    return;
-  }
-
-  /* TODO: Do we want to cache these? */
-  imgStr = new ImageStream(str, width, 1, 1);
-  imgStr->reset();
-
-  invert_bit = invert ? 1 : 0;
-
-  for (y = 0; y < height; y++) {
-    pix = imgStr->getLine();
-    dest = buffer + y * row_stride;
-    for (x = 0; x < width; x++) {
-
-      if (pix[x] ^ invert_bit)
-	*dest++ = 0;
-      else
-	*dest++ = 255;
-    }
-  }
-
-  image = cairo_image_surface_create_for_data (buffer, CAIRO_FORMAT_A8,
-					  width, height, row_stride);
-  if (image == NULL)
-    return;
-  pattern = cairo_pattern_create_for_surface (image);
-  if (pattern == NULL)
-    return;
-
-  ctm = state->getCTM();
-  LOG (printf ("drawImageMask %dx%d, matrix: %f, %f, %f, %f, %f, %f\n",
-	       width, height, ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]));
-  matrix.xx = ctm[0] / width;
-  matrix.xy = -ctm[2] / height;
-  matrix.yx = ctm[1] / width;
-  matrix.yy = -ctm[3] / height;
-  matrix.x0 = ctm[2] + ctm[4];
-  matrix.y0 = ctm[3] + ctm[5];
-  cairo_matrix_invert (&matrix);
-  cairo_pattern_set_matrix (pattern, &matrix);
-
-  cairo_pattern_set_filter (pattern, CAIRO_FILTER_BEST);
-  /* FIXME: Doesn't the image mask support any colorspace? */
-  cairo_set_source_rgb (cairo, fill_color.r, fill_color.g, fill_color.b);
-  cairo_mask (cairo, pattern);
-
-  cairo_pattern_destroy (pattern);
-  cairo_surface_destroy (image);
-  free (buffer);
-  imgStr->close ();
-  delete imgStr;
-#endif
-}
-
-//TODO: lots more work here.
-void ArthurOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
-				int width, int height,
-				GfxImageColorMap *colorMap,
-				GBool interpolate, int *maskColors, GBool inlineImg)
-{
-  unsigned int *data;
-  unsigned int *line;
-  int x, y;
-  ImageStream *imgStr;
-  Guchar *pix;
-  int i;
-  double *ctm;
-  QMatrix matrix;
-  QImage image;
-  int stride;
-  
-  /* TODO: Do we want to cache these? */
-  imgStr = new ImageStream(str, width,
-			   colorMap->getNumPixelComps(),
-			   colorMap->getBits());
-  imgStr->reset();
-  
-  image = QImage(width, height, QImage::Format_ARGB32);
-  data = (unsigned int *)image.bits();
-  stride = image.bytesPerLine()/4;
-  for (y = 0; y < height; y++) {
-    pix = imgStr->getLine();
-    line = data+y*stride;
-    colorMap->getRGBLine(pix, line, width);
-
-    if (maskColors) {
-      for (x = 0; x < width; x++) {
-        for (i = 0; i < colorMap->getNumPixelComps(); ++i) {
-            if (pix[i] < maskColors[2*i] * 255||
-                pix[i] > maskColors[2*i+1] * 255) {
-                *line = *line | 0xff000000;
-                break;
-            }
-        }
-        pix += colorMap->getNumPixelComps();
-        line++;
-      }
-    } else {
-      for (x = 0; x < width; x++) { *line = *line | 0xff000000; line++; }
-    }
-  }
-
-  ctm = state->getCTM();
-  matrix.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
-
-  m_painter->setMatrix(matrix, true);
-  m_painter->drawImage( QPoint(0,0), image );
-  delete imgStr;
-
-}
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/ArthurOutputDev.h b/Build/source/libs/poppler/poppler-0.23.2/poppler/ArthurOutputDev.h
deleted file mode 100644
index 9d5e867951a..00000000000
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/ArthurOutputDev.h
+++ /dev/null
@@ -1,170 +0,0 @@
-//========================================================================
-//
-// ArthurOutputDev.h
-//
-// Copyright 2003 Glyph & Cog, LLC
-//
-//========================================================================
-
-//========================================================================
-//
-// 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) 2005 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2005 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2010 Pino Toscano <pino@kde.org>
-// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
-// Copyright (C) 2013 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
-//
-//========================================================================
-
-#ifndef ARTHUROUTPUTDEV_H
-#define ARTHUROUTPUTDEV_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma interface
-#endif
-
-#include "goo/gtypes.h"
-#include "OutputDev.h"
-#include "GfxState.h"
-
-#include <QtGui/QPainter>
-
-class GfxState;
-class GfxPath;
-class Gfx8BitFont;
-struct GfxRGB;
-
-class SplashFont;
-class SplashFontEngine;
-struct SplashGlyphBitmap;
-
-//------------------------------------------------------------------------
-// ArthurOutputDev - Qt 4 QPainter renderer
-//------------------------------------------------------------------------
-
-class ArthurOutputDev: public OutputDev {
-public:
-  /**
-   * Describes how fonts are distorted (aka hinted) to fit the pixel grid.
-   * More hinting means sharper edges and less adherence to the true letter shapes.
-   */
-  enum FontHinting {
-    NoHinting = 0, ///< Font shapes are left unchanged
-    SlightHinting, ///< Font shapes are distorted vertically only
-    FullHinting ///< Font shapes are distorted horizontally and vertically
-  };
-
-  // Constructor.
-  ArthurOutputDev(QPainter *painter );
-
-  // Destructor.
-  virtual ~ArthurOutputDev();
-
-  void setFontHinting(FontHinting hinting) { m_fontHinting = hinting; }
-
-  //----- get info about output device
-
-  // Does this device use upside-down coordinates?
-  // (Upside-down means (0,0) is the top left corner of the page.)
-  virtual GBool upsideDown() { return gTrue; }
-
-  // Does this device use drawChar() or drawString()?
-  virtual GBool useDrawChar() { return gTrue; }
-
-  // Does this device use beginType3Char/endType3Char?  Otherwise,
-  // text in Type 3 fonts will be drawn with drawChar/drawString.
-  virtual GBool interpretType3Chars() { return gTrue; }
-
-  //----- initialization and control
-
-  // Start a page.
-  virtual void startPage(int pageNum, GfxState *state, XRef *xref);
-
-  // End a page.
-  virtual void endPage();
-
-  //----- save/restore graphics state
-  virtual void saveState(GfxState *state);
-  virtual void restoreState(GfxState *state);
-
-  //----- update graphics state
-  virtual void updateAll(GfxState *state);
-  virtual void updateCTM(GfxState *state, double m11, double m12,
-			 double m21, double m22, double m31, double m32);
-  virtual void updateLineDash(GfxState *state);
-  virtual void updateFlatness(GfxState *state);
-  virtual void updateLineJoin(GfxState *state);
-  virtual void updateLineCap(GfxState *state);
-  virtual void updateMiterLimit(GfxState *state);
-  virtual void updateLineWidth(GfxState *state);
-  virtual void updateFillColor(GfxState *state);
-  virtual void updateStrokeColor(GfxState *state);
-  virtual void updateFillOpacity(GfxState *state);
-  virtual void updateStrokeOpacity(GfxState *state);
-
-  //----- update text state
-  virtual void updateFont(GfxState *state);
-
-  //----- path painting
-  virtual void stroke(GfxState *state);
-  virtual void fill(GfxState *state);
-  virtual void eoFill(GfxState *state);
-
-  //----- path clipping
-  virtual void clip(GfxState *state);
-  virtual void eoClip(GfxState *state);
-
-  //----- text drawing
-  //   virtual void drawString(GfxState *state, GooString *s);
-  virtual void drawChar(GfxState *state, double x, double y,
-			double dx, double dy,
-			double originX, double originY,
-			CharCode code, int nBytes, Unicode *u, int uLen);
-  virtual GBool beginType3Char(GfxState *state, double x, double y,
-			       double dx, double dy,
-			       CharCode code, Unicode *u, int uLen);
-  virtual void endType3Char(GfxState *state);
-  virtual void endTextObject(GfxState *state);
-
-  //----- image drawing
-  virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
-			     int width, int height, GBool invert,
-			     GBool interpolate, GBool inlineImg);
-  virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-			 int width, int height, GfxImageColorMap *colorMap,
-			 GBool interpolate, int *maskColors, GBool inlineImg);
-
-  //----- Type 3 font operators
-  virtual void type3D0(GfxState *state, double wx, double wy);
-  virtual void type3D1(GfxState *state, double wx, double wy,
-		       double llx, double lly, double urx, double ury);
-
-  //----- special access
-
-  // Called to indicate that a new PDF document has been loaded.
-  void startDoc(XRef *xrefA);
- 
-  GBool isReverseVideo() { return gFalse; }
-  
-private:
-  QPainter *m_painter;
-  FontHinting m_fontHinting;
-  QFont m_currentFont;
-  QPen m_currentPen;
-  QBrush m_currentBrush;
-  GBool m_needFontUpdate;		// set when the font needs to be updated
-  SplashFontEngine *m_fontEngine;
-  SplashFont *m_font;		// current font
-  XRef *xref;			// xref table for current document
-};
-
-#endif
diff --git a/Build/source/libs/poppler/poppler-0.23.2-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.23.3-PATCHES/ChangeLog
index 184a9931512..1fcb9e5dc7a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.23.3-PATCHES/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported poppler-0.23.3 source tree from:
+	  http://poppler.freedesktop.org/
+
+	* patch-01-MINGW_PRINTF_FORMAT (removed): Now included upstream.
+	* patch-02-LLONG_MAX: Adapted.
+
 2013-06-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported poppler-0.23.2 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.23.2-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.23.3-PATCHES/TL-Changes
index 66db6fb4d4e..86851f14c88 100644
--- a/Build/source/libs/poppler/poppler-0.23.2-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.23.3-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.23.2 tree as obtained from:
+Changes applied to the poppler-0.23.3 tree as obtained from:
 	http://poppler.freedesktop.org/
 
 Removed:
@@ -22,6 +22,7 @@ Removed unused dirs:
 	glib
 	m4
 	qt4
+	qt5
 	splash
 	test
 	utils
diff --git a/Build/source/libs/poppler/poppler-0.23.2-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.23.3-PATCHES/patch-02-LLONG_MAX
index bc624d35dc4..79dcc2a463c 100644
--- a/Build/source/libs/poppler/poppler-0.23.2-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.23.3-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.23.2.orig/goo/GooString.h poppler-0.23.2/goo/GooString.h
---- poppler-0.23.2.orig/goo/GooString.h	2013-04-16 23:29:11.000000000 +0200
-+++ poppler-0.23.2/goo/GooString.h	2013-06-18 18:28:08.000000000 +0200
+diff -ur poppler-0.23.3.orig/goo/GooString.h poppler-0.23.3/goo/GooString.h
+--- poppler-0.23.3.orig/goo/GooString.h	2013-04-16 23:29:11.000000000 +0200
++++ poppler-0.23.3/goo/GooString.h	2013-06-18 18:28:08.000000000 +0200
 @@ -33,6 +33,21 @@
  #endif
  
diff --git a/Build/source/libs/poppler/poppler-0.23.2/AUTHORS b/Build/source/libs/poppler/poppler-0.23.3/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.23.3/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.23.2/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.23.3/CMakeLists.txt
index ef51eca20d3..1d6cff50a32 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.23.3/CMakeLists.txt
@@ -18,13 +18,14 @@ CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "23")
-set(POPPLER_MICRO_VERSION "2")
+set(POPPLER_MICRO_VERSION "3")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
 option(ENABLE_XPDF_HEADERS "Install unsupported xpdf headers." OFF)
 option(BUILD_GTK_TESTS "Whether compile the GTK+ test programs." ON)
 option(BUILD_QT4_TESTS "Whether compile the Qt4 test programs." ON)
+option(BUILD_QT5_TESTS "Whether compile the Qt5 test programs." ON)
 option(BUILD_CPP_TESTS "Whether compile the CPP test programs." ON)
 option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
 option(ENABLE_UTILS "Compile poppler command line utils." ON)
@@ -101,6 +102,23 @@ if(JPEG_FOUND)
   set(ENABLE_LIBJPEG ${JPEG_FOUND})
 endif(JPEG_FOUND)
 macro_optional_find_package(Qt4)
+if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
+  find_package(Qt5Core)
+  find_package(Qt5Gui)
+  find_package(Qt5Xml)
+  find_package(Qt5Widgets)
+  find_package(Qt5Test)
+  if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)
+    set(QT5_FOUND true)
+  else ()
+    message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
+    set(QT5_FOUND false)
+  endif()
+else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
+  set(QT5_FOUND false)
+  message("-- CMake >= 2.8.8 is needed to enable Qt5")
+endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
+
 macro_optional_find_package(Cairo ${CAIRO_VERSION})
 if(CAIRO_FOUND)
   set(HAVE_CAIRO ${CAIRO_FOUND})
@@ -402,7 +420,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 40.0.0 SOVERSION 40)
+set_target_properties(poppler PROPERTIES VERSION 41.0.0 SOVERSION 41)
 target_link_libraries(poppler ${poppler_LIBS})
 if(HAVE_PTHREAD)
   target_link_libraries(poppler -lpthread)
@@ -579,6 +597,9 @@ add_subdirectory(test)
 if(QT4_FOUND)
   add_subdirectory(qt4)
 endif(QT4_FOUND)
+if(QT5_FOUND)
+  add_subdirectory(qt5)
+endif(QT5_FOUND)
 if(ENABLE_CPP)
   add_subdirectory(cpp)
 endif(ENABLE_CPP)
@@ -603,6 +624,9 @@ endif(ENABLE_SPLASH)
 if(QT4_FOUND)
   poppler_create_install_pkgconfig(poppler-qt4.pc lib${LIB_SUFFIX}/pkgconfig)
 endif(QT4_FOUND)
+if(QT5_FOUND)
+  poppler_create_install_pkgconfig(poppler-qt5.pc lib${LIB_SUFFIX}/pkgconfig)
+endif(QT5_FOUND)
 if(ENABLE_GLIB)
   poppler_create_install_pkgconfig(poppler-glib.pc lib${LIB_SUFFIX}/pkgconfig)
 endif(ENABLE_GLIB)
@@ -619,6 +643,7 @@ show_end_message("font configuration" ${font_configuration})
 show_end_message_yesno("splash output" ENABLE_SPLASH)
 show_end_message_yesno("cairo output" CAIRO_FOUND)
 show_end_message_yesno("qt4 wrapper" QT4_FOUND)
+show_end_message_yesno("qt5 wrapper" QT5_FOUND)
 show_end_message_yesno("glib wrapper" ENABLE_GLIB)
 show_end_message_yesno("  introspection" INTROSPECTION_FOUND)
 show_end_message_yesno("cpp wrapper" ENABLE_CPP)
diff --git a/Build/source/libs/poppler/poppler-0.23.2/COPYING b/Build/source/libs/poppler/poppler-0.23.3/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/COPYING
+++ b/Build/source/libs/poppler/poppler-0.23.3/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.23.2/ChangeLog b/Build/source/libs/poppler/poppler-0.23.3/ChangeLog
index 49b931f0155..19aba39cfd7 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.23.3/ChangeLog
@@ -1,3 +1,769 @@
+commit df9d4fee17adfe003c822175b6921a3cd93675f6
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jul 1 21:04:10 2013 +0200
+
+    Update copyrights
+
+ poppler/Annot.cc              | 2 +-
+ poppler/Annot.h               | 2 +-
+ poppler/Page.cc               | 2 +-
+ poppler/TextOutputDev.cc      | 2 +-
+ poppler/TextOutputDev.h       | 2 +-
+ qt5/src/poppler-annotation.cc | 2 +-
+ qt5/src/poppler-annotation.h  | 2 +-
+ qt5/src/poppler-document.cc   | 2 +-
+ qt5/src/poppler-link.cc       | 2 +-
+ qt5/src/poppler-qt5.h         | 2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 67129e9db88e8332907407f14d3e09ee5c49e274
+Author: Jason Crain <jason@aquaticape.us>
+Date:   Mon Jul 1 02:24:47 2013 -0500
+
+    Check for NULL in Page::getResourceDictCopy
+
+ poppler/Page.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit c376559bc412e90204162bb4b2d20cd586db70c1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Jun 30 13:14:07 2013 +0200
+
+    annots: Invalidate the appearance stream when annot properties change
+
+    Make invalidateAppearance() protected and only call it when properties
+    that affect the appearance stream are updated. Remove all calls to
+    invalidateAppearance() from qt frontend, this is now handled by
+    the core
+    and fixes the appearance stream regeneration in the glib frontend too.
+
+ poppler/Annot.cc              | 36 ++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h               | 10 ++++++----
+ qt4/src/poppler-annotation.cc | 34 ----------------------------------
+ qt5/src/poppler-annotation.cc | 34 ----------------------------------
+ 4 files changed, 42 insertions(+), 72 deletions(-)
+
+commit c746e8b38e821d1ebeaf52c4c816515bc3ddaaf6
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Jun 30 11:44:59 2013 +0200
+
+    annots: Remove unused variable
+
+ poppler/Annot.cc | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 7d9d5d2518f7760e6a4317a358040ddd9164fdef
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Jun 30 11:40:15 2013 +0200
+
+    annots: Do not update AP and AS entries if they are not present when
+    invaliding the appaearance stream
+
+ poppler/Annot.cc | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+commit 347b53f7fca644564724c230fe6c0dcbffa0d6f9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Jun 30 11:23:54 2013 +0200
+
+    annots: do not set the default appearance state when invalidating
+    appearances
+
+    We are setting the default appareance state to Off and then we are
+    updating AS dictionary to NULL in the XRef. The appearance state
+    is only
+    required when there's more than once appearance stream, but when
+    invalidating the apperance we remove all streams.
+
+ poppler/Annot.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit b5e9941c145fc99e03a28d92a50840638895908d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jul 1 00:32:51 2013 +0200
+
+    Fix crash on malformed doc
+
+    Where the Colorants dictionary values are not arrays
+    Document can be found on KDE bug #319925
+
+ poppler/GfxState.cc | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+commit 19f8a88bba6022b8172477e6f52dfd36b2fc5e92
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Thu Mar 7 00:20:15 2013 +0100
+
+    qt5: Free some temporary memory in
+    TextAnnotationPrivate::createNativeAnnot
+
+    There's no need to keep this buffer around after it has been flushed
+
+ qt5/src/poppler-annotation.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 8bac4d1e43ce9a4c66fddc8430d7bed2d9aabba1
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Tue Jun 25 20:09:00 2013 +0200
+
+    qt5: Some documentation about annotations
+
+    * Removed incorrect hint "Use uniqueName to test for Annotation
+      equality": uniqueNames are optional and we don't actually guarantee
+      uniqueness
+    * Added "How to add annotations" and "FixedRotation flag specifics"
+      sections in the Annotation class page
+    * Added links from enum Annotation::SubType items to actual subclasses
+    * Added documentation for annotation flags that are known to work
+    * Added "see also" links between annotation flag and boundary
+      setters/getters
+    * Added warning on Annotation::setPopup to tell that it's currently
+    not
+      implemented
+
+ qt5/src/poppler-annotation.h | 143
+ ++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 135 insertions(+), 8 deletions(-)
+
+commit 1d5fe3f20189fd3928121e954bcc8fa7278b39fb
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Sat Mar 2 19:06:49 2013 +0100
+
+    qt5: FixedRotation annotations' coordinate conversion
+
+    FixedRotation(=flagNoRotate) annotations use a different coordinate
+    system than regular annotations. This patch implements transparent
+    conversion so that qt5 clients don't notice the difference.
+
+    Important! When dealing with FixedRotation annotations, poppler-qt5
+    clients will need to set geometry-related annotation properties in
+    the following order:
+     1) flags (because we need to know if this is a FixedRotation
+        annotation or not)
+     2) boundary (because we need to know what the topleft corner is,
+        so that we can construct the conversion matrix)
+     3) anything else
+
+    This requirement will be documented in the next patch
+
+ qt5/src/poppler-annotation-private.h |   7 ++-
+ qt5/src/poppler-annotation.cc        | 111
+ +++++++++++++++++++++++++++--------
+ 2 files changed, 92 insertions(+), 26 deletions(-)
+
+commit ab130c91492765f8be29ed112dd2e2e6f665641b
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Sat Mar 2 00:55:58 2013 +0100
+
+    core: Remove geometry-related arguments from annotation constructors
+
+    Removed arguments from annotation constructors related to the geometry
+    of the annotation. This change will make it easier to support creating
+    annotations with flag NoRotate in the next patch (because no special
+    cases will be needed: coordinate conversion code will be able
+    to always
+    assume that the underlying annotation object already exists).
+
+    Data that used to be taken from these arguments is now replaced
+    by dummy
+    values, which can be modified using appropriate setter methods after
+    the annotation object is created.
+
+    Affected annotation types:
+     - AnnotLine
+     - AnnotTextMarkup
+     - AnnotPolygon
+     - AnnotInk
+
+ qt5/src/poppler-annotation.cc | 34 ++++++++++++++++++----------------
+ 1 file changed, 18 insertions(+), 16 deletions(-)
+
+commit 35cfb6914e1be4c5eda2f355900b1a0a1fa69d19
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Fri Feb 15 12:24:18 2013 +0100
+
+    poppler_qt5viewer: Add combobox to select rotation
+
+ qt5/demos/navigationtoolbar.cpp | 15 +++++++++++++++
+ qt5/demos/navigationtoolbar.h   |  4 ++++
+ qt5/demos/pageview.cpp          | 24 +++++++++++++++++++++++-
+ qt5/demos/pageview.h            |  3 +++
+ qt5/demos/viewer.cpp            |  2 ++
+ 5 files changed, 47 insertions(+), 1 deletion(-)
+
+commit de2a93c0bc6e92a95c687796f59780c998b90ca4
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Thu Mar 7 00:20:15 2013 +0100
+
+    qt4: Free some temporary memory in
+    TextAnnotationPrivate::createNativeAnnot
+
+    There's no need to keep this buffer around after it has been flushed
+
+ qt4/src/poppler-annotation.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 738b0b4fedaa2b2b28ea1c11622dfd880180d1c9
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Thu Mar 7 20:50:52 2013 +0100
+
+    qt4: Some documentation about annotations
+
+    * Removed incorrect hint "Use uniqueName to test for Annotation
+      equality": uniqueNames are optional and we don't actually guarantee
+      uniqueness
+    * Added "How to add annotations" and "FixedRotation flag specifics"
+      sections in the Annotation class page
+    * Added links from enum Annotation::SubType items to actual subclasses
+    * Added documentation for annotation flags that are known to work
+    * Added "see also" links between annotation flag and boundary
+      setters/getters
+    * Added warning on Annotation::setPopup to tell that it's currently
+    not
+      implemented
+
+ qt4/src/poppler-annotation.h | 143
+ ++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 135 insertions(+), 8 deletions(-)
+
+commit cf950a2b7e8278e70719c67b441b0d324ffd0399
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Sat Mar 2 19:06:49 2013 +0100
+
+    qt4: FixedRotation annotations' coordinate conversion
+
+    FixedRotation(=flagNoRotate) annotations use a different coordinate
+    system than regular annotations. This patch implements transparent
+    conversion so that qt4 clients don't notice the difference.
+
+    Important! When dealing with FixedRotation annotations, poppler-qt4
+    clients will need to set geometry-related annotation properties in
+    the following order:
+     1) flags (because we need to know if this is a FixedRotation
+        annotation or not)
+     2) boundary (because we need to know what the topleft corner is,
+        so that we can construct the conversion matrix)
+     3) anything else
+
+    This requirement will be documented in the next patch
+
+ poppler/Annot.cc                     |   8 +++
+ poppler/Annot.h                      |   2 +
+ qt4/src/poppler-annotation-private.h |   7 ++-
+ qt4/src/poppler-annotation.cc        | 111
+ +++++++++++++++++++++++++++--------
+ 4 files changed, 102 insertions(+), 26 deletions(-)
+
+commit 4b13085568df09d8b75099f6a5438f025a028fd5
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Sat Mar 2 00:55:58 2013 +0100
+
+    core: Remove geometry-related arguments from annotation constructors
+
+    Removed arguments from annotation constructors related to the geometry
+    of the annotation. This change will make it easier to support creating
+    annotations with flag NoRotate in the next patch (because no special
+    cases will be needed: coordinate conversion code will be able
+    to always
+    assume that the underlying annotation object already exists).
+
+    Data that used to be taken from these arguments is now replaced
+    by dummy
+    values, which can be modified using appropriate setter methods after
+    the annotation object is created.
+
+    Affected annotation types:
+     - AnnotLine
+     - AnnotTextMarkup
+     - AnnotPolygon
+     - AnnotInk
+
+ poppler/Annot.cc              | 56
+ +++++++++++++------------------------------
+ poppler/Annot.h               |  9 ++++---
+ qt4/src/poppler-annotation.cc | 34 +++++++++++++-------------
+ 3 files changed, 39 insertions(+), 60 deletions(-)
+
+commit 5923cfb5f7e3a0703de17e21f4952f92a44f3c14
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Fri Feb 15 12:24:18 2013 +0100
+
+    poppler_qt4viewer: Add combobox to select rotation
+
+ qt4/demos/navigationtoolbar.cpp | 15 +++++++++++++++
+ qt4/demos/navigationtoolbar.h   |  4 ++++
+ qt4/demos/pageview.cpp          | 24 +++++++++++++++++++++++-
+ qt4/demos/pageview.h            |  3 +++
+ qt4/demos/viewer.cpp            |  2 ++
+ 5 files changed, 47 insertions(+), 1 deletion(-)
+
+commit 74ea15cc454f31b772e71b3525b71045dbfa5527
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Tue Jun 25 19:56:20 2013 +0200
+
+    core: Support for rendering annotations with flagNoRotate
+
+    Gfx::drawAnnot now makes a counter-rotation if flagNoRotate is set
+
+ poppler/Annot.cc | 55
+ ++++++++++++++++++++++++++++++++++++-------------------
+ poppler/Annot.h  |  3 ++-
+ poppler/Gfx.cc   | 41 +++++++++++++++++++++++++++++++++++++----
+ poppler/Gfx.h    |  3 ++-
+ 4 files changed, 77 insertions(+), 25 deletions(-)
+
+commit 2639957ba78defd2ab6282679375fb7969bad21f
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Wed Jun 26 23:12:40 2013 +0200
+
+    Do not crash in page::removeAnnot if there are non-Ref entries
+    in /Annots
+
+ poppler/Page.cc | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+commit ae016aa263c218fbfbd607cc92feac1013348c7e
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed Jun 26 11:33:55 2013 +0200
+
+    Fix qt5 found/not found logic
+
+ CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit e27c1057caf4d878a0dc43c92c9e0b565db8fe40
+Merge: c55b577 ee8cfbc
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 25 19:17:13 2013 +0200
+
+    Merge remote-tracking branch 'origin/qt5'
+
+commit c55b577ce69ad4bb69f5261b3e120e92c9fdb3d0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Tue Jun 25 10:01:38 2013 +0200
+
+    glib: Use TextPage::getSelectionWords to build text layout and
+    attributes
+
+    This way we can make sure that the list of words used in
+    poppler_page_get_text_layout and poppler_page_get_text_attributes
+    is the
+    same that the one used in poppler_page_get_text. This fixes the
+    mismatch
+    between the number of characters in the text returned by
+    poppler_page_get_text and the number of characters returned by
+    poppler_page_get_text_layout in some documents.
+
+ glib/poppler-page.cc | 168
+ +++++++++++++++++++++++++++------------------------
+ 1 file changed, 90 insertions(+), 78 deletions(-)
+
+commit fc534f571315c064005515c19d7d70ad3af1563e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Tue Jun 25 10:05:01 2013 +0200
+
+    TextOutputDev: add a method to TextPage to get the selection as a
+    list of words
+
+    Returns a list of lines of words.
+
+ poppler/TextOutputDev.cc | 36 ++++++++++++++++++++++++++++++++++++
+ poppler/TextOutputDev.h  |  4 ++++
+ 2 files changed, 40 insertions(+)
+
+commit a924246b7534e86165f8e9ab6c60d56b73a17b94
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Tue Jun 25 09:57:48 2013 +0200
+
+    TextOutputDev: simplify the text selection dumper
+
+    Build a list of lines of words and don't try to format the text when
+    detecting tables, simply add the words and lines in the right order.
+
+ poppler/TextOutputDev.cc | 200
+ ++++++++++++++++++++++-------------------------
+ 1 file changed, 92 insertions(+), 108 deletions(-)
+
+commit c849094a2daf896d085937adff1f7659a09da062
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Mon Jun 24 18:29:11 2013 +0200
+
+    TextOutputDev: Move TextSelection class from TextSelectionPainter
+    to TextSelectionVisitor
+
+    So that it can be used by other TextSelectionVisitor implementations.
+    Also renamed it as TextWordSelection since it contains a word
+    selection.
+
+ poppler/TextOutputDev.cc | 35 ++++++++++++++++++-----------------
+ 1 file changed, 18 insertions(+), 17 deletions(-)
+
+commit b3ff3f2c3e131556d2b27cbe52f0ddbbb4820c19
+Author: Jason Crain <jason@aquaticape.us>
+Date:   Thu Jun 20 21:47:13 2013 -0500
+
+    Draw glyphs after selection background
+
+    When multiple lines of text are selected, TextSelectionPainter will
+    draw selections over each other, hiding the previous line with the
+    selection background of the current line.  This patch changes
+    TextSelectionPainter so that glyphs are drawn only after the entire
+    background is drawn.
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=65989
+
+ poppler/TextOutputDev.cc | 109
+ ++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 69 insertions(+), 40 deletions(-)
+
+commit ee8cfbc78fe9de109abbe0727a738870f6027a73
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 18 23:20:01 2013 +0200
+
+    Fix indent
+
+ qt5/src/poppler-optcontent.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 9d0a5b6afb25a1273504383e108bdb95ca82f099
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 18 23:19:30 2013 +0200
+
+    Bring changes from the qt4 dir
+
+ qt5/src/Doxyfile                 |   2 +-
+ qt5/src/poppler-private.h        |   2 +-
+ qt5/tests/CMakeLists.txt         |   1 +
+ qt5/tests/Makefile.am            |  13 +-
+ qt5/tests/stress-threads-qt5.cpp | 304
+ +++++++++++++++++++++++++++++++++++++++
+ qt5/tests/test-poppler-qt5.cpp   |   2 +-
+ 6 files changed, 320 insertions(+), 4 deletions(-)
+
+commit 1adb1ab7aee026e227d25716a4b7be22b19b5b84
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 18 20:50:49 2013 +0200
+
+    Make it build with autotools
+
+ poppler/ArthurOutputDev.cc    | 816
+ ------------------------------------------
+ poppler/ArthurOutputDev.h     | 170 ---------
+ poppler/Makefile.am           |  23 +-
+ qt4/src/ArthurOutputDev.cc    | 816
+ ++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/ArthurOutputDev.h     | 170 +++++++++
+ qt4/src/CMakeLists.txt        |   2 +-
+ qt4/src/Makefile.am           |   5 +-
+ qt5/src/ArthurOutputDev.cc    | 816
+ ++++++++++++++++++++++++++++++++++++++++++
+ qt5/src/ArthurOutputDev.h     | 170 +++++++++
+ qt5/src/CMakeLists.txt        |   2 +-
+ qt5/src/Makefile.am           |   5 +-
+ qt5/src/poppler-optcontent.cc |   2 +
+ 12 files changed, 1983 insertions(+), 1014 deletions(-)
+
+commit 93a1c2b768cc419c5bf9b3033bf85fb21326a65a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 18 00:33:38 2013 +0200
+
+    If qmake gives us a Qt5 qmake try with qmake4 and qmake-qt4
+
+ cmake/modules/FindQt4.cmake | 62
+ ++++++++++++++++++++++++++++-----------------
+ 1 file changed, 39 insertions(+), 23 deletions(-)
+
+commit 7cc33a752ef864b595748ce7724ba553a8e3ba8e
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 22:57:56 2013 +0200
+
+    We are not compiling an executable
+
+ qt5/src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 87cfcd41e8e970186c6ce753aa660ef86aca8878
+Author: Granger Anthony <grangeranthony@gmail.com>
+Date:   Mon Jun 17 09:17:51 2013 +0200
+
+    Allow to enable Qt5 support only with CMake >= 2.8.8
+
+ CMakeLists.txt           | 26 ++++++++++++++++----------
+ qt5/tests/CMakeLists.txt |  1 -
+ 2 files changed, 16 insertions(+), 11 deletions(-)
+
+commit b44c70f04758000cf0e049b06cc7864287570f7b
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 22:10:05 2013 +0200
+
+    Bring PIC back to the toplevel, still have linking errors tohugh :-/
+
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit be49073f5ce79f56b38197758a5cf1253b972306
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 21:50:31 2013 +0200
+
+    Use qtchooser if available
+
+ configure.ac | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+commit b1958228d4bc6793a3606b5e31c61a57b9fac9f5
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 20:21:08 2013 +0200
+
+    No distro ships moc-qt5 but make it work in case someone would
+
+ configure.ac | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 06f45c7177afc67e02985be1a97cd976c530c4ae
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 20:04:49 2013 +0200
+
+    Build fixes
+
+    Fix moc when moc-qt4 is qt4 moc but moc is qt5 one
+    Do not add -fPIE everywhere, just -fPIC to qt5
+
+ configure.ac        | 10 ++++++----
+ qt5/src/Makefile.am |  2 +-
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+commit cb617c21fba727781f46278f5475b91d528a488b
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 18:12:18 2013 +0200
+
+    Files i forgot
+
+ poppler-qt5-uninstalled.pc.in |  7 +++++++
+ poppler-qt5.pc.cmake          | 13 +++++++++++++
+ poppler-qt5.pc.in             | 13 +++++++++++++
+ 3 files changed, 33 insertions(+)
+
+commit 5c521bba427eb163e4b77d936865fbdd0e07faf3
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 18:12:07 2013 +0200
+
+    soversion 1
+
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Makefile.am    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 43786964946b4f4c005a0526e16fead3ffa6ba4a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 00:23:31 2013 +0200
+
+    harmonize spaces
+
+ CMakeLists.txt | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+commit 2e2ea27fe3dc688c87003d170b82451a6a872b0d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 00:22:18 2013 +0200
+
+    Remove qt4 mentions
+
+ qt5/src/poppler-converter-private.h    | 6 +++---
+ qt5/src/poppler-embeddedfile-private.h | 2 +-
+ qt5/src/poppler-form.cc                | 2 +-
+ qt5/src/poppler-form.h                 | 6 +++---
+ qt5/src/poppler-pdf-converter.cc       | 2 +-
+ qt5/src/poppler-private.cc             | 4 ++--
+ qt5/src/poppler-private.h              | 2 +-
+ qt5/src/poppler-qt5.h                  | 2 +-
+ 8 files changed, 13 insertions(+), 13 deletions(-)
+
+commit e2264ce82af3e971e34930f5307b7c9b43a1e346
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 00:19:27 2013 +0200
+
+    remove deprecated stuff
+
+ qt5/src/poppler-annotation.cc |  19 ++------
+ qt5/src/poppler-annotation.h  |  18 -------
+ qt5/src/poppler-document.cc   |  19 --------
+ qt5/src/poppler-link.cc       |   5 --
+ qt5/src/poppler-link.h        |  10 ----
+ qt5/src/poppler-page.cc       |  18 -------
+ qt5/src/poppler-qt5.h         |  41 ----------------
+ qt5/tests/check_fonts.cpp     |  21 ++-------
+ qt5/tests/check_metadata.cpp  |   1 -
+ qt5/tests/check_search.cpp    | 107
+ ++++++++++++++++++++++--------------------
+ 10 files changed, 65 insertions(+), 194 deletions(-)
+
+commit 21808e203eed46e379954b58b7014998b3836573
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 00:03:45 2013 +0200
+
+    remove commented stuff
+
+ qt5/src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 16e7033f18a8da8e27aaed6f63cce156abf8837a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 00:01:27 2013 +0200
+
+    Initial Qt5 port
+
+ CMakeLists.txt                               |   20 +
+ Makefile.am                                  |   18 +-
+ configure.ac                                 |   66 +-
+ qt5/.gitignore                               |    4 +
+ qt5/CMakeLists.txt                           |    3 +
+ qt5/Makefile.am                              |    1 +
+ qt5/demos/.gitignore                         |    4 +
+ qt5/demos/CMakeLists.txt                     |   38 +
+ qt5/demos/Makefile.am                        |   67 +
+ qt5/demos/abstractinfodock.cpp               |   57 +
+ qt5/demos/abstractinfodock.h                 |   48 +
+ qt5/demos/documentobserver.cpp               |   50 +
+ qt5/demos/documentobserver.h                 |   50 +
+ qt5/demos/embeddedfiles.cpp                  |   82 +
+ qt5/demos/embeddedfiles.h                    |   44 +
+ qt5/demos/fonts.cpp                          |   72 +
+ qt5/demos/fonts.h                            |   43 +
+ qt5/demos/info.cpp                           |   72 +
+ qt5/demos/info.h                             |   43 +
+ qt5/demos/main_viewer.cpp                    |   33 +
+ qt5/demos/metadata.cpp                       |   50 +
+ qt5/demos/metadata.h                         |   43 +
+ qt5/demos/navigationtoolbar.cpp              |  129 +
+ qt5/demos/navigationtoolbar.h                |   61 +
+ qt5/demos/optcontent.cpp                     |   69 +
+ qt5/demos/optcontent.h                       |   47 +
+ qt5/demos/pageview.cpp                       |   79 +
+ qt5/demos/pageview.h                         |   50 +
+ qt5/demos/permissions.cpp                    |   66 +
+ qt5/demos/permissions.h                      |   43 +
+ qt5/demos/thumbnails.cpp                     |   84 +
+ qt5/demos/thumbnails.h                       |   48 +
+ qt5/demos/toc.cpp                            |   88 +
+ qt5/demos/toc.h                              |   43 +
+ qt5/demos/viewer.cpp                         |  317 ++
+ qt5/demos/viewer.h                           |   73 +
+ qt5/src/.gitignore                           |    9 +
+ qt5/src/CMakeLists.txt                       |   54 +
+ qt5/src/Doxyfile                             | 1637 ++++++++++
+ qt5/src/Mainpage.dox                         |   85 +
+ qt5/src/Makefile.am                          |   73 +
+ qt5/src/poppler-annotation-helper.h          |  198 ++
+ qt5/src/poppler-annotation-private.h         |  111 +
+ qt5/src/poppler-annotation.cc                | 4394
+ ++++++++++++++++++++++++++
+ qt5/src/poppler-annotation.h                 |  921 ++++++
+ qt5/src/poppler-base-converter.cc            |  105 +
+ qt5/src/poppler-converter-private.h          |   49 +
+ qt5/src/poppler-document.cc                  |  679 ++++
+ qt5/src/poppler-embeddedfile-private.h       |   42 +
+ qt5/src/poppler-embeddedfile.cc              |  135 +
+ qt5/src/poppler-export.h                     |   17 +
+ qt5/src/poppler-fontinfo.cc                  |  149 +
+ qt5/src/poppler-form.cc                      |  416 +++
+ qt5/src/poppler-form.h                       |  343 ++
+ qt5/src/poppler-link-extractor-private.h     |   57 +
+ qt5/src/poppler-link-extractor.cc            |   84 +
+ qt5/src/poppler-link.cc                      |  711 +++++
+ qt5/src/poppler-link.h                       |  612 ++++
+ qt5/src/poppler-media.cc                     |  168 +
+ qt5/src/poppler-media.h                      |  100 +
+ qt5/src/poppler-movie.cc                     |  110 +
+ qt5/src/poppler-optcontent-private.h         |  121 +
+ qt5/src/poppler-optcontent.cc                |  427 +++
+ qt5/src/poppler-optcontent.h                 |   77 +
+ qt5/src/poppler-page-private.h               |   54 +
+ qt5/src/poppler-page-transition-private.h    |   28 +
+ qt5/src/poppler-page-transition.cc           |   95 +
+ qt5/src/poppler-page-transition.h            |  148 +
+ qt5/src/poppler-page.cc                      |  744 +++++
+ qt5/src/poppler-pdf-converter.cc             |  115 +
+ qt5/src/poppler-private.cc                   |  292 ++
+ qt5/src/poppler-private.h                    |  240 ++
+ qt5/src/poppler-ps-converter.cc              |  273 ++
+ qt5/src/poppler-qiodeviceoutstream-private.h |   47 +
+ qt5/src/poppler-qiodeviceoutstream.cc        |   64 +
+ qt5/src/poppler-qt5.h                        | 1812 +++++++++++
+ qt5/src/poppler-sound.cc                     |  132 +
+ qt5/src/poppler-textbox.cc                   |   63 +
+ qt5/tests/.gitignore                         |   30 +
+ qt5/tests/CMakeLists.txt                     |   75 +
+ qt5/tests/Makefile.am                        |  152 +
+ qt5/tests/README.unittest                    |   23 +
+ qt5/tests/check_actualtext.cpp               |   33 +
+ qt5/tests/check_attachments.cpp              |  157 +
+ qt5/tests/check_dateConversion.cpp           |  142 +
+ qt5/tests/check_fonts.cpp                    |  248 ++
+ qt5/tests/check_goostring.cpp                |   61 +
+ qt5/tests/check_lexer.cpp                    |  128 +
+ qt5/tests/check_links.cpp                    |   96 +
+ qt5/tests/check_metadata.cpp                 |  275 ++
+ qt5/tests/check_optcontent.cpp               |  484 +++
+ qt5/tests/check_pagelabelinfo.cpp            |   43 +
+ qt5/tests/check_pagelayout.cpp               |   49 +
+ qt5/tests/check_pagemode.cpp                 |   73 +
+ qt5/tests/check_password.cpp                 |   88 +
+ qt5/tests/check_permissions.cpp              |   44 +
+ qt5/tests/check_search.cpp                   |   91 +
+ qt5/tests/check_strings.cpp                  |  250 ++
+ qt5/tests/poppler-attachments.cpp            |   39 +
+ qt5/tests/poppler-fonts.cpp                  |   89 +
+ qt5/tests/poppler-forms.cpp                  |  166 +
+ qt5/tests/poppler-texts.cpp                  |   40 +
+ qt5/tests/stress-poppler-dir.cpp             |   67 +
+ qt5/tests/stress-poppler-qt5.cpp             |   74 +
+ qt5/tests/test-password-qt5.cpp              |  136 +
+ qt5/tests/test-poppler-qt5.cpp               |  235 ++
+ 106 files changed, 21480 insertions(+), 4 deletions(-)
+
+commit 714ee1e61d853394818dca7155b1b882408ffc6a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jun 16 19:00:01 2013 +0200
+
+    Pass down the recursion param
+
+    Fixes heap smashing in 168.pdf.SIGSEGV.598.462
+
+ poppler/Stream.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 1f3e3828b9a57e044b86640b9bf9ad2437cc5656
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Jun 15 17:21:36 2013 +0200
+
+    Add quotes since use_cairo can have spaces
+
+    BUG #65709
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit fe3ffab19d54326052fd0ff8ee3ee1feb9fa928c
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:   Tue Jun 11 23:08:07 2013 +0200
+
+    Windows compile fixes
+
+ qt4/tests/stress-threads-qt4.cpp | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+commit 99908cb0c8a784791ffa0682c8f105acdef0d5ab
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:   Tue Jun 11 10:02:01 2013 +0200
+
+    MinGW32 may or may not define __MINGW_PRINTF_FORMAT
+
+    Moreover __USE_MINGW_ANSI_STDIO might be defined as 0
+
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 commit 0673f3d8024554c414f578e0770086f475e6a605
 Author: Albert Astals Cid <aacid@kde.org>
 Date:   Tue Jun 11 00:19:19 2013 +0200
diff --git a/Build/source/libs/poppler/poppler-0.23.2/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.23.3/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.3/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.2/INSTALL b/Build/source/libs/poppler/poppler-0.23.3/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.23.3/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.23.2/Makefile.am b/Build/source/libs/poppler/poppler-0.23.3/Makefile.am
index 01d2fdff648..e7e5bace9d4 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.23.3/Makefile.am
@@ -15,11 +15,17 @@ glib_subdir = glib
 glib_pc_file = poppler-glib.pc
 endif
 
+if BUILD_POPPLER_QT5
+qt5_subdir = qt5
+qt5_pc_file = poppler-qt5.pc
+endif
+
 if BUILD_POPPLER_QT4
 qt4_subdir = qt4
 qt4_pc_file = poppler-qt4.pc
 endif
 
+
 if BUILD_POPPLER_CPP
 cpp_subdir = cpp
 cpp_pc_file = poppler-cpp.pc
@@ -29,7 +35,7 @@ if BUILD_UTILS
 utils_subdir = utils
 endif
 
-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(cpp_subdir)
+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
 
 EXTRA_DIST =					\
 	README-XPDF				\
@@ -41,6 +47,8 @@ EXTRA_DIST =					\
 	poppler-splash-uninstalled.pc.in	\
 	poppler-qt4.pc.in			\
 	poppler-qt4-uninstalled.pc.in		\
+	poppler-qt5.pc.in			\
+	poppler-qt5-uninstalled.pc.in		\
 	poppler-cpp.pc.in			\
 	poppler-cpp-uninstalled.pc.in
 
@@ -51,6 +59,7 @@ pkgconfig_DATA =				\
 	$(splash_pc_file)			\
 	$(glib_pc_file)				\
 	$(qt4_pc_file)				\
+	$(qt5_pc_file)				\
 	$(cpp_pc_file)
 
 # Add CMake buildsystem files here so they get added on make dist
@@ -64,6 +73,10 @@ EXTRA_DIST +=							\
 	qt4/tests/CMakeLists.txt				\
 	qt4/CMakeLists.txt					\
 	qt4/demos/CMakeLists.txt				\
+	qt5/src/CMakeLists.txt					\
+	qt5/tests/CMakeLists.txt				\
+	qt5/CMakeLists.txt					\
+	qt5/demos/CMakeLists.txt				\
 	test/CMakeLists.txt					\
 	utils/CMakeLists.txt					\
 	CMakeLists.txt						\
@@ -94,6 +107,7 @@ EXTRA_DIST +=							\
 	poppler-cpp.pc.cmake					\
 	poppler-glib.pc.cmake					\
 	poppler-qt4.pc.cmake					\
+	poppler-qt5.pc.cmake					\
 	poppler-splash.pc.cmake					\
 	poppler.pc.cmake
 
diff --git a/Build/source/libs/poppler/poppler-0.23.2/NEWS b/Build/source/libs/poppler/poppler-0.23.3/NEWS
index c7fb7ac32e3..c7fb7ac32e3 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/NEWS
+++ b/Build/source/libs/poppler/poppler-0.23.3/NEWS
diff --git a/Build/source/libs/poppler/poppler-0.23.2/README b/Build/source/libs/poppler/poppler-0.23.3/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/README
+++ b/Build/source/libs/poppler/poppler-0.23.3/README
diff --git a/Build/source/libs/poppler/poppler-0.23.2/README-XPDF b/Build/source/libs/poppler/poppler-0.23.3/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.23.3/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.23.2/TODO b/Build/source/libs/poppler/poppler-0.23.3/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/TODO
+++ b/Build/source/libs/poppler/poppler-0.23.3/TODO
diff --git a/Build/source/libs/poppler/poppler-0.23.2/config.h.cmake b/Build/source/libs/poppler/poppler-0.23.3/config.h.cmake
index b707ba72249..b707ba72249 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.3/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.2/config.h.in b/Build/source/libs/poppler/poppler-0.23.3/config.h.in
index 79028560a02..79028560a02 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/configure.ac b/Build/source/libs/poppler/poppler-0.23.3/configure.ac
index ae87a2046d2..1a7ca8ca7f8 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.23.3/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[23])
-m4_define([poppler_version_micro],[2])
+m4_define([poppler_version_micro],[3])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
 AC_PREREQ(2.59)
@@ -491,7 +491,7 @@ elif test x$enable_cairo_output = xtry; then
                     [enable_cairo_output="no"
 		     use_cairo="no (requires cairo >= $CAIRO_VERSION)"])
 fi
-if test x$use_cairo = x; then
+if test "x$use_cairo" = "x"; then
    use_cairo=$enable_cairo_output
 fi
 
@@ -608,14 +608,16 @@ if test x$enable_poppler_qt4 = xyes; then
   if test x"$mocversiongrep" != x"$mocversion"; then
     AC_MSG_RESULT([no])
     # moc was not the qt4 one, try with moc-qt4
-    AC_CHECK_TOOL(MOCQT4, moc-qt4)
+    AC_CHECK_TOOL(MOCQT42, moc-qt4)
     AC_MSG_CHECKING([for Qt4 moc-qt4])
-    mocversion=`$MOCQT4 -v 2>&1`
+    mocversion=`$MOCQT42 -v 2>&1`
     mocversiongrep=`echo $mocversion | grep "Qt 4"`
     if test x"$mocversiongrep" != x"$mocversion"; then
       # no valid moc found
       enable_poppler_qt4=no;
       MOCQT4="not found"
+    else
+      MOCQT4=$MOCQT42
     fi
   fi
   AC_SUBST(MOCQT4)
@@ -624,6 +626,72 @@ fi
 
 AM_CONDITIONAL(BUILD_POPPLER_QT4, test "x$enable_poppler_qt4" = "xyes")
 
+dnl 
+dnl Try Qt5
+dnl
+
+AC_ARG_ENABLE(poppler-qt5,
+              AC_HELP_STRING([--disable-poppler-qt5],
+	                     [Don't compile poppler Qt5 wrapper.]),
+              enable_poppler_qt5=$enableval,
+              enable_poppler_qt5="try")
+if test x$enable_poppler_qt5 = xyes; then
+  PKG_CHECK_MODULES(POPPLER_QT5, 
+	            Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0)
+  PKG_CHECK_MODULES(POPPLER_QT5_TEST, 
+	            Qt5Test >= 5.0.0 ) 
+elif test x$enable_poppler_qt5 = xtry; then
+  PKG_CHECK_MODULES(POPPLER_QT5,
+                    Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0,
+                    [enable_poppler_qt5="yes"],
+                    [enable_poppler_qt5="no"])
+  if test x$enable_poppler_qt5 = xyes; then
+    PKG_CHECK_MODULES(POPPLER_QT5_TEST,
+                    Qt5Test >= 5.0.0,
+                    [enable_poppler_qt5="yes"],
+                    [enable_poppler_qt5="no"])
+  fi
+fi
+
+AC_SUBST(POPPLER_QT5_CXXFLAGS)
+AC_SUBST(POPPLER_QT5_LIBS)
+AC_SUBST(POPPLER_QT5_TEST_LIBS)
+
+if test x$enable_poppler_qt5 = xyes; then
+  AC_CHECK_TOOL(MOCQT5, moc)
+  AC_MSG_CHECKING([for Qt5 moc])
+  mocversion=`$MOCQT5 -v 2>&1`
+  mocversiongrep=`echo $mocversion | grep "Qt 5"`
+  if test x"$mocversiongrep" != x"$mocversion"; then
+    AC_MSG_RESULT([no])
+    # moc was not the qt5 one, try with moc-qt5
+    AC_CHECK_TOOL(MOCQT52, moc-qt5)
+    AC_MSG_CHECKING([for Qt5 moc-qt5])
+    mocversion=`$MOCQT52 -v 2>&1`
+    mocversiongrep=`echo $mocversion | grep "Qt 5"`
+    if test x"$mocversiongrep" != x"$mocversion"; then
+      AC_CHECK_TOOL(QTCHOOSER, qtchooser)
+      AC_MSG_CHECKING([for qtchooser])
+      qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
+      mocversion=`$qt5tooldir/moc -v 2>&1`
+      mocversiongrep=`echo $mocversion | grep "Qt 5"`
+      if test x"$mocversiongrep" != x"$mocversion"; then
+        # no valid moc found
+        enable_poppler_qt5=no;
+        MOCQT5="not found"
+      else
+        MOCQT5=$qt5tooldir/moc
+      fi
+    else
+      MOCQT5=$MOCQT52
+    fi
+  fi
+  AC_SUBST(MOCQT5)
+  AC_MSG_RESULT([$MOCQT5])
+fi
+
+AM_CONDITIONAL(BUILD_POPPLER_QT5, test "x$enable_poppler_qt5" = "xyes")
+
 dnl
 dnl CPP frontend
 dnl
@@ -756,6 +824,7 @@ case "$enable_compile_warnings" in
 		-Wmissing-format-attribute -fno-exceptions -fno-check-new \
 		-fno-common $CXXFLAGS" ;;
 esac
+CXXFLAGS="-fPIC $CXXFLAGS";
 
 case `$PKG_CONFIG --version` in
   0.?|0.1[0-7])
@@ -791,6 +860,10 @@ qt4/Makefile
 qt4/src/Makefile
 qt4/tests/Makefile
 qt4/demos/Makefile
+qt5/Makefile
+qt5/src/Makefile
+qt5/tests/Makefile
+qt5/demos/Makefile
 cpp/Makefile
 cpp/poppler-version.h
 cpp/tests/Makefile
@@ -804,6 +877,8 @@ poppler-glib.pc
 poppler-glib-uninstalled.pc
 poppler-qt4.pc
 poppler-qt4-uninstalled.pc
+poppler-qt5.pc
+poppler-qt5-uninstalled.pc
 poppler-cpp.pc
 poppler-cpp-uninstalled.pc])
 
@@ -814,6 +889,7 @@ echo "  font configuration: $with_font_configuration"
 echo "  splash output:      $enable_splash_output"
 echo "  cairo output:       $use_cairo"
 echo "  qt4 wrapper:        $enable_poppler_qt4"
+echo "  qt5 wrapper:        $enable_poppler_qt5"
 echo "  glib wrapper:       $use_glib"
 echo "    introspection:    $found_introspection"
 echo "  cpp wrapper:        $enable_poppler_cpp"
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiTrueType.cc
index cd11d6ff2c6..cd11d6ff2c6 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1.cc
index 8fa10a016b6..8fa10a016b6 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.23.3/fofi/Makefile.am
index c4654dd28b9..c4654dd28b9 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.23.3/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.23.3/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.23.3/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.23.3/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/GooList.h b/Build/source/libs/poppler/poppler-0.23.3/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.23.3/goo/GooMutex.h
index e9d5a543ff7..e9d5a543ff7 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/GooString.cc
index d35161d87ad..d35161d87ad 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/GooString.h b/Build/source/libs/poppler/poppler-0.23.3/goo/GooString.h
index b811c5ce5d8..b811c5ce5d8 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.23.3/goo/GooTimer.h
index d77373e90c1..d77373e90c1 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.23.3/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.23.3/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.23.3/goo/Makefile.am
index 0764e79ca18..0764e79ca18 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/PNGWriter.cc
index b775600c0a3..b775600c0a3 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.23.3/goo/PNGWriter.h
index c73c96426b8..c73c96426b8 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/TiffWriter.cc
index d372a5bdfce..d372a5bdfce 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.23.3/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/gfile.cc
index c590a1937e8..c590a1937e8 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/gfile.h b/Build/source/libs/poppler/poppler-0.23.3/goo/gfile.h
index 5f546f11156..5f546f11156 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/gmem.h b/Build/source/libs/poppler/poppler-0.23.3/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/grandom.h b/Build/source/libs/poppler/poppler-0.23.3/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.23.3/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.23.3/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.23.3/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.23.3/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/gtk-doc.make b/Build/source/libs/poppler/poppler-0.23.3/gtk-doc.make
index 9841de47922..9841de47922 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.23.3/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.23.3/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5-uninstalled.pc.in
new file mode 100644
index 00000000000..a91e1d5a3bd
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: poppler-qt5
+Description: Qt5 bindings for poppler - uninstalled
+Version: @VERSION@
+Requires: poppler = @VERSION@ 
+
+Libs: ${pc_top_builddir}/${pcfiledir}/qt5/src/libpoppler-qt5.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/qt5/src
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5.pc.cmake
new file mode 100644
index 00000000000..b4d87b76675
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5.pc.cmake
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib@LIB_SUFFIX@
+includedir=${prefix}/include
+
+Name: poppler-qt5
+Description: Qt5 bindings for poppler
+Version: @POPPLER_VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
+
+Libs: -L${libdir} -lpoppler-qt5
+Cflags: -I${includedir}/poppler/qt5
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5.pc.in
new file mode 100644
index 00000000000..cda4c6f80fe
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: poppler-qt5
+Description: Qt5 bindings for poppler
+Version: @VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
+
+Libs: -L${libdir} -lpoppler-qt5
+Cflags: -I${includedir}/poppler/qt5
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.23.3/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.23.3/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler.pc.in b/Build/source/libs/poppler/poppler-0.23.3/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Annot.cc
index 791a645989e..f0cce6d035a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Annot.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
 // Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright (C) 2007-2013 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2007-2012 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007-2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
 // Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2008, 2011 Pino Toscano <pino@kde.org>
@@ -24,7 +24,7 @@
 // Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
 // Copyright (C) 2011, 2013 José Aliste <jaliste@src.gnome.org>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2012 Tobias Koenig <tokoe@kdab.com>
 // Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
@@ -1082,7 +1082,6 @@ void AnnotAppearanceBBox::extendTo(double x, double y) {
 }
 
 void AnnotAppearanceBBox::getBBoxRect(double bbox[4]) const {
-  Object obj2;
   bbox[0] = minX - borderWidth;
   bbox[1] = minY - borderWidth;
   bbox[2] = maxX + borderWidth;
@@ -1345,6 +1344,7 @@ void Annot::setRect(double x1, double y1, double x2, double y2) {
   obj1.arrayAdd (obj2.initReal (rect->y2));
 
   update("Rect", &obj1);
+  invalidateAppearance();
 }
 
 GBool Annot::inRect(double x, double y) const {
@@ -1437,6 +1437,7 @@ void Annot::setBorder(AnnotBorderArray *new_border) {
   } else {
     border = NULL;
   }
+  invalidateAppearance();
 }
 
 void Annot::setColor(AnnotColor *new_color) {
@@ -1451,6 +1452,7 @@ void Annot::setColor(AnnotColor *new_color) {
   } else {
     color = NULL;
   }
+  invalidateAppearance();
 }
 
 void Annot::setPage(int pageIndex, GBool updateP) {
@@ -1504,12 +1506,24 @@ void Annot::invalidateAppearance() {
   delete appearStreams;
   appearStreams = NULL;
 
-  setAppearanceState("Off"); // Default appearance state
+  delete appearState;
+  appearState = NULL;
 
-  Object obj1;
+  delete appearBBox;
+  appearBBox = NULL;
+
+  appearance.free();
+  appearance.initNull();
+
+  Object obj1, obj2;
   obj1.initNull();
-  update ("AP", &obj1); // Remove AP
-  update ("AS", &obj1); // Remove AS
+  if (!annotObj.dictLookup("AP", &obj2)->isNull())
+    update ("AP", &obj1); // Remove AP
+  obj2.free();
+
+  if (!annotObj.dictLookup("AS", &obj2)->isNull())
+    update ("AS", &obj1); // Remove AS
+  obj2.free();
 }
 
 double Annot::getXMin() {
@@ -1520,6 +1534,14 @@ double Annot::getYMin() {
   return rect->y1;
 }
 
+double Annot::getXMax() {
+  return rect->x2;
+}
+
+double Annot::getYMax() {
+  return rect->y2;
+}
+
 void Annot::readArrayNum(Object *pdfArray, int key, double *value) {
   Object valueObject;
 
@@ -1780,6 +1802,18 @@ GBool Annot::isVisible(GBool printing) {
   return gTrue;
 }
 
+int Annot::getRotation() const
+{
+  Page *pageobj = doc->getPage(page);
+  assert(pageobj != NULL);
+
+  if (flags & flagNoRotate) {
+    return (360 - pageobj->getRotate()) % 360;
+  } else {
+    return 0;
+  }
+}
+
 void Annot::draw(Gfx *gfx, GBool printing) {
   Object obj;
 
@@ -1790,7 +1824,7 @@ void Annot::draw(Gfx *gfx, GBool printing) {
   // draw the appearance stream
   appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-      rect->x1, rect->y1, rect->x2, rect->y2);
+      rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
@@ -1990,6 +2024,7 @@ void AnnotMarkup::setOpacity(double opacityA) {
   opacity = opacityA;
   obj1.initReal(opacity);
   update ("CA", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotMarkup::setDate(GooString *new_date) {
@@ -2148,6 +2183,7 @@ void AnnotText::setIcon(GooString *new_icon) {
   Object obj1;
   obj1.initName (icon->getCString());
   update("Name", &obj1);
+  invalidateAppearance();
 }
 
 #define ANNOT_TEXT_AP_NOTE                                                    \
@@ -2457,10 +2493,11 @@ void AnnotText::draw(Gfx *gfx, GBool printing) {
   if (appearBBox) {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                    appearBBox->getPageXMin(), appearBBox->getPageYMin(),
-                   appearBBox->getPageXMax(), appearBBox->getPageYMax());
+                   appearBBox->getPageXMax(), appearBBox->getPageYMax(),
+                   getRotation());
   } else {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                   rect->x1, rect->y1, rect->x2, rect->y2);
+                   rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   }
   obj.free();
 }
@@ -2555,7 +2592,7 @@ void AnnotLink::draw(Gfx *gfx, GBool printing) {
   // draw the appearance stream
   appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, border, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
@@ -2693,6 +2730,11 @@ void AnnotFreeText::initialize(PDFDoc *docA, Dict *dict) {
   obj1.free();
 }
 
+void AnnotFreeText::setContents(GooString *new_content) {
+  Annot::setContents(new_content);
+  invalidateAppearance();
+}
+
 void AnnotFreeText::setAppearanceString(GooString *new_string) {
   delete appearanceString;
 
@@ -2705,6 +2747,7 @@ void AnnotFreeText::setAppearanceString(GooString *new_string) {
   Object obj1;
   obj1.initString(appearanceString->copy());
   update ("DA", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotFreeText::setQuadding(AnnotFreeTextQuadding new_quadding) {
@@ -2712,6 +2755,7 @@ void AnnotFreeText::setQuadding(AnnotFreeTextQuadding new_quadding) {
   quadding = new_quadding;
   obj1.initInt((int)quadding);
   update ("Q", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotFreeText::setStyleString(GooString *new_string) {
@@ -2762,6 +2806,7 @@ void AnnotFreeText::setCalloutLine(AnnotCalloutLine *line) {
   }
 
   update("CL", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotFreeText::setIntent(AnnotFreeTextIntent new_intent) {
@@ -2989,7 +3034,7 @@ void AnnotFreeText::draw(Gfx *gfx, GBool printing) {
   // draw the appearance stream
   appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                 rect->x1, rect->y1, rect->x2, rect->y2);
+                 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
@@ -3006,21 +3051,13 @@ Object *AnnotFreeText::getAppearanceResDict(Object *dest) {
 // AnnotLine
 //------------------------------------------------------------------------
 
-AnnotLine::AnnotLine(PDFDoc *docA, PDFRectangle *rect, PDFRectangle *lRect) :
+AnnotLine::AnnotLine(PDFDoc *docA, PDFRectangle *rect) :
     AnnotMarkup(docA, rect) {
   Object obj1;
 
   type = typeLine;
   annotObj.dictSet ("Subtype", obj1.initName ("Line"));
 
-  Object obj2, obj3;
-  obj2.initArray (doc->getXRef());
-  obj2.arrayAdd (obj3.initReal (lRect->x1));
-  obj2.arrayAdd (obj3.initReal (lRect->y1));
-  obj2.arrayAdd (obj3.initReal (lRect->x2));
-  obj2.arrayAdd (obj3.initReal (lRect->y2));
-  annotObj.dictSet ("L", &obj2);
-
   initialize (docA, annotObj.getDict());
 }
 
@@ -3178,6 +3215,12 @@ void AnnotLine::initialize(PDFDoc *docA, Dict *dict) {
   obj1.free();
 }
 
+void AnnotLine::setContents(GooString *new_content) {
+  Annot::setContents(new_content);
+  if (caption)
+    invalidateAppearance();
+}
+
 void AnnotLine::setVertices(double x1, double y1, double x2, double y2) {
   Object obj1, obj2;
 
@@ -3193,6 +3236,7 @@ void AnnotLine::setVertices(double x1, double y1, double x2, double y2) {
   obj1.arrayAdd( obj2.initReal(y2) );
 
   update("L", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotLine::setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end) {
@@ -3206,6 +3250,7 @@ void AnnotLine::setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyl
   obj1.arrayAdd( obj2.initName(convertAnnotLineEndingStyle( endStyle )) );
 
   update("LE", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotLine::setInteriorColor(AnnotColor *new_color) {
@@ -3219,6 +3264,7 @@ void AnnotLine::setInteriorColor(AnnotColor *new_color) {
   } else {
     interiorColor = NULL;
   }
+  invalidateAppearance();
 }
 
 void AnnotLine::setLeaderLineLength(double len) {
@@ -3227,6 +3273,7 @@ void AnnotLine::setLeaderLineLength(double len) {
   leaderLineLength = len;
   obj1.initReal(len);
   update ("LL", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotLine::setLeaderLineExtension(double len) {
@@ -3239,6 +3286,7 @@ void AnnotLine::setLeaderLineExtension(double len) {
   // LL is required if LLE is present
   obj1.initReal(leaderLineLength);
   update ("LL", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotLine::setCaption(bool new_cap) {
@@ -3247,6 +3295,7 @@ void AnnotLine::setCaption(bool new_cap) {
   caption = new_cap;
   obj1.initBool(new_cap);
   update ("Cap", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotLine::setIntent(AnnotLineIntent new_intent) {
@@ -3464,10 +3513,11 @@ void AnnotLine::draw(Gfx *gfx, GBool printing) {
   if (appearBBox) {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                    appearBBox->getPageXMin(), appearBBox->getPageYMin(),
-                   appearBBox->getPageXMax(), appearBBox->getPageYMax());
+                   appearBBox->getPageXMax(), appearBBox->getPageYMax(),
+                   getRotation());
   } else {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                   rect->x1, rect->y1, rect->x2, rect->y2);
+                   rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   }
   obj.free();
 }
@@ -3484,8 +3534,7 @@ Object *AnnotLine::getAppearanceResDict(Object *dest) {
 //------------------------------------------------------------------------
 // AnnotTextMarkup
 //------------------------------------------------------------------------
-AnnotTextMarkup::AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType,
-				 AnnotQuadrilaterals *quadPoints) :
+AnnotTextMarkup::AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType) :
     AnnotMarkup(docA, rect) {
   Object obj1;
 
@@ -3506,22 +3555,12 @@ AnnotTextMarkup::AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype
       assert (0 && "Invalid subtype for AnnotTextMarkup\n");
   }
 
-  Object obj2;
+  // Store dummy quadrilateral with null coordinates
+  Object obj2, obj3;
   obj2.initArray (doc->getXRef());
-
-  for (int i = 0; i < quadPoints->getQuadrilateralsLength(); ++i) {
-    Object obj3;
-
-    obj2.arrayAdd (obj3.initReal (quadPoints->getX1(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getY1(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getX2(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getY2(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getX3(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getY3(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getX4(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getY4(i)));
+  for (int i = 0; i < 4*2; ++i) {
+    obj2.arrayAdd (obj3.initReal (0));
   }
-
   annotObj.dictSet ("QuadPoints", &obj2);
 
   initialize(docA, annotObj.getDict());
@@ -3589,6 +3628,7 @@ void AnnotTextMarkup::setType(AnnotSubtype new_type) {
 
   type = new_type;
   update("Subtype", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotTextMarkup::setQuadrilaterals(AnnotQuadrilaterals *quadPoints) {
@@ -3609,6 +3649,7 @@ void AnnotTextMarkup::setQuadrilaterals(AnnotQuadrilaterals *quadPoints) {
   quadrilaterals = new AnnotQuadrilaterals(obj1.getArray(), rect);
 
   annotObj.dictSet ("QuadPoints", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) {
@@ -3778,10 +3819,11 @@ void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) {
   if (appearBBox) {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                    appearBBox->getPageXMin(), appearBBox->getPageYMin(),
-                   appearBBox->getPageXMax(), appearBBox->getPageYMax());
+                   appearBBox->getPageXMax(), appearBBox->getPageYMax(),
+                   getRotation());
   } else {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                   rect->x1, rect->y1, rect->x2, rect->y2);
+                   rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   }
   obj.free();
 }
@@ -5045,7 +5087,7 @@ void AnnotWidget::draw(Gfx *gfx, GBool printing) {
     delete dict;
   }
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   if (addDingbatsResource) {
     gfx->popResources();
   }
@@ -5201,7 +5243,7 @@ void AnnotMovie::draw(Gfx *gfx, GBool printing) {
   // draw the appearance stream
   appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
@@ -5319,6 +5361,7 @@ void AnnotStamp::setIcon(GooString *new_icon) {
   Object obj1;
   obj1.initName (icon->getCString());
   update("Name", &obj1);
+  invalidateAppearance();
 }
 
 //------------------------------------------------------------------------
@@ -5406,6 +5449,7 @@ void AnnotGeometry::setType(AnnotSubtype new_type) {
 
   type = new_type;
   update("Subtype", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotGeometry::setInteriorColor(AnnotColor *new_color) {
@@ -5419,6 +5463,7 @@ void AnnotGeometry::setInteriorColor(AnnotColor *new_color) {
   } else {
     interiorColor = NULL;
   }
+  invalidateAppearance();
 }
 
 void AnnotGeometry::draw(Gfx *gfx, GBool printing) {
@@ -5544,14 +5589,14 @@ void AnnotGeometry::draw(Gfx *gfx, GBool printing) {
   // draw the appearance stream
   appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
 //------------------------------------------------------------------------
 // AnnotPolygon
 //------------------------------------------------------------------------
-AnnotPolygon::AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType, AnnotPath *path) :
+AnnotPolygon::AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType) :
     AnnotMarkup(docA, rect) {
   Object obj1;
 
@@ -5566,16 +5611,11 @@ AnnotPolygon::AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subTyp
       assert (0 && "Invalid subtype for AnnotGeometry\n");
   }
 
-  Object obj2;
+  // Store dummy path with one null vertex only
+  Object obj2, obj3;
   obj2.initArray (doc->getXRef());
-
-  for (int i = 0; i < path->getCoordsLength(); ++i) {
-    Object obj3;
-
-    obj2.arrayAdd (obj3.initReal (path->getX(i)));
-    obj2.arrayAdd (obj3.initReal (path->getY(i)));
-  }
-
+  obj2.arrayAdd (obj3.initReal (0));
+  obj2.arrayAdd (obj3.initReal (0));
   annotObj.dictSet ("Vertices", &obj2);
 
   initialize(docA, annotObj.getDict());
@@ -5686,6 +5726,7 @@ void AnnotPolygon::setType(AnnotSubtype new_type) {
 
   type = new_type;
   update("Subtype", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotPolygon::setVertices(AnnotPath *path) {
@@ -5702,6 +5743,7 @@ void AnnotPolygon::setVertices(AnnotPath *path) {
   vertices = new AnnotPath(obj1.getArray());
 
   update("Vertices", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotPolygon::setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end) {
@@ -5715,6 +5757,7 @@ void AnnotPolygon::setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingS
   obj1.arrayAdd( obj2.initName(convertAnnotLineEndingStyle( endStyle )) );
 
   update("LE", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotPolygon::setInteriorColor(AnnotColor *new_color) {
@@ -5728,6 +5771,7 @@ void AnnotPolygon::setInteriorColor(AnnotColor *new_color) {
   } else {
     interiorColor = NULL;
   }
+  invalidateAppearance();
 }
 
 void AnnotPolygon::setIntent(AnnotPolygonIntent new_intent) {
@@ -5831,10 +5875,11 @@ void AnnotPolygon::draw(Gfx *gfx, GBool printing) {
   if (appearBBox) {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                    appearBBox->getPageXMin(), appearBBox->getPageYMin(),
-                   appearBBox->getPageXMax(), appearBBox->getPageYMax());
+                   appearBBox->getPageXMax(), appearBBox->getPageYMax(),
+                   getRotation());
   } else {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                   rect->x1, rect->y1, rect->x2, rect->y2);
+                   rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   }
   obj.free();
 }
@@ -5890,12 +5935,13 @@ void AnnotCaret::setSymbol(AnnotCaretSymbol new_symbol) {
   obj1.initName( new_symbol == symbolP ? "P" : "None" );
   symbol = new_symbol;
   update("Sy", &obj1);
+  invalidateAppearance();
 }
 
 //------------------------------------------------------------------------
 // AnnotInk
 //------------------------------------------------------------------------
-AnnotInk::AnnotInk(PDFDoc *docA, PDFRectangle *rect, AnnotPath **paths, int n_paths) :
+AnnotInk::AnnotInk(PDFDoc *docA, PDFRectangle *rect) :
     AnnotMarkup(docA, rect) {
   Object obj1;
 
@@ -5903,10 +5949,12 @@ AnnotInk::AnnotInk(PDFDoc *docA, PDFRectangle *rect, AnnotPath **paths, int n_pa
 
   annotObj.dictSet ("Subtype", obj1.initName ("Ink"));
 
-  Object obj2;
+  // Store dummy path with one null vertex only
+  Object obj2, obj3, obj4;
   obj2.initArray (doc->getXRef());
-  writeInkList(paths, n_paths, obj2.getArray());
-
+  obj2.arrayAdd (obj3.initArray (doc->getXRef()));
+  obj3.arrayAdd (obj4.initReal (0));
+  obj3.arrayAdd (obj4.initReal (0));
   annotObj.dictSet ("InkList", &obj2);
 
   initialize(docA, annotObj.getDict());
@@ -5979,6 +6027,7 @@ void AnnotInk::setInkList(AnnotPath **paths, int n_paths) {
 
   parseInkList(obj1.getArray());
   annotObj.dictSet ("InkList", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotInk::draw(Gfx *gfx, GBool printing) {
@@ -6044,10 +6093,11 @@ void AnnotInk::draw(Gfx *gfx, GBool printing) {
   if (appearBBox) {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                    appearBBox->getPageXMin(), appearBBox->getPageYMin(),
-                   appearBBox->getPageXMax(), appearBBox->getPageYMax());
+                   appearBBox->getPageXMax(), appearBBox->getPageYMax(),
+                   getRotation());
   } else {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                   rect->x1, rect->y1, rect->x2, rect->y2);
+                   rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   }
   obj.free();
 }
@@ -6264,7 +6314,7 @@ void AnnotFileAttachment::draw(Gfx *gfx, GBool printing) {
   // draw the appearance stream
   appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, border, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
@@ -6426,7 +6476,7 @@ void AnnotSound::draw(Gfx *gfx, GBool printing) {
   // draw the appearance stream
   appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, border, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Annot.h
index 7be21142f10..2865d23f7af 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Annot.h
@@ -15,14 +15,14 @@
 //
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
 // Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2007-2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
 // Copyright (C) 2008 Pino Toscano <pino@kde.org>
 // Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com>
 // Copyright (C) 2009-2011, 2013 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012 Tobias Koenig <tokoe@kdab.com>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
@@ -553,6 +553,8 @@ public:
 
   double getXMin();
   double getYMin();
+  double getXMax();
+  double getYMax();
 
   double getFontSize() { return fontSize; }
 
@@ -561,7 +563,7 @@ public:
 
   // Sets the annot contents to new_content
   // new_content should never be NULL
-  void setContents(GooString *new_content);
+  virtual void setContents(GooString *new_content);
   void setName(GooString *new_name);
   void setModified(GooString *new_date);
   void setFlags(Guint new_flags);
@@ -574,9 +576,6 @@ public:
 
   void setAppearanceState(const char *state);
 
-  // Delete appearance streams and reset appearance state
-  void invalidateAppearance();
-
   // getters
   PDFDoc *getDoc() const { return doc; }
   XRef *getXRef() const { return xref; }
@@ -624,11 +623,15 @@ protected:
   void createResourcesDict(const char *formName, Object *formStream, const char *stateName,
 			   double opacity, const char *blendMode, Object *resDict);
   GBool isVisible(GBool printing);
+  int getRotation() const;
 
   // Updates the field key of the annotation dictionary
   // and sets M to the current time
   void update(const char *key, Object *value);
 
+  // Delete appearance streams and reset appearance state
+  void invalidateAppearance();
+
   int refCnt;
 
   Object annotObj;
@@ -902,6 +905,7 @@ public:
 
   virtual void draw(Gfx *gfx, GBool printing);
   virtual Object *getAppearanceResDict(Object *dest);
+  virtual void setContents(GooString *new_content);
 
   void setAppearanceString(GooString *new_string);
   void setQuadding(AnnotFreeTextQuadding new_quadding);
@@ -959,12 +963,13 @@ public:
     captionPosTop     // Top
   };
 
-  AnnotLine(PDFDoc *docA, PDFRectangle *rect, PDFRectangle *lRect);
+  AnnotLine(PDFDoc *docA, PDFRectangle *rect);
   AnnotLine(PDFDoc *docA, Dict *dict, Object *obj);
   ~AnnotLine();
 
   virtual void draw(Gfx *gfx, GBool printing);
   virtual Object *getAppearanceResDict(Object *dest);
+  virtual void setContents(GooString *new_content);
 
   void setVertices(double x1, double y1, double x2, double y2);
   void setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end);
@@ -1024,8 +1029,7 @@ protected:
 class AnnotTextMarkup: public AnnotMarkup {
 public:
 
-  AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType,
-		  AnnotQuadrilaterals *quadPoints);
+  AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType);
   AnnotTextMarkup(PDFDoc *docA, Dict *dict, Object *obj);
   virtual ~AnnotTextMarkup();
 
@@ -1111,7 +1115,7 @@ public:
     polygonDimension   // PolygonDimension
   };
 
-  AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType, AnnotPath *path);
+  AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType);
   AnnotPolygon(PDFDoc *docA, Dict *dict, Object *obj);
   ~AnnotPolygon();
 
@@ -1186,7 +1190,7 @@ private:
 class AnnotInk: public AnnotMarkup {
 public:
 
-  AnnotInk(PDFDoc *docA, PDFRectangle *rect, AnnotPath **paths, int n_paths);
+  AnnotInk(PDFDoc *docA, PDFRectangle *rect);
   AnnotInk(PDFDoc *docA, Dict *dict, Object *obj);
   ~AnnotInk();
 
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Array.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/CMap.cc
index 13f293a4aea..13f293a4aea 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoFontEngine.cc
index 1546594f9ea..1546594f9ea 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoOutputDev.cc
index a50e1895d9f..a50e1895d9f 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoOutputDev.h
index bbad744fe40..bbad744fe40 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Catalog.cc
index 6bd511a11aa..6bd511a11aa 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Catalog.h
index 24a3dcfba62..24a3dcfba62 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/CharCodeToUnicode.cc
index 16ba6d48649..16ba6d48649 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Dict.cc
index 3f3c022be17..3f3c022be17 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Error.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Error.h
index 88fc3ea4353..88fc3ea4353 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Form.cc
index 78c25e3aa93..78c25e3aa93 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Form.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Form.h
index ef67748aa69..ef67748aa69 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Function.cc
index 2f94a54a307..2f94a54a307 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Function.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Gfx.cc
index c609292277c..f2971d666c9 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Gfx.cc
@@ -35,7 +35,7 @@
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2011 Axel Strübing <axel.struebing@freenet.de>
 // Copyright (C) 2012 Even Rouault <even.rouault@mines-paris.org>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012 Lu Wang <coolwanglu@gmail.com>
 //
 // To see a description of the changes please see the Changelog file that
@@ -62,6 +62,7 @@
 #include "Object.h"
 #include "PDFDoc.h"
 #include "Array.h"
+#include "Annot.h"
 #include "Dict.h"
 #include "Stream.h"
 #include "Lexer.h"
@@ -5131,8 +5132,20 @@ void Gfx::opMarkPoint(Object args[], int numArgs) {
 // misc
 //------------------------------------------------------------------------
 
+struct GfxStackStateSaver {
+  GfxStackStateSaver(Gfx *gfx) : gfx(gfx) {
+    gfx->saveState();
+  }
+
+  ~GfxStackStateSaver() {
+    gfx->restoreState();
+  }
+
+  Gfx * const gfx;
+};
+
 void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
-		    double xMin, double yMin, double xMax, double yMax) {
+		    double xMin, double yMin, double xMax, double yMax, int rotate) {
   Dict *dict, *resDict;
   Object matrixObj, bboxObj, resObj, obj1;
   double formXMin, formYMin, formXMax, formYMax;
@@ -5153,6 +5166,28 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
     return;
   }
 
+  // saves gfx state and automatically restores it on return
+  GfxStackStateSaver stackStateSaver(this);
+
+  // Rotation around the topleft corner (for the NoRotate flag)
+  if (rotate != 0) {
+    const double angle_rad = rotate * M_PI / 180;
+    const double c = cos(angle_rad);
+    const double s = sin(angle_rad);
+
+    // (xMin, yMax) is the pivot
+    const double unrotateMTX[6] = {
+        +c, -s,
+        +s, +c,
+        -c*xMin - s*yMax + xMin, -c*yMax + s*xMin + yMax
+    };
+
+    state->concatCTM(unrotateMTX[0], unrotateMTX[1], unrotateMTX[2],
+                     unrotateMTX[3], unrotateMTX[4], unrotateMTX[5]);
+    out->updateCTM(state, unrotateMTX[0], unrotateMTX[1], unrotateMTX[2],
+                          unrotateMTX[3], unrotateMTX[4], unrotateMTX[5]);
+  }
+
   // draw the appearance stream (if there is one)
   if (str->isStream()) {
 
@@ -5276,7 +5311,6 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
 
   // draw the border
   if (border && border->getWidth() > 0) {
-    saveState();
     if (state->getStrokeColorSpace()->getMode() != csDeviceRGB) {
       state->setStrokePattern(NULL);
       state->setStrokeColorSpace(new GfxDeviceRGBColorSpace());
@@ -5315,7 +5349,6 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
       state->closePath();
     }
     out->stroke(state);
-    restoreState();
   }
 }
 
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Gfx.h
index 4107e8a9b9a..aba3b7e5bfe 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Gfx.h
@@ -21,6 +21,7 @@
 // Copyright (C) 2009, 2010, 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2010 David Benjamin <davidben@mit.edu>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
+// Copyright (C) 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 //
 // 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
@@ -166,7 +167,7 @@ public:
   // Display an annotation, given its appearance (a Form XObject),
   // border style, and bounding box (in default user space).
   void drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
-		 double xMin, double yMin, double xMax, double yMax);
+		 double xMin, double yMin, double xMax, double yMax, int rotate);
 
   // Save graphics state.
   void saveState();
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxFont.cc
index ea22af8272c..ea22af8272c 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxFont.h
index f9806681102..f9806681102 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState.cc
index ea79465b02e..0bafb6d3f72 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState.cc
@@ -2534,7 +2534,14 @@ GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, OutputDev *out, int recur
       for (i = 0; i < colorants->getLength(); i++) {
         Object obj3;
         colorants->getVal(i, &obj3);
-        separationList->append(GfxSeparationColorSpace::parse(obj3.getArray(), out, recursion));
+        if (obj3.isArray()) {
+          separationList->append(GfxSeparationColorSpace::parse(obj3.getArray(), out, recursion));
+        } else {
+          obj3.free();
+          obj2.free();
+          error(errSyntaxWarning, -1, "Bad DeviceN color space (colorant value entry is not an Array)");
+          goto err4;
+        }
         obj3.free();
       }
     }
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState.h
index 2f3efcfb2ef..2f3efcfb2ef 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParams.cc
index 6efdd0c0b9c..6efdd0c0b9c 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParams.h
index bc11684f268..bc11684f268 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Hints.cc
index 49e201daa93..49e201daa93 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Hints.h
index f5225f9fa9b..f5225f9fa9b 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/JBIG2Stream.cc
index 12de50e18c5..12de50e18c5 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/JBIG2Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/JBIG2Stream.h
index be1b3bd7897..be1b3bd7897 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/JPEG2000Stream.cc
index 703d471c99a..703d471c99a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/JPEG2000Stream.h
index 3feccbef06d..3feccbef06d 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Lexer.cc
index bd7546f889c..bd7546f889c 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Lexer.h
index d9c23dc8eb9..d9c23dc8eb9 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Link.cc
index 20184d1376c..20184d1376c 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Link.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.23.3/poppler/Makefile.am
index 8786e129a3a..c061e718aaf 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Makefile.am
@@ -15,24 +15,6 @@ splash_libs =					\
 
 endif
 
-if BUILD_POPPLER_QT4
-
-poppler_arthur = libpoppler-arthur.la
-
-libpoppler_arthur_la_SOURCES =			\
-	ArthurOutputDev.h			\
-	ArthurOutputDev.cc
-
-arthur_includes =				\
-	$(POPPLER_QT4_CFLAGS)
-
-arthur_libs =					\
-	$(POPPLER_QT4_LIBS)
-
-endif
-
-
-
 if BUILD_CAIRO_OUTPUT
 
 poppler_cairo = libpoppler-cairo.la
@@ -144,7 +126,6 @@ INCLUDES =					\
 	$(cms_includes)				\
 	$(splash_includes)			\
 	$(cairo_includes)			\
-	$(arthur_includes)			\
 	$(libjpeg_includes)			\
 	$(libtiff_includes)			\
 	$(libjpeg2000_includes)			\
@@ -155,8 +136,7 @@ INCLUDES =					\
 
 lib_LTLIBRARIES = libpoppler.la
 
-noinst_LTLIBRARIES = $(poppler_cairo)		\
-	$(poppler_arthur)
+noinst_LTLIBRARIES = $(poppler_cairo)
 
 CFLAGS+=$(PTHREAD_CFLAGS)
 CXXFLAGS+=$(PTHREAD_CFLAGS)
@@ -177,7 +157,7 @@ libpoppler_la_LIBADD =				\
 	$(PTHREAD_LIBS)				\
 	$(win32_libs)
 
-libpoppler_la_LDFLAGS = -version-info 40:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 41:0:0 @create_shared_lib@ @auto_import_flags@
 
 if ENABLE_XPDF_HEADERS
 
@@ -262,7 +242,6 @@ endif
 libpoppler_la_SOURCES =		\
 	$(splash_sources)	\
 	$(cairo_sources)	\
-	$(arthur_sources)	\
 	$(libjpeg_sources)	\
 	$(zlib_sources)		\
 	$(libjpeg2000_sources)	\
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToUnicodeTable.h
index 74645ab2878..74645ab2878 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Object.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Object.h
index 1b123549a72..1b123549a72 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/OptionalContent.h
index 02c9a471e33..02c9a471e33 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDoc.cc
index c78d5ca5323..c78d5ca5323 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDoc.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDoc.h
index da9bf5b3c8a..da9bf5b3c8a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/PSOutputDev.cc
index 41c763d5cc4..41c763d5cc4 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PSOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PSOutputDev.h
index f9dc63c2235..f9dc63c2235 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PSOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Page.cc
index a587b9ba4cd..e0a3b298afc 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Page.cc
@@ -24,8 +24,9 @@
 // Copyright (C) 2008 Iñigo Martínez <inigomartinez@gmail.com>
 // Copyright (C) 2008 Brad Hards <bradh@kde.org>
 // Copyright (C) 2008 Ilya Gorenbein <igorenbein@finjan.com>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
 //
 // 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
@@ -363,7 +364,8 @@ Dict *Page::getResourceDict() {
 
 Dict *Page::getResourceDictCopy(XRef *xrefA) { 
   pageLocker();
-  return attrs->getResourceDict()->copy(xrefA);
+  Dict *dict = attrs->getResourceDict();
+  return dict ? dict->copy(xrefA) : NULL;
 }
 
 void Page::replaceXRef(XRef *xrefA) {
@@ -454,11 +456,13 @@ void Page::removeAnnot(Annot *annot) {
     // Get annotation position
     for (int i = 0; idx == -1 && i < annArray.arrayGetLength(); ++i) {
       Object tmp;
-      Ref currAnnot = annArray.arrayGetNF(i, &tmp)->getRef();
-      tmp.free();
-      if (currAnnot.num == annotRef.num && currAnnot.gen == annotRef.gen) {
-        idx = i;
+      if (annArray.arrayGetNF(i, &tmp)->isRef()) {
+        Ref currAnnot = tmp.getRef();
+        if (currAnnot.num == annotRef.num && currAnnot.gen == annotRef.gen) {
+          idx = i;
+        }
       }
+      tmp.free();
     }
 
     if (idx == -1) {
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Page.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Page.h
index 1c9d0a9cbc7..1c9d0a9cbc7 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo_p.h
index d3cd89f9bcd..d3cd89f9bcd 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Parser.cc
index 03705640b7c..03705640b7c 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Parser.h
index 9702716448e..9702716448e 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/PreScanOutputDev.cc
index 6a011266013..6a011266013 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/PreScanOutputDev.h
index 0fc9d3e3446..0fc9d3e3446 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/SecurityHandler.cc
index 8b85e60db0a..8b85e60db0a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/SplashOutputDev.cc
index b11b695b6c8..b11b695b6c8 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/SplashOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/SplashOutputDev.h
index ce1d50d0fdd..ce1d50d0fdd 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream.cc
index d6a69b0c99c..41cb8c1d016 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream.cc
@@ -186,7 +186,7 @@ Stream *Stream::addFilters(Object *dict, int recursion) {
     str = makeFilter(obj.getName(), str, &params, recursion, dict);
   } else if (obj.isArray()) {
     for (i = 0; i < obj.arrayGetLength(); ++i) {
-      obj.arrayGet(i, &obj2);
+      obj.arrayGet(i, &obj2, recursion);
       if (params.isArray())
 	params.arrayGet(i, &params2, recursion);
       else
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream.h
index 9b40fd1623a..9b40fd1623a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/TextOutputDev.cc
index 801f347c3e9..5efb5c3fa17 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/TextOutputDev.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2005-2007 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-// Copyright (C) 2006-2008, 2011, 2012 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006-2008, 2011-2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2006, 2007 Ed Catmur <ed@catmur.co.uk>
 // Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2007, 2008, 2012 Adrian Johnson <ajohnson@redneon.com>
@@ -3999,6 +3999,21 @@ public:
 			  PDFRectangle *selection) = 0;
 
 protected:
+
+  class TextWordSelection {
+  public:
+    TextWordSelection(TextWord *word, int begin, int end)
+      : word(word),
+        begin(begin),
+        end(end)
+    {
+    }
+
+    TextWord *word;
+    int begin;
+    int end;
+  };
+
   TextPage *page;
 };
 
@@ -4024,26 +4039,56 @@ public:
 			  int edge_end,
 			  PDFRectangle *selection);
   virtual void visitWord (TextWord *word, int begin, int end,
-			  PDFRectangle *selection) { };
+			  PDFRectangle *selection);
+  void endPage();
 
   GooString *getText(void);
+  GooList **getWordList(int *nLines);
 
 private:
-  TextLineFrag *frags;
-  int nFrags, fragsSize;
+
+  void startLine();
+  void finishLine();
+
+  GooList **lines;
+  int nLines, linesSize;
+  GooList *words;
+  int tableId;
+  TextBlock *currentBlock;
 };
 
 TextSelectionDumper::TextSelectionDumper(TextPage *page)
     : TextSelectionVisitor(page)
 {
-  fragsSize = 256;
-  frags = (TextLineFrag *)gmallocn(fragsSize, sizeof(TextLineFrag));
-  nFrags = 0;
+  linesSize = 256;
+  lines = (GooList **)gmallocn(linesSize, sizeof(GooList *));
+  nLines = 0;
+
+  tableId = -1;
+  currentBlock = NULL;
+  words = NULL;
 }
 
 TextSelectionDumper::~TextSelectionDumper()
 {
-  gfree(frags);
+  for (int i = 0; i < nLines; i++)
+    deleteGooList(lines[i], TextWordSelection);
+  gfree(lines);
+}
+
+void TextSelectionDumper::startLine()
+{
+  finishLine();
+  words = new GooList();
+}
+
+void TextSelectionDumper::finishLine()
+{
+  if (words && words->getLength() > 0)
+    lines[nLines++] = words;
+  else if (words)
+    delete words;
+  words = NULL;
 }
 
 void TextSelectionDumper::visitLine (TextLine *line,
@@ -4053,130 +4098,107 @@ void TextSelectionDumper::visitLine (TextLine *line,
 				     int edge_end,
 				     PDFRectangle *selection)
 {
-  if (nFrags == fragsSize) {
-    fragsSize *= 2;
-    frags = (TextLineFrag *) grealloc(frags, fragsSize * sizeof(TextLineFrag));
+  TextLineFrag frag;
+
+  if (nLines == linesSize) {
+    linesSize *= 2;
+    lines = (GooList **)grealloc(lines, linesSize * sizeof(GooList *));
+  }
+
+  frag.init(line, edge_begin, edge_end - edge_begin);
+
+  if (tableId >= 0 && frag.line->blk->tableId < 0) {
+    finishLine();
+
+    tableId = -1;
+    currentBlock = NULL;
   }
 
-  frags[nFrags].init(line, edge_begin, edge_end - edge_begin);
-  ++nFrags;
+  if (frag.line->blk->tableId >= 0) { // a table
+    if (tableId == -1) {
+      tableId = frag.line->blk->tableId;
+      currentBlock = frag.line->blk;
+    }
 
+    if (currentBlock == frag.line->blk) { // the same block
+      startLine();
+    } else { // another block
+      if (currentBlock->tableEnd) { // previous block ended its row
+        startLine();
+      }
+      currentBlock = frag.line->blk;
+    }
+  } else { // not a table
+    startLine();
+  }
+}
+
+void TextSelectionDumper::visitWord (TextWord *word, int begin, int end,
+                                     PDFRectangle *selection)
+{
+  words->append(new TextWordSelection(word, begin, end));
+}
+
+void TextSelectionDumper::endPage()
+{
+  finishLine();
 }
 
 GooString *TextSelectionDumper::getText (void)
 {
-  GooString *s;
-  TextLineFrag *frag;
+  GooString *text;
   int i, j;
   UnicodeMap *uMap;
   char space[8], eol[16];
   int spaceLen, eolLen;
-  GooList *strings = NULL;
-  int actual_table = -1;
-  int actual_line = -1;
-  int last_length = 0;
-  TextBlock *actual_block = NULL;
 
-  s = new GooString();
+  text = new GooString();
 
-  uMap = globalParams->getTextEncoding();
-
-  if (uMap == NULL)
-      return s;
+  if (!(uMap = globalParams->getTextEncoding()))
+    return text;
 
   spaceLen = uMap->mapUnicode(0x20, space, sizeof(space));
   eolLen = uMap->mapUnicode(0x0a, eol, sizeof(eol));
 
-  if (nFrags > 0) {
-    for (i = 0; i < nFrags; ++i) {
-      frag = &frags[i];
+  for (i = 0; i < nLines; i++) {
+    GooList *lineWords = lines[i];
+    for (j = 0; j < lineWords->getLength(); j++) {
+      TextWordSelection *sel = (TextWordSelection *)lineWords->get(j);
 
-      if (actual_table >= 0 && frag->line->blk->tableId < 0) {
-        for (j = 0; j < strings->getLength (); j++) {
-          s->append ((GooString*) strings->get (j));
-          s->append (eol, eolLen);
-          delete ((GooString*) strings->get (j));
-        }
-        delete strings;
-        strings = NULL;
-        actual_table = -1;
-        actual_line = -1;
-        actual_block = NULL;
-      }
+      page->dumpFragment (sel->word->text + sel->begin, sel->end - sel->begin, uMap, text);
+      if (j < lineWords->getLength() - 1)
+        text->append(space, spaceLen);
+    }
+    if (i < nLines - 1)
+      text->append(eol, eolLen);
+  }
 
-      // a table
-      if (frag->line->blk->tableId >= 0) {
-        if (actual_table == -1) {
-          strings = new GooList();
-          actual_table = frag->line->blk->tableId;
-          actual_block = frag->line->blk;
-          actual_line = -1;
-        }
+  uMap->decRefCnt();
 
-        // the same block
-        if (actual_block == frag->line->blk) {
-          actual_line++;
-          if (actual_line >= strings->getLength ()) {
-            GooString *t = new GooString ();
-            // add some spaces to have this block correctly aligned
-            if (actual_line > 0)
-              for (j = 0; j < ((GooString*) (strings->get (actual_line - 1)))->getLength() - last_length - 1; j++)
-                t->append (space, spaceLen);
-            strings->append (t);
-          }
-        }
-        // another block
-        else {
-          // previous block ended its row
-          if (actual_block->tableEnd) {
-            for (j = 0; j < strings->getLength (); j++) {
-              s->append ((GooString*) strings->get (j));
-              s->append (eol, eolLen);
-              delete ((GooString*) strings->get (j));
-            }
-            delete strings;
+  return text;
+}
 
-            strings = new GooList();
-            GooString *t = new GooString ();
-            strings->append (t);
-          }
-          actual_block = frag->line->blk;
-          actual_line = 0;
-        }
+GooList **TextSelectionDumper::getWordList(int *nLinesOut)
+{
+  int i, j;
 
-        page->dumpFragment(frag->line->text + frag->start, frag->len, uMap, ((GooString*) strings->get (actual_line)));
-        last_length = frag->len;
+  if (nLines == 0)
+    return NULL;
 
-        if (!frag->line->blk->tableEnd) {
-          ((GooString*) strings->get (actual_line))->append (space, spaceLen);
-        }
-      }
-      // not a table
-      else {
-        page->dumpFragment (frag->line->text + frag->start, frag->len, uMap, s);
-        if (i < nFrags - 1) {
-          s->append (eol, eolLen);
-        }
-      }
-    }
+  GooList **wordList = (GooList **)gmallocn(nLines, sizeof(GooList *));
 
-    if (strings != NULL) {
-      for (j = 0; j < strings->getLength (); j++) {
-        s->append((GooString*) strings->get (j));
-        s->append(eol, eolLen);
-        delete ((GooString*) strings->get (j));
-      }
-      delete strings;
-      strings = NULL;
-      actual_table = -1;
-      actual_line = -1;
-      actual_block = NULL;
+  for (i = 0; i < nLines; i++) {
+    GooList *lineWords = lines[i];
+    wordList[i] = new GooList();
+    for (j = 0; j < lineWords->getLength(); j++) {
+      TextWordSelection *sel = (TextWordSelection *)lineWords->get(j);
+      wordList[i]->append(sel->word);
     }
   }
 
-  uMap->decRefCnt();
+  *nLinesOut = nLines;
 
-  return s;
+  return wordList;
 }
 
 class TextSelectionSizer : public TextSelectionVisitor {
@@ -4257,11 +4279,14 @@ public:
 			  PDFRectangle *selection);
   virtual void visitWord (TextWord *word, int begin, int end,
 			  PDFRectangle *selection);
+  void endPage();
 
 private:
   OutputDev *out;
   GfxColor *box_color, *glyph_color;
   GfxState *state;
+  GooList *selectionList;
+  Matrix ctm, ictm;
 };
 
 TextSelectionPainter::TextSelectionPainter(TextPage *page,
@@ -4277,18 +4302,23 @@ TextSelectionPainter::TextSelectionPainter(TextPage *page,
 {
   PDFRectangle box(0, 0, page->pageWidth, page->pageHeight);
 
+  selectionList = new GooList();
   state = new GfxState(72 * scale, 72 * scale, &box, rotation, gFalse);
 
-  out->startPage (0, state, NULL);
+  state->getCTM(&ctm);
+  ctm.invertTo(&ictm);
+
+  out->startPage(0, state, NULL);
   out->setDefaultCTM (state->getCTM());
 
   state->setFillColorSpace(new GfxDeviceRGBColorSpace());
+  state->setFillColor(box_color);
+  out->updateFillColor(state);
 }
 
 TextSelectionPainter::~TextSelectionPainter()
 {
-  out->endPage ();
-
+  deleteGooList(selectionList, TextWordSelection);
   delete state;
 }
 
@@ -4300,10 +4330,6 @@ void TextSelectionPainter::visitLine (TextLine *line,
 				      PDFRectangle *selection)
 {
   double x1, y1, x2, y2, margin;
-  Matrix ctm, ictm;
-
-  state->setFillColor(box_color);
-  out->updateFillColor(state);
 
   margin = (line->yMax - line->yMin) / 8;
   x1 = floor (line->edge[edge_begin]);
@@ -4311,7 +4337,6 @@ void TextSelectionPainter::visitLine (TextLine *line,
   x2 = ceil (line->edge[edge_end]);
   y2 = ceil (line->yMax + margin);
 
-  state->getCTM (&ctm);
   ctm.transform(line->edge[edge_begin], line->yMin - margin, &x1, &y1);
   ctm.transform(line->edge[edge_end], line->yMax + margin, &x2, &y2);
 
@@ -4320,7 +4345,6 @@ void TextSelectionPainter::visitLine (TextLine *line,
   x2 = ceil (x2);
   y2 = ceil (y2);
 
-  ctm.invertTo (&ictm);
   ictm.transform(x1, y1, &x1, &y1);
   ictm.transform(x2, y2, &x2, &y2);
 
@@ -4329,47 +4353,59 @@ void TextSelectionPainter::visitLine (TextLine *line,
   state->lineTo(x2, y2);
   state->lineTo(x1, y2);
   state->closePath();
-
-  out->fill(state);
-  state->clearPath();
 }
 
 void TextSelectionPainter::visitWord (TextWord *word, int begin, int end,
 				      PDFRectangle *selection)
 {
-  state->setFillColor(glyph_color);
-  out->updateFillColor(state);
-
-  while (begin < end) {
-    TextFontInfo *font = word->font[begin];
-    font->gfxFont->incRefCnt();
-    Matrix *mat = &word->textMat[begin];
-
-    state->setTextMat(mat->m[0], mat->m[1], mat->m[2], mat->m[3], 0, 0);
-    state->setFont(font->gfxFont, 1);
-    out->updateFont(state);
+  selectionList->append(new TextWordSelection(word, begin, end));
+}
 
-    int fEnd = begin + 1;
-    while (fEnd < end && font->matches(word->font[fEnd]) &&
-	   mat->m[0] == word->textMat[fEnd].m[0] &&
-	   mat->m[1] == word->textMat[fEnd].m[1] &&
-	   mat->m[2] == word->textMat[fEnd].m[2] &&
-	   mat->m[3] == word->textMat[fEnd].m[3])
-      fEnd++;
+void TextSelectionPainter::endPage()
+{
+  out->fill(state);
+  state->clearPath();
 
-    /* The only purpose of this string is to let the output device query
-     * it's length.  Might want to change this interface later. */
-    GooString *string = new GooString ((char *) word->charcode, fEnd - begin);
-    out->beginString(state, string);
+  state->setFillColor(glyph_color);
+  out->updateFillColor(state);
 
-    for (int i = begin; i < fEnd; i++) {
-      out->drawChar(state, word->textMat[i].m[4], word->textMat[i].m[5], 0, 0, 0, 0,
-		    word->charcode[i], 1, NULL, 0);
+  for (int i = 0; i < selectionList->getLength(); i++) {
+    TextWordSelection *sel = (TextWordSelection *) selectionList->get(i);
+    int begin = sel->begin;
+
+    while (begin < sel->end) {
+      TextFontInfo *font = sel->word->font[begin];
+      font->gfxFont->incRefCnt();
+      Matrix *mat = &sel->word->textMat[begin];
+
+      state->setTextMat(mat->m[0], mat->m[1], mat->m[2], mat->m[3], 0, 0);
+      state->setFont(font->gfxFont, 1);
+      out->updateFont(state);
+
+      int fEnd = begin + 1;
+      while (fEnd < sel->end && font->matches(sel->word->font[fEnd]) &&
+	     mat->m[0] == sel->word->textMat[fEnd].m[0] &&
+	     mat->m[1] == sel->word->textMat[fEnd].m[1] &&
+	     mat->m[2] == sel->word->textMat[fEnd].m[2] &&
+	     mat->m[3] == sel->word->textMat[fEnd].m[3])
+	fEnd++;
+
+      /* The only purpose of this string is to let the output device query
+       * it's length.  Might want to change this interface later. */
+      GooString *string = new GooString ((char *) sel->word->charcode, fEnd - begin);
+      out->beginString(state, string);
+
+      for (int i = begin; i < fEnd; i++) {
+	out->drawChar(state, sel->word->textMat[i].m[4], sel->word->textMat[i].m[5], 0, 0, 0, 0,
+		      sel->word->charcode[i], 1, NULL, 0);
+      }
+      out->endString(state);
+      delete string;
+      begin = fEnd;
     }
-    out->endString(state);
-    delete string;
-    begin = fEnd;
   }
+
+  out->endPage ();
 }
 
 void TextWord::visitSelection(TextSelectionVisitor *visitor,
@@ -4715,6 +4751,7 @@ void TextPage::drawSelection(OutputDev *out,
 			       out, box_color, glyph_color);
 
   visitSelection(&painter, selection, style);
+  painter.endPage();
 }
 
 GooList *TextPage::getSelectionRegion(PDFRectangle *selection,
@@ -4733,10 +4770,23 @@ GooString *TextPage::getSelectionText(PDFRectangle *selection,
   TextSelectionDumper dumper(this);
 
   visitSelection(&dumper, selection, style);
+  dumper.endPage();
 
   return dumper.getText();
 }
 
+GooList **TextPage::getSelectionWords(PDFRectangle *selection,
+                                      SelectionStyle style,
+                                      int *nLines)
+{
+  TextSelectionDumper dumper(this);
+
+  visitSelection(&dumper, selection, style);
+  dumper.endPage();
+
+  return dumper.getWordList(nLines);
+}
+
 GBool TextPage::findCharRange(int pos, int length,
 			      double *xMin, double *yMin,
 			      double *xMax, double *yMax) {
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/TextOutputDev.h
index 664f9d1fd77..56736b3f7ce 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/TextOutputDev.h
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2005-2007 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006 Ed Catmur <ed@catmur.co.uk>
-// Copyright (C) 2007, 2008, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007, 2008, 2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Brian Ewins <brian.ewins@gmail.com>
@@ -563,6 +563,10 @@ public:
   GooString *getSelectionText(PDFRectangle *selection,
 			      SelectionStyle style);
 
+  GooList **getSelectionWords(PDFRectangle *selection,
+                              SelectionStyle style,
+                              int *nLines);
+
   // Find a string by character position and length.  If found, sets
   // the text bounding rectangle and returns true; otherwise returns
   // false.
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/XRef.cc
index 5495b62f7ba..5495b62f7ba 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.23.3/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.23.3/poppler/XpdfPluginAPI.h
index b0165c0a72a..b0165c0a72a 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.23.3/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.23.3/poppler/poppler-config.h.cmake
index af534c99a26..71a3278ff44 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/poppler-config.h.cmake
@@ -158,7 +158,7 @@ char * strtok_r (char *s, const char *delim, char **save_ptr);
 //------------------------------------------------------------------------
 
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#ifdef __USE_MINGW_ANSI_STDIO
+#ifdef __MINGW_PRINTF_FORMAT
 #define GCC_PRINTF_FORMAT(fmt_index, va_index) \
        __attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))
 #else
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.23.3/poppler/poppler-config.h.in
index c5e181c4337..c5e181c4337 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.23.2/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.23.3/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.23.2/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.23.3/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index acfffc40f13..203fe23a7c8 100644
--- a/Build/source/libs/poppler/version.ac
+++ b/Build/source/libs/poppler/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.23.2])
+m4_define([poppler_version], [0.23.3])