summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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.35.0-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.34.0-PATCHES/ChangeLog)7
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-0.34.0-PATCHES/TL-Changes)2
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-02-LLONG_MAX (renamed from Build/source/libs/poppler/poppler-0.34.0-PATCHES/patch-02-LLONG_MAX)8
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/AUTHORS (renamed from Build/source/libs/poppler/poppler-0.34.0/AUTHORS)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/CMakeLists.txt (renamed from Build/source/libs/poppler/poppler-0.34.0/CMakeLists.txt)8
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/COPYING (renamed from Build/source/libs/poppler/poppler-0.34.0/COPYING)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.34.0/ChangeLog)427
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/ConfigureChecks.cmake (renamed from Build/source/libs/poppler/poppler-0.34.0/ConfigureChecks.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/INSTALL (renamed from Build/source/libs/poppler/poppler-0.34.0/INSTALL)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.34.0/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/NEWS (renamed from Build/source/libs/poppler/poppler-0.34.0/NEWS)29
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/README (renamed from Build/source/libs/poppler/poppler-0.34.0/README)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/README-XPDF (renamed from Build/source/libs/poppler/poppler-0.34.0/README-XPDF)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/TODO (renamed from Build/source/libs/poppler/poppler-0.34.0/TODO)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.34.0/config.h.cmake)3
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/config.h.in (renamed from Build/source/libs/poppler/poppler-0.34.0/config.h.in)3
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/configure.ac (renamed from Build/source/libs/poppler/poppler-0.34.0/configure.ac)61
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiBase.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.h (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiBase.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiEncodings.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.h (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiEncodings.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiIdentifier.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.h (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiIdentifier.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiTrueType.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.h (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiTrueType.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.h (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1C.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.h (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1C.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/fofi/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.34.0/fofi/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/FixedPoint.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/FixedPoint.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/GooHash.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/GooHash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/GooLikely.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/GooLikely.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/GooList.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/GooList.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/GooList.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/GooList.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/GooMutex.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/GooMutex.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/GooString.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/GooString.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/GooString.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/GooString.h)24
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/GooTimer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/GooTimer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/ImgWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/ImgWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/JpegWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/JpegWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/NetPBMWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/NetPBMWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/PNGWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/PNGWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/TiffWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/TiffWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/gfile.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/gfile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/gfile.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/gfile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/gmem.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/gmem.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/gmem.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/gmem.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/gmempp.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/gmempp.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/grandom.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/grandom.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/grandom.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/grandom.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/gstrtod.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/gstrtod.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/gtypes.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/gtypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/goo/gtypes_p.h (renamed from Build/source/libs/poppler/poppler-0.34.0/goo/gtypes_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/gtk-doc.make (renamed from Build/source/libs/poppler/poppler-0.34.0/gtk-doc.make)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-cairo-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-cairo-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-cairo.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-cairo.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-cpp-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-cpp-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-cpp.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-cpp.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-glib-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-glib-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-glib.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-glib.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-qt4-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-qt4-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-qt4.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-qt4.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-qt5-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-qt5-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-qt5.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-qt5.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-splash-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-splash-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-splash.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-splash.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler.pc.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Annot.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Annot.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Array.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Array.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Array.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Array.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFontTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CairoFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CairoFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CairoOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CairoOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CairoRescaleBox.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CairoRescaleBox.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Catalog.cc)34
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Catalog.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CharCodeToUnicode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CharCodeToUnicode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CharTypes.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CharTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CompactFontTables.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CompactFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CurlCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CurlCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CurlPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/CurlPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/DCTStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/DCTStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/DateInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/DateInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Decrypt.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Decrypt.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Dict.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Dict.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Error.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Error.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Error.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Error.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/ErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/ErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/FileSpec.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/FileSpec.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/FlateStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/FlateStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/FontEncodingTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/FontEncodingTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/FontInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/FontInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Form.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Form.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Form.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Form.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Function.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Function.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Function.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Function.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Gfx.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Gfx.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/GfxFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/GfxFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState_helpers.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState_helpers.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParams.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParams.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParamsWin.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParamsWin.cc)57
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Hints.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Hints.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/JArithmeticDecoder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/JArithmeticDecoder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/JBIG2Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/JBIG2Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/JPEG2000Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/JPEG2000Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/JPXStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/JPXStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Lexer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Lexer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Linearization.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Linearization.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Link.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Link.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Link.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Link.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/LocalPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/LocalPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Makefile.am)2
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/MarkedContentOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/MarkedContentOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Movie.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Movie.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/NameToCharCode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/NameToCharCode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/NameToUnicodeTable.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/NameToUnicodeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Object.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Object.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Object.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Object.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/OptionalContent.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/OptionalContent.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Outline.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Outline.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/OutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/OutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDoc.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDoc.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocEncoding.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocEncoding.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocFactory.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocFactory.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PSOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PSOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PSTokenizer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PSTokenizer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Page.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Page.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Page.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Page.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo_p.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PageTransition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PageTransition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Parser.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Parser.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PopplerCache.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PopplerCache.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PreScanOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/PreScanOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/ProfileData.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/ProfileData.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Rendition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Rendition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/SecurityHandler.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/SecurityHandler.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Sound.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Sound.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/SplashOutputDev.cc)61
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/SplashOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/StdinCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/StdinCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/StdinPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/StdinPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Stream-CCITT.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Stream-CCITT.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/StructElement.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/StructElement.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/StructTreeRoot.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/StructTreeRoot.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/TextOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/TextOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UTF.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UTF.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UTF8.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UTF8.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCClassTables.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeCClassTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCompTables.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeCompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeDecompTables.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeDecompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMapTables.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMapTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeTypeTable.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeTypeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/ViewerPreferences.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/ViewerPreferences.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/XRef.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/XRef.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/XpdfPluginAPI.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.h (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/XpdfPluginAPI.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/gen-unicode-tables.py (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/gen-unicode-tables.py)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/poppler-config.h.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.in (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/poppler-config.h.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/poppler/strtok_r.cpp (renamed from Build/source/libs/poppler/poppler-0.34.0/poppler/strtok_r.cpp)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/Splash.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/Splash.cc)2
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/Splash.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/Splash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashBitmap.cc)32
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashBitmap.h)5
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashClip.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashClip.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontEngine.cc)9
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFileID.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFileID.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashGlyphBitmap.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashGlyphBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashMath.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashMath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashPattern.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashPattern.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashScreen.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashScreen.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashState.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashState.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1Font.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1Font.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashTypes.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.cc (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPathScanner.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.h (renamed from Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPathScanner.h)0
-rw-r--r--Build/source/libs/poppler/version.ac2
297 files changed, 720 insertions, 97 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 6a62e959e36..93fc8c9fc5d 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -49,7 +49,7 @@ mpfr 3.1.3 - checked 20jun15
pixman 0.32.6 - checked 7jul14
http://cairographics.org/releases/
-poppler 0.34.0 - checked 9jul15
+poppler 0.35.0 - checked 10aug15
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.12 - checked 27mar15
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 5a4055ba783..6eae6543a22 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.35.0.
+ * version.ac: Adjust.
+
2015-07-09 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.34.0.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 30ed32ab1e7..7e5ebf47345 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -276,7 +276,7 @@ am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing \
- $(top_srcdir)/poppler-0.34.0/poppler/poppler-config.h.in \
+ $(top_srcdir)/poppler-0.35.0/poppler/poppler-config.h.in \
../../build-aux/compile ../../build-aux/config.guess \
../../build-aux/config.sub ../../build-aux/depcomp \
../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -597,7 +597,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.34.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.35.0/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 822b0dd5980..a25b547b9f5 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.34.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.35.0.
#
# 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.34.0'
-PACKAGE_STRING='poppler (TeX Live) 0.34.0'
+PACKAGE_VERSION='0.35.0'
+PACKAGE_STRING='poppler (TeX Live) 0.35.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.34.0/poppler/Array.cc"
+ac_unique_file="poppler-0.35.0/poppler/Array.cc"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1306,7 +1306,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.34.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.35.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1373,7 +1373,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.34.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.35.0:";;
esac
cat <<\_ACEOF
@@ -1486,7 +1486,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.34.0
+poppler (TeX Live) configure 0.35.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2076,7 +2076,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.34.0, which was
+It was created by poppler (TeX Live) $as_me 0.35.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3999,7 +3999,7 @@ fi
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.34.0'
+ VERSION='0.35.0'
# Some tools Automake needs.
@@ -6573,12 +6573,12 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.34.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.35.0/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.34.0"
+#define POPPLER_VERSION "0.35.0"
_ACEOF
@@ -6712,7 +6712,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.34.0
+POPPLER_TREE=poppler-0.35.0
ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7272,7 +7272,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.34.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.35.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7338,7 +7338,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.34.0
+poppler (TeX Live) config.status 0.35.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7469,7 +7469,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.34.0/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.35.0/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.34.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.35.0-PATCHES/ChangeLog
index 08bfbba6bdf..041ef5aacd8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.35.0-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.35.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
2015-07-09 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported poppler-0.34.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.34.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.35.0-PATCHES/TL-Changes
index 7905d9318fa..0b14de1f3e6 100644
--- a/Build/source/libs/poppler/poppler-0.34.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.35.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.34.0 tree as obtained from:
+Changes applied to the poppler-0.35.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
diff --git a/Build/source/libs/poppler/poppler-0.34.0-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-02-LLONG_MAX
index 204eb69cd03..138654abcb9 100644
--- a/Build/source/libs/poppler/poppler-0.34.0-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-02-LLONG_MAX
@@ -1,7 +1,7 @@
-diff -ur poppler-0.34.0.orig/goo/GooString.h poppler-0.34.0/goo/GooString.h
---- poppler-0.34.0.orig/goo/GooString.h 2015-07-07 23:25:05.000000000 +0200
-+++ poppler-0.34.0/goo/GooString.h 2015-07-09 08:28:26.000000000 +0200
-@@ -34,6 +34,21 @@
+diff -ur poppler-0.35.0.orig/goo/GooString.h poppler-0.35.0/goo/GooString.h
+--- poppler-0.35.0.orig/goo/GooString.h 2015-07-12 17:05:10.000000000 +0200
++++ poppler-0.35.0/goo/GooString.h 2015-08-10 09:38:59.000000000 +0200
+@@ -35,6 +35,21 @@
#endif
#include <limits.h> // for LLONG_MAX and ULLONG_MAX
diff --git a/Build/source/libs/poppler/poppler-0.34.0/AUTHORS b/Build/source/libs/poppler/poppler-0.35.0/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.35.0/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.34.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.35.0/CMakeLists.txt
index b1435055e49..c587ea67e3d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.35.0/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ECM_FOUND)
endif()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "34")
+set(POPPLER_MINOR_VERSION "35")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -39,6 +39,7 @@ set(ENABLE_LIBOPENJPEG "auto" CACHE STRING "Use libopenjpeg for JPX streams. Pos
set(ENABLE_CMS "auto" CACHE STRING "Use color management system. Possible values: auto, lcms1, lcms2. 'auto' prefers lcms2 over lcms1 if both are available. Unset to disable color management system.")
option(ENABLE_LIBCURL "Build libcurl based HTTP support." OFF)
option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF)
+option(SPLASH_CMYK "Include support for CMYK rasterization." OFF)
option(USE_FIXEDPOINT "Use fixed point arithmetic in the Splash backend" OFF)
option(USE_FLOAT "Use single precision arithmetic in the Splash backend" OFF)
if(WIN32)
@@ -476,7 +477,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 53.0.0 SOVERSION 53)
+set_target_properties(poppler PROPERTIES VERSION 54.0.0 SOVERSION 54)
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})
@@ -703,6 +704,9 @@ endif(ENABLE_CPP)
message("Building Poppler with support for:")
show_end_message("font configuration" ${font_configuration})
show_end_message_yesno("splash output" ENABLE_SPLASH)
+if(SPLASH_CMYK)
+ message(" with CMYK support")
+endif()
show_end_message_yesno("cairo output" CAIRO_FOUND)
show_end_message_yesno("qt4 wrapper" QT4_FOUND)
show_end_message_yesno("qt5 wrapper" QT5_FOUND)
diff --git a/Build/source/libs/poppler/poppler-0.34.0/COPYING b/Build/source/libs/poppler/poppler-0.35.0/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/COPYING
+++ b/Build/source/libs/poppler/poppler-0.35.0/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.34.0/ChangeLog b/Build/source/libs/poppler/poppler-0.35.0/ChangeLog
index 60380914d82..8b04982fbfc 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.35.0/ChangeLog
@@ -1,3 +1,430 @@
+commit 1213501882cf2ec6e3dcb3c078391040c8cb0a57
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 9 18:27:06 2015 +0200
+
+ 0.35.0
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 29 +++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
+ 11 files changed, 40 insertions(+), 11 deletions(-)
+
+commit a7b1151ce7a14d359d85bacfe02352cdeb8d9a8f
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Jul 26 10:38:37 2015 +0200
+
+ glib-demo: Prefer gtk_label_set_{x,y}align() over deprecated
+ gtk_misc_set_alignment()
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=88788
+
+ glib/demo/main.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+commit e6e7d1492b518d57136031a94069a994182693cc
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun May 31 12:32:36 2015 +0200
+
+ pdftocairo: Fix cast to pointer from integer of different size
+ on win64
+
+ Fixes warning:
+
+ [ 322s] CXX pdftocairo-pdftocairo-win32.o
+ [ 324s] In file included from
+ /usr/x86_64-w64-mingw32/sys-root/mingw/include/windows.h:72:0,
+ [ 324s] from
+ /usr/x86_64-w64-mingw32/sys-root/mingw/include/cairo/cairo-win32.h:44,
+ [ 324s] from pdftocairo-win32.cc:16:
+ [ 324s] pdftocairo-win32.cc: In function 'HWND__*
+ createGroupBox(HWND, HINSTANCE, int, const char*, RECT*)':
+ [ 324s] pdftocairo-win32.cc:170:23: warning: cast to pointer from
+ integer of different size [-Wint-to-pointer-cast]
+ [ 324s] parent, (HMENU)id,
+ [ 324s] ^
+ [ 324s] pdftocairo-win32.cc: In function 'HWND__*
+ createCheckBox(HWND, HINSTANCE, int, const char*, RECT*)':
+ [ 324s] pdftocairo-win32.cc:186:23: warning: cast to pointer from
+ integer of different size [-Wint-to-pointer-cast]
+ [ 324s] parent, (HMENU)id,
+ [ 324s] ^
+ [ 324s] pdftocairo-win32.cc: In function 'HWND__*
+ createStaticText(HWND, HINSTANCE, int, const char*, RECT*)':
+ [ 324s] pdftocairo-win32.cc:202:23: warning: cast to pointer from
+ integer of different size [-Wint-to-pointer-cast]
+ [ 324s] parent, (HMENU)id,
+ [ 324s] ^
+ [ 324s] pdftocairo-win32.cc: In function 'HWND__*
+ createPageScaleComboBox(HWND, HINSTANCE, int, RECT*)':
+ [ 324s] pdftocairo-win32.cc:219:23: warning: cast to pointer from
+ integer of different size [-Wint-to-pointer-cast]
+ [ 324s] parent, (HMENU)id,
+ [ 324s] ^
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=91465
+
+ utils/pdftocairo-win32.cc | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+commit f3a0191abbf67c8b0f83739e1844a2fabe4138a4
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Jul 23 21:44:57 2015 +0200
+
+ Explicitly link poppler-glib against pthread
+
+ Debian complains about missing symbols:
+
+ dpkg-shlibdeps: warning: symbol pthread_mutexattr_destroy used by
+ debian/libpoppler-glib8/usr/lib/i386-linux-gnu/libpoppler-glib.so.8.6.0
+ found in none of the libraries
+ dpkg-shlibdeps: warning: symbol pthread_mutexattr_init used by
+ debian/libpoppler-glib8/usr/lib/i386-linux-gnu/libpoppler-glib.so.8.6.0
+ found in none of the libraries
+ dpkg-shlibdeps: warning: symbol pthread_mutexattr_settype used by
+ debian/libpoppler-glib8/usr/lib/i386-linux-gnu/libpoppler-glib.so.8.6.0
+ found in none of the libraries
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=91450
+
+ glib/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit fb264bfa8bf7142cabc8d94a86594cf0e7c9f134
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Jul 24 22:18:26 2015 +0200
+
+ glib-demo: Remove code for no longer supported gtk versions
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=88788
+
+ glib/demo/annots.c | 8 --------
+ glib/demo/selections.c | 16 ----------------
+ 2 files changed, 24 deletions(-)
+
+commit dd0883649ac296c6033474fe5991c534ac2ce594
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Jul 24 22:09:57 2015 +0200
+
+ glib-demo: Remove use of deprecated
+ gtk_dialog_set_alternative_button_order()
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=88788
+
+ glib/demo/main.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+commit ffc798a7fcf95d2aaf123772072ef956ceb2dff7
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Jan 25 18:16:04 2015 +0100
+
+ glib-demo: Remove deprecated use of gtk_misc_set_alignment()
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=88788
+
+ glib/demo/main.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+commit 56915b2989fc244b58a454fe40412eb731e706bd
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Jan 25 13:10:31 2015 +0100
+
+ glib-demo: Remove use of deprecated GtkAlignment
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=88788
+
+ glib/demo/annots.c | 23 +++++++++++---------
+ glib/demo/forms.c | 23 +++++++++++---------
+ glib/demo/info.cc | 18 +++++++++------
+ glib/demo/main.c | 12 +---------
+ glib/demo/page.c | 34 ++++++++++++++++++-----------
+ glib/demo/text.c | 18 +++++++++------
+ glib/demo/utils.c | 64
+ +++++++++++++++++++++++++++++++-----------------------
+ 7 files changed, 107 insertions(+), 85 deletions(-)
+
+commit 49e33e1213a7957d4814656960bf269abcabc7c3
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Jan 25 12:21:41 2015 +0100
+
+ glib-demo: Remove deprecated use of gtk_tree_view_set_rules_hint()
+
+ The use of rules-hint is deprecated in gtk because it is
+ considered bad application API and is not really usefull.
+
+ See
+ https://git.gnome.org/browse/gtk+/commit/?id=0ed766ec866a2da7e3db05b1db2fc2519d6b1cdc
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=88788
+
+ glib/demo/attachments.c | 1 -
+ glib/demo/find.c | 1 -
+ glib/demo/fonts.c | 1 -
+ glib/demo/transitions.c | 1 -
+ 4 files changed, 4 deletions(-)
+
+commit 70f3c5ff0010775e5fcd590db1b8d475694fe3a4
+Author: William Bader <williambader@hotmail.com>
+Date: Sat Jul 18 16:36:30 2015 +0200
+
+ Updated patch to add configure --enable-build-type
+
+ Bug #90796
+
+ configure.ac | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 52 insertions(+)
+
+commit 1aa2f6e8a41a6a86dc02bf7c5cbc62355e780961
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 17 00:40:56 2015 +0200
+
+ Silly micro optimization: Move vars inside case {}
+
+ poppler/SplashOutputDev.cc | 19 ++++++++++++-------
+ 1 file changed, 12 insertions(+), 7 deletions(-)
+
+commit 705615f7569bbadb555bbf45c15c7c01f1690db5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 17 00:38:58 2015 +0200
+
+ More typo fix
+
+ poppler/Catalog.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 3b6b3fefe97b885e42966fece84a123fc4671b20
+Author: William Bader <williambader@hotmail.com>
+Date: Fri Jul 17 00:37:46 2015 +0200
+
+ [Splash] Fix wrong writes on non rgb outputs
+
+ Bug #90570
+
+ poppler/SplashOutputDev.cc | 52
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 51 insertions(+), 1 deletion(-)
+
+commit 885b23bfd16a3e4970a52956493e92a160b2d0a8
+Author: Dmytro Morgun <lztoad@gmail.com>
+Date: Fri Jul 17 00:30:08 2015 +0200
+
+ GlobalParamsWin bug/fixes
+
+ Bug #91053
+
+ poppler/GlobalParamsWin.cc | 57
+ ++++++++++++++++++++++++++--------------------
+ 1 file changed, 32 insertions(+), 25 deletions(-)
+
+commit 0ce4da8ab16b4a5497688a6cf86175aaec0f585f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 15 23:59:11 2015 +0200
+
+ Make sure pageRootRef is a ref before using it
+
+ Bug #91344
+
+ poppler/Catalog.cc | 32 ++++++++++++++++++--------------
+ 1 file changed, 18 insertions(+), 14 deletions(-)
+
+commit b71431513b45f8a1aa4154332dae56af241258f8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 15 13:10:27 2015 +0200
+
+ Typo fix in warning
+
+ poppler/Catalog.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit ccd780f9504f5b077ea12370fd5380ff7da5cd23
+Author: Dmytro Morgun <lztoad@gmail.com>
+Date: Wed Jul 15 00:26:55 2015 +0200
+
+ [Windows] remove ifndef
+
+ splash/SplashFontEngine.cc | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+commit 2ed8465074c4fc2c88f745b29bdae92410751327
+Author: William Bader <williambader@hotmail.com>
+Date: Wed Jul 15 00:07:48 2015 +0200
+
+ Allow configuring SPLASH_CMYK support from cmake/configure
+
+ Bug #90795
+
+ CMakeLists.txt | 4 ++++
+ config.h.cmake | 3 +++
+ configure.ac | 7 +++++++
+ poppler/SplashOutputDev.cc | 4 ++--
+ qt4/src/poppler-document.cc | 3 ++-
+ qt4/src/poppler-page.cc | 4 ++--
+ qt5/src/poppler-document.cc | 3 ++-
+ qt5/src/poppler-page.cc | 4 ++--
+ splash/Splash.cc | 2 +-
+ splash/SplashBitmap.cc | 4 ++--
+ 10 files changed, 27 insertions(+), 11 deletions(-)
+
+commit 334dc56f2f9adf4daa33c20ce034a5b1f8259baf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 12 23:29:30 2015 +0200
+
+ [qt] KeepAlphaChannel -> IgnorePaperColor
+
+ qt4/src/poppler-page.cc | 13 ++++++-------
+ qt4/src/poppler-qt4.h | 4 ++--
+ qt5/src/poppler-page.cc | 13 ++++++-------
+ qt5/src/poppler-qt5.h | 4 ++--
+ 4 files changed, 16 insertions(+), 18 deletions(-)
+
+commit 2a1363a4a3129fe4b5e4fae1018dc8919a2d796a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 12 23:22:32 2015 +0200
+
+ Update (C)
+
+ splash/SplashBitmap.cc | 1 +
+ splash/SplashBitmap.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+commit e903b2364f55c4f6417d826ab85dcb60cd240563
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 12 23:20:20 2015 +0200
+
+ [qt] fix spacing in header
+
+ qt4/src/poppler-qt4.h | 4 ++--
+ qt5/src/poppler-qt5.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 810c659faea542c3bd6e9c48c9a7c60b886a9269
+Author: Adam Reichold <adam.reichold@t-online.de>
+Date: Fri Jul 3 00:31:56 2015 +0200
+
+ Switch default image format of Qt frontends
+
+ This changes the Poppler::Page::renderToImage method w.r.t. to
+ the image
+ formats used to render using Splash, i.e. the default will be RGB8. If
+ overprint preview is requested, DeviceN8 will be used and converted to
+ XBGR8 for display. If the internal alpha channel is requested,
+ XBGR8 will
+ be used and augmented by Splash's separate alpha channel.
+
+ This yields some improvements w.r.t. to rendering including alpha
+ blending
+ with the paper colour, i.e. synthetic benchmarks using structurally
+ simple
+ documents yield more than two percent improvement.
+
+ qt4/src/poppler-page.cc | 115
+ +++++++++++++++++++++++++++++-------------------
+ qt5/src/poppler-page.cc | 114
+ ++++++++++++++++++++++++++++-------------------
+ 2 files changed, 138 insertions(+), 91 deletions(-)
+
+commit 8fea54e48ec9ba35122c565f761e7e7f016a34f9
+Author: Adam Reichold <adam.reichold@t-online.de>
+Date: Thu Jul 2 21:08:38 2015 +0200
+
+ Improve efficiency of Poppler::Page::renderToImage
+
+ Improves the efficiency of rendering into a QImage using
+ the Splash output device by removing a copy of the raw bitmap data
+ since Qt5 will properly free this data using a function supplied
+ during construction, i.e. in this case gfree.
+
+ This improves performance in synthentic rendering benchmarks
+ by approximately four percent and reduces the maximum working
+ set size.
+
+ qt5/src/poppler-page.cc | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+commit 09db5a71fff4b7a0ed1d5d7e76c8270e2f6e9a8d
+Author: Adam Reichold <adam.reichold@t-online.de>
+Date: Thu Jul 2 21:02:59 2015 +0200
+
+ Add KeepAlphaChannel render flag to Qt frontends
+
+ Adds a new render flag which will indicate that the image return by
+ Poppler::Page::renderToImage will not be opaque and alpha blended with
+ the paper colour, but retain its actually background transparency.
+
+ This improves performance in synthentic rendering benchmarks by almost
+ five percent and the additional alpha blending that is then done
+ by the
+ consuming application is often a hardware-accellerated operation.
+
+ qt4/src/poppler-page.cc | 6 ++++--
+ qt4/src/poppler-qt4.h | 3 ++-
+ qt5/src/poppler-page.cc | 6 ++++--
+ qt5/src/poppler-qt5.h | 3 ++-
+ 4 files changed, 12 insertions(+), 6 deletions(-)
+
+commit d604a075c6b171d5c3fe26c146d3469c4bc0af3f
+Author: Adam Reichold <adam.reichold@t-online.de>
+Date: Thu Jul 2 21:00:16 2015 +0200
+
+ Make SplashBitmap XBGR transfer alpha channel
+
+ Adds an option to SplashBitmap::convertToXBGR and
+ SplashBitmap::getXBGRLine
+ so that both optionally transfer Splash's internal alpha channel
+ into the
+ fourth component of the resulting bitmap data.
+
+ splash/SplashBitmap.cc | 27 ++++++++++++++++++++++-----
+ splash/SplashBitmap.h | 4 ++--
+ 2 files changed, 24 insertions(+), 7 deletions(-)
+
+commit 17adfc848f99a5c5bfad35c94289ccf03fba1a16
+Author: Adam Reichold <adamreichold@myopera.com>
+Date: Sun Jul 12 17:05:24 2015 +0200
+
+ Adjust memory layout computation of GooString
+
+ GooString uses the small string optimization but the static buffer
+ size is
+ hard-coded and hence the final object size becomes dependent on
+ architecture.
+ This adds a helper class to compute the memory layout at compile
+ time so that
+ the target object size of e.g. 32 or another multiple of 16 is
+ achieved.
+
+ This also adds an overload so that the C string returned by
+ GooString's
+ getCString method respect the constness of this and fixes a constness
+ issue
+ in the lexer tests.
+
+ goo/GooString.h | 24 ++++++++++++++++--------
+ qt4/tests/check_lexer.cpp | 2 +-
+ qt5/tests/check_lexer.cpp | 2 +-
+ 3 files changed, 18 insertions(+), 10 deletions(-)
+
+commit d1720740f3381f489f1ee83ce1ce53e73aafd537
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 8 23:22:13 2015 +0200
+
+ Poppler 0.34
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 13 +++++++++++++
+ configure.ac | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 6 files changed, 19 insertions(+), 6 deletions(-)
+
commit 2fc1f540754391ffa87d7fe9f3438e134d821207
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
Date: Tue Jul 7 18:48:51 2015 +0200
diff --git a/Build/source/libs/poppler/poppler-0.34.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.35.0/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.35.0/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.34.0/INSTALL b/Build/source/libs/poppler/poppler-0.35.0/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.35.0/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.34.0/Makefile.am b/Build/source/libs/poppler/poppler-0.35.0/Makefile.am
index 691512f4e3a..691512f4e3a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.35.0/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.34.0/NEWS b/Build/source/libs/poppler/poppler-0.35.0/NEWS
index a0f979a3041..1354d3b1a71 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/NEWS
+++ b/Build/source/libs/poppler/poppler-0.35.0/NEWS
@@ -1,3 +1,32 @@
+Release 0.35.0
+ core:
+ * Fix assert in broken file. Bug #91344
+ * Adjust memory layout computation of GooString
+ * Make SplashBitmap XBGR transfer alpha channel
+ * Splash: Fix wrong writes on non rgb outputs. Bug #90570
+ * Splash: remove ifndef in Windows code
+ * GlobalParamsWin bugfixes. Bug #91053
+
+ qt4:
+ * Switch default image format
+ * Add IgnorePaperColor render flag
+
+ qt5:
+ * Improve efficiency of Poppler::Page::renderToImage
+ * Switch default image format
+ * Add IgnorePaperColor render flag
+
+ build system:
+ * Allow configuring SPLASH_CMYK support
+ * Add configure --enable-build-type. Bug #90796
+
+ glib:
+ * Explicitly link against pthread
+ * Deprecation fixes
+
+ utils:
+ * pdftocairo: Fix cast to pointer from integer of different size on win64
+
Release 0.34.0
core:
* Splash: Fix crash in PDF with nested softmasks. Bug #91240
diff --git a/Build/source/libs/poppler/poppler-0.34.0/README b/Build/source/libs/poppler/poppler-0.35.0/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/README
+++ b/Build/source/libs/poppler/poppler-0.35.0/README
diff --git a/Build/source/libs/poppler/poppler-0.34.0/README-XPDF b/Build/source/libs/poppler/poppler-0.35.0/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.35.0/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.34.0/TODO b/Build/source/libs/poppler/poppler-0.35.0/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/TODO
+++ b/Build/source/libs/poppler/poppler-0.35.0/TODO
diff --git a/Build/source/libs/poppler/poppler-0.34.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.35.0/config.h.cmake
index 8ed1c92248e..400b16b1590 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.35.0/config.h.cmake
@@ -174,6 +174,9 @@
/* Support for curl based doc builder is compiled in. */
#cmakedefine POPPLER_HAS_CURL_SUPPORT 1
+/* Include support for CMYK rasterization */
+#cmakedefine SPLASH_CMYK 1
+
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
diff --git a/Build/source/libs/poppler/poppler-0.34.0/config.h.in b/Build/source/libs/poppler/poppler-0.35.0/config.h.in
index c47d66d3e52..786143b27d4 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/config.h.in
@@ -197,6 +197,9 @@
your system. */
#undef PTHREAD_CREATE_JOINABLE
+/* Include support for CMYK rasterization */
+#undef SPLASH_CMYK
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff --git a/Build/source/libs/poppler/poppler-0.34.0/configure.ac b/Build/source/libs/poppler/poppler-0.35.0/configure.ac
index 5e7222a91d3..bd0fcc2a14f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.35.0/configure.ac
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[34])
+m4_define([poppler_version_minor],[35])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
@@ -71,6 +71,55 @@ AC_ARG_ENABLE(xpdf-headers,
enable_xpdf_headers="no")
AM_CONDITIONAL(ENABLE_XPDF_HEADERS, test x$enable_xpdf_headers = xyes)
+dnl ##### Emulate cmake -DCMAKE_BUILD_TYPE=Release using options from cmake/modules/PopplerMacros.cmake
+
+AC_ARG_ENABLE(build-type,
+ AC_HELP_STRING([--enable-build-type=@<:@relwithdebinfo/release/debug/debugfull/profile@:>@],
+ [Build with options similar to 'cmake -DCMAKE_BUILD_TYPE=' values.]),
+ [enable_build_type=no;
+ case "$enableval" in
+ relwithdebinfo|release|debug|debugfull|profile) enable_build_type="$enableval" ;;
+ *) AC_MSG_ERROR([bad value $enableval for --enable-build-type option.
+ Options are relwithdebinfo, release, debug, debugfull, and profile.]) ;;
+ esac],
+ enable_build_type=no)
+
+if test "x$GCC" = "xyes"; then
+ case "$enable_build_type" in
+ relwithdebinfo)
+ CFLAGS="-O2 -g $CFLAGS"
+ CXXFLAGS="-O2 -g $CXXFLAGS"
+ ;;
+ release)
+ CFLAGS="-O2 $CFLAGS -g0 -DNDEBUG"
+ CXXFLAGS="-O2 $CXXFLAGS -g0 -DNDEBUG"
+ ;;
+ debug)
+ CFLAGS="-O2 -g $CFLAGS -fno-reorder-blocks -fno-schedule-insns -fno-inline"
+ CXXFLAGS="-O2 -g $CXXFLAGS -fno-reorder-blocks -fno-schedule-insns -fno-inline"
+ ;;
+ debugfull)
+ CFLAGS="$CFLAGS -g3 -fno-inline"
+ CXXFLAGS="$CXXFLAGS -g3 -fno-inline"
+ ;;
+ profile)
+ CFLAGS="$CFLAGS -g3 -fno-inline -ftest-coverage -fprofile-arcs"
+ CXXFLAGS="$CXXFLAGS -g3 -fno-inline -ftest-coverage -fprofile-arcs"
+ LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage -lgcov"
+ ;;
+ *)
+ enable_build_type=no
+ ;;
+ esac
+else
+ case "$enable_build_type" in
+ relwithdebinfo|release|debug|debugfull|profile)
+ echo " Warning: --enable-build-type ignored for non-gcc compiler."
+ ;;
+ esac
+ enable_build_type=no
+fi
+
AC_ARG_ENABLE(single-precision,
[ --enable-single-precision use single precision arithmetic (instead of double precision) in the Splash backend],
AC_DEFINE(USE_FLOAT, [1], [Use single precision arithmetic in the Splash backend]))
@@ -79,6 +128,10 @@ AC_ARG_ENABLE(fixedpoint,
[ --enable-fixedpoint use fixed point (instead of double precision) arithmetic in the Splash backend],
AC_DEFINE(USE_FIXEDPOINT, [1], [Use fixed point arithmetic in the Splash backend]))
+AC_ARG_ENABLE(cmyk,
+[ --enable-cmyk Include support for CMYK rasterization],
+AC_DEFINE(SPLASH_CMYK, [1], [Include support for CMYK rasterization]))
+
dnl Relocation support
AC_ARG_ENABLE(relocatable,
AC_HELP_STRING([--disable-relocatable],
@@ -938,6 +991,9 @@ echo ""
echo "Building poppler with support for:"
echo " font configuration: $with_font_configuration"
echo " splash output: $enable_splash_output"
+if test x$enable_cmyk = xyes;then
+ echo " with CMYK support"
+fi
echo " cairo output: $use_cairo"
echo " qt4 wrapper: $enable_poppler_qt4"
echo " qt5 wrapper: $enable_poppler_qt5"
@@ -966,6 +1022,9 @@ if test x$enable_cms = xyes;then
echo " with lcms2"
fi
fi
+if test x$enable_build_type != xno;then
+ echo " build type: $enable_build_type"
+fi
echo " command line utils: $enable_utils"
echo " test data dir: $TESTDATADIR"
echo ""
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.cc
index 11699dd6119..11699dd6119 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.cc
index 827ebc7d7c3..827ebc7d7c3 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.35.0/fofi/Makefile.am
index 4deb7d5e063..4deb7d5e063 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.35.0/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.35.0/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.35.0/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.35.0/goo/GooMutex.h
index b2714b048c7..b2714b048c7 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/GooString.cc
index 3f22f368560..3f22f368560 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.35.0/goo/GooString.h
index 0176d873646..cca5a905e97 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/GooString.h
@@ -20,6 +20,7 @@
// Copyright (C) 2008-2010, 2012, 2014 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2012-2014 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2015 Adam Reichold <adam.reichold@t-online.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -129,13 +130,14 @@ public:
~GooString();
// Get length.
- int getLength() { return length; }
+ int getLength() const { return length; }
// Get C string.
- char *getCString() const { return s; }
+ char *getCString() { return s; }
+ const char *getCString() const { return s; }
// Get <i>th character.
- char getChar(int i) { return s[i]; }
+ char getChar(int i) const { return s[i]; }
// Change <i>th character.
void setChar(int i, char c) { s[i] = c; }
@@ -185,11 +187,17 @@ private:
GooString(const GooString &other);
GooString& operator=(const GooString &other);
- // you can tweak this number for a different speed/memory usage tradeoffs.
- // In libc malloc() rounding is 16 so it's best to choose a value that
- // results in sizeof(GooString) be a multiple of 16.
- // 24 makes sizeof(GooString) to be 32.
- static const int STR_STATIC_SIZE = 24;
+ // You can tweak the final object size for different time/space tradeoffs.
+ // In libc malloc(), rounding is 16 so it's best to choose a value that
+ // is a multiple of 16.
+ class MemoryLayout {
+ char c[sizeof(char*)];
+ int i;
+ char* s;
+ };
+
+ static const int STR_FINAL_SIZE = 32;
+ static const int STR_STATIC_SIZE = STR_FINAL_SIZE - sizeof(MemoryLayout) + sizeof(char*);
int roundedSize(int len);
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.h
index ac64f6b4868..ac64f6b4868 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.35.0/goo/Makefile.am
index 370e85021be..370e85021be 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.cc
index 316008778b1..316008778b1 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/gfile.cc
index 3528bb357d8..3528bb357d8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.35.0/goo/gfile.h
index 1365a9cf2ab..1365a9cf2ab 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.35.0/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/grandom.h b/Build/source/libs/poppler/poppler-0.35.0/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.35.0/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.35.0/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.35.0/gtk-doc.make
index e7916563d75..e7916563d75 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.35.0/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.35.0/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.35.0/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.cc
index 18576c8d94f..18576c8d94f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.h
index 1e64f59bc76..1e64f59bc76 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.cc
index 6731ab5a1fa..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.cc
index 1d611b59d3c..1d611b59d3c 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.cc
index a86ec120f20..a86ec120f20 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.h
index 33dde0c570a..33dde0c570a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.cc
index f75f4e106f3..04caa1c1f35 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.cc
@@ -825,24 +825,28 @@ int Catalog::getNumPages()
Object pageRootRef;
catDict.dictLookupNF("Pages", &pageRootRef);
- error(errSyntaxError, -1, "Pages top-level is a single Page. The document is mal-formet, trying to recover...");
+ error(errSyntaxError, -1, "Pages top-level is a single Page. The document is malformed, trying to recover...");
Dict *pageDict = pagesDict.getDict();
- const Ref pageRef = pageRootRef.getRef();
- Page *p = new Page(doc, 1, pageDict, pageRef, new PageAttrs(NULL, pageDict), form);
- if (p->isOk()) {
- pages = (Page **)gmallocn(1, sizeof(Page *));
- pageRefs = (Ref *)gmallocn(1, sizeof(Ref));
-
- pages[0] = p;
- pageRefs[0].num = pageRef.num;
- pageRefs[0].gen = pageRef.gen;
-
- numPages = 1;
- lastCachedPage = 1;
- pagesSize = 1;
+ if (pageRootRef.isRef()) {
+ const Ref pageRef = pageRootRef.getRef();
+ Page *p = new Page(doc, 1, pageDict, pageRef, new PageAttrs(NULL, pageDict), form);
+ if (p->isOk()) {
+ pages = (Page **)gmallocn(1, sizeof(Page *));
+ pageRefs = (Ref *)gmallocn(1, sizeof(Ref));
+
+ pages[0] = p;
+ pageRefs[0].num = pageRef.num;
+ pageRefs[0].gen = pageRef.gen;
+
+ numPages = 1;
+ lastCachedPage = 1;
+ pagesSize = 1;
+ } else {
+ delete p;
+ numPages = 0;
+ }
} else {
- delete p;
numPages = 0;
}
} else {
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.cc
index 59b7c93e66f..59b7c93e66f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.cc
index c2a94f4a1fa..c2a94f4a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Error.h
index 9e11733d803..9e11733d803 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Form.cc
index 661ed8972df..661ed8972df 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Function.cc
index 67283dffe9f..67283dffe9f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.cc
index 07d95b355a8..07d95b355a8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.cc
index 81f59037f7f..81f59037f7f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.h
index febb902922d..febb902922d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.cc
index 3e9cac41534..3e9cac41534 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.h
index f018e93dd34..f018e93dd34 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.cc
index 7e110d05b15..7e110d05b15 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.h
index 16d615ae6d9..16d615ae6d9 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParamsWin.cc
index 084b49bf639..f9f40ef4e29 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParamsWin.cc
@@ -7,6 +7,7 @@
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012 Mark Brand <mabrand@mabrand.nl>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+ // Copyright (C) 2013 Dmytro Morgun <lztoad@gmail.com>
TODO: instead of a fixed mapping defined in displayFontTab, it could
scan the whole fonts directory, parse TTF files and build font
@@ -443,11 +444,14 @@ void GlobalParams::setupBaseFonts(char * dir)
delete fontPath;
}
- if (displayFontTab[i].warnIfMissing)
- error(errSyntaxError, -1, "No display font for '{0:s}'", fontName);
+ if (displayFontTab[i].warnIfMissing) {
+ error(errSyntaxError, -1, "No display font for '{0:s}'", displayFontTab[i].name);
+ delete fontName;
+ }
}
if (winFontDir[0]) {
- sysFonts->scanWindowsFonts(new GooString(winFontDir));
+ GooString gooWinFontsDir(winFontDir);
+ sysFonts->scanWindowsFonts(&gooWinFontsDir);
}
fileName = new GooString(dataRoot);
@@ -468,32 +472,35 @@ void GlobalParams::setupBaseFonts(char * dir)
obj1.free();
parser->getObj(&obj1);
while (!obj1.isEOF()) {
- parser->getObj(&obj2);
- if (obj1.isName()) {
- // Substitutions
- if (obj2.isDict()) {
- Object obj3;
- obj2.getDict()->lookup("Path", &obj3);
- if (obj3.isString())
- addFontFile(new GooString(obj1.getName()), obj3.getString()->copy());
- obj3.free();
- // Aliases
- } else if (obj2.isName()) {
- substFiles->add(new GooString(obj1.getName()), new GooString(obj2.getName()));
- }
- }
- obj2.free();
- obj1.free();
- parser->getObj(&obj1);
- // skip trailing ';'
- while (obj1.isCmd(";")) {
- obj1.free();
- parser->getObj(&obj1);
- }
+ parser->getObj(&obj2);
+ if (obj1.isName()) {
+ // Substitutions
+ if (obj2.isDict()) {
+ Object obj3;
+ obj2.getDict()->lookup("Path", &obj3);
+ if (obj3.isString())
+ addFontFile(new GooString(obj1.getName()), obj3.getString()->copy());
+ obj3.free();
+ // Aliases
+ } else if (obj2.isName()) {
+ substFiles->add(new GooString(obj1.getName()), new GooString(obj2.getName()));
+ }
+ }
+ obj2.free();
+ obj1.free();
+ parser->getObj(&obj1);
+ // skip trailing ';'
+ while (obj1.isCmd(";")) {
+ obj1.free();
+ parser->getObj(&obj1);
+ }
}
delete file;
delete parser;
}
+ else {
+ delete fileName;
+ }
}
static const char *findSubstituteName(GfxFont *font, GooHash *fontFiles,
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.cc
index bdd0d322612..bdd0d322612 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.cc
index 66c1d2505e8..66c1d2505e8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.h
index 1e14c5cf783..1e14c5cf783 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.cc
index 35e98b86ebc..35e98b86ebc 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.h
index 73b6bdd97b8..73b6bdd97b8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.cc
index 952967a998a..952967a998a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Link.cc
index 4ab5f52ceda..4ab5f52ceda 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.35.0/poppler/Makefile.am
index 04429292b23..3c943bad331 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 53:0:0 \
+ -version-info 54:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.h
index 15bea159857..15bea159857 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.cc
index 71a1efe269d..71a1efe269d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.h
index 6c40f7b0c0c..6c40f7b0c0c 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.cc
index 7b93e3bf65a..7b93e3bf65a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.h
index 7318cafdf2a..7318cafdf2a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Page.cc
index a4af3405b92..a4af3405b92 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo_p.h
index 6cd5220d372..6cd5220d372 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.cc
index 28a54607f5c..28a54607f5c 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.cc
index b2af18d86b8..b2af18d86b8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.h
index 50fcbf22f73..50fcbf22f73 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.cc
index 63d8b4e1287..63d8b4e1287 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.cc
index 97ed1c14053..d9d5699a051 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.cc
@@ -143,6 +143,61 @@ static inline void convertGfxColor(SplashColorPtr dest,
splashColorCopy(dest, color);
}
+// Copy a color according to the color mode.
+// Use convertGfxShortColor() below when the destination is a bitmap
+// to avoid overwriting cells.
+// Calling this in SplashGouraudPattern::getParameterizedColor() fixes bug 90570.
+// Use convertGfxColor() above when the destination is an array of SPOT_NCOMPS+4 bytes,
+// to ensure that everything is initialized.
+
+static inline void convertGfxShortColor(SplashColorPtr dest,
+ SplashColorMode colorMode,
+ GfxColorSpace *colorSpace,
+ GfxColor *src) {
+ switch (colorMode) {
+ case splashModeMono1:
+ case splashModeMono8:
+ {
+ GfxGray gray;
+ colorSpace->getGray(src, &gray);
+ dest[0] = colToByte(gray);
+ }
+ break;
+ case splashModeXBGR8:
+ dest[3] = 255;
+ case splashModeBGR8:
+ case splashModeRGB8:
+ {
+ GfxRGB rgb;
+ colorSpace->getRGB(src, &rgb);
+ dest[0] = colToByte(rgb.r);
+ dest[1] = colToByte(rgb.g);
+ dest[2] = colToByte(rgb.b);
+ }
+ break;
+#if SPLASH_CMYK
+ case splashModeCMYK8:
+ {
+ GfxCMYK cmyk;
+ colorSpace->getCMYK(src, &cmyk);
+ dest[0] = colToByte(cmyk.c);
+ dest[1] = colToByte(cmyk.m);
+ dest[2] = colToByte(cmyk.y);
+ dest[3] = colToByte(cmyk.k);
+ }
+ break;
+ case splashModeDeviceN8:
+ {
+ GfxColor deviceN;
+ colorSpace->getDeviceN(src, &deviceN);
+ for (int i = 0; i < SPOT_NCOMPS + 4; i++)
+ dest[i] = colToByte(deviceN.c[i]);
+ }
+ break;
+#endif
+ }
+}
+
//------------------------------------------------------------------------
// SplashGouraudPattern
//------------------------------------------------------------------------
@@ -179,7 +234,7 @@ void SplashGouraudPattern::getParameterizedColor(double colorinterp, SplashColor
for (int m = 0; m < colorComps; ++m)
dest[m] = colToByte(src.c[m]);
} else {
- convertGfxColor(dest, mode, srcColorSpace, &src);
+ convertGfxShortColor(dest, mode, srcColorSpace, &src);
}
}
@@ -888,7 +943,7 @@ static void setSat(Guchar rIn, Guchar gIn, Guchar bIn, int sat,
static void splashOutBlendHue(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend, SplashColorMode cm) {
Guchar r0, g0, b0;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
Guchar r1, g1, b1;
int i;
SplashColor src2, dest2;
@@ -938,7 +993,7 @@ static void splashOutBlendSaturation(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend,
SplashColorMode cm) {
Guchar r0, g0, b0;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
Guchar r1, g1, b1;
int i;
SplashColor src2, dest2;
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.h
index d34426c0f3c..d34426c0f3c 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.cc
index d2dd761c729..d2dd761c729 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.cc
index c6688208fee..c6688208fee 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.h
index cd89a970ddb..cd89a970ddb 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.cc
index e46e3e28388..e46e3e28388 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.h
index 3b1f3c84421..3b1f3c84421 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.cc
index 16f099f291a..16f099f291a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.h
index a0aa6f8a991..a0aa6f8a991 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.cc
index 1bbbdc51c25..1bbbdc51c25 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.h
index 6ed890a8f1f..6ed890a8f1f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.35.0/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.cmake
index b087a693f92..b087a693f92 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.in
index f73d0f66ee9..f73d0f66ee9 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.34.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.35.0/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.35.0/splash/Makefile.am
index 5c265d6360c..5c265d6360c 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/Splash.cc
index 276cc8f0390..e07fa06db2b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/Splash.cc
@@ -605,7 +605,7 @@ void Splash::pipeRun(SplashPipe *pipe) {
//----- blend function
if (state->blendFunc) {
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (bitmap->mode == splashModeDeviceN8) {
for (int k = 4; k < 4 + SPOT_NCOMPS; k++) {
cBlend[k] = 0;
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/Splash.h b/Build/source/libs/poppler/poppler-0.35.0/splash/Splash.h
index 75764544fed..75764544fed 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/Splash.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.cc
index e886683fd41..c905c97afb9 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.cc
@@ -18,9 +18,10 @@
// Copyright (C) 2010, 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2010 Harry Roberts <harry.roberts@midnight-labs.org>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
-// Copyright (C) 2010 William Bader <williambader@hotmail.com>
+// Copyright (C) 2010, 2015 William Bader <williambader@hotmail.com>
// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2012 Anthony Wesley <awesley@smartnetworks.com.au>
+// Copyright (C) 2015 Adam Reichold <adamreichold@myopera.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
@@ -361,7 +362,7 @@ SplashError SplashBitmap::writeImgFile(SplashImageFileFormat format, FILE *f, in
#endif
#ifdef ENABLE_LIBJPEG
- #ifdef SPLASH_CMYK
+ #if SPLASH_CMYK
case splashFormatJpegCMYK:
writer = new JpegWriter(JpegWriter::CMYK);
break;
@@ -460,7 +461,7 @@ void SplashBitmap::getRGBLine(int yl, SplashColorPtr line) {
}
}
-void SplashBitmap::getXBGRLine(int yl, SplashColorPtr line) {
+void SplashBitmap::getXBGRLine(int yl, SplashColorPtr line, bool useAlpha) {
SplashColor col;
double c, m, y, k, c1, m1, y1, k1, r, g, b;
@@ -503,20 +504,37 @@ void SplashBitmap::getXBGRLine(int yl, SplashColorPtr line) {
*line++ = dblToByte(clip01(b));
*line++ = dblToByte(clip01(g));
*line++ = dblToByte(clip01(r));
- *line++ = 255;
+ *line++ = useAlpha ? getAlpha(x, yl) : 255;
}
}
-GBool SplashBitmap::convertToXBGR() {
- if (mode == splashModeXBGR8)
+GBool SplashBitmap::convertToXBGR(bool useAlpha) {
+ if (mode == splashModeXBGR8) {
+ if (useAlpha) {
+ // Copy the alpha channel into the fourth component so that XBGR becomes ABGR.
+ const SplashColorPtr dbegin = data;
+ const SplashColorPtr dend = data + rowSize * height;
+
+ Guchar *const abegin = alpha;
+ Guchar *const aend = alpha + width * height;
+
+ SplashColorPtr d = dbegin + 3;
+ Guchar *a = abegin;
+
+ for(; d < dend && a < aend; d += 4, a += 1) {
+ *d = *a;
+ }
+ }
+
return gTrue;
+ }
int newrowSize = width * 4;
SplashColorPtr newdata = (SplashColorPtr)gmallocn_checkoverflow(newrowSize, height);
if (newdata != NULL) {
for (int y = 0; y < height; y++) {
unsigned char *row = newdata + y * newrowSize;
- getXBGRLine(y, row);
+ getXBGRLine(y, row, useAlpha);
}
if (rowSize < 0) {
gfree(data + (height - 1) * rowSize);
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.h
index 70509abcfaa..9fa7613f879 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.h
@@ -20,6 +20,7 @@
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
// Copyright (C) 2010 William Bader <williambader@hotmail.com>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2015 Adam Reichold <adamreichold@myopera.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
@@ -75,11 +76,11 @@ public:
SplashError writeImgFile(SplashImageFileFormat format, FILE *f, int hDPI, int vDPI, const char *compressionString = "");
SplashError writeImgFile(ImgWriter *writer, FILE *f, int hDPI, int vDPI);
- GBool convertToXBGR();
+ GBool convertToXBGR(bool useAlpha = false);
void getPixel(int x, int y, SplashColorPtr pixel);
void getRGBLine(int y, SplashColorPtr line);
- void getXBGRLine(int y, SplashColorPtr line);
+ void getXBGRLine(int y, SplashColorPtr line, bool useAlpha = false);
#if SPLASH_CMYK
void getCMYKLine(int y, SplashColorPtr line);
#endif
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.cc
index b785826d66b..b785826d66b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.cc
index f0dcf50384b..f0dcf50384b 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.cc
index 3d6d6b2343e..3d6d6b2343e 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.cc
index 968e8207362..73ef8de0877 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.cc
@@ -17,6 +17,7 @@
// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2015 Dmytro Morgun <lztoad@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
@@ -149,14 +150,12 @@ SplashFontFile *SplashFontEngine::loadType1Font(SplashFontFileID *idA,
}
#endif
-#ifndef _WIN32
// delete the (temporary) font file -- with Unix hard link
// semantics, this will remove the last link; otherwise it will
// return an error, leaving the file to be deleted later (if
// loadXYZFont failed, the file will always be deleted)
if (src->isFile)
src->unref();
-#endif
return fontFile;
}
@@ -178,14 +177,12 @@ SplashFontFile *SplashFontEngine::loadType1CFont(SplashFontFileID *idA,
}
#endif
-#ifndef _WIN32
// delete the (temporary) font file -- with Unix hard link
// semantics, this will remove the last link; otherwise it will
// return an error, leaving the file to be deleted later (if
// loadXYZFont failed, the file will always be deleted)
if (src->isFile)
src->unref();
-#endif
return fontFile;
}
@@ -223,14 +220,12 @@ SplashFontFile *SplashFontEngine::loadCIDFont(SplashFontFileID *idA,
}
#endif
-#ifndef _WIN32
// delete the (temporary) font file -- with Unix hard link
// semantics, this will remove the last link; otherwise it will
// return an error, leaving the file to be deleted later (if
// loadXYZFont failed, the file will always be deleted)
if (src->isFile)
src->unref();
-#endif
return fontFile;
}
@@ -277,14 +272,12 @@ SplashFontFile *SplashFontEngine::loadTrueTypeFont(SplashFontFileID *idA,
gfree(codeToGID);
}
-#ifndef _WIN32
// delete the (temporary) font file -- with Unix hard link
// semantics, this will remove the last link; otherwise it will
// return an error, leaving the file to be deleted later (if
// loadXYZFont failed, the file will always be deleted)
if (src->isFile)
src->unref();
-#endif
return fontFile;
}
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.h
index e678c9e20e6..e678c9e20e6 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.cc
index fd2789d02f9..fd2789d02f9 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.h
index 2c603531cfd..2c603531cfd 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.cc
index ac47881cb4f..ac47881cb4f 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.cc
diff --git a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.h
index cc295cb68fe..cc295cb68fe 100644
--- a/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index d15bba3d99b..33891de21b1 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.34.0])
+m4_define([poppler_version], [0.35.0])