summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-03 10:18:48 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-01-03 10:18:48 +0000
commitdcb2aaacd80d8af3d5a026950e17c3c738b08a7b (patch)
treeda6012d30e872c8a3c307fe58ca7b4443d82ecf8
parent6dcf909844b7e6b3fe352973ddb42bcfaa9bad76 (diff)
poppler 0.25.1
git-svn-id: svn://tug.org/texlive/trunk@32555 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/README2
-rw-r--r--Build/source/libs/poppler/ChangeLog5
-rw-r--r--Build/source/libs/poppler/Makefile.in4
-rwxr-xr-xBuild/source/libs/poppler/configure30
-rw-r--r--Build/source/libs/poppler/poppler-0.25.0/splash/Makefile.in816
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.25.0-PATCHES/ChangeLog)7
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-0.25.0-PATCHES/TL-Changes)3
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1-PATCHES/patch-02-LLONG_MAX (renamed from Build/source/libs/poppler/poppler-0.25.0-PATCHES/patch-02-LLONG_MAX)6
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/AUTHORS (renamed from Build/source/libs/poppler/poppler-0.25.0/AUTHORS)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/CMakeLists.txt (renamed from Build/source/libs/poppler/poppler-0.25.0/CMakeLists.txt)2
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/COPYING (renamed from Build/source/libs/poppler/poppler-0.25.0/COPYING)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.25.0/ChangeLog)254
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/ConfigureChecks.cmake (renamed from Build/source/libs/poppler/poppler-0.25.0/ConfigureChecks.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/INSTALL (renamed from Build/source/libs/poppler/poppler-0.25.0/INSTALL)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.25.0/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/NEWS (renamed from Build/source/libs/poppler/poppler-0.25.0/NEWS)23
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/README (renamed from Build/source/libs/poppler/poppler-0.25.0/README)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/README-XPDF (renamed from Build/source/libs/poppler/poppler-0.25.0/README-XPDF)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/TODO (renamed from Build/source/libs/poppler/poppler-0.25.0/TODO)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.25.0/config.h.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/config.h.in (renamed from Build/source/libs/poppler/poppler-0.25.0/config.h.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/configure.ac (renamed from Build/source/libs/poppler/poppler-0.25.0/configure.ac)8
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiBase.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.h (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiBase.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiEncodings.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.h (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiEncodings.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiIdentifier.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.h (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiIdentifier.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiTrueType.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.h (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiTrueType.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.h (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1C.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.h (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1C.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/fofi/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.25.0/fofi/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/FixedPoint.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/FixedPoint.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/GooHash.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/GooHash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/GooLikely.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/GooLikely.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/GooList.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/GooList.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/GooList.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/GooList.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/GooMutex.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/GooMutex.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/GooString.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/GooString.cc)19
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/GooString.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/GooString.h)10
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/GooTimer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/GooTimer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/ImgWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/ImgWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/JpegWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/JpegWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/NetPBMWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/NetPBMWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/PNGWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/PNGWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/TiffWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/TiffWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/gfile.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/gfile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/gfile.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/gfile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/gmem.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/gmem.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/gmem.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/gmem.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/gmempp.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/gmempp.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/grandom.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/grandom.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/grandom.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/grandom.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/gstrtod.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/gstrtod.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/gtypes.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/gtypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/goo/gtypes_p.h (renamed from Build/source/libs/poppler/poppler-0.25.0/goo/gtypes_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/gtk-doc.make (renamed from Build/source/libs/poppler/poppler-0.25.0/gtk-doc.make)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-cairo-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-cairo-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-cairo.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-cairo.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-cpp-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-cpp-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-cpp.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-cpp.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-glib-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-glib-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-glib.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-glib.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-qt4-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-qt4-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-qt4.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-qt4.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-qt5-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-qt5-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-qt5.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-qt5.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-splash-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-splash-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-splash.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-splash.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Annot.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Annot.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Array.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Array.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Array.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Array.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFontTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CMap.cc)3
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CairoFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CairoFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CairoOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CairoOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CairoRescaleBox.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CairoRescaleBox.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Catalog.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Catalog.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CharCodeToUnicode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CharCodeToUnicode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CharTypes.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CharTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CompactFontTables.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CompactFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CurlCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CurlCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CurlPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/CurlPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/DCTStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/DCTStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/DateInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/DateInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Decrypt.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Decrypt.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Dict.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Dict.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Error.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Error.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Error.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Error.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/ErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/ErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/FileSpec.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/FileSpec.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/FlateStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/FlateStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/FontEncodingTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/FontEncodingTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/FontInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/FontInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Form.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Form.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Form.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Form.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Function.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Function.cc)3
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Function.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Function.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Gfx.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Gfx.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/GfxFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/GfxFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/GfxState.cc)9
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/GfxState.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState_helpers.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/GfxState_helpers.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/GlobalParams.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/GlobalParams.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParamsWin.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/GlobalParamsWin.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Hints.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Hints.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/JArithmeticDecoder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/JArithmeticDecoder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/JBIG2Stream.cc)1
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/JBIG2Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/JPEG2000Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/JPEG2000Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/JPXStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/JPXStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Lexer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Lexer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Linearization.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Linearization.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Link.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Link.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Link.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Link.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/LocalPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/LocalPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/MarkedContentOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/MarkedContentOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Movie.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Movie.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/NameToCharCode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/NameToCharCode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/NameToUnicodeTable.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/NameToUnicodeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Object.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Object.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Object.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Object.h)4
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/OptionalContent.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/OptionalContent.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Outline.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Outline.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/OutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/OutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDoc.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDoc.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocEncoding.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocEncoding.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocFactory.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocFactory.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PSOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PSOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PSTokenizer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PSTokenizer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Page.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Page.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Page.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Page.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PageLabelInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PageLabelInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo_p.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PageLabelInfo_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PageTransition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PageTransition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Parser.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Parser.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PopplerCache.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PopplerCache.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PreScanOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/PreScanOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/ProfileData.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/ProfileData.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Rendition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Rendition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/SecurityHandler.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/SecurityHandler.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Sound.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Sound.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/SplashOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/SplashOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/StdinCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/StdinCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/StdinPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/StdinPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Stream-CCITT.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Stream-CCITT.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/StructElement.cc)2
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/StructElement.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/StructTreeRoot.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/StructTreeRoot.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/TextOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/TextOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UTF.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UTF.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UTF8.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UTF8.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCClassTables.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeCClassTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCompTables.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeCompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeDecompTables.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeDecompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMapTables.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeMapTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeTypeTable.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeTypeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/ViewerPreferences.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/ViewerPreferences.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/XRef.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/XRef.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/XpdfPluginAPI.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.h (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/XpdfPluginAPI.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/gen-unicode-tables.py (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/gen-unicode-tables.py)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/poppler-config.h.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.in (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/poppler-config.h.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/poppler/strtok_r.cpp (renamed from Build/source/libs/poppler/poppler-0.25.0/poppler/strtok_r.cpp)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/Splash.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/Splash.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/Splash.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/Splash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashBitmap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashClip.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashClip.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFileID.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFileID.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashGlyphBitmap.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashGlyphBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashMath.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashMath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashPattern.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashPattern.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashScreen.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashScreen.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashState.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashState.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1Font.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1Font.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashTypes.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.cc (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPathScanner.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.h (renamed from Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPathScanner.h)0
-rw-r--r--Build/source/libs/poppler/version.ac4
298 files changed, 337 insertions, 878 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 2cbf392c38e..c5172d0a39b 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -40,7 +40,7 @@ paper 1.1.24+nmu2 - checked 24oct13
pixman 0.32.4 - checked 18nov13
http://cairographics.org/releases/
-poppler 0.25.0 - checked 13dec13
+poppler 0.25.1 - checked 3jan14
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.11 - checked 12apr13
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index de4cf3cb718..5e18892aa8c 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.25.1.
+ * version.ac: Adjust.
+
2013-12-13 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.25.0.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 2145e278cbd..8c6c4b383ef 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -80,7 +80,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \
$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/config.h.in \
- $(top_srcdir)/poppler-0.25.0/poppler/poppler-config.h.in \
+ $(top_srcdir)/poppler-0.25.1/poppler/poppler-config.h.in \
$(top_srcdir)/../../build-aux/depcomp ChangeLog \
../../build-aux/compile ../../build-aux/config.guess \
../../build-aux/config.sub ../../build-aux/depcomp \
@@ -579,7 +579,7 @@ poppler-config.h: stamp-h2
@test -f $@ || rm -f stamp-h2
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
-stamp-h2: $(top_srcdir)/poppler-0.25.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.25.1/poppler/poppler-config.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status poppler-config.h
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index e07d8390a5c..9ac2dddbc6c 100755
--- a/Build/source/libs/poppler/configure
+++ b/Build/source/libs/poppler/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.25.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.25.1.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -580,12 +580,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='poppler (TeX Live)'
PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.25.0'
-PACKAGE_STRING='poppler (TeX Live) 0.25.0'
+PACKAGE_VERSION='0.25.1'
+PACKAGE_STRING='poppler (TeX Live) 0.25.1'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.25.0/poppler/Array.cc"
+ac_unique_file="poppler-0.25.1/poppler/Array.cc"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1304,7 +1304,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poppler (TeX Live) 0.25.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.25.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1371,7 +1371,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.25.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.25.1:";;
esac
cat <<\_ACEOF
@@ -1484,7 +1484,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.25.0
+poppler (TeX Live) configure 0.25.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2074,7 +2074,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poppler (TeX Live) $as_me 0.25.0, which was
+It was created by poppler (TeX Live) $as_me 0.25.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3997,7 +3997,7 @@ fi
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.25.0'
+ VERSION='0.25.1'
# Some tools Automake needs.
@@ -6473,12 +6473,12 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.25.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.25.1/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.25.0"
+#define POPPLER_VERSION "0.25.1"
_ACEOF
@@ -6612,7 +6612,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.25.0
+POPPLER_TREE=poppler-0.25.1
ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7172,7 +7172,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.25.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.25.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7238,7 +7238,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poppler (TeX Live) config.status 0.25.0
+poppler (TeX Live) config.status 0.25.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7369,7 +7369,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.25.0/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.25.1/poppler/poppler-config.h.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/goo/Makefile") CONFIG_FILES="$CONFIG_FILES include/goo/Makefile" ;;
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/Makefile.in b/Build/source/libs/poppler/poppler-0.25.0/splash/Makefile.in
deleted file mode 100644
index 3e550e6b466..00000000000
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/Makefile.in
+++ /dev/null
@@ -1,816 +0,0 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = splash
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp \
- $(am__poppler_splash_include_HEADERS_DIST)
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
- $(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
- $(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h \
- $(top_builddir)/poppler/poppler-config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libsplash_la_LIBADD =
-am_libsplash_la_OBJECTS = Splash.lo SplashBitmap.lo SplashClip.lo \
- SplashFTFont.lo SplashFTFontEngine.lo SplashFTFontFile.lo \
- SplashFont.lo SplashFontEngine.lo SplashFontFile.lo \
- SplashFontFileID.lo SplashPath.lo SplashPattern.lo \
- SplashScreen.lo SplashState.lo SplashT1Font.lo \
- SplashT1FontEngine.lo SplashT1FontFile.lo SplashXPath.lo \
- SplashXPathScanner.lo
-libsplash_la_OBJECTS = $(am_libsplash_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_@AM_V@)
-am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo " CXX " $@;
-am__v_CXX_1 =
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo " CXXLD " $@;
-am__v_CXXLD_1 =
-SOURCES = $(libsplash_la_SOURCES)
-DIST_SOURCES = $(libsplash_la_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__poppler_splash_include_HEADERS_DIST = Splash.h SplashBitmap.h \
- SplashClip.h SplashErrorCodes.h SplashFTFont.h \
- SplashFTFontEngine.h SplashFTFontFile.h SplashFont.h \
- SplashFontEngine.h SplashFontFile.h SplashFontFileID.h \
- SplashGlyphBitmap.h SplashMath.h SplashPath.h SplashPattern.h \
- SplashScreen.h SplashState.h SplashT1Font.h \
- SplashT1FontEngine.h SplashT1FontFile.h SplashTypes.h \
- SplashXPath.h SplashXPathScanner.h
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(poppler_splash_includedir)"
-HEADERS = $(poppler_splash_include_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_FEATURE = @CAIRO_FEATURE@
-CAIRO_LIBS = @CAIRO_LIBS@
-CAIRO_REQ = @CAIRO_REQ@
-CAIRO_VERSION = @CAIRO_VERSION@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_CONFIG = @FREETYPE_CONFIG@
-FREETYPE_LIBS = @FREETYPE_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GLIB_REQ = @GLIB_REQ@
-GLIB_REQUIRED = @GLIB_REQUIRED@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
-GTK_TEST_LIBS = @GTK_TEST_LIBS@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-LCMS_CFLAGS = @LCMS_CFLAGS@
-LCMS_LIBS = @LCMS_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
-LIBCURL_LIBS = @LIBCURL_LIBS@
-LIBICONV = @LIBICONV@
-LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@
-LIBJPEG_LIBS = @LIBJPEG_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBOPENJPEG_CFLAGS = @LIBOPENJPEG_CFLAGS@
-LIBOPENJPEG_LIBS = @LIBOPENJPEG_LIBS@
-LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
-LIBPNG_LIBS = @LIBPNG_LIBS@
-LIBS = @LIBS@
-LIBTIFF_CFLAGS = @LIBTIFF_CFLAGS@
-LIBTIFF_CFLAGSS = @LIBTIFF_CFLAGSS@
-LIBTIFF_LIBS = @LIBTIFF_LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MOCQT4 = @MOCQT4@
-MOCQT42 = @MOCQT42@
-MOCQT5 = @MOCQT5@
-MOCQT52 = @MOCQT52@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PC_REQUIRES = @PC_REQUIRES@
-PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
-PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@
-PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POPPLER_DATADIR = @POPPLER_DATADIR@
-POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
-POPPLER_GLIB_DISABLE_DEPRECATED = @POPPLER_GLIB_DISABLE_DEPRECATED@
-POPPLER_GLIB_DISABLE_SINGLE_INCLUDES = @POPPLER_GLIB_DISABLE_SINGLE_INCLUDES@
-POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
-POPPLER_MAJOR_VERSION = @POPPLER_MAJOR_VERSION@
-POPPLER_MICRO_VERSION = @POPPLER_MICRO_VERSION@
-POPPLER_MINOR_VERSION = @POPPLER_MINOR_VERSION@
-POPPLER_QT4_CFLAGS = @POPPLER_QT4_CFLAGS@
-POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
-POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
-POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
-POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
-POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
-POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
-POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
-POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
-POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
-POPPLER_VERSION = @POPPLER_VERSION@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-QTCHOOSER = @QTCHOOSER@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TESTDATADIR = @TESTDATADIR@
-VERSION = @VERSION@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-ZLIB_LIBS = @ZLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-auto_import_flags = @auto_import_flags@
-ax_pthread_config = @ax_pthread_config@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-create_shared_lib = @create_shared_lib@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-win32_libs = @win32_libs@
-INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/goo \
- $(libjpeg_includes) \
- $(libtiff_includes) \
- $(libpng_includes) \
- $(FREETYPE_CFLAGS)
-
-
-# SplashBitmap includes JpegWriter.h, TiffWriter.h, PNGWriter.h
-@BUILD_LIBJPEG_TRUE@libjpeg_includes = $(LIBJPEG_CFLAGS)
-@BUILD_LIBTIFF_TRUE@libtiff_includes = $(LIBTIFF_CFLAGS)
-@BUILD_LIBPNG_TRUE@libpng_includes = $(LIBPNG_CFLAGS)
-noinst_LTLIBRARIES = libsplash.la
-@ENABLE_XPDF_HEADERS_TRUE@poppler_splash_includedir = $(includedir)/poppler/splash
-@ENABLE_XPDF_HEADERS_TRUE@poppler_splash_include_HEADERS = \
-@ENABLE_XPDF_HEADERS_TRUE@ Splash.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashBitmap.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashClip.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashErrorCodes.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashFTFont.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashFTFontEngine.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashFTFontFile.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashFont.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashFontEngine.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashFontFile.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashFontFileID.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashGlyphBitmap.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashMath.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashPath.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashPattern.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashScreen.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashState.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashT1Font.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashT1FontEngine.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashT1FontFile.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashTypes.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashXPath.h \
-@ENABLE_XPDF_HEADERS_TRUE@ SplashXPathScanner.h
-
-libsplash_la_SOURCES = \
- Splash.cc \
- SplashBitmap.cc \
- SplashClip.cc \
- SplashFTFont.cc \
- SplashFTFontEngine.cc \
- SplashFTFontFile.cc \
- SplashFont.cc \
- SplashFontEngine.cc \
- SplashFontFile.cc \
- SplashFontFileID.cc \
- SplashPath.cc \
- SplashPattern.cc \
- SplashScreen.cc \
- SplashState.cc \
- SplashT1Font.cc \
- SplashT1FontEngine.cc \
- SplashT1FontFile.cc \
- SplashXPath.cc \
- SplashXPathScanner.cc
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign splash/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign splash/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
-
-libsplash.la: $(libsplash_la_OBJECTS) $(libsplash_la_DEPENDENCIES) $(EXTRA_libsplash_la_DEPENDENCIES)
- $(AM_V_CXXLD)$(CXXLINK) $(libsplash_la_OBJECTS) $(libsplash_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Splash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashBitmap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashClip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashFTFont.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashFTFontEngine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashFTFontFile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashFont.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashFontEngine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashFontFile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashFontFileID.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashPath.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashPattern.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashScreen.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashState.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashT1Font.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashT1FontEngine.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashT1FontFile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashXPath.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashXPathScanner.Plo@am__quote@
-
-.cc.o:
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cc.obj:
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-poppler_splash_includeHEADERS: $(poppler_splash_include_HEADERS)
- @$(NORMAL_INSTALL)
- @list='$(poppler_splash_include_HEADERS)'; test -n "$(poppler_splash_includedir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(poppler_splash_includedir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(poppler_splash_includedir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(poppler_splash_includedir)'"; \
- $(INSTALL_HEADER) $$files "$(DESTDIR)$(poppler_splash_includedir)" || exit $$?; \
- done
-
-uninstall-poppler_splash_includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(poppler_splash_include_HEADERS)'; test -n "$(poppler_splash_includedir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(poppler_splash_includedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- set x; \
- here=`pwd`; \
- $(am__define_uniq_tagged_files); \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
- for dir in "$(DESTDIR)$(poppler_splash_includedir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-poppler_splash_includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-poppler_splash_includeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
- ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-poppler_splash_includeHEADERS install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-poppler_splash_includeHEADERS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/Build/source/libs/poppler/poppler-0.25.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.25.1-PATCHES/ChangeLog
index 9de8396fa58..0f824f9f771 100644
--- a/Build/source/libs/poppler/poppler-0.25.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.25.1-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.25.1 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
2013-12-12 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported poppler-0.25.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.25.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.25.1-PATCHES/TL-Changes
index 2536b5d06d7..56010a0bdc4 100644
--- a/Build/source/libs/poppler/poppler-0.25.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.25.1-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.25.0 tree as obtained from:
+Changes applied to the poppler-0.25.1 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
@@ -16,6 +16,7 @@ Removed:
fofi/Makefile.in
goo/Makefile.in
poppler/Makefile.in
+ splash/Makefile.in
Removed unused dirs:
cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.25.1-PATCHES/patch-02-LLONG_MAX
index 8d246ea8b67..8ffc30fe869 100644
--- a/Build/source/libs/poppler/poppler-0.25.0-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.25.1-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.25.0.orig/goo/GooString.h poppler-0.25.0/goo/GooString.h
---- poppler-0.25.0.orig/goo/GooString.h 2013-12-01 18:16:34.000000000 +0100
-+++ poppler-0.25.0/goo/GooString.h 2013-12-12 17:05:26.000000000 +0100
+diff -ur poppler-0.25.1.orig/goo/GooString.h poppler-0.25.1/goo/GooString.h
+--- poppler-0.25.1.orig/goo/GooString.h 2014-01-03 00:12:21.000000000 +0100
++++ poppler-0.25.1/goo/GooString.h 2014-01-03 11:00:48.000000000 +0100
@@ -34,6 +34,21 @@
#endif
diff --git a/Build/source/libs/poppler/poppler-0.25.0/AUTHORS b/Build/source/libs/poppler/poppler-0.25.1/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.25.1/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.25.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.25.1/CMakeLists.txt
index f2eb0aa4d01..297cc950ff5 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.25.1/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "25")
-set(POPPLER_MICRO_VERSION "0")
+set(POPPLER_MICRO_VERSION "1")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
diff --git a/Build/source/libs/poppler/poppler-0.25.0/COPYING b/Build/source/libs/poppler/poppler-0.25.1/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/COPYING
+++ b/Build/source/libs/poppler/poppler-0.25.1/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.25.0/ChangeLog b/Build/source/libs/poppler/poppler-0.25.1/ChangeLog
index 478049f5b5b..450516046ed 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.25.1/ChangeLog
@@ -1,12 +1,236 @@
+commit e238c1f83fd5f667336bfbb0e9a59569ff638ecc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jan 3 00:29:28 2014 +0100
+
+ Fix qt5 moc detection fix
+
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit 381ae2877acace4e8908b07ee5fb442bc19bf814
+Merge: 64100e7 a2f0e4b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jan 3 00:04:29 2014 +0100
+
+ Merge remote-tracking branch 'origin/poppler-0.24'
+
+ Conflicts:
+ CMakeLists.txt
+ NEWS
+ configure.ac
+ cpp/Doxyfile
+ qt4/src/Doxyfile
+ qt5/src/Doxyfile
+
+commit a2f0e4b1fd8b3d9675cc00a561094bd78a63d048
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 2 23:48:29 2014 +0100
+
+ 0.24.5
+
+ CMakeLists.txt | 2 +-
+ NEWS | 4 ++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 6 files changed, 9 insertions(+), 5 deletions(-)
+
+commit 523b2731e0489bab58e66b21016bd6f010e616ea
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 2 22:54:42 2014 +0100
+
+ Update copyrights
+
+ poppler/JBIG2Stream.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 64100e7f1f6b550e952838fce38615ec3788e17c
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date: Sat Dec 28 12:11:47 2013 +0100
+
+ Simplify some calls to GooString::format-family functions
+
+ poppler/Object.h | 4 ++--
+ utils/pdftocairo.cc | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 0abde34d0f7ba0fc04a30dbfd78373ec9d9d0695
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date: Sat Dec 28 12:11:05 2013 +0100
+
+ Fixed some GooString format markers
+
+ poppler/CMap.cc | 3 ++-
+ poppler/Function.cc | 3 ++-
+ poppler/StructElement.cc | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+commit a7da4c6ac2b13308803806009c3437332b140586
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date: Fri Dec 27 17:09:39 2013 +0100
+
+ GooString format: fixed bug with printing LLONG_MIN
+
+ ( -LLONG_MIN doesn't fit in a signed long long )
+
+ goo/GooString.cc | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+commit fe88f20cc565b4cf4765fed56c821989148ef454
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date: Fri Dec 27 17:08:50 2013 +0100
+
+ GooString format: Added some tests + improved documentation
+
+ goo/GooString.h | 10 +++++--
+ qt4/tests/check_goostring.cpp | 66
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt5/tests/check_goostring.cpp | 66
+ +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 139 insertions(+), 3 deletions(-)
+
+commit 5234a349adb678d267a3d8ca13176ac8abb7afd2
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Fri Dec 20 20:25:26 2013 +0100
+
+ pdfunite: do not lose fonts when merging some files
+
+ utils/pdfunite.cc | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+commit 8e24fcc0d296e07327e9cbe297f627bfc6471ee3
+Merge: 85efba3 b02f873
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Dec 18 21:51:57 2013 +0100
+
+ Merge remote-tracking branch 'origin/poppler-0.24'
+
+ Conflicts:
+ poppler/GfxState.cc
+
+commit b02f873174865837fed3a9544b70b8b21747a3dd
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date: Wed Dec 18 21:46:12 2013 +0100
+
+ Fixed some GooString format markers
+
+ poppler/GfxState.cc | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+commit 85efba38c02b5daf7d3fc46bc85850e6842a085d
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Wed Dec 18 00:46:00 2013 +0100
+
+ Make pdfunite work even if there's a single file given
+
+ Bug #72720
+
+ utils/pdfunite.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit a766c55f68db38feed91cf003a0d5710e2f925a8
+Author: Tuomas Jormola <tj@solitudo.net>
+Date: Mon Dec 16 20:43:28 2013 +0100
+
+ Fix detection of moc for Qt5
+
+ Bug #72744
+
+ On my Mac OS X 10.9 Mavericks system with Qt 5.2.0 installed using
+ Homebrew, the output of the moc command doesn't include the string
+ "Qt 5" which is expected by the moc version detection logic in
+ configure.ac of poppler 0.24.4. This patch updates the grep pattern so
+ that the current expected moc version output and the version output of
+ this installation of Qt5 are both detected as a valid moc for
+ Qt5. With
+ this patch applied, I was able to build and test poppler with Qt5
+ support successfully.
+
+ (09:26:05)(tj@gauri)(~)$ uname -a
+ Darwin gauri.ad.local.domain 13.0.0 Darwin Kernel Version 13.0.0:
+ Thu Sep 19 22:22:27 PDT 2013; root:xnu-2422.1.72~6/RELEASE_X86_64
+ x86_64 i386 MacBookPro3,1 Darwin
+ (09:26:08)(tj@gauri)(~)$ /usr/local/opt/qt5/bin/moc -v
+ moc 5.2.0
+ (09:26:24)(tj@gauri)(~)$
+
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit a43b4bf84fe4bde6649049685bf4ed6a682e8286
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 15 11:59:57 2013 +0100
+
+ regtest: Add a command line option to create-report command to not
+ launch the browser
+
+ regtest/HTMLReport.py | 5 +++--
+ regtest/commands/create-report.py | 5 ++++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 113958276b96d7f1aab7042e1807a9970425d234
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 15 11:48:51 2013 +0100
+
+ regtest: Return an exist status code depending on whether the
+ command succeeded
+
+ regtest/TestRun.py | 2 ++
+ regtest/commands/__init__.py | 4 ++--
+ regtest/commands/create-refs.py | 2 ++
+ regtest/commands/create-report.py | 2 ++
+ regtest/commands/find-regression.py | 4 +++-
+ regtest/commands/run-tests.py | 6 ++++--
+ regtest/main.py | 8 ++++----
+ regtest/poppler-regtest | 2 +-
+ 8 files changed, 20 insertions(+), 10 deletions(-)
+
+commit 44cf2de0df351d5948893f6a4e2bca1168d16b70
+Author: Dominik Haumann <dhaumann@kde.org>
+Date: Thu Dec 12 23:12:35 2013 +0100
+
+ Arthur font rendering improvements
+
+ The patch does does the following:
+ - use NoPen to fill the glyphs
+ - since SplashPath seems to bitwise OR stop and start of path,
+ closing a subpath needs to happen before starting a path.
+
+ Arthur needs serious work but this is a definite improvement in all
+ the files i've tried it on
+
+ qt4/src/ArthurOutputDev.cc | 18 +++++++++---------
+ qt5/src/ArthurOutputDev.cc | 18 +++++++++---------
+ 2 files changed, 18 insertions(+), 18 deletions(-)
+
+commit 02863f683be4543a2af6c26d53be93785d2b836a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 12 23:09:43 2013 +0100
+
+ qt: Simple silly test program to save to file
+
+ Allows us to do some quick arthur testing
+
+ qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/Makefile.am | 8 ++++-
+ qt4/tests/test-render-to-file.cpp | 69
+ +++++++++++++++++++++++++++++++++++++++
+ qt5/tests/CMakeLists.txt | 1 +
+ qt5/tests/Makefile.am | 8 ++++-
+ qt5/tests/test-render-to-file.cpp | 69
+ +++++++++++++++++++++++++++++++++++++++
+ 6 files changed, 154 insertions(+), 2 deletions(-)
+
commit 018892d4ceccd5e2994cdb74cd2d401293fc929d
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Dec 11 23:05:53 2013 +0100
+Date: Wed Dec 11 23:05:53 2013 +0100
0.25.0
CMakeLists.txt | 6 +++---
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
poppler/Makefile.am | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
@@ -14,7 +238,7 @@ Date: Wed Dec 11 23:05:53 2013 +0100
commit a1b99b26da9124fa55f773af55ae7382bd911d47
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Dec 11 23:00:00 2013 +0100
+Date: Wed Dec 11 23:00:00 2013 +0100
NEWS
@@ -23,39 +247,39 @@ Date: Wed Dec 11 23:00:00 2013 +0100
commit 10a0c45676ef56bee5924e889a7e7c21244b4339
Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Dec 10 20:48:36 2013 +0100
+Date: Tue Dec 10 20:48:36 2013 +0100
Update copyrights
- cpp/poppler-image.cpp | 1 +
- goo/PNGWriter.cc | 2 +-
+ cpp/poppler-image.cpp | 1 +
+ goo/PNGWriter.cc | 2 +-
poppler/MarkedContentOutputDev.cc | 2 ++
poppler/MarkedContentOutputDev.h | 2 ++
- poppler/Object.h | 1 +
- poppler/PDFDoc.h | 1 +
- utils/ImageOutputDev.h | 2 +-
+ poppler/Object.h | 1 +
+ poppler/PDFDoc.h | 1 +
+ utils/ImageOutputDev.h | 2 +-
7 files changed, 9 insertions(+), 2 deletions(-)
commit 6c0e7d35f273583acc2aa818860e3120b0cab64f
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Tue Dec 10 20:14:39 2013 +0100
+Date: Tue Dec 10 20:14:39 2013 +0100
correction for knockout transparency groups
Fixes test "G" in eci_altona-test-suite-v2_technical2_x4.pdf
poppler/SplashOutputDev.cc | 18 ++++++++++---
- splash/Splash.cc | 63
+ splash/Splash.cc | 63
+++++++++++++++++++++++++++++++++------------
- splash/SplashFTFontEngine.h | 3 +++
+ splash/SplashFTFontEngine.h | 3 +++
splash/SplashFontEngine.cc | 13 ++++++++++
- splash/SplashFontEngine.h | 5 ++++
+ splash/SplashFontEngine.h | 5 ++++
5 files changed, 82 insertions(+), 20 deletions(-)
commit f77bc21813ae7234ec4ce94ce4e92230fe5c174a
Merge: 06e9dc9 58e04a0
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Dec 7 16:56:11 2013 +0000
+Date: Sat Dec 7 16:56:11 2013 +0000
Merge remote-tracking branch 'origin/poppler-0.24'
diff --git a/Build/source/libs/poppler/poppler-0.25.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.25.1/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.1/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0/INSTALL b/Build/source/libs/poppler/poppler-0.25.1/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.25.1/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.25.0/Makefile.am b/Build/source/libs/poppler/poppler-0.25.1/Makefile.am
index e7e5bace9d4..e7e5bace9d4 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.25.1/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.0/NEWS b/Build/source/libs/poppler/poppler-0.25.1/NEWS
index fb08f79a763..8da297e70cf 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/NEWS
+++ b/Build/source/libs/poppler/poppler-0.25.1/NEWS
@@ -1,3 +1,22 @@
+Release 0.25.1
+ core:
+ * GooString format: Added some tests + improved documentation
+ * GooString format: fixed bug with printing LLONG_MIN
+ * regression test improvements
+
+ qt4:
+ * Arthur backend font rendering improvements
+ * test program to save to file
+
+ qt5:
+ * Arthur backend font rendering improvements
+ * Improve detection of Qt5 moc. Bug #72744
+ * test program to save to file
+
+ utils:
+ * pdfunite: Work even if there's a single file given
+ * pdfunite: do not lose fonts when merging some files
+
Release 0.25.0
core:
* Annotation improvements
@@ -21,6 +40,10 @@ Release 0.25.0
* Add API to get text, text layout and text attributes for a given area
* demo improvements
+Release 0.24.5
+ core:
+ * Fix crash due to wrong formatting of error message. KDE Bug #328511
+
Release 0.24.4
core:
* Fix regression in broken endstream detection. Bug #70854
diff --git a/Build/source/libs/poppler/poppler-0.25.0/README b/Build/source/libs/poppler/poppler-0.25.1/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/README
+++ b/Build/source/libs/poppler/poppler-0.25.1/README
diff --git a/Build/source/libs/poppler/poppler-0.25.0/README-XPDF b/Build/source/libs/poppler/poppler-0.25.1/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.25.1/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.25.0/TODO b/Build/source/libs/poppler/poppler-0.25.1/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/TODO
+++ b/Build/source/libs/poppler/poppler-0.25.1/TODO
diff --git a/Build/source/libs/poppler/poppler-0.25.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.25.1/config.h.cmake
index b707ba72249..b707ba72249 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.1/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0/config.h.in b/Build/source/libs/poppler/poppler-0.25.1/config.h.in
index 12fb1a09ec6..12fb1a09ec6 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/configure.ac b/Build/source/libs/poppler/poppler-0.25.1/configure.ac
index 62f2a501cb0..9c5c7ee3215 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.25.1/configure.ac
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[25])
-m4_define([poppler_version_micro],[0])
+m4_define([poppler_version_micro],[1])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
@@ -661,20 +661,20 @@ 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"`
+ mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 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"`
+ mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 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"`
+ mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
if test x"$mocversiongrep" != x"$mocversion"; then
# no valid moc found
enable_poppler_qt5=no;
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.cc
index cd11d6ff2c6..cd11d6ff2c6 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.cc
index 8fa10a016b6..8fa10a016b6 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.25.1/fofi/Makefile.am
index c4654dd28b9..c4654dd28b9 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.25.1/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.25.1/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.25.1/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.25.1/goo/GooMutex.h
index e9d5a543ff7..e9d5a543ff7 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/GooString.cc
index e27f1588f1f..8591d95cd3e 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/GooString.cc
@@ -20,7 +20,7 @@
// Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2008-2011 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2011 Kenji Uno <ku@digitaldolphins.jp>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012 Pino Toscano <pino@kde.org>
// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
@@ -651,18 +651,25 @@ void GooString::formatInt(long x, char *buf, int bufSize,
const char *vals = upperCase ? upperCaseDigits : lowerCaseDigits;
GBool neg;
int start, i, j;
+#ifdef LLONG_MAX
+ unsigned long long abs_x;
+#else
+ unsigned long abs_x;
+#endif
i = bufSize;
if ((neg = x < 0)) {
- x = -x;
+ abs_x = -x;
+ } else {
+ abs_x = x;
}
start = neg ? 1 : 0;
- if (x == 0) {
+ if (abs_x == 0) {
buf[--i] = '0';
} else {
- while (i > start && x) {
- buf[--i] = vals[x % base];
- x /= base;
+ while (i > start && abs_x) {
+ buf[--i] = vals[abs_x % base];
+ abs_x /= base;
}
}
if (zeroFill) {
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.25.1/goo/GooString.h
index 0776fc1f798..3f8bdd7d1b6 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/GooString.h
@@ -18,7 +18,7 @@
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2008-2010, 2012 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) 2013 Jason Crain <jason@aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
@@ -102,8 +102,12 @@ public:
// ld, lx, lX, lo, lb, uld, ulx, ulX, ulo, ulb -- long, unsigned long
// lld, llx, llX, llo, llb, ulld, ullx, ullX, ullo, ullb
// -- long long, unsigned long long
- // f, g -- double
- // c -- char
+ // f, g, gs -- floating point (float or double)
+ // f -- always prints trailing zeros (eg 1.0 with .2f will print 1.00)
+ // g -- omits trailing zeros and, if possible, the dot (eg 1.0 shows up as 1)
+ // gs -- is like g, but treats <precision> as number of significant
+ // digits to show (eg 0.0123 with .2gs will print 0.012)
+ // c -- character (char, short or int)
// s -- string (char *)
// t -- GooString *
// w -- blank space; arg determines width
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.h
index d77373e90c1..d77373e90c1 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.25.1/goo/Makefile.am
index a48b20ec493..a48b20ec493 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.cc
index d372a5bdfce..d372a5bdfce 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/gfile.cc
index 44beddd5a13..44beddd5a13 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.25.1/goo/gfile.h
index 5f546f11156..5f546f11156 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.25.1/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/grandom.h b/Build/source/libs/poppler/poppler-0.25.1/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.25.1/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.25.1/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.25.1/gtk-doc.make
index 104c3993f3e..104c3993f3e 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.25.1/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.25.1/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.25.1/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.cc
index 90a6e5d09d3..90a6e5d09d3 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.h
index 8fde6a6736b..8fde6a6736b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.cc
index 13f293a4aea..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.cc
@@ -15,6 +15,7 @@
//
// Copyright (C) 2008 Koji Otani <sho@bbr.jp>
// Copyright (C) 2008, 2009 Albert Astals Cid <aacid@kde.org>
+// 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
@@ -420,7 +421,7 @@ void CMap::addCIDs(Guint start, Guint end, Guint nBytes, CID firstCID) {
for (byte = (int)(start & 0xff); byte <= (int)(end & 0xff); ++byte) {
if (vec[byte].isVector) {
error(errSyntaxError, -1,
- "Invalid CID ({0:x} - {1:x} [{2:d} bytes]) in CMap",
+ "Invalid CID ({0:ux} - {1:ux} [{2:ud} bytes]) in CMap",
start, end, nBytes);
} else {
vec[byte].cid = cid;
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.cc
index 1546594f9ea..1546594f9ea 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.cc
index 77bd2458714..77bd2458714 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.h
index c9ae33d4c65..c9ae33d4c65 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.cc
index 446434687ba..446434687ba 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.cc
index 16ba6d48649..16ba6d48649 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.cc
index 4cf42dcd2c1..4cf42dcd2c1 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Error.h
index 88fc3ea4353..88fc3ea4353 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Form.cc
index 661ed8972df..661ed8972df 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Function.cc
index 2f94a54a307..81829ec004a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Function.cc
@@ -19,6 +19,7 @@
// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2012 Adam Reichold <adamreichold@myopera.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
@@ -1194,7 +1195,7 @@ PostScriptFunction::PostScriptFunction(Object *funcObj, Dict *dict) {
codeString = new GooString();
str->reset();
if (!(tok = getToken(str)) || tok->cmp("{")) {
- error(errSyntaxError, -1, "Expected '{' at start of PostScript function");
+ error(errSyntaxError, -1, "Expected '{{' at start of PostScript function");
if (tok) {
delete tok;
}
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.cc
index 90bf41e4965..90bf41e4965 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.cc
index c54181b4150..c54181b4150 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.h
index f9806681102..f9806681102 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.cc
index 7c7928a915d..c6f855b9495 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.cc
@@ -26,6 +26,7 @@
// Copyright (C) 2012 William Bader <williambader@hotmail.com>
// Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
// Copyright (C) 2013 Hib Eris <hib@hiberis.nl>
+// 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
@@ -2817,7 +2818,7 @@ void GfxSeparationColorSpace::createMapping(GooList *separationList, int maxSepC
if (!sepCS->getName()->cmp(name)) {
if (sepCS->getFunc()->hasDifferentResultSet(func)) {
error(errSyntaxWarning, -1,
- "Different functions found for '{0:s}', convert immediately", name);
+ "Different functions found for '{0:t}', convert immediately", name);
gfree(mapping);
mapping = NULL;
return;
@@ -2830,7 +2831,7 @@ void GfxSeparationColorSpace::createMapping(GooList *separationList, int maxSepC
}
if (separationList->getLength() == maxSepComps) {
error(errSyntaxWarning, -1,
- "Too many ({0:d}) spots, convert '{1:s}' immediately", maxSepComps, name);
+ "Too many ({0:d}) spots, convert '{1:t}' immediately", maxSepComps, name);
gfree(mapping);
mapping = NULL;
return;
@@ -3131,7 +3132,7 @@ void GfxDeviceNColorSpace::createMapping(GooList *separationList, int maxSepComp
if (!sepCS->getName()->cmp(names[i])) {
if (sepFunc != NULL && sepCS->getFunc()->hasDifferentResultSet(sepFunc)) {
error(errSyntaxWarning, -1,
- "Different functions found for '{0:s}', convert immediately", names[i]);
+ "Different functions found for '{0:t}', convert immediately", names[i]);
gfree(mapping);
mapping = NULL;
overprintMask = 0xffffffff;
@@ -3147,7 +3148,7 @@ void GfxDeviceNColorSpace::createMapping(GooList *separationList, int maxSepComp
if (!found) {
if (separationList->getLength() == maxSepComps) {
error(errSyntaxWarning, -1,
- "Too many ({0:d}) spots, convert '{1:s}' immediately", maxSepComps, names[i]);
+ "Too many ({0:d}) spots, convert '{1:t}' immediately", maxSepComps, names[i]);
gfree(mapping);
mapping = NULL;
overprintMask = 0xffffffff;
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.h
index 106b2c0bf00..106b2c0bf00 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.cc
index 01a31573d01..01a31573d01 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.h
index c33a8024c04..c33a8024c04 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.cc
index 49e201daa93..49e201daa93 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.cc
index dbc7bdca260..bda7d523c74 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.cc
@@ -21,6 +21,7 @@
// Copyright (C) 2012 William Bader <williambader@hotmail.com>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.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
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.h
index 0ee2518575c..0ee2518575c 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.cc
index 703d471c99a..703d471c99a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.h
index 3feccbef06d..3feccbef06d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.cc
index c62052998b8..c62052998b8 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Link.cc
index 20184d1376c..20184d1376c 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.25.1/poppler/Makefile.am
index 07cfb3b0090..07cfb3b0090 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Object.h
index a2996248b94..15bea159857 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Object.h
@@ -45,14 +45,14 @@
#define OBJECT_TYPE_CHECK(wanted_type) \
if (unlikely(type != wanted_type)) { \
- error(errInternal, 0, (char *) "Call to Object where the object was type {0:d}, " \
+ error(errInternal, 0, "Call to Object where the object was type {0:d}, " \
"not the expected type {1:d}", type, wanted_type); \
abort(); \
}
#define OBJECT_3TYPES_CHECK(wanted_type1, wanted_type2, wanted_type3) \
if (unlikely(type != wanted_type1) && unlikely(type != wanted_type2) && unlikely(type != wanted_type3)) { \
- error(errInternal, 0, (char *) "Call to Object where the object was type {0:d}, " \
+ error(errInternal, 0, "Call to Object where the object was type {0:d}, " \
"not the expected type {1:d}, {2:d} or {3:d}", type, wanted_type1, wanted_type2, wanted_type3); \
abort(); \
}
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.cc
index c78d5ca5323..c78d5ca5323 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.h
index 42c7cba772b..42c7cba772b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.cc
index 623251f65f8..623251f65f8 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.h
index 92b007eafaf..92b007eafaf 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Page.cc
index ecdff32f693..ecdff32f693 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo_p.h
index d3cd89f9bcd..d3cd89f9bcd 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.cc
index a0219945bd9..a0219945bd9 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.cc
index 6a011266013..6a011266013 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.h
index 0fc9d3e3446..0fc9d3e3446 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.cc
index 8b85e60db0a..8b85e60db0a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.cc
index d0a945468a1..d0a945468a1 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.h
index ce1d50d0fdd..ce1d50d0fdd 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.cc
index 8ef061ab90d..8ef061ab90d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.cc
index 3a98658437b..6392433e218 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.cc
@@ -1260,7 +1260,7 @@ StructElement *StructElement::parseChild(Object *ref,
child = new StructElement(childObj->getDict(), treeRoot, this, seen);
} else {
error(errSyntaxWarning, -1,
- "Loop detected in structure tree, skipping subtree at object {0:i}:{0:i}",
+ "Loop detected in structure tree, skipping subtree at object {0:d}:{1:d}",
ref->getRefNum(), ref->getRefGen());
}
} else {
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.h
index b9eef8a6b60..b9eef8a6b60 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.cc
index 59f017ee910..59f017ee910 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.h
index 9928e2f6eba..9928e2f6eba 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.cc
index 7c2ca78895f..7c2ca78895f 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.h
index 23fb3b726a9..23fb3b726a9 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.cc
index 5495b62f7ba..5495b62f7ba 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.h
index b0165c0a72a..b0165c0a72a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.25.1/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.cmake
index 71a3278ff44..71a3278ff44 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.in
index c5e181c4337..c5e181c4337 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.25.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.25.1/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.25.1/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.25.1/splash/Makefile.am
index 4330c53aabf..4330c53aabf 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/Splash.cc
index 4a7d814f623..4a7d814f623 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/Splash.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/Splash.h b/Build/source/libs/poppler/poppler-0.25.1/splash/Splash.h
index cf98e6c6824..cf98e6c6824 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/Splash.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.cc
index ac344f17c35..ac344f17c35 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.h
index 70509abcfaa..70509abcfaa 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.cc
index 2a2362520cb..2a2362520cb 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.cc
index 34f6ce5c6b4..34f6ce5c6b4 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.cc
index 2bfcdc8719e..2bfcdc8719e 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.cc
index 968e8207362..968e8207362 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.h
index 42c1660f126..42c1660f126 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.cc
index fd2789d02f9..fd2789d02f9 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.h
index 2c603531cfd..2c603531cfd 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.cc
index 0fd5ccdc59d..0fd5ccdc59d 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.h
index b59e3068093..b59e3068093 100644
--- a/Build/source/libs/poppler/poppler-0.25.0/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index 8410de17413..6344146a32f 100644
--- a/Build/source/libs/poppler/version.ac
+++ b/Build/source/libs/poppler/version.ac
@@ -1,5 +1,5 @@
dnl
-dnl Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.25.0])
+m4_define([poppler_version], [0.25.1])