summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-27 09:49:34 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-27 09:49:34 +0000
commit2847413647e75ffcfeb5dfd46bcefc0a930bd634 (patch)
tree15bc92490a308af2a0ab3b13b85720deee389022 /Build
parent8de42f8b06704f8ba7f1469bcee4110a2debd064 (diff)
poppler 0.25.2
git-svn-id: svn://tug.org/texlive/trunk@33300 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-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.2-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.25.1-PATCHES/ChangeLog)9
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-0.25.1-PATCHES/TL-Changes)2
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-02-LLONG_MAX (renamed from Build/source/libs/poppler/poppler-0.25.1-PATCHES/patch-02-LLONG_MAX)6
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX53
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/AUTHORS (renamed from Build/source/libs/poppler/poppler-0.25.1/AUTHORS)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/CMakeLists.txt (renamed from Build/source/libs/poppler/poppler-0.25.1/CMakeLists.txt)12
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/COPYING (renamed from Build/source/libs/poppler/poppler-0.25.1/COPYING)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.25.1/ChangeLog)1169
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/ConfigureChecks.cmake (renamed from Build/source/libs/poppler/poppler-0.25.1/ConfigureChecks.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/INSTALL (renamed from Build/source/libs/poppler/poppler-0.25.1/INSTALL)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.25.1/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/NEWS (renamed from Build/source/libs/poppler/poppler-0.25.1/NEWS)48
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/README (renamed from Build/source/libs/poppler/poppler-0.25.1/README)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/README-XPDF (renamed from Build/source/libs/poppler/poppler-0.25.1/README-XPDF)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/TODO (renamed from Build/source/libs/poppler/poppler-0.25.1/TODO)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.25.1/config.h.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/config.h.in (renamed from Build/source/libs/poppler/poppler-0.25.1/config.h.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/configure.ac (renamed from Build/source/libs/poppler/poppler-0.25.1/configure.ac)21
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiBase.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiBase.h (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiEncodings.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiEncodings.h (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiIdentifier.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiIdentifier.h (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiTrueType.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiTrueType.h (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1.h (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1C.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1C.h (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/fofi/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.25.1/fofi/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/FixedPoint.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/FixedPoint.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/GooHash.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/GooHash.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/GooLikely.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/GooLikely.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/GooList.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/GooList.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/GooList.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/GooList.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/GooMutex.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/GooMutex.h)5
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/GooString.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/GooString.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/GooString.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/GooString.h)12
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/GooTimer.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/GooTimer.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.h)4
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/ImgWriter.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/ImgWriter.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/JpegWriter.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/JpegWriter.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/NetPBMWriter.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/NetPBMWriter.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/PNGWriter.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/PNGWriter.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/TiffWriter.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.cc)11
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/TiffWriter.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/gfile.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/gfile.cc)4
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/gfile.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/gfile.h)4
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/gmem.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/gmem.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/gmem.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/gmem.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/gmempp.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/gmempp.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/grandom.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/grandom.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/grandom.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/grandom.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/gstrtod.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/gstrtod.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/gtypes.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/gtypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/goo/gtypes_p.h (renamed from Build/source/libs/poppler/poppler-0.25.1/goo/gtypes_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/gtk-doc.make (renamed from Build/source/libs/poppler/poppler-0.25.1/gtk-doc.make)33
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-cairo-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-cairo-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-cairo.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-cairo.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-cpp-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-cpp-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-cpp.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-cpp.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-glib-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-glib-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-glib.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-glib.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-qt4-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-qt4-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-qt4.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-qt4.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-qt5-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-qt5-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-qt5.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-qt5.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-splash-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-splash-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-splash.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-splash.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler.pc.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Annot.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.cc)1
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Annot.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Array.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Array.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Array.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Array.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFont.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFont.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFontTables.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFontTables.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CMap.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CMap.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CachedFile.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CairoFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CairoFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CairoOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CairoOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.h)6
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CairoRescaleBox.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CairoRescaleBox.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Catalog.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Catalog.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CharCodeToUnicode.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CharCodeToUnicode.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CharTypes.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CharTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CompactFontTables.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CompactFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CurlCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CurlCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CurlPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/CurlPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/DCTStream.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/DCTStream.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/DateInfo.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/DateInfo.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Decrypt.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Decrypt.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Dict.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Dict.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Error.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Error.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Error.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Error.h)4
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/ErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/ErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/FileSpec.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/FileSpec.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/FlateStream.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/FlateStream.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/FontEncodingTables.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/FontEncodingTables.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/FontInfo.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/FontInfo.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Form.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Form.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Form.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Form.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Function.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Function.cc)8
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Function.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Function.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Gfx.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Gfx.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/GfxFont.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.cc)139
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/GfxFont.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.cc)4
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState_helpers.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState_helpers.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParams.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.cc)4
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParams.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParamsWin.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParamsWin.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Hints.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.cc)10
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Hints.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/JArithmeticDecoder.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/JArithmeticDecoder.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/JBIG2Stream.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.cc)21
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/JBIG2Stream.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/JPEG2000Stream.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/JPEG2000Stream.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/JPXStream.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/JPXStream.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Lexer.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Lexer.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Linearization.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Linearization.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Link.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Link.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Link.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Link.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/LocalPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/LocalPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Makefile.am)2
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/MarkedContentOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/MarkedContentOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Movie.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Movie.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/NameToCharCode.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/NameToCharCode.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/NameToUnicodeTable.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/NameToUnicodeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Object.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Object.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Object.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Object.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/OptionalContent.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/OptionalContent.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Outline.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Outline.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/OutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/OutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDoc.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.cc)37
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDoc.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.h)8
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocEncoding.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocEncoding.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocFactory.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocFactory.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PSOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.cc)256
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PSOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.h)12
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PSTokenizer.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PSTokenizer.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Page.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Page.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Page.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Page.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo_p.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PageTransition.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PageTransition.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Parser.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.cc)4
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Parser.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PopplerCache.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PopplerCache.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PreScanOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.cc)16
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/PreScanOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.h)3
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/ProfileData.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/ProfileData.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Rendition.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Rendition.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/SecurityHandler.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.cc)3
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/SecurityHandler.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Sound.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Sound.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/SplashOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/SplashOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/StdinCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/StdinCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/StdinPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/StdinPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Stream-CCITT.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Stream-CCITT.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Stream.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.cc)4
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/Stream.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/StructElement.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.cc)43
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/StructElement.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.h)11
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/StructTreeRoot.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.cc)9
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/StructTreeRoot.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.h)10
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/TextOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.cc)8
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/TextOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UTF.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UTF.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UTF8.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UTF8.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeCClassTables.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCClassTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeCompTables.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeDecompTables.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeDecompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMap.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMap.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMapTables.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMapTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeTypeTable.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeTypeTable.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/ViewerPreferences.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/ViewerPreferences.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/XRef.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/XRef.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/XpdfPluginAPI.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/XpdfPluginAPI.h (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.h)4
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/gen-unicode-tables.py (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/gen-unicode-tables.py)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/poppler-config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.cmake)20
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/poppler-config.h.in (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.in)20
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/poppler/strtok_r.cpp (renamed from Build/source/libs/poppler/poppler-0.25.1/poppler/strtok_r.cpp)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/Splash.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/Splash.cc)13
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/Splash.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/Splash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashBitmap.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashBitmap.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashClip.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashClip.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFont.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFont.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontFile.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFont.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFont.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFile.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFileID.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFileID.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashGlyphBitmap.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashGlyphBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashMath.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashMath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashPath.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashPath.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashPattern.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashPattern.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashScreen.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashScreen.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashState.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashState.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1Font.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1Font.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontEngine.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontFile.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontFile.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashTypes.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPath.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPath.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPathScanner.cc (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPathScanner.h (renamed from Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.h)0
-rw-r--r--Build/source/libs/poppler/version.ac2
298 files changed, 1821 insertions, 295 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 015fe45f591..dc8ae05a60f 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -43,7 +43,7 @@ luajit 2.0.3 - checked 14mar14
pixman 0.32.4 - checked 18nov13
http://cairographics.org/releases/
-poppler 0.25.1 - checked 3jan14
+poppler 0.25.2 - checked 27mar14
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 5e18892aa8c..bce57251af4 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.25.2.
+ * version.ac: Adjust.
+
2014-01-03 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.25.1.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 8c6c4b383ef..76a6893e8e6 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.1/poppler/poppler-config.h.in \
+ $(top_srcdir)/poppler-0.25.2/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.1/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.25.2/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 9ac2dddbc6c..a0c8776c6a4 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.1.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.25.2.
#
# 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.1'
-PACKAGE_STRING='poppler (TeX Live) 0.25.1'
+PACKAGE_VERSION='0.25.2'
+PACKAGE_STRING='poppler (TeX Live) 0.25.2'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.25.1/poppler/Array.cc"
+ac_unique_file="poppler-0.25.2/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.1 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.25.2 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.1:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.25.2:";;
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.1
+poppler (TeX Live) configure 0.25.2
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.1, which was
+It was created by poppler (TeX Live) $as_me 0.25.2, 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.1'
+ VERSION='0.25.2'
# 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.1/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.25.2/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.25.1"
+#define POPPLER_VERSION "0.25.2"
_ACEOF
@@ -6612,7 +6612,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.25.1
+POPPLER_TREE=poppler-0.25.2
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.1, which was
+This file was extended by poppler (TeX Live) $as_me 0.25.2, 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.1
+poppler (TeX Live) config.status 0.25.2
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.1/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.25.2/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.1-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.25.2-PATCHES/ChangeLog
index 0f824f9f771..5d6275a64cc 100644
--- a/Build/source/libs/poppler/poppler-0.25.1-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.25.2-PATCHES/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.25.2 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
+ * patch-03-NOMINMAX (new): Avoid to redefine NOMINMAX.
+
2014-01-03 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported poppler-0.25.1 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.25.1-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.25.2-PATCHES/TL-Changes
index 56010a0bdc4..035d4286a84 100644
--- a/Build/source/libs/poppler/poppler-0.25.1-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.25.2-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.25.1 tree as obtained from:
+Changes applied to the poppler-0.25.2 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
diff --git a/Build/source/libs/poppler/poppler-0.25.1-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-02-LLONG_MAX
index 8ffc30fe869..dd4301cf634 100644
--- a/Build/source/libs/poppler/poppler-0.25.1-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-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
+diff -ur poppler-0.25.2.orig/goo/GooString.h poppler-0.25.2/goo/GooString.h
+--- poppler-0.25.2.orig/goo/GooString.h 2014-02-17 22:22:29.000000000 +0100
++++ poppler-0.25.2/goo/GooString.h 2014-03-27 08:56:22.000000000 +0100
@@ -34,6 +34,21 @@
#endif
diff --git a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX b/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX
new file mode 100644
index 00000000000..0ed8625003c
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX
@@ -0,0 +1,53 @@
+diff -ur poppler-0.25.2.orig/goo/GooMutex.h poppler-0.25.2/goo/GooMutex.h
+--- poppler-0.25.2.orig/goo/GooMutex.h 2014-02-09 16:10:30.000000000 +0100
++++ poppler-0.25.2/goo/GooMutex.h 2014-03-27 09:21:13.000000000 +0100
+@@ -41,7 +41,9 @@
+ // gDestroyMutex(&m);
+
+ #ifdef _WIN32
++#ifndef NOMINMAX
+ #define NOMINMAX
++#endif
+ #include <windows.h>
+
+ typedef CRITICAL_SECTION GooMutex;
+diff -ur poppler-0.25.2.orig/goo/GooTimer.h poppler-0.25.2/goo/GooTimer.h
+--- poppler-0.25.2.orig/goo/GooTimer.h 2014-02-09 16:10:30.000000000 +0100
++++ poppler-0.25.2/goo/GooTimer.h 2014-03-27 09:21:13.000000000 +0100
+@@ -27,7 +27,9 @@
+ #endif
+
+ #ifdef _WIN32
++#ifndef NOMINMAX
+ #define NOMINMAX
++#endif
+ #include <windows.h>
+ #endif
+
+diff -ur poppler-0.25.2.orig/goo/gfile.h poppler-0.25.2/goo/gfile.h
+--- poppler-0.25.2.orig/goo/gfile.h 2014-02-09 16:10:31.000000000 +0100
++++ poppler-0.25.2/goo/gfile.h 2014-03-27 09:21:13.000000000 +0100
+@@ -40,7 +40,9 @@
+ # ifdef FPTEX
+ # include <win32lib.h>
+ # else
+- #define NOMINMAX
++# ifndef NOMINMAX
++# define NOMINMAX
++# endif
+ # include <windows.h>
+ # endif
+ #elif defined(ACORN)
+diff -ur poppler-0.25.2.orig/poppler/XpdfPluginAPI.h poppler-0.25.2/poppler/XpdfPluginAPI.h
+--- poppler-0.25.2.orig/poppler/XpdfPluginAPI.h 2014-02-09 16:10:33.000000000 +0100
++++ poppler-0.25.2/poppler/XpdfPluginAPI.h 2014-03-27 09:21:13.000000000 +0100
+@@ -23,7 +23,9 @@
+ #define XPDFPLUGINAPI_H
+
+ #ifdef _WIN32
++#ifndef NOMINMAX
+ #define NOMINMAX
++#endif
+ #include <windows.h>
+ #else
+ #define Object XtObject
diff --git a/Build/source/libs/poppler/poppler-0.25.1/AUTHORS b/Build/source/libs/poppler/poppler-0.25.2/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.25.2/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.25.1/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.25.2/CMakeLists.txt
index 297cc950ff5..a522f7636b7 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.25.2/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "25")
-set(POPPLER_MICRO_VERSION "1")
+set(POPPLER_MICRO_VERSION "2")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
@@ -427,7 +427,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 45.0.0 SOVERSION 45)
+set_target_properties(poppler PROPERTIES VERSION 46.0.0 SOVERSION 46)
target_link_libraries(poppler ${poppler_LIBS})
target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
@@ -535,6 +535,11 @@ if(ENABLE_XPDF_HEADERS)
goo/TiffWriter.h
DESTINATION include/poppler/goo)
endif(TIFF_FOUND)
+ if(JPEG_FOUND)
+ install(FILES
+ goo/JpegWriter.h
+ DESTINATION include/poppler/goo)
+ endif(JPEG_FOUND)
install(FILES
fofi/FoFiBase.h
fofi/FoFiEncodings.h
@@ -553,9 +558,6 @@ if(ENABLE_XPDF_HEADERS)
install(FILES
poppler/JPEG2000Stream.h
DESTINATION include/poppler)
- install(FILES
- goo/JpegWriter.h
- DESTINATION include/poppler/goo)
else(LIBOPENJPEG_FOUND)
install(FILES
poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/COPYING b/Build/source/libs/poppler/poppler-0.25.2/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/COPYING
+++ b/Build/source/libs/poppler/poppler-0.25.2/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.25.1/ChangeLog b/Build/source/libs/poppler/poppler-0.25.2/ChangeLog
index 450516046ed..b7adf9dfe80 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.25.2/ChangeLog
@@ -1,3 +1,1172 @@
+commit ec2f8bca9f48935d3180dab65ef2ca455a893afd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 26 18:38:13 2014 +0100
+
+ Fix overflow malloc
+
+ poppler/Stream.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 322e416451b7b33cba8fb3d4702207693c3c7921
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 26 17:58:48 2014 +0100
+
+ Fix error reported by ASAN in 1195.asan.0.293.pdf
+
+ ==31060== ERROR: AddressSanitizer: heap-buffer-overflow on
+ address 0x60040002a215 at pc 0x7f5614cd96c4 bp 0x7fff54a44050 sp
+ 0x7fff54a44048
+ READ of size 1 at 0x60040002a215 thread T0
+ #0 0x7f5614cd96c3 in JBIG2Stream::readGenericBitmap(bool,
+ int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3389
+ #1 0x7f5614cce0e7 in JBIG2Stream::readSymbolDictSeg(unsigned
+ int, unsigned int, unsigned int*, unsigned int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867
+ #2 0x7f5614ccb8fe in JBIG2Stream::readSegments()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408
+ #3 0x7f5614cca72e in JBIG2Stream::reset()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
+ #4 0x7f5614d1648b in ImageStream::reset()
+ /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
+ #5 0x7f5614de6578 in SplashOutputDev::drawImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
+ #6 0x7f5614c41d64 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
+ #7 0x7f5614c3ede0 in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #8 0x7f5614c1933a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #9 0x7f5614c1850f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #10 0x7f5614c18163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #11 0x7f5614cfae27 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #12 0x7f5614d02353 in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #14 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #15 0x7f5614322ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #16 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+
+ poppler/JBIG2Stream.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 225232f6f070d17d8570108ffe39ffd4350fc6e8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 26 15:00:09 2014 +0100
+
+ Fix error reported by ASAN in 6609.asan.0.8343.pdf
+
+ ==8470== ERROR: AddressSanitizer: heap-buffer-overflow on
+ address 0x7f3b12f7b5e1 at pc 0x7f3b0f915f5e bp 0x7fff47842de0 sp
+ 0x7fff47842dd8
+ READ of size 1 at 0x7f3b12f7b5e1 thread T0
+ #0 0x7f3b0f915f5d in JBIG2Stream::readGenericBitmap(bool,
+ int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3628
+ #1 0x7f3b0f910558 in JBIG2Stream::readGenericRegionSeg(unsigned
+ int, bool, bool, unsigned int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:2849
+ #2 0x7f3b0f906b33 in JBIG2Stream::readSegments()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1443
+ #3 0x7f3b0f90572e in JBIG2Stream::reset()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
+ #4 0x7f3b0f951459 in ImageStream::reset()
+ /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
+ #5 0x7f3b0fa21546 in SplashOutputDev::drawImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
+ #6 0x7f3b0f87cd64 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
+ #7 0x7f3b0f879de0 in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #8 0x7f3b0f85433a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #9 0x7f3b0f85350f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #10 0x7f3b0f853163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #11 0x7f3b0f935df5 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #12 0x7f3b0f93d321 in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #14 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #15 0x7f3b0ef5dec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #16 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+
+ poppler/JBIG2Stream.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 216890f1f147b25643e0d6e18e361d4d34b6c332
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 26 12:19:42 2014 +0100
+
+ Fix error reported by ASAN in 6760.asan.0.8568.pdf
+
+ ==26566== ERROR: AddressSanitizer: SEGV on unknown address
+ 0x7fffbc3e5ea8 (pc 0x7fe1fa858db1 sp 0x7fffc788eb30 bp 0x7fffc788eb40
+ T0)
+ AddressSanitizer can not provide additional info.
+ #0 0x7fe1fa858db0 in PSStack::index(int)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:1067
+ #1 0x7fe1fa856fd6 in PostScriptFunction::exec(PSStack*, int)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:1621
+ #2 0x7fe1fa854c10 in PostScriptFunction::transform(double*,
+ double*) /home/tsdgeos/devel/poppler/poppler/Function.cc:1266
+ #3 0x7fe1fa854097 in
+ PostScriptFunction::PostScriptFunction(Object*, Dict*)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:1216
+ #4 0x7fe1fa84a0c2 in Function::parse(Object*,
+ std::set<int, std::less<int>, std::allocator<int> >*)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:98
+ #5 0x7fe1fa849e3c in Function::parse(Object*)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:63
+ #6 0x7fe1fa8c1d8c in GfxDeviceNColorSpace::parse(Array*,
+ OutputDev*, GfxState*, int)
+ /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2978
+ #7 0x7fe1fa8a6fb7 in GfxColorSpace::parse(Object*,
+ OutputDev*, GfxState*, int)
+ /home/tsdgeos/devel/poppler/poppler/GfxState.cc:328
+ #8 0x7fe1fa88440f in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4403
+ #9 0x7fe1fa882d6c in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #10 0x7fe1fa85d2c6 in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #11 0x7fe1fa85c49b in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #12 0x7fe1fa85c0ef in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #13 0x7fe1fa93ed81 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #14 0x7fe1fa9462ad in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #15 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #16 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #17 0x7fe1f9f66ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #18 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+
+ poppler/Function.cc | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+commit fb7d91435c71603697b652c70cfa76dd595ee200
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 26 12:08:52 2014 +0100
+
+ Fix ASAN in 750.asan.0.9621.pdf
+
+ ==25876== ERROR: AddressSanitizer: heap-buffer-overflow on
+ address 0x60040002a10f at pc 0x7fc396c3c23e bp 0x7ffff1123d20 sp
+ 0x7ffff1123d18
+ READ of size 1 at 0x60040002a10f thread T0
+ #0 0x7fc396c3c23d in JBIG2Stream::readGenericBitmap(bool,
+ int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3504
+ #1 0x7fc396c30073 in JBIG2Stream::readSymbolDictSeg(unsigned
+ int, unsigned int, unsigned int*, unsigned int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867
+ #2 0x7fc396c2d88a in JBIG2Stream::readSegments()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408
+ #3 0x7fc396c2c6ba in JBIG2Stream::reset()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
+ #4 0x7fc396c783f7 in ImageStream::reset()
+ /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
+ #5 0x7fc396d484e4 in SplashOutputDev::drawImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
+ #6 0x7fc396ba3cf0 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
+ #7 0x7fc396ba0d6c in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #8 0x7fc396b7b2c6 in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #9 0x7fc396b7a49b in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #10 0x7fc396b7a0ef in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #11 0x7fc396c5cd93 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #12 0x7fc396c642bf in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #14 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #15 0x7fc396284ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #16 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+
+ poppler/JBIG2Stream.cc | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+commit 9002b3b7cbbbc5802abfa8383ded2093a29d1746
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 26 00:48:15 2014 +0100
+
+ Fix ASAN in 784.asan.0.9671.pdf
+
+ =================================================================
+ ==24856== ERROR: AddressSanitizer: SEGV on unknown address
+ 0x603bfffe5804 (pc 0x7f7aa3310c6b sp 0x7fff0e656bd0 bp 0x7fff0e656e90
+ T0)
+ AddressSanitizer can not provide additional info.
+ #0 0x7f7aa3310c6a in
+ GfxIndexedColorSpace::mapColorToBase(GfxColor*, GfxColor*)
+ /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2509
+ #1 0x7f7aa33110d2 in GfxIndexedColorSpace::getRGB(GfxColor*,
+ GfxRGB*) /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2529
+ #2 0x7f7aa3466712 in convertGfxColor(unsigned
+ char*, SplashColorMode, GfxColorSpace*, GfxColor*)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:117
+ #3 0x7f7aa34675a9 in SplashUnivariatePattern::getColor(int,
+ int, unsigned char*)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:215
+ #4 0x7f7aa348d2a2 in Splash::pipeRun(SplashPipe*)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:363
+ #5 0x7f7aa34c9c29 in Splash::drawAALine(SplashPipe*,
+ int, int, int, bool, unsigned char)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:1537
+ #6 0x7f7aa34c4787 in Splash::shadedFill(SplashPath*, bool,
+ SplashPattern*) /home/tsdgeos/devel/poppler/splash/Splash.cc:6388
+ #7 0x7f7aa348b65c in
+ SplashOutputDev::univariateShadedFill(GfxState*,
+ SplashUnivariatePattern*, double, double)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4408
+ #8 0x7f7aa348b93d in SplashOutputDev::radialShadedFill(GfxState*,
+ GfxRadialShading*, double, double)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4427
+ #9 0x7f7aa32c7574 in Gfx::doRadialShFill(GfxRadialShading*)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3058
+ #10 0x7f7aa32c188f in Gfx::opShFill(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:2476
+ #11 0x7f7aa32b12c6 in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #12 0x7f7aa32b049b in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #13 0x7f7aa32b00ef in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #14 0x7f7aa3392dc9 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #15 0x7f7aa339a2f5 in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #16 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #17 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #18 0x7f7aa29baec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #19 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ SUMMARY: AddressSanitizer: SEGV
+ /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2509
+ GfxIndexedColorSpace::mapColorToBase(GfxColor*, GfxColor*)
+
+ poppler/GfxState.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 8947c6bc1dcb768b9d9c03a7a5db1573abdc2e87
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 26 00:47:59 2014 +0100
+
+ Forgot my (C) in the last commit
+
+ poppler/TextOutputDev.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 1d7095ab7bdf0f14c3bfe99d6d5985bce98abe16
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 25 22:29:07 2014 +0100
+
+ Fix Heap-buffer-overflow in TextPage::updateFont
+
+ Bug #76442
+
+ poppler/TextOutputDev.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 37ad83d69bd1d10da6ea1eb559c4bd320917ae25
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 22 17:33:55 2014 +0100
+
+ Reorder the if check condition
+
+ I think the previous condition was correct anyway because of the
+ extra -1 in the i check
+ but it really makes more sense to have the i check first
+
+ Bug #76478
+
+ goo/gfile.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 3535d658095ffa49ef8615d69843afa9c5ada061
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 22 17:29:46 2014 +0100
+
+ Make the test rect go to xMax, yMax not xMax-1,yMax-1
+
+ I don't understand why the -1 is there and removing
+ it actually fixes bug #76387
+
+ splash/Splash.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 1e93c3f2d1c86edd40ca283ed422089f64886d04
+Author: William Bader <williambader@hotmail.com>
+Date: Sat Mar 15 17:14:21 2014 +0100
+
+ Fix regression when creating level1 PS
+
+ Bug #75241
+
+ poppler/PreScanOutputDev.cc | 16 ++++++++++++++--
+ poppler/PreScanOutputDev.h | 3 ++-
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+commit 1ea2eb412d12d97eaf49d1e51d7fda7abd8fbf9d
+Author: Jason Crain <jason@aquaticape.us>
+Date: Wed Mar 12 00:34:13 2014 +0100
+
+ Limit numeric parsing of character names
+
+ Bug #38456
+
+ poppler/GfxFont.cc | 139
+ ++++++++++++++++++++++++++++++++++--------------
+ poppler/GlobalParams.cc | 4 +-
+ 2 files changed, 102 insertions(+), 41 deletions(-)
+
+commit e24cbeae22d6c8630e292897bd982a87e6290ca6
+Author: Steven Lee <roc.sky@gmail.com>
+Date: Tue Mar 11 21:24:59 2014 +0100
+
+ Fix TIFF writting in Windows
+
+ Bug #75969
+
+ goo/TiffWriter.cc | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+commit b984a3b5946ebcd736e0583a10eb614cede3388a
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Wed Mar 5 11:19:48 2014 +0200
+
+ glib: Use flags argument in poppler_structure_element_get_text()
+
+ Instead of accepting a boolean argument to enable recursive text
+ extraction,
+ use a flags value. Text extraction may add features in the future (for
+ example, allowing using alternate text as replacement for inline
+ figures),
+ and this will allow to extend the method without introducing ABI
+ or API
+ breakage.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=75796
+
+ glib/poppler-structure-element.cc | 12 +++++++-----
+ glib/poppler-structure-element.h | 14 +++++++++++++-
+ glib/reference/poppler-sections.txt | 3 +++
+ 3 files changed, 23 insertions(+), 6 deletions(-)
+
+commit 94df09de1e07d442895ec1fb5cc23cacd9826552
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Thu Mar 6 10:44:51 2014 +0200
+
+ glib: Add missing underscore in method name
+
+ The correct name is poppler_structure_element_get_form_state().
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=75827
+
+ glib/poppler-structure-element.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7ddd03f9a00dcf505921821c55bebe6817aa3605
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 5 17:48:39 2014 +0100
+
+ Rename getNumElements, getElement and appendElement as getNumChildren,
+ getChild and appendChild
+
+ It's more consistent with other internal API and less confusing.
+
+ glib/poppler-structure-element.cc | 16 ++++++++--------
+ poppler/StructElement.cc | 6 +++---
+ poppler/StructElement.h | 8 ++++----
+ poppler/StructTreeRoot.cc | 4 ++--
+ poppler/StructTreeRoot.h | 8 ++++----
+ 5 files changed, 21 insertions(+), 21 deletions(-)
+
+commit 7d6a5b65f8497537248d405177ae141f3765a419
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 5 17:40:14 2014 +0100
+
+ glib: Update the documentation symbols after the PopplerStructureScope
+ rename
+
+ glib/reference/poppler-sections.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 9282b5a26e9ce81d81d42c0cbe449543c8366b7c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 5 17:37:38 2014 +0100
+
+ glib: Rename PopplerStructureScope as PopplerStructureTableScope
+
+ It's a table specific attribute
+
+ glib/poppler-structure-element.cc | 14 +++++++-------
+ glib/poppler-structure-element.h | 12 ++++++------
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 9888eb65c6fad0eabcf525a7e88941dec2a27e92
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Thu Sep 26 19:36:12 2013 +0300
+
+ glib: Implement accessors for element attributes
+
+ Implement inspecting the standard attributes of
+ PopplerStructureElement
+ objects.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=64821
+
+ glib/poppler-structure-element.cc | 1279
+ ++++++++++++++++++++++++++++++++++-
+ glib/poppler-structure-element.h | 252 ++++++-
+ glib/reference/poppler-sections.txt | 84 +++
+ 3 files changed, 1597 insertions(+), 18 deletions(-)
+
+commit b346df59ef0775f5bd74a9f7379b5f430ccd7b79
+Author: Adam Reichold <adamreichold@myopera.com>
+Date: Tue Mar 4 23:40:59 2014 +0100
+
+ Qt: Expose document-supplied text direction
+
+ qt4/src/poppler-document.cc | 17 +++++++++++++++++
+ qt4/src/poppler-qt4.h | 10 +++++++++-
+ qt5/src/poppler-document.cc | 17 +++++++++++++++++
+ qt5/src/poppler-qt5.h | 10 +++++++++-
+ 4 files changed, 52 insertions(+), 2 deletions(-)
+
+commit 2fc38c1866243598e22be07f0177e7d9385542d5
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Fri Feb 28 19:14:36 2014 +0200
+
+ glib: Fixes in the API reference documentation
+
+ - Remove the references to non-existent methods for
+ PopplerStructureElement,
+ and point to PopplerStructureElementIter instead to point out how to
+ obtain the structure tree.
+ - Remove a non-existent include in poppler-docs.sgml
+ - Add POPPLER_TYPE_TEXT_SPAN to the list of private symbols.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=75615
+
+ glib/poppler-structure-element.cc | 6 +++---
+ glib/reference/poppler-docs.sgml | 1 -
+ glib/reference/poppler-sections.txt | 1 +
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit cfe47a655ec5e280168e000da85bbf13f5f5f8b8
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Fri Feb 28 19:17:45 2014 +0200
+
+ glib: Remove poppler_text_span_is_link() in header
+
+ The method poppler_text_span_is_link() does not exist, and must
+ be removed from the API header.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=75613
+
+ glib/poppler-structure-element.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 7a2db63b5f7cae4bc215baa0859c4d4f8a660951
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Wed Feb 26 20:16:29 2014 +0200
+
+ glib: Remove unneeded POPPLER_STRUCTURE_ELEMENT_UNKNOWN
+
+ The enum value POPPLER_STRUCTURE_ELEMENT_UNKNOWN because Poppler does
+ not add invalid StructElements ("invalid" being nodes of type
+ StructElement::Unknown) to the Tagged-PDF structure tree. That means
+ that poppler-glib does not need to expose it in the API. An assertion
+ is left to aid in finding issues when using debug builds.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=75541
+
+ glib/poppler-structure-element.cc | 12 +++++++-----
+ glib/poppler-structure-element.h | 1 -
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+commit db909c2a14f962234a813ba9853535b9692cfd5a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 26 22:09:44 2014 +0100
+
+ Try harder to open broken files
+
+ Bug #75232
+
+ poppler/PDFDoc.cc | 33 ++++++++++++++++++++++-----------
+ poppler/PDFDoc.h | 8 ++++----
+ 2 files changed, 26 insertions(+), 15 deletions(-)
+
+commit b2394eee5384edf4128d598030989e66d64714ef
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Mon Feb 10 20:29:35 2014 +0200
+
+ Tagged-PDF: Fix parsing of attached element attributes
+
+ The wrong object was used as attribute dictionary, which caused
+ a segmentation fault when parsing PDF files in which the structure
+ elements included attributes attached to them. This patch fixes the
+ issue.
+
+ Thanks to Joanmarie Diggs <jdiggs@igalia.com> for helping in
+ debugging the problem.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=74805
+
+ poppler/StructElement.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c549b5e9ce2dcc8beb2511ee315bfff2fdfdf6e8
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Sun Feb 9 18:31:22 2014 +0200
+
+ glib: Add poppler_structure_element_is_grouping()
+
+ Implement a method to check whether a structure element is a grouping
+ element, wrapping the StructElement::isGrouping() method.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=74753
+
+ glib/poppler-structure-element.cc | 20 ++++++++++++++++++++
+ glib/poppler-structure-element.h | 1 +
+ glib/reference/poppler-sections.txt | 1 +
+ 3 files changed, 22 insertions(+)
+
+commit 6fbd6cb85bdd32dc5a3d4c3c719556269a4488ac
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Fri Feb 21 15:02:44 2014 +0200
+
+ glib: Handle missing structure element types
+
+ Element Art (article); RB, RP, RB (Ruby text inner elements); and
+ WT, WP (Warichu inner elements) were not being handled. This adds
+ the corresponding handling in poppler-glib. Also, the "default" case
+ in the switch in poppler_structure_element_get_type() is removed, so
+ the compiler can emit warnings when enum values are not handled.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=75323
+
+ glib/poppler-structure-element.cc | 25 +++++++++++++++++++------
+ glib/poppler-structure-element.h | 9 +++++++--
+ 2 files changed, 26 insertions(+), 8 deletions(-)
+
+commit 63e9c0b67fa2e64ca20258d873a849386c7eb295
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date: Mon Feb 17 23:58:09 2014 +0100
+
+ Some error() usage fixes
+
+ poppler/Hints.cc | 3 ++-
+ poppler/JBIG2Stream.cc | 4 ++--
+ poppler/PSOutputDev.cc | 4 ++--
+ poppler/SecurityHandler.cc | 3 ++-
+ poppler/StructTreeRoot.cc | 3 ++-
+ qt4/src/poppler-annotation.cc | 6 +++---
+ qt5/src/poppler-annotation.cc | 6 +++---
+ utils/HtmlOutputDev.cc | 11 ++++++-----
+ 8 files changed, 22 insertions(+), 18 deletions(-)
+
+commit 8f2d847f1d0224a297e642944f8da9c1409732b6
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date: Mon Feb 17 23:56:49 2014 +0100
+
+ Clang++ plugin that checks for usage errors in GooString::format-style
+ calls
+
+ goo/GooString.h | 12 +-
+ poppler/Error.h | 4 +-
+ test/goostring-format-checker/README | 16 +
+ .../goostring-format-checker.cc | 369
+ +++++++++++++++++++++
+ 4 files changed, 397 insertions(+), 4 deletions(-)
+
+commit d7d61dcda91910f7eb2548b19e8380d7c3232dd3
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Wed Feb 12 21:50:38 2014 +0100
+
+ blend usage in PDF with spot colors casue random output
+
+ The reason for the random colors is the uninitialized local variable
+ cBlend. The blend functions only fills offset 0 to 3, so offset 4
+ up to 4 + SPOT_NCOMPS are left uninitialized, but all offsets are
+ stored in the bitmap.
+ So we need to initialize these offsets with 0!
+
+ Bug #74883
+
+ splash/Splash.cc | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+commit b2905a0d299cc09fcd219afe49cb370f6db61c5a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 10 20:19:07 2014 +0100
+
+ increase gtk3 dependency
+
+ gtk_tree_view_set_activate_on_single_click was introduced in 3.8
+
+ cmake/modules/FindGTK.cmake | 2 +-
+ configure.ac | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 71d4041b061c109a965e72230640cf8ee616dac3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 10 20:16:46 2014 +0100
+
+ Make sure number of least objects in hints table is valid
+
+ Bug #74741
+
+ poppler/Hints.cc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit a865f13def88153fdbe8a0a054d2005e3e2bb737
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 9 23:22:07 2014 +0100
+
+ Fix cmake build
+
+ glib/CMakeLists.txt | 2 ++
+ glib/demo/CMakeLists.txt | 1 +
+ 2 files changed, 3 insertions(+)
+
+commit d6fde0fac0120b1622942d8344d5153d9abf3e1e
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Wed May 29 23:44:03 2013 +0300
+
+ glib-demo: Pane showing the document structure
+
+ Adds a new pane in poppler-glib-demo showing the structure for
+ Tagged-PDF
+ documents. It also serves as an example on how to to use the API for
+ PopplerStructure and PopplerStructureElement.
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/main.c | 2 +
+ glib/demo/taggedstruct.c | 232
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/taggedstruct.h | 31 +++++++
+ 4 files changed, 267 insertions(+)
+
+commit 0f9fa775c469c03d1613b955ee7b06b823e6e080
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Thu Sep 26 17:50:51 2013 +0300
+
+ glib: Expose inline attributes of structure elements
+
+ Allows obtaining inline text attributes from structure elements. The
+ text
+ is divived into "spans", which are groups of consecutive glyphs
+ that share
+ their attributes. Each one of those is represented by a
+ PopplerTextSpan,
+ which gives information about the text font and color, and the
+ link target
+ for links. The list of PopplerTextSpans is created lazily when
+ first used.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=64821
+
+ glib/poppler-structure-element.cc | 269
+ ++++++++++++++++++++++++++++++++++++
+ glib/poppler-structure-element.h | 16 ++-
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 12 ++
+ 4 files changed, 297 insertions(+), 1 deletion(-)
+
+commit 8072d4b0e3ea10b4308f8172891f769f30466133
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Thu May 9 12:01:59 2013 +0300
+
+ glib: Expose the document structure tree
+
+ Implements a new PopplerStructureElement classe, which builds upon
+ StructTreeRoot and StructElement to expose the document structure of
+ tagged PDFs in the GLib binding.
+
+ Navigation of the structure tree is done by an iterator-based
+ interface,
+ using PopplerStructureElementIter.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=64821
+
+ glib/Makefile.am | 2 +
+ glib/poppler-private.h | 10 +
+ glib/poppler-structure-element.cc | 663
+ ++++++++++++++++++++++++++++++++++++
+ glib/poppler-structure-element.h | 112 ++++++
+ glib/poppler.h | 3 +
+ glib/reference/poppler-docs.sgml | 2 +
+ glib/reference/poppler-sections.txt | 37 ++
+ glib/reference/poppler.types | 2 +
+ 8 files changed, 831 insertions(+)
+
+commit 46b7470ae9846d7e6dbb72bbb3ff831acd954168
+Author: Germán Poo-Caamaño <gpoo@gnome.org>
+Date: Thu Jan 30 14:42:51 2014 -0800
+
+ glib-demo: Fix performance in text markup annotations
+
+ Fix https://bugs.freedesktop.org/show_bug.cgi?id=51487#c45
+
+ glib/demo/annots.c | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+commit 8a84b45674aed8c27a1d172b07eb0531c0ec14f1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 8 09:17:02 2014 +0100
+
+ glib: Fix gobject-introspection warnings
+
+ glib/poppler-page.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 899799df78c00fc2ca6d2d0e612536b87a871817
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Tue Feb 4 19:26:53 2014 +0200
+
+ Allow properly identifying grouping elements
+
+ Grouping elements in the Tagged-PDF structure should be identifiable
+ as
+ such (see section 14.8.4.2 "Grouping Elements" of the PDF
+ standard). Those
+ were previously reported as inline elements, which is quite not
+ correct.
+ This patch introduces a new StructElement::isGrouping() method which
+ correctly reports grouping elements as such.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=74520
+
+ poppler/StructElement.cc | 31 +++++++++++++++++++------------
+ poppler/StructElement.h | 1 +
+ 2 files changed, 20 insertions(+), 12 deletions(-)
+
+commit 27cd9a00bfebf0602e7ed29a8ee8e16ffff67bde
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date: Tue Feb 4 19:35:58 2014 +0200
+
+ Report LBody elements in Tagged-PDF structure as block elements
+
+ According to section 14.8.4.3 "Block-Level Structure Elements"
+ (in particular subsection 14.8.4.3.3 "List Elements"), structure
+ elements of type LBody must be reported as block elements. This
+ patch changes the reported type from elementTypeUndefined to
+ elementTypeBlock accordingly.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=74522
+
+ poppler/StructElement.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 4cda839cb489fe5cd4726109cb9ab8b0ba2fa563
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue Jan 28 06:06:09 2014 +1030
+
+ pdftops: ensure there is always a page size in the output
+
+ even if the PDF file as badly broken.
+
+ poppler/PSOutputDev.cc | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+commit 45a87afdf1372911aa1ba840557e61627cdc7b4f
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Dec 29 15:16:37 2013 +1030
+
+ cairo: clip to crop box
+
+ when printing the cairo surface may larger than the crop box
+
+ fixes https://bugzilla.gnome.org/show_bug.cgi?id=649886
+
+ poppler/CairoOutputDev.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 6d39a1d7b348329dd057a8e7c77bfd47921fc495
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Mon Dec 30 17:59:09 2013 +1030
+
+ pdftocairo: ensure page size and crop box works the same as pdftops
+
+ Bug 72312
+
+ utils/pdftocairo.1 | 26 +++++++++-----------------
+ utils/pdftocairo.cc | 20 +++++++++++++++-----
+ 2 files changed, 24 insertions(+), 22 deletions(-)
+
+commit b1da7e20dcef78ef6036418b37a47ba3f8818453
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu Dec 19 22:18:26 2013 +1030
+
+ pdftops: Only change paper size when different to previous size
+
+ Previously this check was done in the code (removed in previous
+ commit).
+ Moving this check into the pdfSetupPaper macro preserves page
+ independence.
+
+ Bug 72312
+
+ poppler/PSOutputDev.cc | 30 +++++++++++++++++++++++++-----
+ 1 file changed, 25 insertions(+), 5 deletions(-)
+
+commit 7ac7d3bad4b868950ee96fd9c5ece88632f8827c
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Dec 20 07:19:21 2013 +1030
+
+ pdftops: Remove origpagesizes mode and make -origpagesizes an alias
+ for -paper match
+
+ Bug 72312
+
+ poppler/PSOutputDev.cc | 9 ++-------
+ poppler/PSOutputDev.h | 4 ++--
+ utils/pdftops.1 | 30 ++++++++++--------------------
+ utils/pdftops.cc | 23 ++++++++++++++---------
+ 4 files changed, 28 insertions(+), 38 deletions(-)
+
+commit 31fc5181bc491ff2e4aee0ae05c0f611a36e585c
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Dec 20 07:16:37 2013 +1030
+
+ pdftops: Use crop box as page size
+
+ unless -nocrop is used. The fontends use the crop box as the page
+ size and
+ acroread uses the cropbox as the page size for display and printing.
+
+ Bug 72312
+
+ poppler/PSOutputDev.cc | 28 +++++++---------------------
+ 1 file changed, 7 insertions(+), 21 deletions(-)
+
+commit bf2049b17ac4706f472c59e50266f4eaf0ffaa32
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Dec 15 18:00:41 2013 +1030
+
+ pdftps: fix DocumentMedia/Page/Media/PageBBox DSC comments
+
+ Bug 72312
+
+ poppler/PSOutputDev.cc | 167
+ ++++++++++++++++++++++++++--------------
+ poppler/PSOutputDev.h | 6 +-
+ qt4/src/poppler-ps-converter.cc | 1 +
+ qt5/src/poppler-ps-converter.cc | 1 +
+ utils/pdftops.cc | 1 +
+ 5 files changed, 119 insertions(+), 57 deletions(-)
+
+commit fe49033c9bd2103c13d4eb59983e06fdcdd33a8d
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Sat Dec 14 16:05:09 2013 +1030
+
+ pdftops: ensure paper size takes into account rotation
+
+ Bug 72312
+
+ poppler/PSOutputDev.cc | 48
+ ++++++++++++++++++++----------------------------
+ 1 file changed, 20 insertions(+), 28 deletions(-)
+
+commit 31edf585e62f4e91b7b64295cc8b978ac466ce58
+Author: Bogdan Cristea <cristeab@gmail.com>
+Date: Mon Jan 27 20:06:11 2014 +0100
+
+ [qt] Improve compilation under Win 8 with Visual Studio 2012
+
+ Bug #73111
+
+ goo/GooMutex.h | 3 ++-
+ goo/GooTimer.h | 2 ++
+ goo/gfile.h | 2 ++
+ poppler/PDFDoc.cc | 4 +---
+ poppler/XpdfPluginAPI.h | 2 ++
+ poppler/poppler-config.h.cmake | 18 ++++++++++++++++--
+ poppler/poppler-config.h.in | 18 ++++++++++++++++--
+ qt4/tests/stress-threads-qt4.cpp | 5 +++++
+ qt5/src/poppler-private.h | 6 ++++--
+ qt5/tests/stress-threads-qt5.cpp | 5 +++++
+ test/perf-test.cc | 1 -
+ 11 files changed, 55 insertions(+), 11 deletions(-)
+
+commit 834cd18e3ddfda44a11316290f7eee98cd871305
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 26 16:10:20 2014 +0100
+
+ Use c99 for the c compiler
+
+ cmake/modules/PopplerMacros.cmake | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 03674a141a96806e5e1a134dc3dec2ee61b68713
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Jan 26 12:43:13 2014 +0100
+
+ qt4/qt5: add GCC visibility export attributes
+
+ this does no actual changes to the exported symbols, but can help in
+ hiding symbols if the right GCC flags for symbols visibility are
+ specified
+
+ qt4/src/poppler-export.h | 3 +++
+ qt5/src/poppler-export.h | 3 +++
+ 2 files changed, 6 insertions(+)
+
+commit 52b46d05219cf9898ee4adae7c8c2702adb1ba23
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Jan 26 12:38:03 2014 +0100
+
+ qt4/qt5: improve naming of internal export/import macros
+
+ use something less generic than LIB_EXPORT/LIB_IMPORT
+
+ qt4/src/poppler-export.h | 12 ++++++------
+ qt5/src/poppler-export.h | 12 ++++++------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 7a8bcea11ad71fccbbba2787fc442f6ba4bf7100
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jan 23 22:34:07 2014 +0100
+
+ cmake: install JpegWriter.h depending on libjpeg
+
+ ... and not libopenjpeg
+
+ CMakeLists.txt | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+commit 57f34f525fa2c2e62ebc7383ceba48ebc80ebba6
+Author: Andres Gomez <agomez@igalia.com>
+Date: Wed Jan 8 12:26:14 2014 +0200
+
+ glib-demo: Fix conding style issue in render.c
+
+ glib/demo/render.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 3fac919eeb1ca1abfdbb4f9923a454e532256f5c
+Author: Andres Gomez <agomez@igalia.com>
+Date: Wed Jan 8 12:25:52 2014 +0200
+
+ glib-demo: Fix trailing whitespaces in render.c
+
+ glib/demo/render.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 92ea15642a6d3fe65d66d5c59fb6bed54e060e5d
+Author: Christian Persch <chpe@gnome.org>
+Date: Fri Jan 3 23:31:56 2014 +0100
+
+ glib: Install error callback
+
+ Install an error callback so that poppler error messages can be
+ redirected
+ to the GLib logging API.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=73269
+
+ glib/poppler.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 47 insertions(+)
+
+commit f99128e38bbff43623d5cd1c1bc27fd789d0bc0c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jan 19 16:03:35 2014 +0100
+
+ glib: Make vertices a constructor parameter of line annotations
+
+ It's a required field in the line annotation.
+
+ glib/demo/annots.c | 4 +---
+ glib/poppler-annot.cc | 12 ++++++++++--
+ glib/poppler-annot.h | 4 +++-
+ 3 files changed, 14 insertions(+), 6 deletions(-)
+
+commit 587a40f90e4ac5a1b6ab9044495a1ae403bc8c58
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jan 19 15:58:43 2014 +0100
+
+ annots: Fix memory leak when setting AnnotTextMarkup quads twice
+
+ poppler/Annot.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 69e73da1fbab9bf3365b40dced1008b0283ac931
+Author: Germán Poo-Caamaño <gpoo@gnome.org>
+Date: Wed Nov 20 11:53:30 2013 -0800
+
+ glib-demo: Add support for PopplerTextAnnotMarkup
+
+ * The subtypes are: Highlihght, Squiggly, StrikeOut and Underline.
+ * Use ScrolledWindow for annotation properties to make room to
+ show the Quadrilaterals of TextMarkup annotations.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=51487
+
+ glib/demo/annots.c | 232
+ +++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 206 insertions(+), 26 deletions(-)
+
+commit 9a7699ebe3e644ba845ef75d9295c88d321cb934
+Author: Germán Poo-Caamaño <gpoo@gnome.org>
+Date: Mon Nov 18 16:42:08 2013 -0800
+
+ glib: Add PopplerAnnotTextMarkup class and subtypes
+
+ The subtypes are: Highlihght, Squiggly, StrikeOut and Underline.
+ It adds convenient methods to set/get/free quadrilaterals
+ necessaries for TextMarkup annotations.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=51487
+
+ glib/poppler-annot.cc | 264
+ ++++++++++++++++++++++++++++++++++++
+ glib/poppler-annot.h | 23 ++++
+ glib/poppler-page.cc | 6 +
+ glib/poppler-private.h | 1 +
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 11 ++
+ 6 files changed, 306 insertions(+)
+
+commit 40040b41216a3dcc833fc224f1c6f15517a88aed
+Author: Germán Poo-Caamaño <gpoo@gnome.org>
+Date: Mon Nov 18 16:26:27 2013 -0800
+
+ glib: Add PopplerQuadrilateral boxed type
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=51487
+
+ glib/poppler-page.cc | 53
+ +++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h | 33 +++++++++++++++++++++++
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 6 +++++
+ 4 files changed, 93 insertions(+)
+
+commit c8a845cf7c7752d3b7dad06013d3154812c66c92
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 14 20:26:59 2014 +0100
+
+ Do not define -ansi
+
+ We are using long long that is not defined in ansi, so forcing ansi
+ strictness does
+ not make any sense. Bug #72499
+
+ cmake/modules/PopplerMacros.cmake | 5 -----
+ configure.ac | 15 ---------------
+ 2 files changed, 20 deletions(-)
+
+commit f0c13ee72e8a7df17bdf847f5e922c01acee1f0d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jan 6 21:55:07 2014 +0100
+
+ C for last commit
+
+ poppler/Parser.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 1e1b9991a911fb610e74119979b20b179f3f2a67
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jan 6 21:51:25 2014 +0100
+
+ Fix rendering of pdf file from KDE bug 329600
+
+ It used to work and regressed with large file support (used to work
+ because stuff just overflowed)
+
+ lexer->getPos needs lexer to be a stream, if it is not, just resort
+ to the +5000 kludge
+
+ poppler/Parser.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 4cd5c349cfbc745688c0c38fc50d364092bc3718
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jan 6 21:48:25 2014 +0100
+
+ Update popplers (C)
+
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7ca2f42b06757587dfd9521fb1c6c7d657545553
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jan 6 15:48:22 2014 +0100
+
+ Learn about automake 1.14
+
+ autogen.sh | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+commit de9643b6f76774ebe131c4787df82dd213181c71
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jan 3 00:53:37 2014 +0100
+
+ 0.25.1
+
+ CMakeLists.txt | 2 +-
+ NEWS | 19 +++++++++++++++++++
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 5 files changed, 23 insertions(+), 4 deletions(-)
+
commit e238c1f83fd5f667336bfbb0e9a59569ff638ecc
Author: Albert Astals Cid <aacid@kde.org>
Date: Fri Jan 3 00:29:28 2014 +0100
diff --git a/Build/source/libs/poppler/poppler-0.25.1/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.25.2/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.2/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.1/INSTALL b/Build/source/libs/poppler/poppler-0.25.2/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.25.2/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.25.1/Makefile.am b/Build/source/libs/poppler/poppler-0.25.2/Makefile.am
index e7e5bace9d4..e7e5bace9d4 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.25.2/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.1/NEWS b/Build/source/libs/poppler/poppler-0.25.2/NEWS
index 8da297e70cf..12e6f400cb8 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/NEWS
+++ b/Build/source/libs/poppler/poppler-0.25.2/NEWS
@@ -1,3 +1,51 @@
+Release 0.25.2
+ core:
+ * Tagged-PDF support
+ * Open some broken files. Bug #75232
+ * Fix crashes on broken files
+ * Fix regression parsing some broken files. KDE Bug #329600
+ * Improve compilation under Win 8 with Visual Studio 2012. Bug #73111
+ * PSOutputDev: Ensure paper size takes into account rotation. Bug #72312
+ * PSOutputDev: Fix DocumentMedia/Page/Media/PageBBox DSC comments
+ * PSOutputDev: Use crop box as page size
+ * PSOutputDev: Remove origpagesizes mode and make -origpagesizes an alias for -paper match
+ * PSOutputDev: Only change paper size when different to previous size
+ * PSOutputDev: Ensure there is always a page size in the output
+ * PSOutputDev: Fix regression when creating level1 PS. Bug #75241
+ * CairoOutputDev: Clip to crop box. Gnome Bug #649886
+ * Splash: Blend usage in PDF with spot colors casue random output. Bug #74883
+ * Splash: Fix off by one that caused crash in a file. Bug #76387
+ * Make sure number of least objects in hints table is valid. Bug #74741
+ * Limit numeric parsing of character names. Bug #38456
+
+ glib:
+ * Tagged-PDF support
+ * Annotation improvements
+ * Install error callback. Bug #73269
+ * Fix gobject-introspection warnings
+ * demo: Fix performance in text markup annotations
+ * Increase gtk3 dependency
+
+ qt4:
+ * Improve naming of internal export/import macros
+ * Add GCC visibility export attributes
+ * Expose document-supplied text direction
+
+ qt5:
+ * Improve naming of internal export/import macros
+ * Add GCC visibility export attributes
+ * Expose document-supplied text direction
+
+ utils:
+ * pdftocairo: Ensure page size and crop box works the same as pdftops
+ * Fix TIFF writting in Windows. Bug #75969
+
+ buildsystem:
+ * Learn about automake 1.14
+ * Do not define -ansi. Bug #72499
+ * cmake: Install JpegWriter.h depending on libjpeg
+ * cmake: Use c99 for the c compiler
+
Release 0.25.1
core:
* GooString format: Added some tests + improved documentation
diff --git a/Build/source/libs/poppler/poppler-0.25.1/README b/Build/source/libs/poppler/poppler-0.25.2/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/README
+++ b/Build/source/libs/poppler/poppler-0.25.2/README
diff --git a/Build/source/libs/poppler/poppler-0.25.1/README-XPDF b/Build/source/libs/poppler/poppler-0.25.2/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.25.2/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.25.1/TODO b/Build/source/libs/poppler/poppler-0.25.2/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/TODO
+++ b/Build/source/libs/poppler/poppler-0.25.2/TODO
diff --git a/Build/source/libs/poppler/poppler-0.25.1/config.h.cmake b/Build/source/libs/poppler/poppler-0.25.2/config.h.cmake
index b707ba72249..b707ba72249 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.2/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.1/config.h.in b/Build/source/libs/poppler/poppler-0.25.2/config.h.in
index 12fb1a09ec6..12fb1a09ec6 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/configure.ac b/Build/source/libs/poppler/poppler-0.25.2/configure.ac
index 9c5c7ee3215..b21d83eca26 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.25.2/configure.ac
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[25])
-m4_define([poppler_version_micro],[1])
+m4_define([poppler_version_micro],[2])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
@@ -25,21 +25,6 @@ AC_PROG_CC_STDC
# CXX="gcc"
#fi
AC_PROG_CXX
-if test "x$GXX" = "xyes"; then
- case "$host_os" in
- cygwin* | mingw*)
- ;;
- *)
- case "${CXXFLAGS}" in
- *-std=*)
- ;;
- *)
- CXXFLAGS="$CXXFLAGS -ansi"
- ;;
- esac
- ;;
- esac
-fi
AC_PROG_INSTALL
dnl ##### Check for pkgconfig
@@ -717,9 +702,9 @@ AC_ARG_ENABLE(gtk-test,
enable_gtk_test=$enableval,
enable_gtk_test="try")
if test x$enable_gtk_test = xyes; then
- PKG_CHECK_MODULES(GTK_TEST, gtk+-3.0 >= 3.0 gdk-pixbuf-2.0)
+ PKG_CHECK_MODULES(GTK_TEST, gtk+-3.0 >= 3.8 gdk-pixbuf-2.0)
elif test x$enable_gtk_test = xtry; then
- PKG_CHECK_MODULES(GTK_TEST, gtk+-3.0 >= 3.0 gdk-pixbuf-2.0,
+ PKG_CHECK_MODULES(GTK_TEST, gtk+-3.0 >= 3.8 gdk-pixbuf-2.0,
[enable_gtk_test="yes"],
[enable_gtk_test="no"])
fi
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiTrueType.cc
index cd11d6ff2c6..cd11d6ff2c6 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1.cc
index 8fa10a016b6..8fa10a016b6 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.25.2/fofi/Makefile.am
index c4654dd28b9..c4654dd28b9 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.25.2/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.25.2/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.25.2/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.25.2/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/GooList.h b/Build/source/libs/poppler/poppler-0.25.2/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.25.2/goo/GooMutex.h
index e9d5a543ff7..5fef47ee694 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/GooMutex.h
@@ -19,6 +19,7 @@
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2013 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
//
// 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
@@ -40,7 +41,9 @@
// gDestroyMutex(&m);
#ifdef _WIN32
-
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
#include <windows.h>
typedef CRITICAL_SECTION GooMutex;
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/GooString.cc
index 8591d95cd3e..8591d95cd3e 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/GooString.h b/Build/source/libs/poppler/poppler-0.25.2/goo/GooString.h
index 3f8bdd7d1b6..b8020b62992 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/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, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012-2014 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
@@ -53,6 +53,12 @@
#include <stdlib.h> // for NULL
#include "gtypes.h"
+#ifdef __clang__
+# define GOOSTRING_FORMAT __attribute__((__annotate__("gooformat")))
+#else
+# define GOOSTRING_FORMAT
+#endif
+
class GooString {
public:
@@ -112,7 +118,7 @@ public:
// t -- GooString *
// w -- blank space; arg determines width
// To get literal curly braces, use {{ or }}.
- static GooString *format(const char *fmt, ...);
+ static GooString *format(const char *fmt, ...) GOOSTRING_FORMAT;
static GooString *formatv(const char *fmt, va_list argList);
// Destructor.
@@ -139,7 +145,7 @@ public:
GooString *append(const char *str, int lengthA=CALC_STRING_LEN);
// Append a formatted string.
- GooString *appendf(const char *fmt, ...);
+ GooString *appendf(const char *fmt, ...) GOOSTRING_FORMAT;
GooString *appendfv(const char *fmt, va_list argList);
// Insert a character or string.
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.25.2/goo/GooTimer.h
index d77373e90c1..d5957b0658b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/GooTimer.h
@@ -8,6 +8,7 @@
// Copyright 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright 2010 Hib Eris <hib@hiberis.nl>
// Copyright 2011 Albert Astals cid <aacid@kde.org>
+// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
// Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team
//
//========================================================================
@@ -26,6 +27,9 @@
#endif
#ifdef _WIN32
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
#include <windows.h>
#endif
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.25.2/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.25.2/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.25.2/goo/Makefile.am
index a48b20ec493..a48b20ec493 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.25.2/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.25.2/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/TiffWriter.cc
index d372a5bdfce..316008778b1 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/TiffWriter.cc
@@ -8,6 +8,7 @@
// Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012 Pino Toscano <pino@kde.org>
+// Copyright (C) 2014 Steven Lee <roc.sky@gmail.com>
//
//========================================================================
@@ -17,6 +18,10 @@
#include <string.h>
+#ifdef _WIN32
+#include <io.h>
+#endif
+
extern "C" {
#include <tiffio.h>
}
@@ -151,7 +156,13 @@ bool TiffWriter::init(FILE *openedFile, int width, int height, int hDPI, int vDP
return false;
}
+#ifdef _WIN32
+ //Convert C Library handle to Win32 Handle
+ priv->f = TIFFFdOpen(_get_osfhandle(fileno(openedFile)), "-", "w");
+#else
priv->f = TIFFFdOpen(fileno(openedFile), "-", "w");
+#endif
+
if (!priv->f) {
return false;
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.25.2/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/gfile.cc
index 44beddd5a13..6fd4cbad105 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/gfile.cc
@@ -19,7 +19,7 @@
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2008 Adam Batkin <adam@batkin.net>
// Copyright (C) 2008, 2010, 2012, 2013 Hib Eris <hib@hiberis.nl>
-// Copyright (C) 2009, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2012, 2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
@@ -492,7 +492,7 @@ FILE *openFile(const char *path, const char *mode) {
}
}
wPath[i] = (wchar_t)0;
- for (i = 0; mode[i] && i < sizeof(mode) - 1; ++i) {
+ for (i = 0; (i < sizeof(mode) - 1) && mode[i]; ++i) {
wMode[i] = (wchar_t)(mode[i] & 0xff);
}
wMode[i] = (wchar_t)0;
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/gfile.h b/Build/source/libs/poppler/poppler-0.25.2/goo/gfile.h
index 5f546f11156..d4c8d92e081 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/gfile.h
@@ -20,6 +20,7 @@
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -39,6 +40,9 @@ extern "C" {
# ifdef FPTEX
# include <win32lib.h>
# else
+# ifndef NOMINMAX
+# define NOMINMAX
+# endif
# include <windows.h>
# endif
#elif defined(ACORN)
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/gmem.h b/Build/source/libs/poppler/poppler-0.25.2/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/grandom.h b/Build/source/libs/poppler/poppler-0.25.2/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.25.2/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.25.2/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.25.2/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.25.2/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/gtk-doc.make b/Build/source/libs/poppler/poppler-0.25.2/gtk-doc.make
index 104c3993f3e..e7916563d75 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.25.2/gtk-doc.make
@@ -49,9 +49,13 @@ REPORT_FILES = \
$(DOC_MODULE)-undeclared.txt \
$(DOC_MODULE)-unused.txt
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+gtkdoc-check.test: Makefile
+ $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+ echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+ chmod +x $@
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
-if ENABLE_GTK_DOC
if GTK_DOC_BUILD_HTML
HTML_BUILD_STAMP=html-build.stamp
else
@@ -63,9 +67,11 @@ else
PDF_BUILD_STAMP=
endif
-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-else
-all-local:
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+if ENABLE_GTK_DOC
+all-local: all-gtk-doc
endif
docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
@@ -83,8 +89,10 @@ setup-build.stamp:
files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
if test "x$$files" != "x" ; then \
for file in $$files ; do \
+ destdir=`dirname $(abs_builddir)/$$file`; \
+ test -d "$$destdir" || mkdir -p "$$destdir"; \
test -f $(abs_srcdir)/$$file && \
- cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
done; \
fi; \
fi
@@ -101,7 +109,7 @@ GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects";
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
$(GTK_DOC_V_SCAN)_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -212,6 +220,9 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
clean-local:
@rm -f *~ *.bak
@rm -rf .libs
+ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+ rm -f $(DOC_MODULE).types; \
+ fi
distclean-local:
@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
@@ -256,15 +267,17 @@ uninstall-local:
#
# Require gtk-doc when making dist
#
-if ENABLE_GTK_DOC
+if HAVE_GTK_DOC
dist-check-gtkdoc: docs
else
dist-check-gtkdoc:
- @echo "*** gtk-doc must be installed and enabled in order to make dist"
+ @echo "*** gtk-doc is needed to run 'make dist'. ***"
+ @echo "*** gtk-doc was not found when 'configure' ran. ***"
+ @echo "*** please install gtk-doc and rerun 'configure'. ***"
@false
endif
-dist-hook: dist-check-gtkdoc dist-hook-local
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
@mkdir $(distdir)/html
@cp ./html/* $(distdir)/html
@-cp ./$(DOC_MODULE).pdf $(distdir)/
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.25.2/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.25.2/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.25.2/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler.pc.in b/Build/source/libs/poppler/poppler-0.25.2/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Annot.cc
index 90a6e5d09d3..ab48be63346 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Annot.cc
@@ -3706,6 +3706,7 @@ void AnnotTextMarkup::setQuadrilaterals(AnnotQuadrilaterals *quadPoints) {
obj1.arrayAdd (obj2.initReal (quadPoints->getY4(i)));
}
+ delete quadrilaterals;
quadrilaterals = new AnnotQuadrilaterals(obj1.getArray(), rect);
annotObj.dictSet ("QuadPoints", &obj1);
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Annot.h
index 8fde6a6736b..8fde6a6736b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Array.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/CMap.cc
index 6731ab5a1fa..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoFontEngine.cc
index 1546594f9ea..1546594f9ea 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoOutputDev.cc
index 77bd2458714..77bd2458714 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoOutputDev.h
index c9ae33d4c65..28f97fdda32 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoOutputDev.h
@@ -18,7 +18,7 @@
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2008, 2009, 2011-2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008, 2009, 2011-2014 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
//
@@ -121,6 +121,10 @@ public:
// text in Type 3 fonts will be drawn with drawChar/drawString.
virtual GBool interpretType3Chars() { return gFalse; }
+ // Does this device need to clip pages to the crop box even when the
+ // box is the crop box?
+ virtual GBool needClipToCropBox() { return gTrue; }
+
//----- initialization and control
// Start a page.
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Catalog.cc
index 446434687ba..446434687ba 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/CharCodeToUnicode.cc
index 16ba6d48649..16ba6d48649 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Dict.cc
index 4cf42dcd2c1..4cf42dcd2c1 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Error.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Error.h
index 88fc3ea4353..9e11733d803 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Error.h
@@ -17,6 +17,7 @@
// Copyright (C) 2005 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2014 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
@@ -33,6 +34,7 @@
#include <stdarg.h>
#include "poppler-config.h"
#include "goo/gtypes.h"
+#include "goo/GooString.h"
enum ErrorCategory {
errSyntaxWarning, // PDF syntax error which can be worked around;
@@ -53,6 +55,6 @@ extern void setErrorCallback(void (*cbk)(void *data, ErrorCategory category,
Goffset pos, char *msg),
void *data);
-extern void CDECL error(ErrorCategory category, Goffset pos, const char *msg, ...);
+extern void CDECL error(ErrorCategory category, Goffset pos, const char *msg, ...) GOOSTRING_FORMAT;
#endif
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Form.cc
index 661ed8972df..661ed8972df 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Form.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Function.cc
index 81829ec004a..67283dffe9f 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Function.cc
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006, 2008-2010, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2008-2010, 2013, 2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
@@ -1060,10 +1060,14 @@ public:
return;
}
--sp;
- if (sp + i + 1 >= psStackSize) {
+ if (unlikely(sp + i + 1 >= psStackSize)) {
error(errSyntaxError, -1, "Stack underflow in PostScript function");
return;
}
+ if (unlikely(sp + i + 1 < 0)) {
+ error(errSyntaxError, -1, "Stack overflow in PostScript function");
+ return;
+ }
stack[sp] = stack[sp + 1 + i];
}
void pop()
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Function.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Gfx.cc
index 90bf41e4965..90bf41e4965 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Gfx.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxFont.cc
index c54181b4150..9eadcc79cff 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxFont.cc
@@ -30,7 +30,7 @@
// Copyright (C) 2012 Yi Yang <ahyangyi@gmail.com>
// Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
-// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2013, 2014 Jason Crain <jason@aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -916,6 +916,88 @@ char *GfxFont::readEmbFontFile(XRef *xref, int *len) {
// Gfx8BitFont
//------------------------------------------------------------------------
+// Parse character names of the form 'Axx', 'xx', 'Ann', 'ABnn', or
+// 'nn', where 'A' and 'B' are any letters, 'xx' is two hex digits,
+// and 'nn' is decimal digits.
+static GBool parseNumericName(char *s, GBool hex, unsigned int *u) {
+ char *endptr;
+
+ // Strip leading alpha characters.
+ if (hex) {
+ int n = 0;
+
+ // Get string length while ignoring junk at end.
+ while (isalnum(s[n]))
+ ++n;
+
+ // Only 2 hex characters with optional leading alpha is allowed.
+ if (n == 3 && isalpha(*s)) {
+ ++s;
+ } else if (n != 2) {
+ return gFalse;
+ }
+ } else {
+ // Strip up to two alpha characters.
+ for (int i = 0; i < 2 && isalpha(*s); ++i)
+ ++s;
+ }
+
+ int v = strtol(s, &endptr, hex ? 16 : 10);
+
+ if (endptr == s)
+ return gFalse;
+
+ // Skip trailing junk characters.
+ while (*endptr != '\0' && !isalnum(*endptr))
+ ++endptr;
+
+ if (*endptr == '\0') {
+ if (u)
+ *u = v;
+ return gTrue;
+ }
+ return gFalse;
+}
+
+// Returns gTrue if the font has character names like xx or Axx which
+// should be parsed for hex or decimal values.
+static GBool testForNumericNames(Dict *fontDict, GBool hex) {
+ Object enc, diff, obj;
+ GBool numeric = gTrue;
+
+ fontDict->lookup("Encoding", &enc);
+ if (!enc.isDict()) {
+ enc.free();
+ return gFalse;
+ }
+
+ enc.dictLookup("Differences", &diff);
+ enc.free();
+ if (!diff.isArray()) {
+ diff.free();
+ return gFalse;
+ }
+
+ for (int i = 0; i < diff.arrayGetLength() && numeric; ++i) {
+ diff.arrayGet(i, &obj);
+ if (obj.isInt()) {
+ // All sequences must start between character codes 0 and 5.
+ if (obj.getInt() > 5)
+ numeric = gFalse;
+ } else if (obj.isName()) {
+ // All character names must sucessfully parse.
+ if (!parseNumericName(obj.getName(), hex, NULL))
+ numeric = gFalse;
+ } else {
+ numeric = gFalse;
+ }
+ obj.free();
+ }
+
+ diff.free();
+ return numeric;
+}
+
Gfx8BitFont::Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA,
GfxFontType typeA, Ref embFontIDA, Dict *fontDict):
GfxFont(tagA, idA, nameA, typeA, embFontIDA) {
@@ -930,6 +1012,7 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA
int code;
char *charName;
GBool missing, hex;
+ GBool numeric;
Unicode toUnicode[256];
CharCodeToUnicode *utu, *ctu2;
Unicode uBuf[8];
@@ -1244,9 +1327,9 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA
(charName[2] >= 'A' && charName[2] <= 'F'))) ||
(strlen(charName) == 2 &&
isxdigit(charName[0]) && isxdigit(charName[1]) &&
- ((charName[0] >= 'a' && charName[0] <= 'f') ||
- (charName[0] >= 'A' && charName[0] <= 'F') ||
- (charName[1] >= 'a' && charName[1] <= 'f') ||
+ // Only check idx 1 to avoid misidentifying a decimal
+ // number like a0
+ ((charName[1] >= 'a' && charName[1] <= 'f') ||
(charName[1] >= 'A' && charName[1] <= 'F')))) {
hex = gTrue;
}
@@ -1257,6 +1340,8 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA
}
}
+ numeric = testForNumericNames(fontDict, hex);
+
// construct the char code -> Unicode mapping object
ctu = CharCodeToUnicode::make8BitToUnicode(toUnicode);
@@ -1280,22 +1365,18 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA
&& (n = parseCharName(charName, uBuf, sizeof(uBuf)/sizeof(*uBuf),
gFalse, // don't check simple names (pass 1)
gTrue, // do check ligatures
- globalParams->getMapNumericCharNames(),
+ numeric,
hex,
gTrue))) { // do check variants
ctu->setMapping((CharCode)code, uBuf, n);
- } else if (globalParams->getMapUnknownCharNames()) {
- // if the 'mapUnknownCharNames' flag is set, do a simple pass-through
- // mapping for unknown character names
- if (charName && charName[0]) {
- for (n = 0; n < (int)(sizeof(uBuf)/sizeof(*uBuf)); ++n)
- if (!(uBuf[n] = charName[n]))
- break;
- ctu->setMapping((CharCode)code, uBuf, n);
- } else {
+ continue;
+ }
+
+ // if the 'mapUnknownCharNames' flag is set, do a simple pass-through
+ // mapping for unknown character names
+ if (globalParams->getMapUnknownCharNames()) {
uBuf[0] = code;
ctu->setMapping((CharCode)code, uBuf, 1);
- }
}
}
}
@@ -1495,7 +1576,7 @@ static int parseCharName(char *charName, Unicode *uBuf, int uLen,
if (names && (uBuf[0] = globalParams->mapNameToUnicodeText(charName))) {
return 1;
}
- if (numeric) {
+ if (globalParams->getMapNumericCharNames()) {
unsigned int n = strlen(charName);
// 3.3. otherwise, if the component is of the form "uni" (U+0075 U+006E
// U+0069) followed by a sequence of uppercase hexadecimal digits (0 .. 9,
@@ -1538,30 +1619,10 @@ static int parseCharName(char *charName, Unicode *uBuf, int uLen,
return 1;
}
}
- // Not in Adobe Glyph Mapping convention: look for names of the form 'Axx',
- // 'xx', 'Ann', 'ABnn', or 'nn', where 'A' and 'B' are any letters, 'xx' is
- // two hex digits, and 'nn' is 2-4 decimal digits
- if (hex && n == 3 && isalpha(charName[0]) &&
- isxdigit(charName[1]) && isxdigit(charName[2])) {
- sscanf(charName+1, "%x", (unsigned int *)uBuf);
- return 1;
- } else if (hex && n == 2 &&
- isxdigit(charName[0]) && isxdigit(charName[1])) {
- sscanf(charName, "%x", (unsigned int *)uBuf);
- return 1;
- } else if (!hex && n >= 2 && n <= 4 &&
- isdigit(charName[0]) && isdigit(charName[1])) {
- uBuf[0] = (Unicode)atoi(charName);
+ // Not in Adobe Glyph Mapping convention: look for names like xx
+ // or Axx and parse for hex or decimal values.
+ if (numeric && parseNumericName(charName, hex, uBuf))
return 1;
- } else if (n >= 3 && n <= 5 &&
- isdigit(charName[1]) && isdigit(charName[2])) {
- uBuf[0] = (Unicode)atoi(charName+1);
- return 1;
- } else if (n >= 4 && n <= 6 &&
- isdigit(charName[2]) && isdigit(charName[3])) {
- uBuf[0] = (Unicode)atoi(charName+2);
- return 1;
- }
}
// 3.5. otherwise, map the component to the empty string
return 0;
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxFont.h
index f9806681102..f9806681102 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState.cc
index c6f855b9495..addba68606c 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState.cc
@@ -16,7 +16,7 @@
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2006-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009, 2012 Koji Otani <sho@bbr.jp>
// Copyright (C) 2009, 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Christian Persch <chpe@gnome.org>
@@ -2503,7 +2503,7 @@ GfxColor *GfxIndexedColorSpace::mapColorToBase(GfxColor *color,
n = base->getNComps();
base->getDefaultRanges(low, range, indexHigh);
const int idx = (int)(colToDbl(color->c[0]) + 0.5) * n;
- if (likely(idx + n < (indexHigh + 1) * base->getNComps())) {
+ if (likely((idx + n < (indexHigh + 1) * base->getNComps()) && idx >= 0)) {
p = &lookup[idx];
for (i = 0; i < n; ++i) {
baseColor->c[i] = dblToCol(low[i] + (p[i] / 255.0) * range[i]);
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState.h
index 106b2c0bf00..106b2c0bf00 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParams.cc
index 01a31573d01..3d88646f7b3 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParams.cc
@@ -34,7 +34,7 @@
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2012 Peter Breitenlohner <peb@mppmu.mpg.de>
-// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2013, 2014 Jason Crain <jason@aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -633,7 +633,7 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
minLineWidth = 0.0;
overprintPreview = gFalse;
mapNumericCharNames = gTrue;
- mapUnknownCharNames = gFalse;
+ mapUnknownCharNames = gTrue;
printCommands = gFalse;
profileCommands = gFalse;
errQuiet = gFalse;
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParams.h
index c33a8024c04..c33a8024c04 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Hints.cc
index 49e201daa93..bdd0d322612 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Hints.cc
@@ -5,9 +5,10 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2010, 2012 Hib Eris <hib@hiberis.nl>
-// Copyright 2010, 2011, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010, 2011, 2013, 2014 Albert Astals Cid <aacid@kde.org>
// Copyright 2010, 2013 Pino Toscano <pino@kde.org>
// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2014 Fabio D'Urso <fabiodurso@hotmail.it>
//
//========================================================================
@@ -38,7 +39,7 @@ Hints::Hints(BaseStream *str, Linearization *linearization, XRef *xref, Security
pageObjectFirst = linearization->getObjectNumberFirst();
if (pageObjectFirst < 0 || pageObjectFirst >= xref->getNumObjects()) {
error(errSyntaxWarning, -1,
- "Invalid reference for first page object (%d) in linearization table ",
+ "Invalid reference for first page object ({0:d}) in linearization table ",
pageObjectFirst);
pageObjectFirst = 0;
}
@@ -176,6 +177,11 @@ void Hints::readPageOffsetTable(Stream *str)
inputBits = 0; // reset on byte boundary.
nObjectLeast = readBits(32, str);
+ if (nObjectLeast < 1) {
+ error(errSyntaxWarning, -1, "Invalid least number of objects reading page offset hints table");
+ nPages = 0;
+ return;
+ }
objectOffsetFirst = readBits(32, str);
if (objectOffsetFirst >= hintsOffset) objectOffsetFirst += hintsLength;
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/JBIG2Stream.cc
index bda7d523c74..4c5512311f6 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/JBIG2Stream.cc
@@ -15,13 +15,13 @@
//
// Copyright (C) 2006 Raj Kumar <rkumar@archive.org>
// Copyright (C) 2006 Paul Walmsley <paul@booyaka.com>
-// Copyright (C) 2006-2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2010, 2012, 2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 David Benjamin <davidben@mit.edu>
// Copyright (C) 2011 Edward Jiang <ejiang@google.com>
// 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>
+// Copyright (C) 2013, 2014 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
@@ -1840,7 +1840,7 @@ GBool JBIG2Stream::readSymbolDictSeg(Guint segNum, Guint length,
}
refBitmap = bitmaps[symID];
if (unlikely(refBitmap == NULL)) {
- error(errSyntaxError, curStr->getPos(), "Invalid ref bitmap for symbol ID {0:d} in JBIG2 symbol dictionary", symID);
+ error(errSyntaxError, curStr->getPos(), "Invalid ref bitmap for symbol ID {0:ud} in JBIG2 symbol dictionary", symID);
goto syntaxError;
}
bitmaps[numInputSyms + i] =
@@ -3384,8 +3384,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
if (atx[0] >= -8 && atx[0] <= 8) {
// set up the adaptive context
- if (y + aty[0] >= 0) {
- atP0 = bitmap->getDataPtr() + (y + aty[0]) * bitmap->getLineSize();
+ const int atY = y + aty[0];
+ if ((atY >= 0) && (atY < bitmap->getHeight())) {
+ atP0 = bitmap->getDataPtr() + atY * bitmap->getLineSize();
atBuf0 = *atP0++ << 8;
} else {
atP0 = NULL;
@@ -3499,8 +3500,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
if (atx[0] >= -8 && atx[0] <= 8) {
// set up the adaptive context
- if (y + aty[0] >= 0) {
- atP0 = bitmap->getDataPtr() + (y + aty[0]) * bitmap->getLineSize();
+ const int atY = y + aty[0];
+ if ((atY >= 0) && (atY < bitmap->getHeight())) {
+ atP0 = bitmap->getDataPtr() + atY * bitmap->getLineSize();
atBuf0 = *atP0++ << 8;
} else {
atP0 = NULL;
@@ -3607,8 +3609,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
if (atx[0] >= -8 && atx[0] <= 8) {
// set up the adaptive context
- if (y + aty[0] >= 0) {
- atP0 = bitmap->getDataPtr() + (y + aty[0]) * bitmap->getLineSize();
+ const int atY = y + aty[0];
+ if ((atY >= 0) && (atY < bitmap->getHeight())) {
+ atP0 = bitmap->getDataPtr() + atY * bitmap->getLineSize();
atBuf0 = *atP0++ << 8;
} else {
atP0 = NULL;
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/JBIG2Stream.h
index 0ee2518575c..0ee2518575c 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/JPEG2000Stream.cc
index 703d471c99a..703d471c99a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/JPEG2000Stream.h
index 3feccbef06d..3feccbef06d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Lexer.cc
index c62052998b8..c62052998b8 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Link.cc
index 20184d1376c..20184d1376c 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Link.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.25.2/poppler/Makefile.am
index 07cfb3b0090..ce6f4b2d17d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Makefile.am
@@ -157,7 +157,7 @@ libpoppler_la_LIBADD = \
$(PTHREAD_LIBS) \
$(win32_libs)
-libpoppler_la_LDFLAGS = -version-info 45:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 46:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Object.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Object.h
index 15bea159857..15bea159857 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDoc.cc
index c78d5ca5323..4f3ab3115fa 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDoc.cc
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2005, 2007-2009, 2011-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007-2009, 2011-2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2008 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2008, 2010 Pino Toscano <pino@kde.org>
// Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
@@ -30,6 +30,7 @@
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -50,9 +51,6 @@
#include <stddef.h>
#include <string.h>
#include <time.h>
-#ifdef _WIN32
-# include <windows.h>
-#endif
#include <sys/stat.h>
#include "goo/gstrtod.h"
#include "goo/GooString.h"
@@ -261,9 +259,16 @@ GBool PDFDoc::setup(GooString *ownerPassword, GooString *userPassword) {
// read xref table
xref = new XRef(str, getStartXRef(), getMainXRefEntriesOffset(), &wasReconstructed);
if (!xref->isOk()) {
- error(errSyntaxError, -1, "Couldn't read xref table");
- errCode = xref->getErrorCode();
- return gFalse;
+ if (wasReconstructed) {
+ delete xref;
+ startXRefPos = -1;
+ xref = new XRef(str, getStartXRef(gTrue), getMainXRefEntriesOffset(gTrue), &wasReconstructed);
+ }
+ if (!xref->isOk()) {
+ error(errSyntaxError, -1, "Couldn't read xref table");
+ errCode = xref->getErrorCode();
+ return gFalse;
+ }
}
// check for encryption
@@ -519,12 +524,16 @@ Linearization *PDFDoc::getLinearization()
return linearization;
}
-GBool PDFDoc::isLinearized() {
+GBool PDFDoc::isLinearized(GBool tryingToReconstruct) {
if ((str->getLength()) &&
(getLinearization()->getLength() == str->getLength()))
return gTrue;
- else
- return gFalse;
+ else {
+ if (tryingToReconstruct)
+ return getLinearization()->getLength() > 0;
+ else
+ return gFalse;
+ }
}
static GBool
@@ -1637,11 +1646,11 @@ long long PDFDoc::strToLongLong(char *s) {
}
// Read the 'startxref' position.
-Goffset PDFDoc::getStartXRef()
+Goffset PDFDoc::getStartXRef(GBool tryingToReconstruct)
{
if (startXRefPos == -1) {
- if (isLinearized()) {
+ if (isLinearized(tryingToReconstruct)) {
char buf[linearizationSearchSize+1];
int c, n, i;
@@ -1699,11 +1708,11 @@ Goffset PDFDoc::getStartXRef()
return startXRefPos;
}
-Goffset PDFDoc::getMainXRefEntriesOffset()
+Goffset PDFDoc::getMainXRefEntriesOffset(GBool tryingToReconstruct)
{
Guint mainXRefEntriesOffset = 0;
- if (isLinearized()) {
+ if (isLinearized(tryingToReconstruct)) {
mainXRefEntriesOffset = getLinearization()->getMainXRefEntriesOffset();
}
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDoc.h
index 42c7cba772b..1e5b8088729 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDoc.h
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2005, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2009, 2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2008 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2008 Pino Toscano <pino@kde.org>
// Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
@@ -219,7 +219,7 @@ public:
// Is this document linearized?
- GBool isLinearized();
+ GBool isLinearized(GBool tryingToReconstruct = gFalse);
// Return the document's Info dictionary (if any).
Object *getDocInfo(Object *obj) { return xref->getDocInfo(obj); }
@@ -301,10 +301,10 @@ private:
void checkHeader();
GBool checkEncryption(GooString *ownerPassword, GooString *userPassword);
// Get the offset of the start xref table.
- Goffset getStartXRef();
+ Goffset getStartXRef(GBool tryingToReconstruct = gFalse);
// Get the offset of the entries in the main XRef table of a
// linearized document (0 for non linearized documents).
- Goffset getMainXRefEntriesOffset();
+ Goffset getMainXRefEntriesOffset(GBool tryingToReconstruct = gFalse);
long long strToLongLong(char *s);
GooString *fileName;
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/PSOutputDev.cc
index 623251f65f8..149bb620df2 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PSOutputDev.cc
@@ -25,9 +25,10 @@
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2009, 2011, 2012 William Bader <williambader@hotmail.com>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
-// Copyright (C) 2009-2011, 2013 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2009-2011, 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2012, 2014 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2012 Lu Wang <coolwanglu@gmail.com>
+// Copyright (C) 2014 Till Kamppeter <till.kamppeter@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -125,12 +126,32 @@ static const char *prolog[] = {
" } ifelse",
"} def",
"/pdfSetupPaper {",
- " 2 array astore",
+ " % Change paper size, but only if different from previous paper size otherwise",
+ " % duplex fails. PLRM specifies a tolerance of 5 pts when matching paper size",
+ " % so we use the same when checking if the size changes.",
" /setpagedevice where {",
- " pop 2 dict begin",
- " /PageSize exch def",
- " /ImagingBBox null def",
- " currentdict end setpagedevice",
+ " pop currentpagedevice",
+ " /PageSize known {",
+ " 2 copy",
+ " currentpagedevice /PageSize get aload pop",
+ " exch 4 1 roll",
+ " sub abs 5 gt",
+ " 3 1 roll",
+ " sub abs 5 gt",
+ " or",
+ " } {",
+ " true",
+ " } ifelse",
+ " {",
+ " 2 array astore",
+ " 2 dict begin",
+ " /PageSize exch def",
+ " /ImagingBBox null def",
+ " currentdict end",
+ " setpagedevice",
+ " } {",
+ " pop pop",
+ " } ifelse",
" } {",
" pop",
" } ifelse",
@@ -944,7 +965,9 @@ struct PSOutImgClipRect {
//------------------------------------------------------------------------
struct PSOutPaperSize {
- PSOutPaperSize(int wA, int hA) { w = wA; h = hA; }
+ PSOutPaperSize(GooString *nameA, int wA, int hA) { name = nameA; w = wA; h = hA; }
+ ~PSOutPaperSize() { delete name; }
+ GooString *name;
int w, h;
};
@@ -1052,7 +1075,8 @@ static void outputToFile(void *stream, const char *data, int len) {
PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
char *psTitle,
int firstPage, int lastPage, PSOutMode modeA,
- int paperWidthA, int paperHeightA, GBool duplexA,
+ int paperWidthA, int paperHeightA,
+ GBool noCropA, GBool duplexA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
GBool forceRasterizeA,
GBool manualCtrlA,
@@ -1114,14 +1138,15 @@ PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
init(outputToFile, f, fileTypeA, psTitle,
doc, firstPage, lastPage, modeA,
imgLLXA, imgLLYA, imgURXA, imgURYA, manualCtrlA,
- paperWidthA, paperHeightA, duplexA);
+ paperWidthA, paperHeightA, noCropA, duplexA);
}
PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
char *psTitle,
PDFDoc *doc,
int firstPage, int lastPage, PSOutMode modeA,
- int paperWidthA, int paperHeightA, GBool duplexA,
+ int paperWidthA, int paperHeightA,
+ GBool noCropA, GBool duplexA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
GBool forceRasterizeA,
GBool manualCtrlA,
@@ -1151,7 +1176,40 @@ PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
init(outputFuncA, outputStreamA, psGeneric, psTitle,
doc, firstPage, lastPage, modeA,
imgLLXA, imgLLYA, imgURXA, imgURYA, manualCtrlA,
- paperWidthA, paperHeightA, duplexA);
+ paperWidthA, paperHeightA, noCropA, duplexA);
+}
+
+struct StandardMedia {
+ const char *name;
+ int width;
+ int height;
+};
+
+static const StandardMedia standardMedia[] =
+{
+ { "A0", 2384, 3371 },
+ { "A1", 1685, 2384 },
+ { "A2", 1190, 1684 },
+ { "A3", 842, 1190 },
+ { "A4", 595, 842 },
+ { "A5", 420, 595 },
+ { "B4", 729, 1032 },
+ { "B5", 516, 729 },
+ { "Letter", 612, 792 },
+ { "Tabloid", 792, 1224 },
+ { "Ledger", 1224, 792 },
+ { "Legal", 612, 1008 },
+ { "Statement", 396, 612 },
+ { "Executive", 540, 720 },
+ { "Folio", 612, 936 },
+ { "Quarto", 610, 780 },
+ { "10x14", 720, 1008 },
+ { NULL, 0, 0 }
+};
+
+/* PLRM specifies a tolerance of 5 points when matching page sizes */
+static bool pageDimensionEqual(int a, int b) {
+ return (abs (a - b) < 5);
}
void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
@@ -1159,7 +1217,7 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
int firstPage, int lastPage, PSOutMode modeA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
GBool manualCtrlA, int paperWidthA, int paperHeightA,
- GBool duplexA) {
+ GBool noCropA, GBool duplexA) {
Catalog *catalog;
PDFRectangle *box;
PSOutPaperSize *size;
@@ -1179,44 +1237,74 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
mode = modeA;
paperWidth = paperWidthA;
paperHeight = paperHeightA;
+ noCrop = noCropA;
imgLLX = imgLLXA;
imgLLY = imgLLYA;
imgURX = imgURXA;
imgURY = imgURYA;
if (paperWidth < 0 || paperHeight < 0) {
- Page *page;
paperMatch = gTrue;
- paperSizes = new GooList();
- paperWidth = paperHeight = 1; // in case the document has zero pages
- for (pg = (firstPage >= 1) ? firstPage : 1;
- pg <= lastPage && pg <= catalog->getNumPages();
- ++pg) {
- page = catalog->getPage(pg);
- if (page == NULL) {
- paperMatch = gFalse;
- break;
- }
+ } else {
+ paperMatch = gFalse;
+ }
+ Page *page;
+ paperSizes = new GooList();
+ for (pg = (firstPage >= 1) ? firstPage : 1;
+ pg <= lastPage && pg <= catalog->getNumPages();
+ ++pg) {
+ page = catalog->getPage(pg);
+ if (page == NULL)
+ paperMatch = gFalse;
+ if (!paperMatch) {
+ w = paperWidth;
+ h = paperHeight;
+ if (w < 0 || h < 0) {
+ // Unable to obtain a paper size from the document and no page size
+ // specified. In this case use A4 as the page size to ensure the PS output is
+ // valid. This will only occur if the PDF is very broken.
+ w = 595;
+ h = 842;
+ }
+ } else if (noCropA) {
w = (int)ceil(page->getMediaWidth());
h = (int)ceil(page->getMediaHeight());
- for (i = 0; i < paperSizes->getLength(); ++i) {
- size = (PSOutPaperSize *)paperSizes->get(i);
- if (size->w == w && size->h == h) {
- break;
- }
- }
- if (i == paperSizes->getLength()) {
- paperSizes->append(new PSOutPaperSize(w, h));
- }
- if (w > paperWidth) {
- paperWidth = w;
- }
- if (h > paperHeight) {
- paperHeight = h;
+ } else {
+ w = (int)ceil(page->getCropWidth());
+ h = (int)ceil(page->getCropHeight());
+ }
+ if (paperMatch) {
+ int rotate = page->getRotate();
+ if (rotate == 90 || rotate == 270)
+ std::swap(w, h);
+ }
+ if (w > paperWidth)
+ paperWidth = w;
+ if (h > paperHeight)
+ paperHeight = h;
+ for (i = 0; i < paperSizes->getLength(); ++i) {
+ size = (PSOutPaperSize *)paperSizes->get(i);
+ if (pageDimensionEqual(w, size->w) && pageDimensionEqual(h, size->h))
+ break;
+ }
+ if (i == paperSizes->getLength()) {
+ const StandardMedia *media = standardMedia;
+ GooString *name = NULL;
+ while (media->name) {
+ if (pageDimensionEqual(w, media->width) && pageDimensionEqual(h, media->height)) {
+ name = new GooString(media->name);
+ w = media->width;
+ h = media->height;
+ break;
+ }
+ media++;
}
+ if (!name)
+ name = GooString::format("{0:d}x{1:d}mm", int(w*25.4/72), int(h*25.4/72));
+ paperSizes->append(new PSOutPaperSize(name, w, h));
}
- // NB: img{LLX,LLY,URX,URY} will be set by startPage()
- } else {
- paperMatch = gFalse;
+ pagePaperSize.insert(std::pair<int,int>(pg, i));
+ if (!paperMatch)
+ break; // we only need one entry when all pages are the same size
}
preload = globalParams->getPSPreload();
if (imgLLX == 0 && imgURX == 0 && imgLLY == 0 && imgURY == 0) {
@@ -1224,11 +1312,6 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
imgURX = paperWidth;
imgURY = paperHeight;
}
- if (imgLLX == 0 && imgURX == 0 && imgLLY == 0 && imgURY == 0) {
- imgLLX = imgLLY = 0;
- imgURX = paperWidth;
- imgURY = paperHeight;
- }
manualCtrl = manualCtrlA;
if (mode == psModeForm) {
lastPage = firstPage;
@@ -1389,7 +1472,6 @@ void PSOutputDev::writeHeader(int firstPage, int lastPage,
int i;
switch (mode) {
- case psModePSOrigPageSizes:
case psModePS:
writePS("%!PS-Adobe-3.0\n");
break;
@@ -1431,26 +1513,19 @@ void PSOutputDev::writeHeader(int firstPage, int lastPage,
}
switch (mode) {
- case psModePSOrigPageSizes:
- prevWidth = 0;
- prevHeight = 0;
case psModePS:
- if (paperMatch) {
- for (i = 0; i < paperSizes->getLength(); ++i) {
- size = (PSOutPaperSize *)paperSizes->get(i);
- writePSFmt("%%{0:s} {1:d}x{2:d} {1:d} {2:d} 0 () ()\n",
- i==0 ? "DocumentMedia:" : "+", size->w, size->h);
- }
- } else {
- writePSFmt("%%DocumentMedia: plain {0:d} {1:d} 0 () ()\n",
- paperWidth, paperHeight);
+ for (i = 0; i < paperSizes->getLength(); ++i) {
+ size = (PSOutPaperSize *)paperSizes->get(i);
+ writePSFmt("%%{0:s} {1:t} {2:d} {3:d} 0 () ()\n",
+ i==0 ? "DocumentMedia:" : "+", size->name, size->w, size->h);
}
writePSFmt("%%BoundingBox: 0 0 {0:d} {1:d}\n", paperWidth, paperHeight);
writePSFmt("%%Pages: {0:d}\n", lastPage - firstPage + 1);
writePS("%%EndComments\n");
if (!paperMatch) {
+ size = (PSOutPaperSize *)paperSizes->get(0);
writePS("%%BeginDefaults\n");
- writePS("%%PageMedia: plain\n");
+ writePSFmt("%%PageMedia: {0:t}\n", size->name);
writePS("%%EndDefaults\n");
}
break;
@@ -2434,7 +2509,7 @@ void PSOutputDev::setupExternalCIDTrueTypeFont(GfxFont *font,
gfree(codeToGID);
} else {
error(errSyntaxError, -1,
- "TrueType font '%s' does not allow embedding",
+ "TrueType font '{0:s}' does not allow embedding",
font->getName() ? font->getName()->getCString() : "(unnamed)");
}
@@ -3503,9 +3578,10 @@ void PSOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
int imgWidth, imgHeight, imgWidth2, imgHeight2;
GBool landscape;
GooString *s;
+ PSOutPaperSize *paperSize;
xref = xrefA;
- if (mode == psModePS || mode == psModePSOrigPageSizes) {
+ if (mode == psModePS) {
GooString pageLabel;
const GBool gotLabel = doc->getCatalog()->indexToLabel(pageNum -1, &pageLabel);
if (gotLabel) {
@@ -3524,18 +3600,19 @@ void PSOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
if (paperMatch) {
page = doc->getCatalog()->getPage(pageNum);
imgLLX = imgLLY = 0;
- imgURX = (int)ceil(page->getMediaWidth());
- imgURY = (int)ceil(page->getMediaHeight());
+ if (noCrop) {
+ imgURX = (int)ceil(page->getMediaWidth());
+ imgURY = (int)ceil(page->getMediaHeight());
+ } else {
+ imgURX = (int)ceil(page->getCropWidth());
+ imgURY = (int)ceil(page->getCropHeight());
+ }
if (state->getRotate() == 90 || state->getRotate() == 270) {
t = imgURX;
imgURX = imgURY;
imgURY = t;
}
- writePSFmt("%%PageMedia: {0:d}x{1:d}\n", imgURX, imgURY);
- writePSFmt("%%PageBoundingBox: 0 0 {0:d} {1:d}\n", imgURX, imgURY);
}
- if (mode != psModePSOrigPageSizes)
- writePS("%%BeginPageSetup\n");
}
// underlays
@@ -3549,35 +3626,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
xScale = yScale = 1;
switch (mode) {
- case psModePSOrigPageSizes:
- x1 = (int)floor(state->getX1());
- y1 = (int)floor(state->getY1());
- x2 = (int)ceil(state->getX2());
- y2 = (int)ceil(state->getY2());
- width = x2 - x1;
- height = y2 - y1;
- if (width > height) {
- landscape = gTrue;
- } else {
- landscape = gFalse;
- }
- writePSFmt("%%PageBoundingBox: {0:d} {1:d} {2:d} {3:d}\n", x1, y1, x2 - x1, y2 - y1);
- writePS("%%BeginPageSetup\n");
- writePSFmt("%%PageOrientation: {0:s}\n",
- landscape ? "Landscape" : "Portrait");
- if ((width != prevWidth) || (height != prevHeight)) {
- // Set page size only when it actually changes, as otherwise Duplex
- // printing does not work
- writePSFmt("<</PageSize [{0:d} {1:d}]>> setpagedevice\n", width, height);
- prevWidth = width;
- prevHeight = height;
- }
- writePS("pdfStartPage\n");
- writePSFmt("{0:d} {1:d} {2:d} {3:d} re W\n", x1, y1, x2 - x1, y2 - y1);
- writePS("%%EndPageSetup\n");
- ++seqPage;
- break;
-
case psModePS:
// rotate, translate, and scale page
imgWidth = imgURX - imgLLX;
@@ -3616,8 +3664,18 @@ void PSOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
}
}
}
+ if (paperMatch) {
+ paperSize = (PSOutPaperSize *)paperSizes->get(pagePaperSize[pageNum]);
+ writePSFmt("%%PageMedia: {0:t}\n", paperSize->name);
+ }
+ if (rotate == 0 || rotate == 180) {
+ writePSFmt("%%PageBoundingBox: 0 0 {0:d} {1:d}\n", width, height);
+ } else {
+ writePSFmt("%%PageBoundingBox: 0 0 {0:d} {1:d}\n", height, width);
+ }
writePSFmt("%%PageOrientation: {0:s}\n",
landscape ? "Landscape" : "Portrait");
+ writePS("%%BeginPageSetup\n");
if (paperMatch) {
writePSFmt("{0:d} {1:d} pdfSetupPaper\n", imgURX, imgURY);
}
@@ -3737,9 +3795,7 @@ void PSOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
}
}
- if (mode == psModePS) {
- writePS("%%EndPageSetup\n");
- }
+ writePS("%%EndPageSetup\n");
}
void PSOutputDev::endPage() {
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PSOutputDev.h
index 92b007eafaf..f30204deeb5 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PSOutputDev.h
@@ -22,7 +22,7 @@
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2009, 2011 William Bader <williambader@hotmail.com>
// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
-// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2011, 2014 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
//
// To see a description of the changes please see the Changelog file that
@@ -44,6 +44,7 @@
#include "GlobalParams.h"
#include "OutputDev.h"
#include <set>
+#include <map>
class GHooash;
class PDFDoc;
@@ -67,8 +68,7 @@ class PSOutputDev;
enum PSOutMode {
psModePS,
psModeEPS,
- psModeForm,
- psModePSOrigPageSizes
+ psModeForm
};
enum PSFileType {
@@ -97,6 +97,7 @@ public:
char *psTitle,
int firstPage, int lastPage, PSOutMode modeA,
int paperWidthA = -1, int paperHeightA = -1,
+ GBool noCrop = gFalse,
GBool duplexA = gTrue,
int imgLLXA = 0, int imgLLYA = 0,
int imgURXA = 0, int imgURYA = 0,
@@ -111,6 +112,7 @@ public:
PDFDoc *docA,
int firstPage, int lastPage, PSOutMode modeA,
int paperWidthA = -1, int paperHeightA = -1,
+ GBool noCrop = gFalse,
GBool duplexA = gTrue,
int imgLLXA = 0, int imgLLYA = 0,
int imgURXA = 0, int imgURYA = 0,
@@ -311,7 +313,7 @@ private:
int firstPage, int lastPage, PSOutMode modeA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
GBool manualCtrlA, int paperWidthA, int paperHeightA,
- GBool duplexA);
+ GBool noCropA, GBool duplexA);
void setupResources(Dict *resDict);
void setupFonts(Dict *resDict);
void setupFont(GfxFont *font, Dict *parentResDict);
@@ -408,6 +410,7 @@ private:
imgURX, imgURY;
GBool preload; // load all images into memory, and
// predefine forms
+ GBool noCrop;
PSOutputFunc outputFunc;
void *outputStream;
@@ -452,6 +455,7 @@ private:
GooList *paperSizes; // list of used paper sizes, if paperMatch
// is true [PSOutPaperSize]
+ std::map<int,int> pagePaperSize; // page num to paperSize entry mapping
double tx0, ty0; // global translation
double xScale0, yScale0; // global scaling
int rotate0; // rotation angle (0, 90, 180, 270)
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Page.cc
index ecdff32f693..ecdff32f693 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Page.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo_p.h
index d3cd89f9bcd..d3cd89f9bcd 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Parser.cc
index a0219945bd9..28a54607f5c 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Parser.cc
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006, 2009, 201, 2010, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2009, 201, 2010, 2013, 2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
// Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
@@ -248,7 +248,7 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
} else {
error(errSyntaxError, getPos(), "Missing 'endstream' or incorrect stream length");
if (strict) return NULL;
- if (xref) {
+ if (xref && lexer->getStream()) {
// shift until we find the proper endstream or we change to another object or reach eof
length = lexer->getPos() - pos;
if (buf1.isCmd("endstream")) {
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/PreScanOutputDev.cc
index 6a011266013..b2af18d86b8 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PreScanOutputDev.cc
@@ -15,7 +15,7 @@
//
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2010, 2011 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2011 William Bader <williambader@hotmail.com>
+// Copyright (C) 2011, 2014 William Bader <williambader@hotmail.com>
// Copyright (C) 2011, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
//
@@ -87,7 +87,14 @@ GBool PreScanOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *ca
int x0, int y0, int x1, int y1,
double xStep, double yStep) {
if (paintType == 1) {
+ GBool tilingNeeded = (x1 - x0 != 1 || y1 - y0 != 1);
+ if (tilingNeeded) {
+ inTilingPatternFill++;
+ }
gfx->drawForm(str, resDict, mat, bbox);
+ if (tilingNeeded) {
+ inTilingPatternFill--;
+ }
} else {
check(state->getFillColorSpace(), state->getFillColor(),
state->getFillOpacity(), state->getBlendMode());
@@ -200,7 +207,7 @@ void PreScanOutputDev::drawImageMask(GfxState *state, Object * /*ref*/, Stream *
state->getFillOpacity(), state->getBlendMode());
gdi = gFalse;
if ((level == psLevel1 || level == psLevel1Sep) &&
- state->getFillColorSpace()->getMode() == csPattern) {
+ (state->getFillColorSpace()->getMode() == csPattern || inTilingPatternFill > 0)) {
patternImgMask = gTrue;
}
@@ -238,6 +245,10 @@ void PreScanOutputDev::drawImage(GfxState *state, Object * /*ref*/, Stream *str,
transparency = gTrue;
}
gdi = gFalse;
+ if ((level == psLevel1 || level == psLevel1Sep) &&
+ inTilingPatternFill > 0) {
+ patternImgMask = gTrue;
+ }
if (inlineImg) {
str->reset();
@@ -354,4 +365,5 @@ void PreScanOutputDev::clearStats() {
transparency = gFalse;
gdi = gTrue;
patternImgMask = gFalse;
+ inTilingPatternFill = 0;
}
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/PreScanOutputDev.h
index 0fc9d3e3446..50fcbf22f73 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/PreScanOutputDev.h
@@ -15,7 +15,7 @@
//
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2011 William Bader <williambader@hotmail.com>
+// Copyright (C) 2011, 2014 William Bader <williambader@hotmail.com>
// Copyright (C) 2011, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
//
@@ -176,6 +176,7 @@ private:
GBool gdi;
PSLevel level; // PostScript level (1, 2, separation)
GBool patternImgMask;
+ int inTilingPatternFill;
};
#endif
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/SecurityHandler.cc
index 8b85e60db0a..d6f55995b1c 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/SecurityHandler.cc
@@ -15,6 +15,7 @@
//
// Copyright (C) 2010, 2012 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2014 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
@@ -295,7 +296,7 @@ StandardSecurityHandler::StandardSecurityHandler(PDFDoc *docA,
ok = gTrue;
} else if (!(encVersion == -1 && encRevision == -1)) {
error(errUnimplemented, -1,
- "Unsupported version/revision (%d/%d) of Standard security handler",
+ "Unsupported version/revision ({0:d}/{1:d}) of Standard security handler",
encVersion, encRevision);
}
} else {
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/SplashOutputDev.cc
index d0a945468a1..d0a945468a1 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/SplashOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/SplashOutputDev.h
index ce1d50d0fdd..ce1d50d0fdd 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream.cc
index 8ef061ab90d..4c00ddb0d5d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream.cc
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2006-2010, 2012, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2010, 2012-2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2008 Julien Rebetez <julien@fhtagn.net>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
@@ -452,7 +452,7 @@ ImageStream::ImageStream(Stream *strA, int widthA, int nCompsA, int nBitsA) {
nVals = width * nComps;
inputLineSize = (nVals * nBits + 7) >> 3;
- if (nBits <= 0 || nVals > INT_MAX / nBits - 7) {
+ if (nBits <= 0 || nVals > INT_MAX / nBits - 7 || width > INT_MAX / nComps) {
inputLineSize = -1;
}
inputLine = (Guchar *)gmallocn_checkoverflow(inputLineSize, sizeof(char));
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/StructElement.cc
index 6392433e218..8e064a04fdf 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/StructElement.cc
@@ -4,7 +4,7 @@
//
// This file is licensed under the GPLv2 or later
//
-// Copyright 2013 Igalia S.L.
+// Copyright 2013, 2014 Igalia S.L.
//
//========================================================================
@@ -506,6 +506,7 @@ static GBool ownerHasMorePriority(Attribute::Owner a, Attribute::Owner b)
enum ElementType {
elementTypeUndefined,
+ elementTypeGrouping,
elementTypeInline,
elementTypeBlock,
};
@@ -516,16 +517,16 @@ static const struct TypeMapEntry {
ElementType elementType;
const AttributeMapEntry **attributes;
} typeMap[] = {
- { StructElement::Document, "Document", elementTypeInline, attributeMapShared },
- { StructElement::Part, "Part", elementTypeInline, attributeMapShared },
- { StructElement::Art, "Art", elementTypeInline, attributeMapColumns },
- { StructElement::Sect, "Sect", elementTypeInline, attributeMapColumns },
- { StructElement::Div, "Div", elementTypeInline, attributeMapColumns },
- { StructElement::BlockQuote, "BlockQuote", elementTypeInline, attributeMapInline },
- { StructElement::Caption, "Caption", elementTypeInline, attributeMapInline },
- { StructElement::NonStruct, "NonStruct", elementTypeInline, attributeMapInline },
- { StructElement::Index, "Index", elementTypeInline, attributeMapInline },
- { StructElement::Private, "Private", elementTypeInline, attributeMapInline },
+ { StructElement::Document, "Document", elementTypeGrouping, attributeMapShared },
+ { StructElement::Part, "Part", elementTypeGrouping, attributeMapShared },
+ { StructElement::Art, "Art", elementTypeGrouping, attributeMapColumns },
+ { StructElement::Sect, "Sect", elementTypeGrouping, attributeMapColumns },
+ { StructElement::Div, "Div", elementTypeGrouping, attributeMapColumns },
+ { StructElement::BlockQuote, "BlockQuote", elementTypeGrouping, attributeMapInline },
+ { StructElement::Caption, "Caption", elementTypeGrouping, attributeMapInline },
+ { StructElement::NonStruct, "NonStruct", elementTypeGrouping, attributeMapInline },
+ { StructElement::Index, "Index", elementTypeGrouping, attributeMapInline },
+ { StructElement::Private, "Private", elementTypeGrouping, attributeMapInline },
{ StructElement::Span, "Span", elementTypeInline, attributeMapInline },
{ StructElement::Quote, "Quote", elementTypeInline, attributeMapInline },
{ StructElement::Note, "Note", elementTypeInline, attributeMapInline },
@@ -552,7 +553,7 @@ static const struct TypeMapEntry {
{ StructElement::L, "L", elementTypeBlock, attributeMapList },
{ StructElement::LI, "LI", elementTypeBlock, attributeMapBlock },
{ StructElement::Lbl, "Lbl", elementTypeBlock, attributeMapBlock },
- { StructElement::LBody, "LBody", elementTypeUndefined, attributeMapBlock },
+ { StructElement::LBody, "LBody", elementTypeBlock, attributeMapBlock },
{ StructElement::Table, "Table", elementTypeBlock, attributeMapTable },
{ StructElement::TR, "TR", elementTypeUndefined, attributeMapShared },
{ StructElement::TH, "TH", elementTypeUndefined, attributeMapTableCell },
@@ -563,8 +564,8 @@ static const struct TypeMapEntry {
{ StructElement::Figure, "Figure", elementTypeUndefined, attributeMapIllustration },
{ StructElement::Formula, "Formula", elementTypeUndefined, attributeMapIllustration },
{ StructElement::Form, "Form", elementTypeUndefined, attributeMapIllustration },
- { StructElement::TOC, "TOC", elementTypeUndefined, attributeMapShared },
- { StructElement::TOCI, "TOCI", elementTypeUndefined, attributeMapShared },
+ { StructElement::TOC, "TOC", elementTypeGrouping, attributeMapShared },
+ { StructElement::TOCI, "TOCI", elementTypeGrouping, attributeMapShared },
};
@@ -913,6 +914,12 @@ GBool StructElement::isInline() const
return entry ? (entry->elementType == elementTypeInline) : gFalse;
}
+GBool StructElement::isGrouping() const
+{
+ const TypeMapEntry *entry = getTypeMapEntry(type);
+ return entry ? (entry->elementType == elementTypeGrouping) : gFalse;
+}
+
GBool StructElement::hasPageRef() const
{
return pageRef.isRef() || (parent && parent->hasPageRef());
@@ -1005,8 +1012,8 @@ GooString* StructElement::appendSubTreeText(GooString *string, GBool recursive)
if (!string)
string = new GooString();
- for (unsigned i = 0; i < getNumElements(); i++)
- getElement(i)->appendSubTreeText(string, recursive);
+ for (unsigned i = 0; i < getNumChildren(); i++)
+ getChild(i)->appendSubTreeText(string, recursive);
return string;
}
@@ -1151,7 +1158,7 @@ void StructElement::parse(Dict *element)
for (int i = 0; i < obj.arrayGetLength(); i++) {
if (obj.arrayGet(i, &iobj)->isDict()) {
attrIndex = getNumAttributes();
- parseAttributes(obj.getDict());
+ parseAttributes(iobj.getDict());
} else if (iobj.isInt()) {
const int revision = iobj.getInt();
// Set revision numbers for the elements previously created.
@@ -1269,7 +1276,7 @@ StructElement *StructElement::parseChild(Object *ref,
if (child) {
if (child->isOk()) {
- appendElement(child);
+ appendChild(child);
if (ref->isRef())
treeRoot->parentTreeAdd(ref->getRef(), child);
} else {
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/StructElement.h
index b9eef8a6b60..51fd83da69b 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/StructElement.h
@@ -4,7 +4,7 @@
//
// This file is licensed under the GPLv2 or later
//
-// Copyright 2013 Igalia S.L.
+// Copyright 2013, 2014 Igalia S.L.
//
//========================================================================
@@ -153,6 +153,7 @@ public:
GBool isOk() const { return type != Unknown; }
GBool isBlock() const;
GBool isInline() const;
+ GBool isGrouping() const;
inline GBool isContent() const { return (type == MCID) || isObjectRef(); }
inline GBool isObjectRef() const { return (type == OBJR && c->ref.num != -1 && c->ref.gen != -1); }
@@ -190,11 +191,11 @@ public:
const GooString *getExpandedAbbr() const { return isContent() ? NULL : s->expandedAbbr; }
GooString *getExpandedAbbr() { return isContent() ? NULL : s->expandedAbbr; }
- unsigned getNumElements() const { return isContent() ? 0 : s->elements.size(); }
- const StructElement *getElement(int i) const { return isContent() ? NULL : s->elements.at(i); }
- StructElement *getElement(int i) { return isContent() ? NULL : s->elements.at(i); }
+ unsigned getNumChildren() const { return isContent() ? 0 : s->elements.size(); }
+ const StructElement *getChild(int i) const { return isContent() ? NULL : s->elements.at(i); }
+ StructElement *getChild(int i) { return isContent() ? NULL : s->elements.at(i); }
- void appendElement(StructElement *element) {
+ void appendChild(StructElement *element) {
if (!isContent() && element && element->isOk()) {
s->elements.push_back(element);
}
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/StructTreeRoot.cc
index 59f017ee910..e46e3e28388 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/StructTreeRoot.cc
@@ -4,7 +4,8 @@
//
// This file is licensed under the GPLv2 or later
//
-// Copyright 2013 Igalia S.L.
+// Copyright 2013, 2014 Igalia S.L.
+// Copyright 2014 Fabio D'Urso <fabiodurso@hotmail.it>
//
//========================================================================
@@ -94,7 +95,7 @@ void StructTreeRoot::parse(Dict *root)
index.free();
}
} else {
- error(errSyntaxError, -1, "Nums array length is not a even ({0:i})", nums.arrayGetLength());
+ error(errSyntaxError, -1, "Nums array length is not a even ({0:d})", nums.arrayGetLength());
}
} else {
error(errSyntaxError, -1, "Nums object is wrong type ({0:s})", nums.getTypeName());
@@ -127,7 +128,7 @@ void StructTreeRoot::parse(Dict *root)
child->getType() == StructElement::Div)) {
error(errSyntaxWarning, -1, "StructTreeRoot element of tagged PDF is wrong type ({0:s})", child->getTypeName());
}
- appendElement(child);
+ appendChild(child);
if (ref.isRef()) {
parentTreeAdd(ref.getRef(), child);
}
@@ -147,7 +148,7 @@ void StructTreeRoot::parse(Dict *root)
}
StructElement *child = new StructElement(kids.getDict(), this, NULL, seenElements);
if (child->isOk()) {
- appendElement(child);
+ appendChild(child);
Object ref;
if (root->lookupNF("K", &ref)->isRef())
parentTreeAdd(ref.getRef(), child);
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/StructTreeRoot.h
index 9928e2f6eba..3b1f3c84421 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/StructTreeRoot.h
@@ -4,7 +4,7 @@
//
// This file is licensed under the GPLv2 or later
//
-// Copyright 2013 Igalia S.L.
+// Copyright 2013, 2014 Igalia S.L.
//
//========================================================================
@@ -33,11 +33,11 @@ public:
PDFDoc *getDoc() { return doc; }
Dict *getRoleMap() { return roleMap.isDict() ? roleMap.getDict() : NULL; }
Dict *getClassMap() { return classMap.isDict() ? classMap.getDict() : NULL; }
- unsigned getNumElements() const { return elements.size(); }
- const StructElement *getElement(int i) const { return elements.at(i); }
- StructElement *getElement(int i) { return elements.at(i); }
+ unsigned getNumChildren() const { return elements.size(); }
+ const StructElement *getChild(int i) const { return elements.at(i); }
+ StructElement *getChild(int i) { return elements.at(i); }
- void appendElement(StructElement *element) {
+ void appendChild(StructElement *element) {
if (element && element->isOk()) {
elements.push_back(element);
}
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/TextOutputDev.cc
index 7c2ca78895f..4b7ff406c3e 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/TextOutputDev.cc
@@ -20,7 +20,7 @@
// Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2007, 2008, 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2008, 2010-2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010-2012, 2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2008 Pino Toscano <pino@kde.org>
// Copyright (C) 2008, 2010 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2009 Ross Moore <ross@maths.mq.edu.au>
@@ -2192,10 +2192,12 @@ void TextPage::updateFont(GfxState *state) {
mCode = letterCode = anyCode = -1;
for (code = 0; code < 256; ++code) {
name = ((Gfx8BitFont *)gfxFont)->getCharName(code);
- if (name && name[0] == 'm' && name[1] == '\0') {
+ int nameLen = name ? strlen(name) : 0;
+ GBool nameOneChar = nameLen == 1 || (nameLen > 1 && name[1] == '\0');
+ if (nameOneChar && name[0] == 'm') {
mCode = code;
}
- if (letterCode < 0 && name && name[1] == '\0' &&
+ if (letterCode < 0 && nameOneChar &&
((name[0] >= 'A' && name[0] <= 'Z') ||
(name[0] >= 'a' && name[0] <= 'z'))) {
letterCode = code;
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/TextOutputDev.h
index 23fb3b726a9..23fb3b726a9 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/XRef.cc
index 5495b62f7ba..5495b62f7ba 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.25.2/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.25.2/poppler/XpdfPluginAPI.h
index b0165c0a72a..da69ee31bcc 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/XpdfPluginAPI.h
@@ -12,6 +12,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -22,6 +23,9 @@
#define XPDFPLUGINAPI_H
#ifdef _WIN32
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
#include <windows.h>
#else
#define Object XtObject
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.25.2/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.25.2/poppler/poppler-config.h.cmake
index 71a3278ff44..b04f2bf60a4 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/poppler-config.h.cmake
@@ -6,6 +6,20 @@
//
//========================================================================
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
#ifndef POPPLER_CONFIG_H
#define POPPLER_CONFIG_H
@@ -117,7 +131,7 @@
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2013 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2014 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
//------------------------------------------------------------------------
@@ -170,8 +184,8 @@ char * strtok_r (char *s, const char *delim, char **save_ptr);
#endif
#if defined(_MSC_VER)
-#define fmax(a, b) max(a, b)
-#define fmin(a, b) min(a, b)
+#define fmax(a, b) std::max(a, b)
+#define fmin(a, b) std::min(a, b)
#endif
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.25.2/poppler/poppler-config.h.in
index c5e181c4337..871540626c6 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/poppler-config.h.in
@@ -6,6 +6,20 @@
//
//========================================================================
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
#ifndef POPPLER_CONFIG_H
#define POPPLER_CONFIG_H
@@ -117,7 +131,7 @@
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2013 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2014 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
//------------------------------------------------------------------------
@@ -170,8 +184,8 @@ char * strtok_r (char *s, const char *delim, char **save_ptr);
#endif
#if defined(_MSC_VER)
-#define fmax(a, b) max(a, b)
-#define fmin(a, b) min(a, b)
+#define fmax(a, b) std::max(a, b)
+#define fmin(a, b) std::min(a, b)
#endif
diff --git a/Build/source/libs/poppler/poppler-0.25.1/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.25.2/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.25.2/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.25.2/splash/Makefile.am
index 4330c53aabf..4330c53aabf 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/Splash.cc
index 4a7d814f623..d9983b0705c 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/Splash.cc
@@ -11,9 +11,9 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
-// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2010-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
// Copyright (C) 2011-2013 William Bader <williambader@hotmail.com>
// Copyright (C) 2012 Markus Trippelsdorf <markus@trippelsdorf.de>
@@ -584,6 +584,13 @@ void Splash::pipeRun(SplashPipe *pipe) {
//----- blend function
if (state->blendFunc) {
+#ifdef SPLASH_CMYK
+ if (bitmap->mode == splashModeDeviceN8) {
+ for (int k = 4; k < 4 + SPOT_NCOMPS; k++) {
+ cBlend[k] = 0;
+ }
+ }
+#endif
(*state->blendFunc)(cSrc, cDest, cBlend, bitmap->mode);
}
@@ -3819,7 +3826,7 @@ SplashError Splash::arbitraryTransformImage(SplashImageSource src, void *srcData
yMax = t1;
}
}
- clipRes = state->clip->testRect(xMin, yMin, xMax - 1, yMax - 1);
+ clipRes = state->clip->testRect(xMin, yMin, xMax, yMax);
opClipRes = clipRes;
if (clipRes == splashClipAllOutside) {
return splashOk;
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/Splash.h b/Build/source/libs/poppler/poppler-0.25.2/splash/Splash.h
index cf98e6c6824..cf98e6c6824 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/Splash.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashBitmap.cc
index ac344f17c35..ac344f17c35 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashBitmap.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashBitmap.h
index 70509abcfaa..70509abcfaa 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFont.cc
index 2a2362520cb..2a2362520cb 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontFile.cc
index 34f6ce5c6b4..34f6ce5c6b4 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFont.cc
index 2bfcdc8719e..2bfcdc8719e 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontEngine.cc
index 968e8207362..968e8207362 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPattern.h
index 42c1660f126..42c1660f126 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashState.cc
index fd2789d02f9..fd2789d02f9 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashState.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashState.h
index 2c603531cfd..2c603531cfd 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashState.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPathScanner.cc
index 0fd5ccdc59d..0fd5ccdc59d 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPathScanner.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPathScanner.h
index b59e3068093..b59e3068093 100644
--- a/Build/source/libs/poppler/poppler-0.25.1/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index 6344146a32f..48d6d43a35b 100644
--- a/Build/source/libs/poppler/version.ac
+++ b/Build/source/libs/poppler/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.25.1])
+m4_define([poppler_version], [0.25.2])