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/configure.ac6
-rw-r--r--Build/source/libs/poppler/poppler-src-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.37.0-PATCHES/ChangeLog)7
-rw-r--r--Build/source/libs/poppler/poppler-src-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-0.37.0-PATCHES/TL-Changes)0
-rw-r--r--Build/source/libs/poppler/poppler-src-PATCHES/patch-02-LLONG_MAX (renamed from Build/source/libs/poppler/poppler-0.37.0-PATCHES/patch-02-LLONG_MAX)6
-rw-r--r--Build/source/libs/poppler/poppler-src-PATCHES/patch-03-Object-functions (renamed from Build/source/libs/poppler/poppler-0.37.0-PATCHES/patch-03-Object-functions)6
-rw-r--r--Build/source/libs/poppler/poppler-src/AUTHORS (renamed from Build/source/libs/poppler/poppler-0.37.0/AUTHORS)0
-rw-r--r--Build/source/libs/poppler/poppler-src/CMakeLists.txt (renamed from Build/source/libs/poppler/poppler-0.37.0/CMakeLists.txt)20
-rw-r--r--Build/source/libs/poppler/poppler-src/COPYING (renamed from Build/source/libs/poppler/poppler-0.37.0/COPYING)0
-rw-r--r--Build/source/libs/poppler/poppler-src/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.37.0/ChangeLog)394
-rw-r--r--Build/source/libs/poppler/poppler-src/ConfigureChecks.cmake (renamed from Build/source/libs/poppler/poppler-0.37.0/ConfigureChecks.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-src/INSTALL (renamed from Build/source/libs/poppler/poppler-0.37.0/INSTALL)0
-rw-r--r--Build/source/libs/poppler/poppler-src/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.37.0/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-src/NEWS (renamed from Build/source/libs/poppler/poppler-0.37.0/NEWS)33
-rw-r--r--Build/source/libs/poppler/poppler-src/README (renamed from Build/source/libs/poppler/poppler-0.37.0/README)4
-rw-r--r--Build/source/libs/poppler/poppler-src/README-XPDF (renamed from Build/source/libs/poppler/poppler-0.37.0/README-XPDF)0
-rw-r--r--Build/source/libs/poppler/poppler-src/TODO (renamed from Build/source/libs/poppler/poppler-0.37.0/TODO)0
-rw-r--r--Build/source/libs/poppler/poppler-src/config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.37.0/config.h.cmake)4
-rw-r--r--Build/source/libs/poppler/poppler-src/config.h.in (renamed from Build/source/libs/poppler/poppler-0.37.0/config.h.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/configure.ac (renamed from Build/source/libs/poppler/poppler-0.37.0/configure.ac)6
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiBase.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiBase.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiBase.h (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiBase.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiEncodings.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiEncodings.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiEncodings.h (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiEncodings.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiIdentifier.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiIdentifier.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiIdentifier.h (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiIdentifier.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiTrueType.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiTrueType.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiTrueType.h (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiTrueType.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiType1.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiType1.h (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiType1C.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1C.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/FoFiType1C.h (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1C.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/fofi/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.37.0/fofi/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/FixedPoint.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/FixedPoint.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/FixedPoint.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/FixedPoint.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooHash.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/GooHash.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooHash.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/GooHash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooLikely.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/GooLikely.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooList.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/GooList.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooList.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/GooList.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooMutex.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/GooMutex.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooString.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/GooString.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooString.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/GooString.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooTimer.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/GooTimer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/GooTimer.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/GooTimer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/ImgWriter.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/ImgWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/ImgWriter.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/ImgWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/JpegWriter.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/JpegWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/JpegWriter.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/JpegWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/NetPBMWriter.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/NetPBMWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/NetPBMWriter.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/NetPBMWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/PNGWriter.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/PNGWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/PNGWriter.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/PNGWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/TiffWriter.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/TiffWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/TiffWriter.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/TiffWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gfile.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/gfile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gfile.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/gfile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gmem.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/gmem.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gmem.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/gmem.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gmempp.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/gmempp.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/grandom.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/grandom.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/grandom.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/grandom.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gstrtod.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/gstrtod.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gstrtod.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/gstrtod.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gtypes.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/gtypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gtypes_p.h (renamed from Build/source/libs/poppler/poppler-0.37.0/goo/gtypes_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/gtk-doc.make (renamed from Build/source/libs/poppler/poppler-0.37.0/gtk-doc.make)13
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-cairo-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-cairo-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-cairo.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-cairo.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-cairo.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-cairo.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-cpp-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-cpp-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-cpp.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-cpp.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-cpp.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-cpp.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-glib-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-glib-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-glib.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-glib.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-glib.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-glib.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-qt4-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-qt4-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-qt4.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-qt4.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-qt4.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-qt4.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-qt5-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-qt5-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-qt5.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-qt5.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-qt5.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-qt5.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-splash-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-splash-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-splash.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-splash.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-splash.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-splash.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler.pc.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Annot.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Annot.cc)4
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Annot.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Annot.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Array.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Array.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Array.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Array.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/BuiltinFont.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/BuiltinFont.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/BuiltinFontTables.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFontTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/BuiltinFontTables.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CMap.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CMap.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CachedFile.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CairoFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CairoFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.cc)129
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.h)7
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CairoRescaleBox.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CairoRescaleBox.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CairoRescaleBox.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CairoRescaleBox.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Catalog.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Catalog.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Catalog.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Catalog.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CharCodeToUnicode.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CharCodeToUnicode.cc)3
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CharCodeToUnicode.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CharCodeToUnicode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CharTypes.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CharTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CompactFontTables.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CompactFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CurlCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CurlCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CurlCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CurlCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CurlPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CurlPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/CurlPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/CurlPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/DCTStream.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/DCTStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/DCTStream.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/DCTStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/DateInfo.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/DateInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/DateInfo.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/DateInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Decrypt.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Decrypt.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Decrypt.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Decrypt.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Dict.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Dict.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Dict.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Dict.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Error.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Error.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Error.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Error.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/ErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/ErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/FileSpec.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/FileSpec.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/FileSpec.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/FileSpec.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/FlateStream.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/FlateStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/FlateStream.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/FlateStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/FontEncodingTables.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/FontEncodingTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/FontEncodingTables.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/FontEncodingTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/FontInfo.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/FontInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/FontInfo.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/FontInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Form.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Form.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Form.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Form.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Function.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Function.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Function.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Function.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Gfx.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Gfx.cc)4
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Gfx.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Gfx.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/GfxFont.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/GfxFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/GfxFont.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/GfxFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/GfxState.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/GfxState.cc)81
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/GfxState.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/GfxState.h)6
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/GfxState_helpers.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/GfxState_helpers.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/GlobalParams.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/GlobalParams.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/GlobalParams.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/GlobalParams.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/GlobalParamsWin.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/GlobalParamsWin.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Hints.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Hints.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Hints.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Hints.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/JArithmeticDecoder.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/JArithmeticDecoder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/JArithmeticDecoder.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/JArithmeticDecoder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/JPEG2000Stream.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/JPEG2000Stream.cc)7
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/JPEG2000Stream.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/JPEG2000Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/JPXStream.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/JPXStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/JPXStream.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/JPXStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Lexer.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Lexer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Lexer.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Lexer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Linearization.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Linearization.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Linearization.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Linearization.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Link.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Link.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Link.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Link.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/LocalPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/LocalPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/LocalPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/LocalPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Makefile.am)2
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/MarkedContentOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/MarkedContentOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Movie.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Movie.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Movie.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Movie.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/NameToCharCode.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/NameToCharCode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/NameToCharCode.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/NameToCharCode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/NameToUnicodeTable.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/NameToUnicodeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Object.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Object.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Object.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Object.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/OptionalContent.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/OptionalContent.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/OptionalContent.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Outline.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Outline.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Outline.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Outline.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/OutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/OutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/OutputDev.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/OutputDev.h)4
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PDFDoc.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDoc.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PDFDoc.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDoc.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PDFDocEncoding.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocEncoding.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PDFDocEncoding.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocEncoding.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PDFDocFactory.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocFactory.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PDFDocFactory.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocFactory.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PSOutputDev.cc)74
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PSOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PSTokenizer.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PSTokenizer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PSTokenizer.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PSTokenizer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Page.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Page.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Page.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Page.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PageLabelInfo.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PageLabelInfo.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PageLabelInfo_p.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PageTransition.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PageTransition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PageTransition.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PageTransition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Parser.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Parser.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Parser.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Parser.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PopplerCache.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PopplerCache.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PopplerCache.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PopplerCache.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PreScanOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PreScanOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/PreScanOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/PreScanOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/ProfileData.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/ProfileData.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/ProfileData.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/ProfileData.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Rendition.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Rendition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Rendition.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Rendition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/SecurityHandler.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/SecurityHandler.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/SecurityHandler.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/SecurityHandler.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Sound.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Sound.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Sound.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Sound.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.cc)8
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.h)2
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/StdinCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/StdinCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/StdinCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/StdinCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/StdinPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/StdinPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/StdinPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/StdinPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Stream-CCITT.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Stream-CCITT.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Stream.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/Stream.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/StructElement.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/StructElement.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/StructElement.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/StructElement.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/StructTreeRoot.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/StructTreeRoot.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/StructTreeRoot.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/StructTreeRoot.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/TextOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/TextOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UTF.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UTF.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UTF.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UTF.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UTF8.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UTF8.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UnicodeCClassTables.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeCClassTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UnicodeCompTables.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeCompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UnicodeDecompTables.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeDecompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UnicodeMap.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UnicodeMap.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UnicodeMapTables.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMapTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UnicodeTypeTable.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeTypeTable.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/UnicodeTypeTable.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeTypeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/ViewerPreferences.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/ViewerPreferences.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/ViewerPreferences.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/ViewerPreferences.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/XRef.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/XRef.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/XRef.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/XRef.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/XpdfPluginAPI.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/XpdfPluginAPI.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/XpdfPluginAPI.h (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/XpdfPluginAPI.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/gen-unicode-tables.py (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/gen-unicode-tables.py)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/poppler-config.h.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.in (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/poppler-config.h.in)0
-rw-r--r--Build/source/libs/poppler/poppler-src/poppler/strtok_r.cpp (renamed from Build/source/libs/poppler/poppler-0.37.0/poppler/strtok_r.cpp)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/Splash.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/Splash.cc)16
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/Splash.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/Splash.h)2
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashBitmap.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashBitmap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashBitmap.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashClip.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashClip.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashClip.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashClip.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFTFont.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFTFont.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFTFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFTFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFont.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFont.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFontFile.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFontFileID.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFileID.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashFontFileID.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFileID.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashGlyphBitmap.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashGlyphBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashMath.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashMath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashPath.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashPath.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashPattern.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashPattern.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashPattern.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashPattern.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashScreen.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashScreen.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashScreen.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashScreen.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashState.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashState.cc)11
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashState.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashState.h)5
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashT1Font.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1Font.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashT1Font.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1Font.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashT1FontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashT1FontEngine.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashT1FontFile.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashT1FontFile.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashTypes.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashXPath.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashXPath.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashXPathScanner.cc (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPathScanner.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-src/splash/SplashXPathScanner.h (renamed from Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPathScanner.h)0
-rw-r--r--Build/source/libs/poppler/version.ac2
299 files changed, 812 insertions, 95 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 1c4f4957b60..f5c05e3b165 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -49,7 +49,7 @@ mpfr 3.1.3 - checked 20jun15
pixman 0.32.8 - checked 27sep15
http://cairographics.org/releases/
-poppler 0.37.0 - checked 10oct15
+poppler 0.39.0 - checked 28dec15
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.13 - checked 28dec15
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index ebb76cea702..71828d6f4ee 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Import poppler-0.39.0.
+ * version.ac: Adjust.
+
2015-10-10 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.37.0.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index a84f23a013f..c0172019f6f 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.37.0/poppler/poppler-config.h.in \
+ $(top_srcdir)/poppler-src/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.37.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-src/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 8ae39948f72..8493e4281b3 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.37.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.39.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.37.0'
-PACKAGE_STRING='poppler (TeX Live) 0.37.0'
+PACKAGE_VERSION='0.39.0'
+PACKAGE_STRING='poppler (TeX Live) 0.39.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.37.0/poppler/Array.cc"
+ac_unique_file="poppler-src/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.37.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.39.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.37.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.39.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.37.0
+poppler (TeX Live) configure 0.39.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.37.0, which was
+It was created by poppler (TeX Live) $as_me 0.39.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.37.0'
+ VERSION='0.39.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.37.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-src/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.37.0"
+#define POPPLER_VERSION "0.39.0"
_ACEOF
@@ -6712,7 +6712,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.37.0
+POPPLER_TREE=poppler-src
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.37.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.39.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.37.0
+poppler (TeX Live) config.status 0.39.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.37.0/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-src/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/configure.ac b/Build/source/libs/poppler/configure.ac
index cd5430f19c8..eb9f94de1db 100644
--- a/Build/source/libs/poppler/configure.ac
+++ b/Build/source/libs/poppler/configure.ac
@@ -9,7 +9,7 @@ dnl
m4_include([version.ac])[] dnl define poppler_version
AC_INIT([poppler (TeX Live)], poppler_version, [tex-k@tug.org])
AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([poppler-]poppler_version[/poppler/Array.cc])
+AC_CONFIG_SRCDIR([poppler-src/poppler/Array.cc])
AC_CONFIG_AUX_DIR([../../build-aux])
AC_CONFIG_MACRO_DIR([../../m4])
@@ -84,7 +84,7 @@ fi
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_HEADERS([poppler-config.h:poppler-]poppler_version[/poppler/poppler-config.h.in])
+AC_CONFIG_HEADERS([poppler-config.h:poppler-src/poppler/poppler-config.h.in])
dnl ##### Export the version
AC_DEFINE_UNQUOTED([POPPLER_VERSION], ["poppler_version"], [Define to the poppler version.])
@@ -105,7 +105,7 @@ fi
AC_DEFINE([ENABLE_ZLIB], 1, [Use zlib instead of builtin zlib decoder.])
-AC_SUBST([POPPLER_TREE], [poppler-]poppler_version)
+AC_SUBST([POPPLER_TREE], [poppler-src])
AC_CONFIG_FILES([Makefile include/Makefile include/goo/Makefile include/fofi/Makefile])
diff --git a/Build/source/libs/poppler/poppler-0.37.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-src-PATCHES/ChangeLog
index ce2c6d5ffe7..d83fdb8fc60 100644
--- a/Build/source/libs/poppler/poppler-0.37.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-src-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Imported poppler-0.39.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
2015-10-10 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported poppler-0.37.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.37.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-src-PATCHES/TL-Changes
index 0e0ed2e9e29..0e0ed2e9e29 100644
--- a/Build/source/libs/poppler/poppler-0.37.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-src-PATCHES/TL-Changes
diff --git a/Build/source/libs/poppler/poppler-0.37.0-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-src-PATCHES/patch-02-LLONG_MAX
index a9eb70511c8..8a1f7334186 100644
--- a/Build/source/libs/poppler/poppler-0.37.0-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-src-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.37.0.orig/goo/GooString.h poppler-0.37.0/goo/GooString.h
---- poppler-0.37.0.orig/goo/GooString.h 2015-07-12 17:05:10.000000000 +0200
-+++ poppler-0.37.0/goo/GooString.h 2015-08-10 09:38:59.000000000 +0200
+diff -ur poppler-0.39.0.orig/goo/GooString.h poppler-0.39.0/goo/GooString.h
+--- poppler-0.39.0.orig/goo/GooString.h Mon Jul 13 00:05:10 2015
++++ poppler-0.39.0/goo/GooString.h Mon Dec 28 22:41:39 2015
@@ -35,6 +35,21 @@
#endif
diff --git a/Build/source/libs/poppler/poppler-0.37.0-PATCHES/patch-03-Object-functions b/Build/source/libs/poppler/poppler-src-PATCHES/patch-03-Object-functions
index b78dc76ce78..657d43b97c4 100644
--- a/Build/source/libs/poppler/poppler-0.37.0-PATCHES/patch-03-Object-functions
+++ b/Build/source/libs/poppler/poppler-src-PATCHES/patch-03-Object-functions
@@ -1,6 +1,6 @@
-diff -ur poppler-0.37.0.orig/poppler/Object.h poppler-0.37.0/poppler/Object.h
---- poppler-0.37.0.orig/poppler/Object.h 2015-08-17 19:47:55.000000000 +0200
-+++ poppler-0.37.0/poppler/Object.h 2015-09-10 08:15:10.000000000 +0200
+diff -ur poppler-0.39.0.orig/poppler/Object.h poppler-0.39.0/poppler/Object.h
+--- poppler-0.39.0.orig/poppler/Object.h Mon Nov 16 06:05:22 2015
++++ poppler-0.39.0/poppler/Object.h Mon Dec 28 22:45:05 2015
@@ -140,7 +140,7 @@
Object *initStream(Stream *streamA);
Object *initRef(int numA, int genA)
diff --git a/Build/source/libs/poppler/poppler-0.37.0/AUTHORS b/Build/source/libs/poppler/poppler-src/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-src/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.37.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-src/CMakeLists.txt
index ff81531a7b6..a1412d815b4 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-src/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ECM_FOUND)
endif()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "37")
+set(POPPLER_MINOR_VERSION "39")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -478,7 +478,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 56.0.0 SOVERSION 56)
+set_target_properties(poppler PROPERTIES VERSION 58.0.0 SOVERSION 58)
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})
@@ -737,6 +737,22 @@ endif(LCMS2_FOUND)
show_end_message_yesno("command line utils" ENABLE_UTILS)
show_end_message("test data dir" ${TESTDATADIR})
+if(NOT ENABLE_SPLASH AND NOT CAIRO_FOUND)
+ message("Warning: There is no rendering backend enabled")
+endif(NOT ENABLE_SPLASH AND NOT CAIRO_FOUND)
+
if(USE_FIXEDPOINT AND USE_FLOAT)
message("Warning: Single precision and fixed point options should not be enabled at the same time")
endif(USE_FIXEDPOINT AND USE_FLOAT)
+
+if(NOT ENABLE_LIBJPEG)
+ message("Warning: Using libjpeg is recommended. The internal DCT decoder is unmaintained.")
+endif(NOT ENABLE_LIBJPEG)
+
+if(ENABLE_ZLIB)
+ message("Warning: Using zlib is not totally safe")
+endif(ENABLE_ZLIB)
+
+if(NOT WITH_OPENJPEG)
+ message("Warning: Using libopenjpeg is recommended. The internal JPX decoder is unmaintained.")
+endif(NOT WITH_OPENJPEG)
diff --git a/Build/source/libs/poppler/poppler-0.37.0/COPYING b/Build/source/libs/poppler/poppler-src/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/COPYING
+++ b/Build/source/libs/poppler/poppler-src/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.37.0/ChangeLog b/Build/source/libs/poppler/poppler-src/ChangeLog
index effd216f31e..8d00b9d2e7c 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-src/ChangeLog
@@ -1,3 +1,397 @@
+commit 3eee5274abb24d5b5be05262aafe794652cdac35
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 17 00:09:37 2015 +0100
+
+ New gtk-doc stuff
+
+ gtk-doc.make | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+commit fb1f7b0fb037837f37be65aa23ecac711a1b4981
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 17 00:08:24 2015 +0100
+
+ Prepare for 0.39
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 21 +++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h | 2 +-
+ poppler/GfxState.cc | 1 +
+ poppler/GfxState.h | 1 +
+ poppler/JPEG2000Stream.cc | 1 +
+ poppler/Makefile.am | 2 +-
+ poppler/PSOutputDev.cc | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ utils/pdftocairo.cc | 2 +-
+ 14 files changed, 35 insertions(+), 11 deletions(-)
+
+commit 7ed7fb6d2be009c5d433338a6b3da816dd38f5ca
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Oct 12 22:43:22 2014 +0200
+
+ Fix typos in error messages
+
+ Reported by Jakub Wilk, thanks!
+
+ poppler/JPEG2000Stream.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 47ffce08e75002aa0707107c76984e7e471d8afb
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu Jan 15 21:20:05 2015 +1030
+
+ cairo: Implement function shading using mesh gradients
+
+ Gfx draws function shadings by subdividing the shading until the
+ colors are the same or the maximum subdivision is reached then fills
+ each cell with the color of the mid point of the cell. The solid
+ colors can result in a pixelated appearance.
+
+ This patch implements a cairo specific version of the function shading
+ that uses mesh gradients to draw each cell. By setting the corner of
+ each patch to the shading color at that point, the mesh gradient will
+ interpolate the colors resulting in a smooth appearance.
+
+ Bug 88394
+
+ poppler/CairoOutputDev.cc | 101
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 5 ++-
+ 2 files changed, 105 insertions(+), 1 deletion(-)
+
+commit d7717cf18d0db5663687690ccf66102e9a124025
+Author: Jason Crain <jason@aquaticape.us>
+Date: Fri Aug 22 00:51:36 2014 -0500
+
+ cairo: Scale radial pattern
+
+ Scale the radial pattern because cairo/pixman do not work well with a
+ very large or small scaled matrix. See cairo bug #81657.
+
+ bug #22098
+
+ poppler/CairoOutputDev.cc | 26 ++++++++++++++++++++------
+ 1 file changed, 20 insertions(+), 6 deletions(-)
+
+commit 9ef565d0302ad4a36c53d7cd3251bff6a53070ea
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Dec 4 11:08:45 2015 +0100
+
+ regtest: Pass always both the owner and user passwords to the tools
+
+ regtest/backends/cairo.py | 2 +-
+ regtest/backends/postscript.py | 2 +-
+ regtest/backends/splash.py | 2 +-
+ regtest/backends/text.py | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 3686005cde6f0c0992498a1773b02331fce79b1c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Dec 4 11:03:27 2015 +0100
+
+ pdftocairo: Fix double free when both user and owner passwords
+ are given
+
+ utils/pdftocairo.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 38796894f8ab19c2cd0b996e6b1aa0be98326eac
+Author: Hib Eris <hib@hiberis.nl>
+Date: Mon Jun 9 22:54:54 2014 +0200
+
+ Remove enum PopplerOrientation from API
+
+ This should have been removed long time ago with
+ 1aad886c6c19a964a3fc9e18f31acc8e115478e0
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=93229
+
+ glib/poppler.h | 8 --------
+ glib/reference/poppler-docs.sgml | 1 -
+ glib/reference/poppler-sections.txt | 11 -----------
+ 3 files changed, 20 deletions(-)
+
+commit 921fe21d56be27c8164111577b9a848525b35508
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Dec 3 16:23:30 2015 +0100
+
+ regtest: Fix testing text backend
+
+ Fix a typo in previous commit.
+
+ regtest/backends/text.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 3e22c678e749eda4402a7440b91b33d627705fdb
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Dec 3 15:46:58 2015 +0100
+
+ regtest: Add support for testing password protected documents
+
+ Similar to how skipped file works, you can pass a passwords file from
+ the command line or add a Passwords file to your docs directory. This
+ file should be a python file containing a "passwords" dictionary where
+ the key is the test document and the value is the password required to
+ open that document.
+
+ regtest/TestReferences.py | 7 +++++--
+ regtest/TestRun.py | 11 +++++++----
+ regtest/Utils.py | 13 +++++++++++++
+ regtest/backends/__init__.py | 2 +-
+ regtest/backends/cairo.py | 7 +++++--
+ regtest/backends/postscript.py | 7 +++++--
+ regtest/backends/splash.py | 7 +++++--
+ regtest/backends/text.py | 7 +++++--
+ regtest/main.py | 3 +++
+ 9 files changed, 49 insertions(+), 15 deletions(-)
+
+commit 50ba37c7b1aff14c73f158ff7f33d31953af512b
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Jun 8 14:03:17 2014 +0200
+
+ doc: Move PopplerError to it's own section
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79837
+
+ glib/poppler.cc | 15 +++++++++++++++
+ glib/reference/poppler-docs.sgml | 1 +
+ glib/reference/poppler-sections.txt | 18 +++++++++++++-----
+ 3 files changed, 29 insertions(+), 5 deletions(-)
+
+commit ef518d601836fcedb8b558447f10c846e4038318
+Author: Hib Eris <hib@hiberis.nl>
+Date: Mon Jun 9 15:53:57 2014 +0200
+
+ doc: Add poppler_orientation_get_type to poppler-sections.txt
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79837
+
+ glib/reference/poppler-sections.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 7f1de12da6d1128535c2e3e7dc89e29ca61b858f
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Jun 8 22:27:47 2014 +0200
+
+ doc: Fix PopplerStructureElement documentation
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79837
+
+ glib/poppler-structure-element.cc | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+commit d4a9da24d2c479d53ff1094e6e1d7c1d79561da4
+Author: Hib Eris <hib@hiberis.nl>
+Date: Mon Jun 9 08:34:13 2014 +0200
+
+ doc: Do not include private headers
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=79837
+
+ glib/reference/Makefile.am | 6 +++++-
+ glib/reference/poppler-sections.txt | 1 -
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 7980727d76b29db12b468e5da19d174d42bc3b00
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue Oct 27 22:27:22 2015 +1030
+
+ pdftops: fix %%PageBoundingBox
+
+ The %%PageBoundingBox calculation did not take into account the
+ page transformation
+ (eg rotate, fit-to-page).
+
+ Bug 87161
+
+ poppler/GfxState.cc | 16 +++++++++++
+ poppler/GfxState.h | 5 ++++
+ poppler/PSOutputDev.cc | 72
+ +++++++++++++++++++++++++++++++++++++-------------
+ 3 files changed, 74 insertions(+), 19 deletions(-)
+
+commit 37840827c4073dedfd37915a74eb8fe0c44843c3
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Wed Dec 2 22:15:33 2015 +0100
+
+ Ignore the alternateSpace and tintTransform
+
+ As a reasonable compromise in my eyes this new patch
+ now also checks the alternate colorspace, and if this
+ is DeviceGray in case of a separation colorspace with
+ name black this patch treats is as if it is really a
+ DeviceGray and so ignore tintTransform and alternate
+ colorspace just in this case when using getGray() and getRGB().
+
+ Bug #92381
+
+ poppler/GfxState.cc | 64
+ +++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 48 insertions(+), 16 deletions(-)
+
+commit 72f0ea4f883417a920be65cb778989bf81e8f57d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Dec 2 16:59:16 2015 +0100
+
+ glib-demo: Use duration_real in transitions demo
+
+ glib/demo/transitions.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit b5c7b93cabc0d95fb3a7dc1b8104363cd04873c1
+Author: Arseniy Lartsev <arseniy@alumni.chalmers.se>
+Date: Wed Dec 2 16:48:05 2015 +0100
+
+ glib: Add duration_real to PopplerPageTransition
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=92040
+
+ glib/poppler-page.cc | 1 +
+ glib/poppler-page.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+commit 38ff3736576b81be51eb11454862f83d1c3f3d0e
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Nov 29 08:06:14 2015 +1030
+
+ Visual Studio 2015 now supports snprintf
+
+ Bug 93116
+
+ config.h.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit c63aa0c153fc114e6457fc89a40a9aa2a5508b9a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 16 21:44:17 2015 +0100
+
+ Poppler 0.38
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 12 ++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 7 files changed, 19 insertions(+), 7 deletions(-)
+
+commit 6ca4afcea790d9118af3cda4961a647485fb14e8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 16 21:40:20 2015 +0100
+
+ Update copyright years
+
+ utils/pdftocairo.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 0e14049bc5b85f8ae2e1a56bc09480a499343e49
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Oct 31 18:32:49 2015 +1030
+
+ pdftocairo: fix fit to page transformation
+
+ Testing with the test case in bug 87161 revealed some bugs.
+
+ utils/pdftocairo.cc | 42 ++++++++++++++++++++----------------------
+ 1 file changed, 20 insertions(+), 22 deletions(-)
+
+commit 3167964d70647d7b04e3ef8f415d5935990ecc9a
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Wed Oct 28 23:13:44 2015 +0100
+
+ Multiply opacity in case of pattern colorspace
+
+ Bug #92592
+
+ poppler/Gfx.cc | 4 +++-
+ poppler/OutputDev.h | 4 +++-
+ poppler/SplashOutputDev.cc | 8 ++++++++
+ poppler/SplashOutputDev.h | 2 ++
+ splash/Splash.cc | 16 ++++++++++++++--
+ splash/Splash.h | 2 ++
+ splash/SplashState.cc | 11 ++++++++++-
+ splash/SplashState.h | 5 ++++-
+ 8 files changed, 46 insertions(+), 6 deletions(-)
+
+commit c20f68ce434366bbec4077824da97ce843ecdff3
+Author: Marek Kasik <mkasik@redhat.com>
+Date: Thu Oct 22 16:15:23 2015 +0200
+
+ forms: Fix showing of some non-ASCII characters
+
+ The &uChar is an array with just 1 member not 2.
+ This fixes mapping of some Unicode characters to
+ character codes.
+
+ poppler/Annot.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 64735113b203bb5adaaadc65641ef6c971f82bc6
+Author: Marek Kasik <mkasik@redhat.com>
+Date: Fri Oct 23 10:15:47 2015 +0200
+
+ forms: Find correct glyph or return 0
+
+ Function CharCodeToUnicode::mapToCharCode() could return
+ wrong character code for given unicode character because
+ of wrongly placed continue statement.
+
+ poppler/CharCodeToUnicode.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit fb906dca8b84d03267099cc3174c50e932a55236
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu Oct 15 07:19:16 2015 +1030
+
+ cmake: synchronize warnings with configure
+
+ CMakeLists.txt | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+commit 6329e3999d0a45b4c0cd0a8b675362e694bf1243
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu Oct 15 07:11:13 2015 +1030
+
+ configure: warn that the internal DCT/JPX decoders are unmaintained
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 67e1463dc65f85aec1f85b5bace9e810bf477e15
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Oct 12 16:49:34 2015 +0200
+
+ Clarify getting a xpdf license does not allow you to use poppler in
+ closed source projects
+
+ README | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 44e1a2f715d0da8bb2941da296faab7ee144cfc2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 9 23:28:03 2015 +0200
+
+ Poppler 0.37
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 13 +++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ gtk-doc.make | 20 ++++++++++++--------
+ 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 +-
+ 12 files changed, 36 insertions(+), 19 deletions(-)
+
commit e8cb16bff48dbe2d9efd988ddb09608406d2633b
Author: Adrian Johnson <ajohnson@redneon.com>
Date: Sun Sep 27 15:34:12 2015 +0930
diff --git a/Build/source/libs/poppler/poppler-0.37.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-src/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-src/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.37.0/INSTALL b/Build/source/libs/poppler/poppler-src/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-src/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.37.0/Makefile.am b/Build/source/libs/poppler/poppler-src/Makefile.am
index 691512f4e3a..691512f4e3a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-src/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.37.0/NEWS b/Build/source/libs/poppler/poppler-src/NEWS
index 949f81791e1..ff547204a66 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/NEWS
+++ b/Build/source/libs/poppler/poppler-src/NEWS
@@ -1,3 +1,36 @@
+Release 0.39.0
+ core:
+ * Ignore the alternateSpace and tintTransform. Bug #92381
+ * CairoOutputDev: Scale radial pattern. Bug #22098
+ * CairoOutputDev: Implement function shading using mesh gradients. Bug #88394
+ * Regression test improvements
+ * Fix typos in error messages
+
+ build system:
+ * Visual Studio 2015 now supports snprintf. Bug #93116
+
+ utils:
+ * pdftops: fix %%PageBoundingBox. Bug #87161
+ * pdftocairo: Fix double free when both user and owner passwords are given
+
+ glib:
+ * Add duration_real to PopplerPageTransition. Bug #92040
+ * Remove enum PopplerOrientation from API. Bug #93229
+ * documentation improvements
+ * glib-demo improvements
+
+Release 0.38.0
+ core:
+ * Splash: Multiply opacity in case of pattern colorspace. Bug #92592
+ * Small form improvements on non ascii character rendering
+ * Clarify README
+
+ build system:
+ * Clarify internal DCT and JPX are only provided as deprecated fallbacks
+
+ utils:
+ * pdftocairo: fix fit to page transformation
+
Release 0.37.0
core:
* CairoOutputDev: Use mask for even-odd fill. Bug #84527
diff --git a/Build/source/libs/poppler/poppler-0.37.0/README b/Build/source/libs/poppler/poppler-src/README
index fa223900fbf..dc3c19ec31b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/README
+++ b/Build/source/libs/poppler/poppler-src/README
@@ -29,7 +29,9 @@ Please note that xpdf, and thus poppler, is licensed under the GPL,
not the LGPL. Consequently, any application using poppler must also
be licensed under the GPL. If you want to incorporate Xpdf based PDF
rendering in a closed source product, please contact Glyph & Cog
-(www.glyphandcog.com) for commercial licensing options.
+(www.glyphandcog.com) for commercial licensing options. Note that
+this only allows you to use xpdf in a closed source product,
+not poppler itself.
Kristian Høgsberg, Feb. 27, 2005
diff --git a/Build/source/libs/poppler/poppler-0.37.0/README-XPDF b/Build/source/libs/poppler/poppler-src/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-src/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.37.0/TODO b/Build/source/libs/poppler/poppler-src/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/TODO
+++ b/Build/source/libs/poppler/poppler-src/TODO
diff --git a/Build/source/libs/poppler/poppler-0.37.0/config.h.cmake b/Build/source/libs/poppler/poppler-src/config.h.cmake
index 400b16b1590..440a13d0dab 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-src/config.h.cmake
@@ -219,8 +219,8 @@
#define HAVE_BOOLEAN
#endif
-/* MS has defined snprintf as deprecated */
-#ifdef _MSC_VER
+/* MS defined snprintf as deprecated but then added it in Visual Studio 2015. */
+#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf _snprintf
#endif
diff --git a/Build/source/libs/poppler/poppler-0.37.0/config.h.in b/Build/source/libs/poppler/poppler-src/config.h.in
index 786143b27d4..786143b27d4 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-src/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/configure.ac b/Build/source/libs/poppler/poppler-src/configure.ac
index e826adf626f..b2fc6cf32e1 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-src/configure.ac
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[37])
+m4_define([poppler_version_minor],[39])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
@@ -1038,7 +1038,7 @@ if test x$enable_single_precision = xyes -a x$enable_fixedpoint = xyes; then
fi
if test x$enable_libjpeg != xyes; then
- echo " Warning: Using libjpeg is recommended"
+ echo " Warning: Using libjpeg is recommended. The internal DCT decoder is unmaintained."
fi
if test x$enable_zlib != xno; then
@@ -1046,5 +1046,5 @@ if test x$enable_zlib != xno; then
fi
if test x$enable_libopenjpeg != xyes; then
- echo " Warning: Using libopenjpeg is recommended"
+ echo " Warning: Using libopenjpeg is recommended. The internal JPX decoder is unmaintained."
fi
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-src/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-src/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-src/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-src/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-src/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-src/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-src/fofi/FoFiTrueType.cc
index 11699dd6119..11699dd6119 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-src/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-src/fofi/FoFiType1.cc
index 151f2d5f5bb..151f2d5f5bb 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-src/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-src/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-src/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-src/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-src/fofi/Makefile.am
index 4deb7d5e063..4deb7d5e063 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-src/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-src/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-src/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-src/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-src/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-src/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-src/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-src/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-src/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-src/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/GooList.h b/Build/source/libs/poppler/poppler-src/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-src/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-src/goo/GooMutex.h
index b2714b048c7..b2714b048c7 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-src/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-src/goo/GooString.cc
index 3f22f368560..3f22f368560 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/GooString.h b/Build/source/libs/poppler/poppler-src/goo/GooString.h
index cca5a905e97..cca5a905e97 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-src/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-src/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-src/goo/GooTimer.h
index ac64f6b4868..ac64f6b4868 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-src/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-src/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-src/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-src/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-src/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-src/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-src/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-src/goo/Makefile.am
index 370e85021be..370e85021be 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-src/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-src/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-src/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-src/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-src/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-src/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-src/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-src/goo/TiffWriter.cc
index 316008778b1..316008778b1 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-src/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-src/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-src/goo/gfile.cc
index 3528bb357d8..3528bb357d8 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/gfile.h b/Build/source/libs/poppler/poppler-src/goo/gfile.h
index 1365a9cf2ab..1365a9cf2ab 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-src/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-src/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/gmem.h b/Build/source/libs/poppler/poppler-src/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-src/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-src/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-src/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/grandom.h b/Build/source/libs/poppler/poppler-src/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-src/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-src/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-src/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-src/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-src/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-src/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-src/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-src/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-src/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/gtk-doc.make b/Build/source/libs/poppler/poppler-src/gtk-doc.make
index 9ccd0b04b5b..45a3350e1d9 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-src/gtk-doc.make
@@ -142,7 +142,7 @@ GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_XML_0=@echo " DOC Building XML";
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
$(GTK_DOC_V_XML)_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -153,6 +153,17 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
sgml.stamp: sgml-build.stamp
@true
+xml/gtkdocentities.ent: Makefile
+ $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
+ echo "<!ENTITY package \"$(PACKAGE)\">"; \
+ echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
+ echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
+ echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
+ echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
+ echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
+ echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
+ ) > $@
+
#### html ####
GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-src/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-src/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-src/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-src/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-src/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-src/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-src/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-src/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-src/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-src/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-src/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-src/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-src/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-src/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-src/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-src/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-src/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-src/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-src/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-src/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-src/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-src/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-src/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-src/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-src/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-src/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-src/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler.pc.in b/Build/source/libs/poppler/poppler-src/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-src/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-src/poppler/Annot.cc
index f3f479ce040..c20398bd936 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Annot.cc
@@ -29,7 +29,7 @@
// Copyright (C) 2012, 2015 Tobias Koenig <tokoe@kdab.com>
// Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2014 Marek Kasik <mkasik@redhat.com>
+// Copyright (C) 2014, 2015 Marek Kasik <mkasik@redhat.com>
// Copyright (C) 2014 Jiri Slaby <jirislaby@gmail.com>
// Copyright (C) 2014 Anuj Khare <khareanuj18@gmail.com>
// Copyright (C) 2015 Petr Gajdos <pgajdos@suse.cz>
@@ -4125,7 +4125,7 @@ void Annot::layoutText(GooString *text, GooString *outBuf, int *i,
// This assumes an identity CMap.
outBuf->append((uChar >> 8) & 0xff);
outBuf->append(uChar & 0xff);
- } else if (ccToUnicode->mapToCharCode(&uChar, &c, 2)) {
+ } else if (ccToUnicode->mapToCharCode(&uChar, &c, 1)) {
ccToUnicode->decRefCnt();
if (font->isCIDFont()) {
// TODO: This assumes an identity CMap. It should be extended to
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-src/poppler/Annot.h
index d90c8080ffe..d90c8080ffe 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-src/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Array.h b/Build/source/libs/poppler/poppler-src/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-src/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-src/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-src/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-src/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-src/poppler/CMap.cc
index 6731ab5a1fa..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-src/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-src/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-src/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.cc
index 1d611b59d3c..1d611b59d3c 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.cc
index 3916485c549..d06f3c72cc6 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.cc
@@ -20,7 +20,7 @@
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
// Copyright (C) 2006-2011, 2013, 2014 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2008 Carl Worth <cworth@cworth.org>
-// Copyright (C) 2008-2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008-2015 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
// Copyright (C) 2008, 2012 Hib Eris <hib@hiberis.nl>
@@ -932,6 +932,107 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat
return gTrue;
}
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
+GBool CairoOutputDev::functionShadedFill(GfxState *state, GfxFunctionShading *shading)
+{
+ // Function shaded fills are subdivided to rectangles that are the
+ // following size in device space. Note when printing this size is
+ // in points.
+ const int subdivide_pixels = 10;
+
+ double x_begin, x_end, x1, x2;
+ double y_begin, y_end, y1, y2;
+ double x_step;
+ double y_step;
+ GfxColor color;
+ GfxRGB rgb;
+ double *matrix;
+ cairo_matrix_t mat;
+
+ matrix = shading->getMatrix();
+ mat.xx = matrix[0];
+ mat.yx = matrix[1];
+ mat.xy = matrix[2];
+ mat.yy = matrix[3];
+ mat.x0 = matrix[4];
+ mat.y0 = matrix[5];
+ if (cairo_matrix_invert(&mat)) {
+ error(errSyntaxWarning, -1, "matrix not invertible\n");
+ return gFalse;
+ }
+
+ // get cell size in pattern space
+ x_step = y_step = subdivide_pixels;
+ cairo_matrix_transform_distance (&mat, &x_step, &y_step);
+
+ cairo_pattern_destroy(fill_pattern);
+ fill_pattern = cairo_pattern_create_mesh ();
+ cairo_pattern_set_matrix(fill_pattern, &mat);
+ shading->getDomain(&x_begin, &y_begin, &x_end, &y_end);
+
+ for (x1 = x_begin; x1 < x_end; x1 += x_step) {
+ x2 = x1 + x_step;
+ if (x2 > x_end)
+ x2 = x_end;
+
+ for (y1 = y_begin; y1 < y_end; y1 += y_step) {
+ y2 = y1 + y_step;
+ if (y2 > y_end)
+ y2 = y_end;
+
+ cairo_mesh_pattern_begin_patch (fill_pattern);
+ cairo_mesh_pattern_move_to (fill_pattern, x1, y1);
+ cairo_mesh_pattern_line_to (fill_pattern, x2, y1);
+ cairo_mesh_pattern_line_to (fill_pattern, x2, y2);
+ cairo_mesh_pattern_line_to (fill_pattern, x1, y2);
+
+ shading->getColor(x1, y1, &color);
+ shading->getColorSpace()->getRGB(&color, &rgb);
+ cairo_mesh_pattern_set_corner_color_rgb (fill_pattern, 0,
+ colToDbl(rgb.r),
+ colToDbl(rgb.g),
+ colToDbl(rgb.b));
+
+ shading->getColor(x2, y1, &color);
+ shading->getColorSpace()->getRGB(&color, &rgb);
+ cairo_mesh_pattern_set_corner_color_rgb (fill_pattern, 1,
+ colToDbl(rgb.r),
+ colToDbl(rgb.g),
+ colToDbl(rgb.b));
+
+ shading->getColor(x2, y2, &color);
+ shading->getColorSpace()->getRGB(&color, &rgb);
+ cairo_mesh_pattern_set_corner_color_rgb (fill_pattern, 2,
+ colToDbl(rgb.r),
+ colToDbl(rgb.g),
+ colToDbl(rgb.b));
+
+ shading->getColor(x1, y2, &color);
+ shading->getColorSpace()->getRGB(&color, &rgb);
+ cairo_mesh_pattern_set_corner_color_rgb (fill_pattern, 3,
+ colToDbl(rgb.r),
+ colToDbl(rgb.g),
+ colToDbl(rgb.b));
+
+ cairo_mesh_pattern_end_patch (fill_pattern);
+ }
+ }
+
+ double xMin, yMin, xMax, yMax;
+ // get the clip region bbox
+ state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax);
+ state->moveTo(xMin, yMin);
+ state->lineTo(xMin, yMax);
+ state->lineTo(xMax, yMax);
+ state->lineTo(xMax, yMin);
+ state->closePath();
+ fill(state);
+ state->clearPath();
+
+ return gTrue;
+}
+#endif /* CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0) */
+
GBool CairoOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) {
double x0, y0, x1, y1;
double dx, dy;
@@ -963,18 +1064,32 @@ GBool CairoOutputDev::axialShadedSupportExtend(GfxState *state, GfxAxialShading
GBool CairoOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) {
double x0, y0, r0, x1, y1, r1;
double dx, dy, dr;
+ cairo_matrix_t matrix;
+ double scale;
shading->getCoords(&x0, &y0, &r0, &x1, &y1, &r1);
dx = x1 - x0;
dy = y1 - y0;
dr = r1 - r0;
+
+ // Cairo/pixman do not work well with a very large or small scaled
+ // matrix. See cairo bug #81657.
+ //
+ // As a workaround, scale the pattern by the average of the vertical
+ // and horizontal scaling of the current transformation matrix.
+ cairo_get_matrix(cairo, &matrix);
+ scale = (sqrt(matrix.xx * matrix.xx + matrix.yx * matrix.yx)
+ + sqrt(matrix.xy * matrix.xy + matrix.yy * matrix.yy)) / 2;
+ cairo_matrix_init_scale(&matrix, scale, scale);
+
cairo_pattern_destroy(fill_pattern);
- fill_pattern = cairo_pattern_create_radial (x0 + sMin * dx,
- y0 + sMin * dy,
- r0 + sMin * dr,
- x0 + sMax * dx,
- y0 + sMax * dy,
- r0 + sMax * dr);
+ fill_pattern = cairo_pattern_create_radial ((x0 + sMin * dx) * scale,
+ (y0 + sMin * dy) * scale,
+ (r0 + sMin * dr) * scale,
+ (x0 + sMax * dx) * scale,
+ (y0 + sMax * dy) * scale,
+ (r0 + sMax * dr) * scale);
+ cairo_pattern_set_matrix(fill_pattern, &matrix);
if (shading->getExtend0() && shading->getExtend1())
cairo_pattern_set_extend (fill_pattern, CAIRO_EXTEND_PAD);
else
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.h
index 33dde0c570a..c146ce01b76 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CairoOutputDev.h
@@ -18,7 +18,7 @@
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2008, 2009, 2011-2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008, 2009, 2011-2015 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
@@ -112,7 +112,7 @@ public:
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
virtual GBool useShadedFills(int type) { return type <= 7; }
#else
- virtual GBool useShadedFills(int type) { return type < 4; }
+ virtual GBool useShadedFills(int type) { return type > 1 && type < 4; }
#endif
// Does this device use FillColorStop()?
@@ -169,6 +169,9 @@ public:
double *mat, double *bbox,
int x0, int y0, int x1, int y1,
double xStep, double yStep);
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
+ virtual GBool functionShadedFill(GfxState *state, GfxFunctionShading *shading);
+#endif
virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax);
virtual GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading);
virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax);
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-src/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-src/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-src/poppler/Catalog.cc
index a8c96ac479f..a8c96ac479f 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-src/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-src/poppler/CharCodeToUnicode.cc
index 5576a4a57d4..fdb787d6470 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/CharCodeToUnicode.cc
@@ -23,6 +23,7 @@
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2014 Jiri Slaby <jirislaby@gmail.com>
+// Copyright (C) 2015 Marek Kasik <mkasik@redhat.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
@@ -656,7 +657,7 @@ int CharCodeToUnicode::mapToCharCode(Unicode* u, CharCode *c, int usize) {
//compare the string char by char
for (j=0; j<sMap[i].len; j++) {
if (sMap[i].u[j] != u[j]) {
- continue;
+ break;
}
}
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-src/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-src/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-src/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-src/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-src/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-src/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-src/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-src/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-src/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-src/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-src/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-src/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-src/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-src/poppler/Dict.cc
index c2a94f4a1fa..c2a94f4a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-src/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-src/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Error.h b/Build/source/libs/poppler/poppler-src/poppler/Error.h
index 9e11733d803..9e11733d803 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-src/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-src/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-src/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-src/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-src/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-src/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-src/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-src/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-src/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-src/poppler/Form.cc
index a46a6590f27..a46a6590f27 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Form.h b/Build/source/libs/poppler/poppler-src/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-src/poppler/Function.cc
index 67283dffe9f..67283dffe9f 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Function.h b/Build/source/libs/poppler/poppler-src/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-src/poppler/Gfx.cc
index 07d95b355a8..577c482ec18 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Gfx.cc
@@ -28,7 +28,7 @@
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2008 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2009 M Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
-// Copyright (C) 2009-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2015 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 William Bader <williambader@hotmail.com>
// Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
// Copyright (C) 2010 Nils Höglund <nils.hoglund@gmail.com>
@@ -2283,6 +2283,7 @@ void Gfx::doTilingPatternFill(GfxTilingPattern *tPat,
xi0, yi0, xi1, yi1, xstep, ystep)) {
goto restore;
} else {
+ out->updatePatternOpacity(state);
for (yi = yi0; yi < yi1; ++yi) {
for (xi = xi0; xi < xi1; ++xi) {
x = xi * xstep;
@@ -2293,6 +2294,7 @@ void Gfx::doTilingPatternFill(GfxTilingPattern *tPat,
m1, tPat->getBBox());
}
}
+ out->clearPatternOpacity(state);
}
// restore graphics state
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-src/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-src/poppler/GfxFont.cc
index 81f59037f7f..81f59037f7f 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/GfxFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-src/poppler/GfxFont.h
index 85bdea13785..85bdea13785 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-src/poppler/GfxState.cc
index ab796f73113..bd3b42d5153 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/GfxState.cc
@@ -18,7 +18,7 @@
// Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2006-2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009, 2012 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2009, 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009, 2011-2015 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Christian Persch <chpe@gnome.org>
// Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
@@ -27,6 +27,7 @@
// Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
// Copyright (C) 2013 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2015 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -80,6 +81,22 @@ GBool Matrix::invertTo(Matrix *other) const
return gTrue;
}
+void Matrix::translate(double tx, double ty)
+{
+ double x0 = tx*m[0] + ty*m[2] + m[4];
+ double y0 = tx*m[1] + ty*m[3] + m[5];
+ m[4] = x0;
+ m[5] = y0;
+}
+
+void Matrix::scale(double sx, double sy)
+{
+ m[0] *= sx;
+ m[1] *= sx;
+ m[2] *= sy;
+ m[3] *= sy;
+}
+
void Matrix::transform(double x, double y, double *tx, double *ty) const
{
double temp_x, temp_y;
@@ -2864,12 +2881,16 @@ void GfxSeparationColorSpace::getGray(GfxColor *color, GfxGray *gray) {
GfxColor color2;
int i;
- x = colToDbl(color->c[0]);
- func->transform(&x, c);
- for (i = 0; i < alt->getNComps(); ++i) {
- color2.c[i] = dblToCol(c[i]);
+ if (alt->getMode() == csDeviceGray && name->cmp("Black") == 0) {
+ *gray = clip01(gfxColorComp1 - color->c[0]);
+ } else {
+ x = colToDbl(color->c[0]);
+ func->transform(&x, c);
+ for (i = 0; i < alt->getNComps(); ++i) {
+ color2.c[i] = dblToCol(c[i]);
+ }
+ alt->getGray(&color2, gray);
}
- alt->getGray(&color2, gray);
}
void GfxSeparationColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
@@ -2878,12 +2899,18 @@ void GfxSeparationColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
GfxColor color2;
int i;
- x = colToDbl(color->c[0]);
- func->transform(&x, c);
- for (i = 0; i < alt->getNComps(); ++i) {
- color2.c[i] = dblToCol(c[i]);
+ if (alt->getMode() == csDeviceGray && name->cmp("Black") == 0) {
+ rgb->r = clip01(gfxColorComp1 - color->c[0]);
+ rgb->g = clip01(gfxColorComp1 - color->c[0]);
+ rgb->b = clip01(gfxColorComp1 - color->c[0]);
+ } else {
+ x = colToDbl(color->c[0]);
+ func->transform(&x, c);
+ for (i = 0; i < alt->getNComps(); ++i) {
+ color2.c[i] = dblToCol(c[i]);
+ }
+ alt->getRGB(&color2, rgb);
}
- alt->getRGB(&color2, rgb);
}
void GfxSeparationColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
@@ -2892,12 +2919,34 @@ void GfxSeparationColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
GfxColor color2;
int i;
- x = colToDbl(color->c[0]);
- func->transform(&x, c);
- for (i = 0; i < alt->getNComps(); ++i) {
- color2.c[i] = dblToCol(c[i]);
+ if (name->cmp("Black") == 0) {
+ cmyk->c = 0;
+ cmyk->m = 0;
+ cmyk->y = 0;
+ cmyk->k = color->c[0];
+ } else if (name->cmp("Cyan") == 0) {
+ cmyk->c = color->c[0];
+ cmyk->m = 0;
+ cmyk->y = 0;
+ cmyk->k = 0;
+ } else if (name->cmp("Magenta") == 0) {
+ cmyk->c = 0;
+ cmyk->m = color->c[0];
+ cmyk->y = 0;
+ cmyk->k = 0;
+ } else if (name->cmp("Yellow") == 0) {
+ cmyk->c = 0;
+ cmyk->m = 0;
+ cmyk->y = color->c[0];
+ cmyk->k = 0;
+ } else {
+ x = colToDbl(color->c[0]);
+ func->transform(&x, c);
+ for (i = 0; i < alt->getNComps(); ++i) {
+ color2.c[i] = dblToCol(c[i]);
+ }
+ alt->getCMYK(&color2, cmyk);
}
- alt->getCMYK(&color2, cmyk);
}
void GfxSeparationColorSpace::getDeviceN(GfxColor *color, GfxColor *deviceN) {
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-src/poppler/GfxState.h
index f018e93dd34..c20438b33ab 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/GfxState.h
@@ -22,6 +22,7 @@
// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
// Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
+// Copyright (C) 2015 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -59,7 +60,12 @@ class Matrix {
public:
double m[6];
+ void init(double xx, double yx, double xy, double yy, double x0, double y0) {
+ m[0] = xx; m[1] = yx; m[2] = xy; m[3] = yy; m[4] = x0; m[5] = y0;
+ }
GBool invertTo(Matrix *other) const;
+ void translate(double tx, double ty);
+ void scale(double sx, double sy);
void transform(double x, double y, double *tx, double *ty) const;
double determinant() const { return m[0] * m[3] - m[1] * m[2]; }
double norm() const;
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-src/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-src/poppler/GlobalParams.cc
index e5434084c31..e5434084c31 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-src/poppler/GlobalParams.h
index 16d615ae6d9..16d615ae6d9 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-src/poppler/GlobalParamsWin.cc
index f9f40ef4e29..f9f40ef4e29 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-src/poppler/Hints.cc
index bdd0d322612..bdd0d322612 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-src/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-src/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-src/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.cc
index a20c2208115..a20c2208115 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.h
index 1e14c5cf783..1e14c5cf783 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-src/poppler/JPEG2000Stream.cc
index 35e98b86ebc..4c632d717e9 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/JPEG2000Stream.cc
@@ -9,6 +9,7 @@
// Copyright 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
// Copyright 2015 Adam Reichold <adam.reichold@t-online.de>
+// Copyright 2015 Jakub Wilk <jwilk@jwilk.net>
//
// Licensed under GPLv2 or later
//
@@ -252,13 +253,13 @@ void JPXStreamPrivate::init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT fo
error:
if (format == CODEC_JP2) {
- error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as JP2, trying as J2K.");
+ error(errSyntaxWarning, -1, "Did not succeed opening JPX Stream as JP2, trying as J2K.");
init2(buf, bufLen, CODEC_J2K);
} else if (format == CODEC_J2K) {
- error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as J2K, trying as JPT.");
+ error(errSyntaxWarning, -1, "Did not succeed opening JPX Stream as J2K, trying as JPT.");
init2(buf, bufLen, CODEC_JPT);
} else {
- error(errSyntaxError, -1, "Did no succeed opening JPX Stream.");
+ error(errSyntaxError, -1, "Did not succeed opening JPX Stream.");
}
}
#endif
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-src/poppler/JPEG2000Stream.h
index 73b6bdd97b8..73b6bdd97b8 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-src/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-src/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-src/poppler/Lexer.cc
index 952967a998a..952967a998a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-src/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-src/poppler/Linearization.cc
index be041f96407..be041f96407 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-src/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-src/poppler/Link.cc
index 4ab5f52ceda..4ab5f52ceda 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Link.h b/Build/source/libs/poppler/poppler-src/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-src/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-src/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-src/poppler/Makefile.am
index 85ee13b03a4..79b6000d244 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-src/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 56:0:0 \
+ -version-info 58:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-src/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-src/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-src/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-src/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-src/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-src/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Object.h b/Build/source/libs/poppler/poppler-src/poppler/Object.h
index 2a3766288a6..2a3766288a6 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-src/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-src/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-src/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-src/poppler/OutputDev.h
index e8a7a4794ce..a15d56b1477 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/OutputDev.h
@@ -17,7 +17,7 @@
// Copyright (C) 2006 Thorkild Stray <thorkild@ifi.uio.no>
// Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2007, 2011 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2013, 2015 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
@@ -185,6 +185,8 @@ public:
virtual void updateBlendMode(GfxState * /*state*/) {}
virtual void updateFillOpacity(GfxState * /*state*/) {}
virtual void updateStrokeOpacity(GfxState * /*state*/) {}
+ virtual void updatePatternOpacity(GfxState * /*state*/) {}
+ virtual void clearPatternOpacity(GfxState * /*state*/) {}
virtual void updateFillOverprint(GfxState * /*state*/) {}
virtual void updateStrokeOverprint(GfxState * /*state*/) {}
virtual void updateOverprintMode(GfxState * /*state*/) {}
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-src/poppler/PDFDoc.cc
index 46c4544e75b..46c4544e75b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/PDFDoc.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-src/poppler/PDFDoc.h
index 6c40f7b0c0c..6c40f7b0c0c 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-src/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-src/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-src/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-src/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-src/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.cc
index 7b93e3bf65a..2d01edbd2b7 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.cc
@@ -25,7 +25,7 @@
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2009, 2011, 2012, 2014, 2015 William Bader <williambader@hotmail.com>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
-// Copyright (C) 2009-2011, 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2009-2011, 2013-2015 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2012, 2014 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2012 Lu Wang <coolwanglu@gmail.com>
// Copyright (C) 2014 Till Kamppeter <till.kamppeter@gmail.com>
@@ -3762,38 +3762,19 @@ void PSOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
}
}
}
- if (paperMatch) {
- paperSize = (PSOutPaperSize *)paperSizes->get(pagePaperSize[pageNum]);
- writePSFmt("%%PageMedia: {0:t}\n", paperSize->name);
- }
- if (rotate == 0 || rotate == 180) {
- writePSFmt("%%PageBoundingBox: 0 0 {0:d} {1:d}\n", width, height);
- } else {
- writePSFmt("%%PageBoundingBox: 0 0 {0:d} {1:d}\n", height, width);
- }
- writePSFmt("%%PageOrientation: {0:s}\n",
- landscape ? "Landscape" : "Portrait");
- writePS("%%BeginPageSetup\n");
- if (paperMatch) {
- writePSFmt("{0:d} {1:d} pdfSetupPaper\n", imgURX, imgURY);
- }
- writePS("pdfStartPage\n");
if (rotate == 0) {
imgWidth2 = imgWidth;
imgHeight2 = imgHeight;
} else if (rotate == 90) {
- writePS("90 rotate\n");
ty = -imgWidth;
imgWidth2 = imgHeight;
imgHeight2 = imgWidth;
} else if (rotate == 180) {
- writePS("180 rotate\n");
imgWidth2 = imgWidth;
imgHeight2 = imgHeight;
tx = -imgWidth;
ty = -imgHeight;
} else { // rotate == 270
- writePS("270 rotate\n");
tx = -imgHeight;
imgWidth2 = imgHeight;
imgHeight2 = imgWidth;
@@ -3837,6 +3818,59 @@ void PSOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
}
tx += (rotate == 0 || rotate == 180) ? imgLLX : imgLLY;
ty += (rotate == 0 || rotate == 180) ? imgLLY : -imgLLX;
+
+ if (paperMatch) {
+ paperSize = (PSOutPaperSize *)paperSizes->get(pagePaperSize[pageNum]);
+ writePSFmt("%%PageMedia: {0:t}\n", paperSize->name);
+ }
+
+ // Create a matrix with the same transform that will be output to PS
+ Matrix m;
+ switch (rotate) {
+ default:
+ case 0:
+ m.init(1, 0,
+ 0, 1,
+ 0, 0);
+ break;
+ case 90:
+ m.init(0, 1,
+ -1, 0,
+ 0, 0);
+ break;
+ case 180:
+ m.init(-1, 0,
+ 0, -1,
+ 0, 0);
+ break;
+ case 270:
+ m.init(0, -1,
+ 1, 0,
+ 0, 0);
+ break;
+ }
+ m.translate(tx, ty);
+ m.scale(xScale, yScale);
+
+ double bboxX1, bboxY1, bboxX2, bboxY2;
+ m.transform(0, 0, &bboxX1, &bboxY1);
+ m.transform(width, height, &bboxX2, &bboxY2);
+
+ writePSFmt("%%PageBoundingBox: {0:g} {1:g} {2:g} {3:g}\n",
+ floor(std::min(bboxX1, bboxX2)),
+ floor(std::min(bboxY1, bboxY2)),
+ ceil (std::max(bboxX1, bboxX2)),
+ ceil (std::max(bboxY1, bboxY2)));
+
+ writePSFmt("%%PageOrientation: {0:s}\n",
+ landscape ? "Landscape" : "Portrait");
+ writePS("%%BeginPageSetup\n");
+ if (paperMatch) {
+ writePSFmt("{0:d} {1:d} pdfSetupPaper\n", imgURX, imgURY);
+ }
+ writePS("pdfStartPage\n");
+ if (rotate)
+ writePSFmt("{0:d} rotate\n", rotate);
if (tx != 0 || ty != 0) {
writePSFmt("{0:.6g} {1:.6g} translate\n", tx, ty);
}
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.h
index 7318cafdf2a..7318cafdf2a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PSOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-src/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-src/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-src/poppler/Page.cc
index a4af3405b92..a4af3405b92 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Page.h b/Build/source/libs/poppler/poppler-src/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-src/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-src/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-src/poppler/PageLabelInfo_p.h
index 6cd5220d372..6cd5220d372 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-src/poppler/PageTransition.cc
index d5a84f89a7b..d5a84f89a7b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-src/poppler/PageTransition.h
index 82f080f418c..82f080f418c 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-src/poppler/Parser.cc
index 28a54607f5c..28a54607f5c 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-src/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-src/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-src/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-src/poppler/PreScanOutputDev.cc
index b2af18d86b8..b2af18d86b8 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-src/poppler/PreScanOutputDev.h
index 50fcbf22f73..50fcbf22f73 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-src/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-src/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-src/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-src/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-src/poppler/SecurityHandler.cc
index 63d8b4e1287..63d8b4e1287 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-src/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-src/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-src/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.cc
index 6d4161687d9..d2827d14645 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.cc
@@ -1842,6 +1842,14 @@ void SplashOutputDev::updateStrokeOpacity(GfxState *state) {
}
}
+void SplashOutputDev::updatePatternOpacity(GfxState *state) {
+ splash->setPatternAlpha((SplashCoord)state->getStrokeOpacity(), (SplashCoord)state->getFillOpacity());
+}
+
+void SplashOutputDev::clearPatternOpacity(GfxState *state) {
+ splash->clearPatternAlpha();
+}
+
void SplashOutputDev::updateFillOverprint(GfxState *state) {
splash->setFillOverprint(state->getFillOverprint());
}
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.h
index d34426c0f3c..ce4082f1d9c 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/SplashOutputDev.h
@@ -231,6 +231,8 @@ public:
virtual void updateBlendMode(GfxState *state);
virtual void updateFillOpacity(GfxState *state);
virtual void updateStrokeOpacity(GfxState *state);
+ virtual void updatePatternOpacity(GfxState *state);
+ virtual void clearPatternOpacity(GfxState *state);
virtual void updateFillOverprint(GfxState *state);
virtual void updateStrokeOverprint(GfxState *state);
virtual void updateOverprintMode(GfxState *state);
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-src/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-src/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-src/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-src/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-src/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-src/poppler/Stream.cc
index 961767896c2..961767896c2 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-src/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-src/poppler/StructElement.cc
index c6688208fee..c6688208fee 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/StructElement.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/StructElement.h b/Build/source/libs/poppler/poppler-src/poppler/StructElement.h
index cd89a970ddb..cd89a970ddb 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/StructElement.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-src/poppler/StructTreeRoot.cc
index e46e3e28388..e46e3e28388 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/StructTreeRoot.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-src/poppler/StructTreeRoot.h
index 3b1f3c84421..3b1f3c84421 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/StructTreeRoot.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.cc
index bbb371a30b8..bbb371a30b8 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h
index 2aab94f5d15..2aab94f5d15 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-src/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-src/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-src/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-src/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-src/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-src/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-src/poppler/UnicodeMap.cc
index 1319666779b..1319666779b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-src/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-src/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-src/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-src/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-src/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-src/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-src/poppler/XRef.cc
index 1bbbdc51c25..1bbbdc51c25 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-src/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-src/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-src/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-src/poppler/XpdfPluginAPI.h
index 6ed890a8f1f..6ed890a8f1f 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-src/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-src/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-src/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.cmake
index b087a693f92..b087a693f92 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.in
index f73d0f66ee9..f73d0f66ee9 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-src/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.37.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-src/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-src/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/Makefile.am b/Build/source/libs/poppler/poppler-src/splash/Makefile.am
index 5c265d6360c..5c265d6360c 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-src/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/Splash.cc b/Build/source/libs/poppler/poppler-src/splash/Splash.cc
index 7453822d291..5bc7767a305 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/Splash.cc
@@ -1752,11 +1752,23 @@ void Splash::setBlendFunc(SplashBlendFunc func) {
}
void Splash::setStrokeAlpha(SplashCoord alpha) {
- state->strokeAlpha = alpha;
+ state->strokeAlpha = (state->multiplyPatternAlpha) ? alpha * state->patternStrokeAlpha : alpha;
}
void Splash::setFillAlpha(SplashCoord alpha) {
- state->fillAlpha = alpha;
+ state->fillAlpha = (state->multiplyPatternAlpha) ? alpha * state->patternFillAlpha : alpha;
+}
+
+void Splash::setPatternAlpha(SplashCoord strokeAlpha, SplashCoord fillAlpha) {
+ state->patternStrokeAlpha = strokeAlpha;
+ state->patternFillAlpha = fillAlpha;
+ state->multiplyPatternAlpha = gTrue;
+}
+
+void Splash::clearPatternAlpha() {
+ state->patternStrokeAlpha = 1;
+ state->patternFillAlpha = 1;
+ state->multiplyPatternAlpha = gFalse;
}
void Splash::setFillOverprint(GBool fop) {
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/Splash.h b/Build/source/libs/poppler/poppler-src/splash/Splash.h
index 75764544fed..3ca15c38bce 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-src/splash/Splash.h
@@ -129,6 +129,8 @@ public:
void setBlendFunc(SplashBlendFunc func);
void setStrokeAlpha(SplashCoord alpha);
void setFillAlpha(SplashCoord alpha);
+ void setPatternAlpha(SplashCoord strokeAlpha, SplashCoord fillAlpha);
+ void clearPatternAlpha();
void setFillOverprint(GBool fop);
void setStrokeOverprint(GBool sop);
void setOverprintMode(int opm);
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-src/splash/SplashBitmap.cc
index 7c14b3161b1..7c14b3161b1 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashBitmap.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-src/splash/SplashBitmap.h
index 4417af73375..4417af73375 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-src/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashClip.h b/Build/source/libs/poppler/poppler-src/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-src/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.cc
index b785826d66b..b785826d66b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-src/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-src/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.cc
index f0dcf50384b..f0dcf50384b 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-src/splash/SplashFont.cc
index 3d6d6b2343e..3d6d6b2343e 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFont.h b/Build/source/libs/poppler/poppler-src/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-src/splash/SplashFontEngine.cc
index 73ef8de0877..73ef8de0877 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-src/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-src/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-src/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-src/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-src/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-src/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashMath.h b/Build/source/libs/poppler/poppler-src/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-src/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashPath.h b/Build/source/libs/poppler/poppler-src/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-src/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-src/splash/SplashPattern.h
index e678c9e20e6..e678c9e20e6 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-src/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-src/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashState.cc b/Build/source/libs/poppler/poppler-src/splash/SplashState.cc
index fd2789d02f9..f0c98c5eff7 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashState.cc
@@ -11,7 +11,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2009, 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009, 2011, 2012, 2015 Thomas Freitag <Thomas.Freitag@alfa.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -59,6 +59,9 @@ SplashState::SplashState(int width, int height, GBool vectorAntialias,
blendFunc = NULL;
strokeAlpha = 1;
fillAlpha = 1;
+ multiplyPatternAlpha = gFalse;
+ patternStrokeAlpha = 1;
+ patternFillAlpha = 1;
lineWidth = 0;
lineCap = splashLineCapButt;
lineJoin = splashLineJoinMiter;
@@ -109,6 +112,9 @@ SplashState::SplashState(int width, int height, GBool vectorAntialias,
blendFunc = NULL;
strokeAlpha = 1;
fillAlpha = 1;
+ multiplyPatternAlpha = gFalse;
+ patternStrokeAlpha = 1;
+ patternFillAlpha = 1;
lineWidth = 0;
lineCap = splashLineCapButt;
lineJoin = splashLineJoinMiter;
@@ -152,6 +158,9 @@ SplashState::SplashState(SplashState *state) {
blendFunc = state->blendFunc;
strokeAlpha = state->strokeAlpha;
fillAlpha = state->fillAlpha;
+ multiplyPatternAlpha = state->multiplyPatternAlpha;
+ patternStrokeAlpha = state->patternStrokeAlpha;
+ patternFillAlpha = state->patternFillAlpha;
lineWidth = state->lineWidth;
lineCap = state->lineCap;
lineJoin = state->lineJoin;
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashState.h b/Build/source/libs/poppler/poppler-src/splash/SplashState.h
index 2c603531cfd..fea7603500e 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashState.h
@@ -11,7 +11,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011, 2012, 2015 Thomas Freitag <Thomas.Freitag@alfa.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -101,6 +101,9 @@ private:
SplashBlendFunc blendFunc;
SplashCoord strokeAlpha;
SplashCoord fillAlpha;
+ GBool multiplyPatternAlpha;
+ SplashCoord patternStrokeAlpha;
+ SplashCoord patternFillAlpha;
SplashCoord lineWidth;
int lineCap;
int lineJoin;
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-src/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-src/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-src/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-src/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-src/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-src/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-src/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-src/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-src/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-src/splash/SplashXPathScanner.cc
index ac47881cb4f..ac47881cb4f 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashXPathScanner.cc
diff --git a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-src/splash/SplashXPathScanner.h
index cc295cb68fe..cc295cb68fe 100644
--- a/Build/source/libs/poppler/poppler-0.37.0/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-src/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index be7fdc2be6e..8ec642ad837 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.37.0])
+m4_define([poppler_version], [0.39.0])