diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-09-10 06:46:36 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-09-10 06:46:36 +0000 |
commit | 659ec263572821f752f87ea4f7e4c13fcdd20461 (patch) | |
tree | 7809867cbb197f2ce93588b4077fd124a8f07a50 /Build/source/libs/poppler | |
parent | 1b3f4adac0a1d65102e83e1adb1f45d2ad35eb22 (diff) |
poppler 0.36.0
git-svn-id: svn://tug.org/texlive/trunk@38335 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/poppler')
-rw-r--r-- | Build/source/libs/poppler/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/poppler/Makefile.in | 4 | ||||
-rwxr-xr-x | Build/source/libs/poppler/configure | 30 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.35.0-PATCHES/ChangeLog) | 7 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-0.35.0-PATCHES/TL-Changes) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0-PATCHES/patch-02-LLONG_MAX (renamed from Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-02-LLONG_MAX) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0-PATCHES/patch-03-Object-functions (renamed from Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-03-Object-functions) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/AUTHORS (renamed from Build/source/libs/poppler/poppler-0.35.0/AUTHORS) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/CMakeLists.txt (renamed from Build/source/libs/poppler/poppler-0.35.0/CMakeLists.txt) | 5 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/COPYING (renamed from Build/source/libs/poppler/poppler-0.35.0/COPYING) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.35.0/ChangeLog) | 358 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/ConfigureChecks.cmake (renamed from Build/source/libs/poppler/poppler-0.35.0/ConfigureChecks.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/INSTALL (renamed from Build/source/libs/poppler/poppler-0.35.0/INSTALL) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.35.0/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/NEWS (renamed from Build/source/libs/poppler/poppler-0.35.0/NEWS) | 38 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/README (renamed from Build/source/libs/poppler/poppler-0.35.0/README) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/README-XPDF (renamed from Build/source/libs/poppler/poppler-0.35.0/README-XPDF) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/TODO (renamed from Build/source/libs/poppler/poppler-0.35.0/TODO) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.35.0/config.h.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/config.h.in (renamed from Build/source/libs/poppler/poppler-0.35.0/config.h.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/configure.ac (renamed from Build/source/libs/poppler/poppler-0.35.0/configure.ac) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiBase.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiBase.h (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiEncodings.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiEncodings.h (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiIdentifier.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiIdentifier.h (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiTrueType.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiTrueType.h (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.cc) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1.h (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1C.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1C.h (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/fofi/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.35.0/fofi/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/FixedPoint.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/FixedPoint.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/GooHash.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/GooHash.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/GooLikely.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/GooLikely.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/GooList.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/GooList.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/GooList.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/GooList.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/GooMutex.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/GooMutex.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/GooString.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/GooString.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/GooString.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/GooString.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/GooTimer.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/GooTimer.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/ImgWriter.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/ImgWriter.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/JpegWriter.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/JpegWriter.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/NetPBMWriter.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/NetPBMWriter.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/PNGWriter.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/PNGWriter.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/TiffWriter.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/TiffWriter.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/gfile.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/gfile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/gfile.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/gfile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/gmem.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/gmem.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/gmem.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/gmem.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/gmempp.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/gmempp.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/grandom.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/grandom.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/grandom.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/grandom.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/gstrtod.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/gstrtod.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/gtypes.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/gtypes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/goo/gtypes_p.h (renamed from Build/source/libs/poppler/poppler-0.35.0/goo/gtypes_p.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/gtk-doc.make (renamed from Build/source/libs/poppler/poppler-0.35.0/gtk-doc.make) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-cairo-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-cairo-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-cairo.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-cairo.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-cpp-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-cpp-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-cpp.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-cpp.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-glib-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-glib-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-glib.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-glib.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-qt4-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-qt4-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-qt4.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-qt4.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-qt5-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-qt5-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-qt5.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-qt5.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-splash-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-splash-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-splash.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-splash.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler.pc.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Annot.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.cc) | 406 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Annot.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.h) | 174 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Array.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Array.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Array.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Array.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFont.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFont.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFontTables.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFontTables.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CMap.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CMap.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CachedFile.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CairoFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CairoFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.cc) | 32 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CairoRescaleBox.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CairoRescaleBox.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Catalog.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Catalog.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CharCodeToUnicode.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.cc) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CharCodeToUnicode.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CharTypes.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CharTypes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CompactFontTables.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CompactFontTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CurlCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CurlCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CurlPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/CurlPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/DCTStream.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/DCTStream.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/DateInfo.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/DateInfo.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Decrypt.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Decrypt.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Dict.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Dict.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Error.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Error.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Error.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Error.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/ErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/ErrorCodes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/FileSpec.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/FileSpec.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/FlateStream.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/FlateStream.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/FontEncodingTables.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/FontEncodingTables.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/FontInfo.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/FontInfo.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Form.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Form.cc) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Form.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Form.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Function.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Function.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Function.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Function.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Gfx.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Gfx.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/GfxFont.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/GfxFont.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/GfxState.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.cc) | 14 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/GfxState.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/GfxState_helpers.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState_helpers.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/GlobalParams.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.cc) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/GlobalParams.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/GlobalParamsWin.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParamsWin.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Hints.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Hints.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/JArithmeticDecoder.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/JArithmeticDecoder.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/JPEG2000Stream.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/JPEG2000Stream.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/JPXStream.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/JPXStream.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Lexer.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Lexer.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Linearization.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.cc) | 3 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Linearization.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Link.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Link.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Link.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Link.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/LocalPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/LocalPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Makefile.am) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/MarkedContentOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/MarkedContentOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Movie.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Movie.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/NameToCharCode.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/NameToCharCode.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/NameToUnicodeTable.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/NameToUnicodeTable.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Object.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Object.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Object.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Object.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/OptionalContent.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/OptionalContent.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Outline.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Outline.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/OutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/OutputDev.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDoc.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.cc) | 24 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDoc.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocEncoding.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocEncoding.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocFactory.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocFactory.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PSOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PSOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PSTokenizer.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PSTokenizer.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Page.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Page.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Page.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Page.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo_p.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo_p.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PageTransition.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PageTransition.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Parser.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Parser.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PopplerCache.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PopplerCache.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PreScanOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/PreScanOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/ProfileData.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/ProfileData.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Rendition.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Rendition.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/SecurityHandler.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/SecurityHandler.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Sound.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Sound.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/StdinCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/StdinCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/StdinPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/StdinPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Stream-CCITT.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Stream-CCITT.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Stream.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.cc) | 10 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/Stream.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/StructElement.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/StructElement.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/StructTreeRoot.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/StructTreeRoot.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/TextOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.cc) | 4 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/TextOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.h) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UTF.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UTF.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UTF8.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UTF8.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeCClassTables.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCClassTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeCompTables.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCompTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeDecompTables.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeDecompTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMap.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.cc) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMap.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMapTables.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMapTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeTypeTable.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeTypeTable.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/ViewerPreferences.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/ViewerPreferences.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/XRef.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/XRef.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/XpdfPluginAPI.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/XpdfPluginAPI.h (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/gen-unicode-tables.py (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/gen-unicode-tables.py) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/poppler-config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/poppler-config.h.in (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/poppler/strtok_r.cpp (renamed from Build/source/libs/poppler/poppler-0.35.0/poppler/strtok_r.cpp) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/Splash.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/Splash.cc) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/Splash.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/Splash.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashBitmap.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.cc) | 49 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashBitmap.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.h) | 11 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashClip.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashClip.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashErrorCodes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFont.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFont.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontFile.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFont.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFont.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFile.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFileID.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFileID.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashGlyphBitmap.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashGlyphBitmap.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashMath.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashMath.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashPath.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashPath.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashPattern.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashPattern.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashScreen.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashScreen.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashState.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashState.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1Font.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1Font.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontEngine.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontFile.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontFile.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashTypes.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashTypes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPath.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPath.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPathScanner.cc (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPathScanner.h (renamed from Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/version.ac | 2 |
297 files changed, 1114 insertions, 100 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog index 6eae6543a22..ac836d00128 100644 --- a/Build/source/libs/poppler/ChangeLog +++ b/Build/source/libs/poppler/ChangeLog @@ -1,3 +1,8 @@ +2015-09-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import poppler-0.36.0. + * version.ac: Adjust. + 2015-08-10 Peter Breitenlohner <peb@mppmu.mpg.de> Import poppler-0.35.0. diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in index 7e5ebf47345..bc38c7974ce 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.35.0/poppler/poppler-config.h.in \ + $(top_srcdir)/poppler-0.36.0/poppler/poppler-config.h.in \ ../../build-aux/compile ../../build-aux/config.guess \ ../../build-aux/config.sub ../../build-aux/depcomp \ ../../build-aux/install-sh ../../build-aux/ltmain.sh \ @@ -597,7 +597,7 @@ poppler-config.h: stamp-h2 @test -f $@ || rm -f stamp-h2 @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2 -stamp-h2: $(top_srcdir)/poppler-0.35.0/poppler/poppler-config.h.in $(top_builddir)/config.status +stamp-h2: $(top_srcdir)/poppler-0.36.0/poppler/poppler-config.h.in $(top_builddir)/config.status @rm -f stamp-h2 cd $(top_builddir) && $(SHELL) ./config.status poppler-config.h diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure index a25b547b9f5..d8934ab54b1 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.35.0. +# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.36.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.35.0' -PACKAGE_STRING='poppler (TeX Live) 0.35.0' +PACKAGE_VERSION='0.36.0' +PACKAGE_STRING='poppler (TeX Live) 0.36.0' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' -ac_unique_file="poppler-0.35.0/poppler/Array.cc" +ac_unique_file="poppler-0.36.0/poppler/Array.cc" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1306,7 +1306,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures poppler (TeX Live) 0.35.0 to adapt to many kinds of systems. +\`configure' configures poppler (TeX Live) 0.36.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.35.0:";; + short | recursive ) echo "Configuration of poppler (TeX Live) 0.36.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.35.0 +poppler (TeX Live) configure 0.36.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.35.0, which was +It was created by poppler (TeX Live) $as_me 0.36.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.35.0' + VERSION='0.36.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.35.0/poppler/poppler-config.h.in" +ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.36.0/poppler/poppler-config.h.in" cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.35.0" +#define POPPLER_VERSION "0.36.0" _ACEOF @@ -6712,7 +6712,7 @@ fi $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h -POPPLER_TREE=poppler-0.35.0 +POPPLER_TREE=poppler-0.36.0 ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile" @@ -7272,7 +7272,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by poppler (TeX Live) $as_me 0.35.0, which was +This file was extended by poppler (TeX Live) $as_me 0.36.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.35.0 +poppler (TeX Live) config.status 0.36.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.35.0/poppler/poppler-config.h.in" ;; + "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.36.0/poppler/poppler-config.h.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "include/goo/Makefile") CONFIG_FILES="$CONFIG_FILES include/goo/Makefile" ;; diff --git a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.36.0-PATCHES/ChangeLog index 59065cd60ea..8f51405dd95 100644 --- a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/ChangeLog +++ b/Build/source/libs/poppler/poppler-0.36.0-PATCHES/ChangeLog @@ -1,3 +1,10 @@ +2015-09-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.36.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted. + 2015-09-01 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-03-Object-functions (new): Declare parameter of Object diff --git a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.36.0-PATCHES/TL-Changes index 0b14de1f3e6..3882f0cbff3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/TL-Changes +++ b/Build/source/libs/poppler/poppler-0.36.0-PATCHES/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the poppler-0.35.0 tree as obtained from: +Changes applied to the poppler-0.36.0 tree as obtained from: http://poppler.freedesktop.org/ Removed: diff --git a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.36.0-PATCHES/patch-02-LLONG_MAX index 138654abcb9..f0dee49b3a7 100644 --- a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-02-LLONG_MAX +++ b/Build/source/libs/poppler/poppler-0.36.0-PATCHES/patch-02-LLONG_MAX @@ -1,6 +1,6 @@ -diff -ur poppler-0.35.0.orig/goo/GooString.h poppler-0.35.0/goo/GooString.h ---- poppler-0.35.0.orig/goo/GooString.h 2015-07-12 17:05:10.000000000 +0200 -+++ poppler-0.35.0/goo/GooString.h 2015-08-10 09:38:59.000000000 +0200 +diff -ur poppler-0.36.0.orig/goo/GooString.h poppler-0.36.0/goo/GooString.h +--- poppler-0.36.0.orig/goo/GooString.h 2015-07-12 17:05:10.000000000 +0200 ++++ poppler-0.36.0/goo/GooString.h 2015-08-10 09:38:59.000000000 +0200 @@ -35,6 +35,21 @@ #endif diff --git a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-03-Object-functions b/Build/source/libs/poppler/poppler-0.36.0-PATCHES/patch-03-Object-functions index cc76a16cd22..4eeab4f4dd3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-03-Object-functions +++ b/Build/source/libs/poppler/poppler-0.36.0-PATCHES/patch-03-Object-functions @@ -1,6 +1,6 @@ -diff -ur poppler-0.35.0.orig/poppler/Object.h poppler-0.35.0/poppler/Object.h ---- poppler-0.35.0.orig/poppler/Object.h 2014-02-09 16:10:32.000000000 +0100 -+++ poppler-0.35.0/poppler/Object.h 2015-09-01 10:16:06.000000000 +0200 +diff -ur poppler-0.36.0.orig/poppler/Object.h poppler-0.36.0/poppler/Object.h +--- poppler-0.36.0.orig/poppler/Object.h 2015-08-17 19:47:55.000000000 +0200 ++++ poppler-0.36.0/poppler/Object.h 2015-09-10 08:15:10.000000000 +0200 @@ -140,7 +140,7 @@ Object *initStream(Stream *streamA); Object *initRef(int numA, int genA) diff --git a/Build/source/libs/poppler/poppler-0.35.0/AUTHORS b/Build/source/libs/poppler/poppler-0.36.0/AUTHORS index a785e403211..a785e403211 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/AUTHORS +++ b/Build/source/libs/poppler/poppler-0.36.0/AUTHORS diff --git a/Build/source/libs/poppler/poppler-0.35.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.36.0/CMakeLists.txt index c587ea67e3d..ac3d090c28a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/CMakeLists.txt +++ b/Build/source/libs/poppler/poppler-0.36.0/CMakeLists.txt @@ -22,7 +22,7 @@ if (ECM_FOUND) endif() set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "35") +set(POPPLER_MINOR_VERSION "36") set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") @@ -49,6 +49,7 @@ else(WIN32) endif(WIN32) set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") +set(SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Share directory name") set(TESTDATADIR "${CMAKE_SOURCE_DIR}/../test" CACHE STRING "Specify test data dir.") if(NOT (EXISTS ${TESTDATADIR} AND EXISTS ${TESTDATADIR}/test-poppler.c)) @@ -477,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 54.0.0 SOVERSION 54) +set_target_properties(poppler PROPERTIES VERSION 55.0.0 SOVERSION 55) 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}) diff --git a/Build/source/libs/poppler/poppler-0.35.0/COPYING b/Build/source/libs/poppler/poppler-0.36.0/COPYING index d511905c164..d511905c164 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/COPYING +++ b/Build/source/libs/poppler/poppler-0.36.0/COPYING diff --git a/Build/source/libs/poppler/poppler-0.35.0/ChangeLog b/Build/source/libs/poppler/poppler-0.36.0/ChangeLog index 8b04982fbfc..c74b0fda591 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/ChangeLog +++ b/Build/source/libs/poppler/poppler-0.36.0/ChangeLog @@ -1,3 +1,361 @@ +commit d490c21fe4a60cff26f34c619d3078dcb575bf44 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 9 23:55:57 2015 +0200 + + Update (C) + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fc69a5e7dab48636946282e5d4b7be77e650023c +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 8 17:48:49 2015 +0200 + + Qt5: Minor optimizations + + Call reserve on containers + Use QStringLiteral/QLatin1String + + qt5/src/poppler-annotation.cc | 612 + +++++++++++++++++++++--------------------- + qt5/src/poppler-document.cc | 3 +- + qt5/src/poppler-fontinfo.cc | 3 +- + qt5/src/poppler-form.cc | 3 +- + qt5/src/poppler-optcontent.cc | 2 + + qt5/src/poppler-page.cc | 1 + + qt5/src/poppler-private.cc | 18 +- + 7 files changed, 325 insertions(+), 317 deletions(-) + +commit 9b4e908d86e78535cced9fb7ccac1f3f0e1fc5c1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 8 17:48:16 2015 +0200 + + Qt4: Minor optimization + + Call reserve on containers upfront + + qt4/src/poppler-annotation.cc | 4 +++- + qt4/src/poppler-document.cc | 3 ++- + qt4/src/poppler-fontinfo.cc | 3 ++- + qt4/src/poppler-form.cc | 3 ++- + qt4/src/poppler-optcontent.cc | 2 ++ + qt4/src/poppler-page.cc | 1 + + 6 files changed, 12 insertions(+), 4 deletions(-) + +commit f8182694909c989bd65b7317f9df439c5bfabe95 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 8 17:13:07 2015 +0200 + + renderingIntent is always non null + + poppler/GfxState.cc | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 6f69e2e35b8fe7a347367074ce36959d47fd8635 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 8 09:44:30 2015 +0200 + + Matrix is 48 bytes, pass it by ref instead of by value + + poppler/TextOutputDev.cc | 4 ++-- + poppler/TextOutputDev.h | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit c871ae2cd6fbc8a827dfe2c4d5595d7439a4b54e +Author: Heiko Becker <heirecka@exherbo.org> +Date: Sun May 3 16:06:30 2015 +0200 + + cmake: Allow configuring SHARE_INSTALL_DIR + + This is helpful on a multiarch layout where the prefix is /usr/${host} + but arch-independent files should still be installed to /usr/share. + + Bug 90293 + + CMakeLists.txt | 1 + + cmake/modules/GObjectIntrospectionMacros.cmake | 2 +- + utils/CMakeLists.txt | 22 + +++++++++++----------- + 3 files changed, 13 insertions(+), 12 deletions(-) + +commit 1e1a2d0600153c98d44f65e83a0555ab5288450b +Author: Jason Crain <jason@aquaticape.us> +Date: Sun Sep 6 22:33:02 2015 +0200 + + Fix JBIG2Decode infinite loop and stack overflow + + Creating a JBIG2Decode filter can create a stack overflow or infinite + loop. Fix stack overflow by adding 'recursion' argument to fetch + call. Fix infinite loop by removing the reference lookup loop. + Chains of references aren't allowed by the spec anyway. + + Bug #91186 + + poppler/Stream.cc | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +commit 3c91ded21c828d3529f9cd00c417601c67c8a741 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 1 23:46:55 2015 +0200 + + Revert a42614284c94c6742b2343abd797657fffa80e0e + + poppler/PDFDoc.cc | 33 ++++++++++++++------------------- + poppler/PDFDoc.h | 11 +++++------ + qt4/src/poppler-pdf-converter.cc | 14 +------------- + qt4/src/poppler-qt4.h | 4 +--- + qt5/src/poppler-pdf-converter.cc | 14 +------------- + qt5/src/poppler-qt5.h | 4 +--- + utils/pdfunite.cc | 3 +-- + 7 files changed, 24 insertions(+), 59 deletions(-) + +commit 911d9fc8d85b776418039b4eebb37200a0987554 +Author: Jeremy Echols <jechols@uoregon.edu> +Date: Tue Sep 1 00:22:28 2015 +0200 + + pdftotext: Add -bbox-layout option + + Adds layout information for blocks and lines in addition to words + + Bug #89941 + + utils/pdftotext.1 | 4 ++ + utils/pdftotext.cc | 115 + +++++++++++++++++++++++++++++++++++++++++++---------- + 2 files changed, 99 insertions(+), 20 deletions(-) + +commit a42614284c94c6742b2343abd797657fffa80e0e +Author: Adam Reichold <adam.reichold@t-online.de> +Date: Tue Sep 1 00:15:46 2015 +0200 + + Add option to strip encryption + + Adds a PDF write mode that forces a complete rewrite that ignores + the original + encryption parameters of the document and also removes the encryption + entry + from the trailer dictionary. + + poppler/PDFDoc.cc | 33 +++++++++++++++++++-------------- + poppler/PDFDoc.h | 11 ++++++----- + qt4/src/poppler-pdf-converter.cc | 14 +++++++++++++- + qt4/src/poppler-qt4.h | 4 +++- + qt5/src/poppler-pdf-converter.cc | 14 +++++++++++++- + qt5/src/poppler-qt5.h | 4 +++- + utils/pdfunite.cc | 3 ++- + 7 files changed, 59 insertions(+), 24 deletions(-) + +commit 72c0162258f2630a3bb11b9c1078ec1ec2812788 +Author: Jason Crain <jason@aquaticape.us> +Date: Tue Aug 18 01:34:10 2015 -0500 + + cairo: fix size of transparency group surface + + Under rotation cairo_surface_create_similar_clip will create a surface + with incorect width/height. Rely on cairo to do the correct + calculation. + + Bug #66229 + + poppler/CairoOutputDev.cc | 30 ++++++++---------------------- + 1 file changed, 8 insertions(+), 22 deletions(-) + +commit 06f942657ee0798d7bdc5bd180150ea0464833a5 +Author: Arthur Stavisky <vovodroid@gmail.com> +Date: Sat Aug 29 15:50:45 2015 +0200 + + Fix for xref table creation + + Bug #90790 + + utils/pdfunite.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6ccdd381b483f50f37005fd9b13f79d2f38273ff +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 29 12:18:44 2015 +0200 + + typo fix, "existant" -> "existent" + + NEWS | 2 +- + poppler/Form.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9d79f06192d176298b4c911a6702ad1cfe099112 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Aug 27 23:10:05 2015 +0200 + + Do not hardcode -fPIC in Makefile.am + + The flag -fPIC is already set on CXXFLAGS by configure. + For the mingw compiler, you should not use fPIC, see d44e7e35. + + https://bugs.freedesktop.org/show_bug.cgi?id=91466 + + qt5/src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3e19bec738889ee9140379ac3f871552dbb9bf41 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Thu Aug 27 23:01:21 2015 +0200 + + pdfunite: Insert embedded files in result pdf + + Bug #90066 + + poppler/PDFDoc.cc | 1 - + utils/pdfunite.cc | 156 + +++++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 154 insertions(+), 3 deletions(-) + +commit 6e469dbe239714b478488af5ff73046e6a46a908 +Author: Adam Reichold <adam.reichold@t-online.de> +Date: Sun Aug 16 21:05:38 2015 +0200 + + Change default Qt frontend image format + + Change the default image format used by the Qt frontends to XBGR/RGB32 + which allows efficient blending and pixmap conversion via Qt. Also use + the premultiplied conversion for IgnorePaperColor to elide a further + copy for pixmap conversion. + + qt4/src/poppler-page.cc | 46 + +++++++++++++++------------------------------- + qt5/src/poppler-page.cc | 46 + +++++++++++++++------------------------------- + 2 files changed, 30 insertions(+), 62 deletions(-) + +commit 56fc0bb2f20adfd89835f3132bfef3033fdcd80d +Author: Adam Reichold <adam.reichold@t-online.de> +Date: Sun Aug 16 21:01:52 2015 +0200 + + Add premultiplied alpha channel to SplashBitmap + + This extends the convertToXBGR method so that it can either + * leave the alpha channel of the bitmap data opaque, + * copy the alpha channel into the bitmap data, + * transfer the alpha channel into the bitmap data and + perform premultiplication on the bitmap data. + + qt4/src/poppler-page.cc | 6 +++++- + qt5/src/poppler-page.cc | 6 +++++- + splash/SplashBitmap.cc | 49 + ++++++++++++++++++++++++++++++++++++++----------- + splash/SplashBitmap.h | 11 +++++++++-- + 4 files changed, 57 insertions(+), 15 deletions(-) + +commit e5511b58e732f921c65e366fb4d221371b95d905 +Author: Hans-Peter Deifel <hpdeifel@gmx.de> +Date: Thu Aug 27 22:38:08 2015 +0200 + + cpp: Fix utf8/utf16 conversion + + The old code assumed that ustring::size() would return the number of + bytes in ustring, but it really returns the number of + characters. Since + ustring is a basic_string<unsigned short>, these two values differ + (by a + factor of two). + + This needs to be considered when using iconv, since it operates + on byte + counts, not character counts. + + Bug #91644 + + cpp/poppler-global.cpp | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit d06c27584ecf4b7ff2fe492f0133722ac461dfd6 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Thu Aug 27 22:16:03 2015 +0200 + + File Saving improvements + + Refinement of the /P annotation test + + Fixes file from comment #8 in bug #87637 + + poppler/PDFDoc.cc | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) + +commit 545a8f7cb0a473706858d2851f968ffadcc78ed0 +Author: Jason Crain <jason@aquaticape.us> +Date: Mon Aug 24 01:12:01 2015 +0200 + + Fix bounds check in Linearization::getPageFirst + + Make sure Linearization::pageFirst is in the interval [0, + getNumPages), + otherwise Hints::getPageObjectNum() can have an out of bounds read. + + Bug #91200 + + poppler/Linearization.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3e61c7523416157acadec7fe59429f880a9d0310 +Author: William Bader <williambader@hotmail.com> +Date: Wed Aug 19 23:01:41 2015 +0200 + + Splash: Fix wrong memory access + + Bug #91686 + + splash/Splash.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 431cd5afe7dc931f21f7eadd3e69406612d09a0c +Author: Jakub Wilk <jwilk@jwilk.net> +Date: Mon Aug 17 19:49:51 2015 +0200 + + Update Jakub Wilk's email + + fofi/FoFiType1.cc | 2 +- + poppler/CharCodeToUnicode.cc | 2 +- + poppler/GlobalParams.cc | 2 +- + poppler/Object.h | 2 +- + poppler/PDFDoc.cc | 2 +- + poppler/UnicodeMap.cc | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit 1745d2166dd7680d72fe4a71c1fc7a0a5379dcca +Author: Tobias Koenig <tokoe@kdab.com> +Date: Fri Aug 14 00:10:53 2015 +0200 + + Add basic support for RichMedia annotations to Qt frontends + + Bug #91548 + + qt4/src/poppler-annotation.cc | 615 + ++++++++++++++++++++++++++++++++++++++++- + qt4/src/poppler-annotation.h | 330 +++++++++++++++++++++- + qt5/src/poppler-annotation.cc | 616 + +++++++++++++++++++++++++++++++++++++++++- + qt5/src/poppler-annotation.h | 331 ++++++++++++++++++++++- + 4 files changed, 1888 insertions(+), 4 deletions(-) + +commit da5760675d75acf1883ac6f757f755222248762f +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 14 00:04:15 2015 +0200 + + add (C) + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit bc01007d714a58fd0023594b055e0cd5fbad1f7e +Author: Tobias Koenig <tokoe@kdab.com> +Date: Thu Aug 13 23:57:44 2015 +0200 + + Patch to support RichMedia annotations in poppler core + + poppler/Annot.cc | 404 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 172 ++++++++++++++++++++++- + 2 files changed, 575 insertions(+), 1 deletion(-) + commit 1213501882cf2ec6e3dcb3c078391040c8cb0a57 Author: Albert Astals Cid <aacid@kde.org> Date: Sun Aug 9 18:27:06 2015 +0200 diff --git a/Build/source/libs/poppler/poppler-0.35.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.36.0/ConfigureChecks.cmake index d3f57325720..d3f57325720 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/ConfigureChecks.cmake +++ b/Build/source/libs/poppler/poppler-0.36.0/ConfigureChecks.cmake diff --git a/Build/source/libs/poppler/poppler-0.35.0/INSTALL b/Build/source/libs/poppler/poppler-0.36.0/INSTALL index 56b077d6a0b..56b077d6a0b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/INSTALL +++ b/Build/source/libs/poppler/poppler-0.36.0/INSTALL diff --git a/Build/source/libs/poppler/poppler-0.35.0/Makefile.am b/Build/source/libs/poppler/poppler-0.36.0/Makefile.am index 691512f4e3a..691512f4e3a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.36.0/Makefile.am diff --git a/Build/source/libs/poppler/poppler-0.35.0/NEWS b/Build/source/libs/poppler/poppler-0.36.0/NEWS index 1354d3b1a71..5326eed5f60 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/NEWS +++ b/Build/source/libs/poppler/poppler-0.36.0/NEWS @@ -1,3 +1,39 @@ +Release 0.36.0 + core: + * Patch to support RichMedia annotations + * Splash: Fix wrong memory access. Bug #91686 + * Cairo: fix size of transparency group surface. Bug #66229 + * Fix bounds check in Linearization::getPageFirst. Bug #91200 + * File Saving improvements + * Add premultiplied alpha channel to SplashBitmap + * Fix for xref table creation. Bug #90790 + * Fix JBIG2Decode infinite loop and stack overflow. Bug #91186 + * Minor optimization in text extraction + + qt4: + * Basic support for RichMedia annotations + * Change default image format + * Minor optimizations + + qt5: + * Basic support for RichMedia annotations + * Change default image format + * Minor optimizationsHEADmaster + + cpp: + * Fix utf8/utf16 conversion. Bug #91644 + + build system: + * Do not hardcode -fPIC in Makefile.am + * cmake: Allow configuring SHARE_INSTALL_DIR. Bug #90293 + + glib: + * + + utils: + * pdfunite: Insert embedded files in result pdf. Bug #90066 + * pdftotext: Add -bbox-layout option. Bug #89941 + Release 0.35.0 core: * Fix assert in broken file. Bug #91344 @@ -2125,7 +2161,7 @@ Release 0.7.0 (0.8 Beta 1) Release 0.6.4 Qt4 frontend: - * Fix crash on links that point to a non existant page + * Fix crash on links that point to a non existent page * Make Document::renderHints return the correct render hints * Fix infinite loop when parsing LineAnnotation diff --git a/Build/source/libs/poppler/poppler-0.35.0/README b/Build/source/libs/poppler/poppler-0.36.0/README index fa223900fbf..fa223900fbf 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/README +++ b/Build/source/libs/poppler/poppler-0.36.0/README diff --git a/Build/source/libs/poppler/poppler-0.35.0/README-XPDF b/Build/source/libs/poppler/poppler-0.36.0/README-XPDF index e97791ce5b2..e97791ce5b2 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/README-XPDF +++ b/Build/source/libs/poppler/poppler-0.36.0/README-XPDF diff --git a/Build/source/libs/poppler/poppler-0.35.0/TODO b/Build/source/libs/poppler/poppler-0.36.0/TODO index e067c2a3156..e067c2a3156 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/TODO +++ b/Build/source/libs/poppler/poppler-0.36.0/TODO diff --git a/Build/source/libs/poppler/poppler-0.35.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.36.0/config.h.cmake index 400b16b1590..400b16b1590 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/config.h.cmake +++ b/Build/source/libs/poppler/poppler-0.36.0/config.h.cmake diff --git a/Build/source/libs/poppler/poppler-0.35.0/config.h.in b/Build/source/libs/poppler/poppler-0.36.0/config.h.in index 786143b27d4..786143b27d4 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/config.h.in +++ b/Build/source/libs/poppler/poppler-0.36.0/config.h.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/configure.ac b/Build/source/libs/poppler/poppler-0.36.0/configure.ac index bd0fcc2a14f..4bc1524e48d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/configure.ac +++ b/Build/source/libs/poppler/poppler-0.36.0/configure.ac @@ -1,5 +1,5 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[35]) +m4_define([poppler_version_minor],[36]) m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiBase.cc index 86bafd80208..86bafd80208 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiBase.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiBase.h index d613acd2bb1..d613acd2bb1 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiBase.h +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiBase.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiEncodings.cc index 5cea6fab7f1..5cea6fab7f1 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiEncodings.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiEncodings.h index ab80ad362a6..ab80ad362a6 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiEncodings.h +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiEncodings.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiIdentifier.cc index be28e2568eb..be28e2568eb 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiIdentifier.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiIdentifier.h index af1323b76d6..af1323b76d6 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiIdentifier.h +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiIdentifier.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiTrueType.cc index 11699dd6119..11699dd6119 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiTrueType.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiTrueType.h index b40a44a8d70..b40a44a8d70 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiTrueType.h +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiTrueType.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1.cc index 827ebc7d7c3..151f2d5f5bb 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1.cc @@ -15,7 +15,7 @@ // // Copyright (C) 2005, 2008, 2010 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com> -// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net> +// Copyright (C) 2010 Jakub Wilk <jwilk@jwilk.net> // Copyright (C) 2014 Carlos Garcia Campos <carlosgc@gnome.org> // // To see a description of the changes please see the Changelog file that diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1.h index f4e29b4ef0b..f4e29b4ef0b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1.h +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1C.cc index c4595a3260e..c4595a3260e 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1C.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1C.h index 698dccd77fd..698dccd77fd 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/FoFiType1C.h +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1C.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.36.0/fofi/Makefile.am index 4deb7d5e063..4deb7d5e063 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/fofi/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.36.0/fofi/Makefile.am diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/FixedPoint.cc index 26b2f0fe890..26b2f0fe890 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/FixedPoint.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.36.0/goo/FixedPoint.h index 99749802db7..99749802db7 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/FixedPoint.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/FixedPoint.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/GooHash.cc index f4a92f17506..f4a92f17506 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/GooHash.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.36.0/goo/GooHash.h index eda19e31409..eda19e31409 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/GooHash.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/GooHash.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.36.0/goo/GooLikely.h index 724ccf00870..724ccf00870 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/GooLikely.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/GooLikely.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/GooList.cc index 6ce4952dc6a..6ce4952dc6a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/GooList.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/GooList.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.36.0/goo/GooList.h index c83a0e36a8a..c83a0e36a8a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/GooList.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/GooList.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.36.0/goo/GooMutex.h index b2714b048c7..b2714b048c7 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/GooMutex.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/GooMutex.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/GooString.cc index 3f22f368560..3f22f368560 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/GooString.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/GooString.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.36.0/goo/GooString.h index cca5a905e97..cca5a905e97 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/GooString.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/GooString.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/GooTimer.cc index c766c6bf2e4..c766c6bf2e4 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/GooTimer.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.36.0/goo/GooTimer.h index ac64f6b4868..ac64f6b4868 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/GooTimer.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/GooTimer.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/ImgWriter.cc index a30d26d89ad..a30d26d89ad 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/ImgWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.36.0/goo/ImgWriter.h index 8feb3511e4d..8feb3511e4d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/ImgWriter.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/ImgWriter.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/JpegWriter.cc index 9b7c5051838..9b7c5051838 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/JpegWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.36.0/goo/JpegWriter.h index d69bbbb8dda..d69bbbb8dda 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/JpegWriter.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/JpegWriter.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.36.0/goo/Makefile.am index 370e85021be..370e85021be 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/Makefile.am diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/NetPBMWriter.cc index fca00b26b1a..fca00b26b1a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/NetPBMWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.36.0/goo/NetPBMWriter.h index 21a19ee7508..21a19ee7508 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/NetPBMWriter.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/NetPBMWriter.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/PNGWriter.cc index c9d5199d040..c9d5199d040 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/PNGWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.36.0/goo/PNGWriter.h index 90a298e7ef3..90a298e7ef3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/PNGWriter.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/PNGWriter.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/TiffWriter.cc index 316008778b1..316008778b1 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/TiffWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.36.0/goo/TiffWriter.h index 52fdd53efa5..52fdd53efa5 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/TiffWriter.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/TiffWriter.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/gfile.cc index 3528bb357d8..3528bb357d8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/gfile.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/gfile.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.36.0/goo/gfile.h index 1365a9cf2ab..1365a9cf2ab 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/gfile.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/gfile.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/gmem.cc index c1c607ac3f3..c1c607ac3f3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/gmem.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/gmem.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.36.0/goo/gmem.h index 898f33933f9..898f33933f9 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/gmem.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/gmem.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/gmempp.cc index a70338ca3ce..a70338ca3ce 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/gmempp.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/gmempp.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/grandom.cc index 1237175420b..1237175420b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/grandom.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/grandom.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/grandom.h b/Build/source/libs/poppler/poppler-0.36.0/goo/grandom.h index 45fa791aba8..45fa791aba8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/grandom.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/grandom.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.36.0/goo/gstrtod.cc index cd1d5b554f7..cd1d5b554f7 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/gstrtod.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.36.0/goo/gstrtod.h index e8abdadf53e..e8abdadf53e 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/gstrtod.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/gstrtod.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.36.0/goo/gtypes.h index a8d4519497e..a8d4519497e 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/gtypes.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/gtypes.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.36.0/goo/gtypes_p.h index cc4866e1389..cc4866e1389 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/goo/gtypes_p.h +++ b/Build/source/libs/poppler/poppler-0.36.0/goo/gtypes_p.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.36.0/gtk-doc.make index e7916563d75..e7916563d75 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/gtk-doc.make +++ b/Build/source/libs/poppler/poppler-0.36.0/gtk-doc.make diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-cairo-uninstalled.pc.in index 2458eb20df8..2458eb20df8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-cairo-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.36.0/poppler-cairo.pc.cmake index b32f118314b..b32f118314b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-cairo.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-cairo.pc.in index 367a5b690bf..367a5b690bf 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-cairo.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-cairo.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-cpp-uninstalled.pc.in index af3640eb2c1..af3640eb2c1 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-cpp-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.36.0/poppler-cpp.pc.cmake index 3f56b3d9d90..3f56b3d9d90 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-cpp.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-cpp.pc.in index a7e97c25dfe..a7e97c25dfe 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-cpp.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-cpp.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-glib-uninstalled.pc.in index 5506c4e53ac..5506c4e53ac 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-glib-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-glib-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.36.0/poppler-glib.pc.cmake index e15e6699a43..e15e6699a43 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-glib.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-glib.pc.in index cd30feb728f..cd30feb728f 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-glib.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-glib.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt4-uninstalled.pc.in index 3a336c6c294..3a336c6c294 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt4-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt4.pc.cmake index b17fd5d8453..b17fd5d8453 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt4.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt4.pc.in index 306ae46e0b0..306ae46e0b0 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt4.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt4.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt5-uninstalled.pc.in index a91e1d5a3bd..a91e1d5a3bd 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt5-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt5.pc.cmake index b4d87b76675..b4d87b76675 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt5.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt5.pc.in index cda4c6f80fe..cda4c6f80fe 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-qt5.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-qt5.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-splash-uninstalled.pc.in index 436ecdb8f1b..436ecdb8f1b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-splash-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-splash-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.36.0/poppler-splash.pc.cmake index cb95b3d2d27..cb95b3d2d27 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-splash.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-splash.pc.in index cf3491fc7cf..cf3491fc7cf 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-splash.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-splash.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler-uninstalled.pc.in index 6076e80c5b3..6076e80c5b3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.36.0/poppler.pc.cmake index f1aebedbefd..f1aebedbefd 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.36.0/poppler.pc.in index 8605b28673b..8605b28673b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler.pc.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler.pc.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Annot.cc index 18576c8d94f..85a8ac4a789 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Annot.cc @@ -26,7 +26,7 @@ // Copyright (C) 2011, 2013 José Aliste <jaliste@src.gnome.org> // Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it> // Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de> -// Copyright (C) 2012 Tobias Koenig <tokoe@kdab.com> +// Copyright (C) 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> @@ -6696,6 +6696,408 @@ Annot3D::Activation::Activation(Dict *dict) { } //------------------------------------------------------------------------ +// AnnotRichMedia +//------------------------------------------------------------------------ +AnnotRichMedia::AnnotRichMedia(PDFDoc *docA, PDFRectangle *rect) : + Annot(docA, rect) { + Object obj1; + + type = typeRichMedia; + + annotObj.dictSet ("Subtype", obj1.initName ("RichMedia")); + + initialize(docA, annotObj.getDict()); +} + +AnnotRichMedia::AnnotRichMedia(PDFDoc *docA, Dict *dict, Object *obj) : + Annot(docA, dict, obj) { + type = typeRichMedia; + initialize(docA, dict); +} + +AnnotRichMedia::~AnnotRichMedia() { + delete content; + delete settings; +} + +void AnnotRichMedia::initialize(PDFDoc *docA, Dict* dict) { + Object obj1; + + if (dict->lookup("RichMediaContent", &obj1)->isDict()) { + content = new AnnotRichMedia::Content(obj1.getDict()); + } else { + content = NULL; + } + obj1.free(); + + if (dict->lookup("RichMediaSettings", &obj1)->isDict()) { + settings = new AnnotRichMedia::Settings(obj1.getDict()); + } else { + settings = NULL; + } + obj1.free(); +} + +AnnotRichMedia::Content* AnnotRichMedia::getContent() const { + return content; +} + +AnnotRichMedia::Settings* AnnotRichMedia::getSettings() const { + return settings; +} + +AnnotRichMedia::Settings::Settings(Dict *dict) { + Object obj1; + + if (dict->lookup("Activation", &obj1)->isDict()) { + activation = new AnnotRichMedia::Activation(obj1.getDict()); + } else { + activation = NULL; + } + obj1.free(); + + if (dict->lookup("Deactivation", &obj1)->isDict()) { + deactivation = new AnnotRichMedia::Deactivation(obj1.getDict()); + } else { + deactivation = NULL; + } + obj1.free(); +} + +AnnotRichMedia::Settings::~Settings() { + delete activation; + delete deactivation; +} + +AnnotRichMedia::Activation* AnnotRichMedia::Settings::getActivation() const { + return activation; +} + +AnnotRichMedia::Deactivation* AnnotRichMedia::Settings::getDeactivation() const { + return deactivation; +} + +AnnotRichMedia::Activation::Activation(Dict *dict) { + Object obj1; + + if (dict->lookup("Condition", &obj1)->isName()) { + const char *name = obj1.getName(); + + if (!strcmp(name, "PO")) { + condition = conditionPageOpened; + } else if (!strcmp(name, "PV")) { + condition = conditionPageVisible; + } else if (!strcmp(name, "XA")) { + condition = conditionUserAction; + } else { + condition = conditionUserAction; + } + } else { + condition = conditionUserAction; + } + obj1.free(); +} + +AnnotRichMedia::Activation::Condition AnnotRichMedia::Activation::getCondition() const { + return condition; +} + +AnnotRichMedia::Deactivation::Deactivation(Dict *dict) { + Object obj1; + + if (dict->lookup("Condition", &obj1)->isName()) { + const char *name = obj1.getName(); + + if (!strcmp(name, "PC")) { + condition = conditionPageClosed; + } else if (!strcmp(name, "PI")) { + condition = conditionPageInvisible; + } else if (!strcmp(name, "XD")) { + condition = conditionUserAction; + } else { + condition = conditionUserAction; + } + } else { + condition = conditionUserAction; + } + obj1.free(); +} + +AnnotRichMedia::Deactivation::Condition AnnotRichMedia::Deactivation::getCondition() const { + return condition; +} + +AnnotRichMedia::Content::Content(Dict *dict) { + Object obj1; + + if (dict->lookup("Configurations", &obj1)->isArray()) { + nConfigurations = obj1.arrayGetLength(); + + configurations = (Configuration **)gmallocn(nConfigurations, sizeof(Configuration *)); + + for (int i = 0; i < nConfigurations; ++i) { + Object obj2; + + if (obj1.arrayGet(i, &obj2)->isDict()) { + configurations[i] = new AnnotRichMedia::Configuration(obj2.getDict()); + } else { + configurations[i] = NULL; + } + obj2.free(); + } + } else { + configurations = NULL; + } + obj1.free(); + + if (dict->lookup("Assets", &obj1)->isDict()) { + Object obj2; + + if (obj1.getDict()->lookup("Names", &obj2)->isArray()) { + nAssets = obj2.arrayGetLength() / 2; + + assets = (Asset **)gmallocn(nAssets, sizeof(Asset *)); + + int counter = 0; + for (int i = 0; i < obj2.arrayGetLength(); i += 2) { + Object objKey; + + assets[counter] = new AnnotRichMedia::Asset; + + obj2.arrayGet(i, &objKey); + obj2.arrayGet(i + 1, &assets[counter]->fileSpec); + + assets[counter]->name = new GooString( objKey.getString() ); + ++counter; + + objKey.free(); + } + } + obj2.free(); + + } else { + assets = NULL; + } + obj1.free(); +} + +AnnotRichMedia::Content::~Content() { + if (configurations) { + for (int i = 0; i < nConfigurations; ++i) + delete configurations[i]; + gfree(configurations); + } + + if (assets) { + for (int i = 0; i < nAssets; ++i) + delete assets[i]; + gfree(assets); + } +} + +int AnnotRichMedia::Content::getConfigurationsCount() const { + return nConfigurations; +} + +AnnotRichMedia::Configuration* AnnotRichMedia::Content::getConfiguration(int index) const { + if (index < 0 || index >= nConfigurations) + return NULL; + + return configurations[index]; +} + +int AnnotRichMedia::Content::getAssetsCount() const { + return nAssets; +} + +AnnotRichMedia::Asset* AnnotRichMedia::Content::getAsset(int index) const { + if (index < 0 || index >= nAssets) + return NULL; + + return assets[index]; +} + +AnnotRichMedia::Asset::Asset() + : name(NULL) +{ +} + +AnnotRichMedia::Asset::~Asset() +{ + delete name; + fileSpec.free(); +} + +GooString* AnnotRichMedia::Asset::getName() const { + return name; +} + +Object* AnnotRichMedia::Asset::getFileSpec() const { + return const_cast<Object*>(&fileSpec); +} + +AnnotRichMedia::Configuration::Configuration(Dict *dict) +{ + Object obj1; + + if (dict->lookup("Instances", &obj1)->isArray()) { + nInstances = obj1.arrayGetLength(); + + instances = (Instance **)gmallocn(nInstances, sizeof(Instance *)); + + for (int i = 0; i < nInstances; ++i) { + Object obj2; + + if (obj1.arrayGet(i, &obj2)->isDict()) { + instances[i] = new AnnotRichMedia::Instance(obj2.getDict()); + } else { + instances[i] = NULL; + } + obj2.free(); + } + } else { + instances = NULL; + } + obj1.free(); + + if (dict->lookup("Name", &obj1)->isString()) { + name = new GooString(obj1.getString()); + } else { + name = NULL; + } + obj1.free(); + + if (dict->lookup("Subtype", &obj1)->isName()) { + const char *name = obj1.getName(); + + if (!strcmp(name, "3D")) { + type = type3D; + } else if (!strcmp(name, "Flash")) { + type = typeFlash; + } else if (!strcmp(name, "Sound")) { + type = typeSound; + } else if (!strcmp(name, "Video")) { + type = typeVideo; + } else { + // determine from first instance + if (instances && nInstances > 0) { + AnnotRichMedia::Instance *instance = instances[0]; + switch (instance->getType()) { + case AnnotRichMedia::Instance::type3D: + type = type3D; + break; + case AnnotRichMedia::Instance::typeFlash: + type = typeFlash; + break; + case AnnotRichMedia::Instance::typeSound: + type = typeSound; + break; + case AnnotRichMedia::Instance::typeVideo: + type = typeVideo; + break; + default: + type = typeFlash; + break; + } + } + } + } + obj1.free(); +} + +AnnotRichMedia::Configuration::~Configuration() +{ + if (instances) { + for (int i = 0; i < nInstances; ++i) + delete instances[i]; + gfree(instances); + } + + delete name; +} + +int AnnotRichMedia::Configuration::getInstancesCount() const { + return nInstances; +} + +AnnotRichMedia::Instance* AnnotRichMedia::Configuration::getInstance(int index) const { + if (index < 0 || index >= nInstances) + return NULL; + + return instances[index]; +} + +GooString* AnnotRichMedia::Configuration::getName() const { + return name; +} + +AnnotRichMedia::Configuration::Type AnnotRichMedia::Configuration::getType() const { + return type; +} + +AnnotRichMedia::Instance::Instance(Dict *dict) +{ + Object obj1; + + if (dict->lookup("Subtype", &obj1)->isName()) { + const char *name = obj1.getName(); + + if (!strcmp(name, "3D")) { + type = type3D; + } else if (!strcmp(name, "Flash")) { + type = typeFlash; + } else if (!strcmp(name, "Sound")) { + type = typeSound; + } else if (!strcmp(name, "Video")) { + type = typeVideo; + } else { + type = typeFlash; + } + } + obj1.free(); + + if (dict->lookup("Params", &obj1)->isDict()) { + params = new AnnotRichMedia::Params(obj1.getDict()); + } else { + params = NULL; + } +} + +AnnotRichMedia::Instance::~Instance() +{ + delete params; +} + +AnnotRichMedia::Instance::Type AnnotRichMedia::Instance::getType() const { + return type; +} + +AnnotRichMedia::Params* AnnotRichMedia::Instance::getParams() const { + return params; +} + +AnnotRichMedia::Params::Params(Dict *dict) +{ + Object obj1; + + if (dict->lookup("FlashVars", &obj1)->isString()) { + flashVars = new GooString(obj1.getString()); + } else { + flashVars = NULL; + } + obj1.free(); +} + +AnnotRichMedia::Params::~Params() +{ + delete flashVars; +} + +GooString* AnnotRichMedia::Params::getFlashVars() const { + return flashVars; +} + +//------------------------------------------------------------------------ // Annots //------------------------------------------------------------------------ @@ -6828,6 +7230,8 @@ Annot *Annots::createAnnot(Dict* dict, Object *obj) { annot = new Annot(doc, dict, obj); } else if (!strcmp(typeName, "3D")) { annot = new Annot3D(doc, dict, obj); + } else if (!strcmp(typeName, "RichMedia")) { + annot = new AnnotRichMedia(doc, dict, obj); } else if (!strcmp(typeName, "Popup")) { /* Popup annots are already handled by markup annots * Here we only care about popup annots without a diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Annot.h index 1e64f59bc76..d90c8080ffe 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Annot.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Annot.h @@ -23,7 +23,7 @@ // Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com> // Copyright (C) 2009-2011, 2013 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it> -// Copyright (C) 2012 Tobias Koenig <tokoe@kdab.com> +// Copyright (C) 2012, 2015 Tobias Koenig <tokoe@kdab.com> // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> // @@ -56,6 +56,7 @@ class PDFRectangle; class Movie; class LinkAction; class Sound; +class FileSpec; enum AnnotLineEndingStyle { annotLineEndingSquare, // Square @@ -526,7 +527,8 @@ public: typePrinterMark, // PrinterMark 22 typeTrapNet, // TrapNet 23 typeWatermark, // Watermark 24 - type3D // 3D 25 + type3D, // 3D 25 + typeRichMedia // RichMedia 26 }; /** @@ -1409,6 +1411,174 @@ private: }; //------------------------------------------------------------------------ +// AnnotRichMedia +//------------------------------------------------------------------------ + +class AnnotRichMedia: public Annot { +public: + class Params { + public: + Params(Dict *dict); + ~Params(); + + GooString* getFlashVars() const; + + private: + // optional + GooString *flashVars; // FlashVars + }; + + class Instance { + public: + enum Type { + type3D, // 3D + typeFlash, // Flash + typeSound, // Sound + typeVideo // Video + }; + + Instance(Dict *dict); + ~Instance(); + + Type getType() const; + Params* getParams() const; + + private: + // optional + Type type; // Subtype + Params *params; // Params + }; + + class Configuration { + public: + enum Type { + type3D, // 3D + typeFlash, // Flash + typeSound, // Sound + typeVideo // Video + }; + + Configuration(Dict *dict); + ~Configuration(); + + Type getType() const; + GooString* getName() const; + int getInstancesCount() const; + Instance* getInstance(int index) const; + + private: + // optional + Type type; // Subtype + GooString *name; // Name + Instance **instances; // Instances + int nInstances; + }; + + class Content; + + class Asset { + public: + Asset(); + ~Asset(); + + GooString* getName() const; + Object* getFileSpec() const; + + private: + friend class AnnotRichMedia::Content; + + GooString *name; + Object fileSpec; + }; + + class Content { + public: + Content(Dict *dict); + ~Content(); + + int getConfigurationsCount() const; + Configuration* getConfiguration(int index) const; + + int getAssetsCount() const; + Asset* getAsset(int index) const; + + private: + // optional + Configuration **configurations; // Configurations + int nConfigurations; + + Asset **assets; // Assets + int nAssets; + }; + + class Activation { + public: + enum Condition { + conditionPageOpened, // PO + conditionPageVisible, // PV + conditionUserAction // XA + }; + + Activation(Dict *dict); + + Condition getCondition() const; + + private: + // optional + Condition condition; + }; + + class Deactivation { + public: + enum Condition { + conditionPageClosed, // PC + conditionPageInvisible, // PI + conditionUserAction // XD + }; + + Deactivation(Dict *dict); + + Condition getCondition() const; + + private: + // optional + Condition condition; + }; + + class Settings { + public: + Settings(Dict *dict); + ~Settings(); + + Activation* getActivation() const; + Deactivation* getDeactivation() const; + + private: + // optional + Activation *activation; + Deactivation *deactivation; + }; + + AnnotRichMedia(PDFDoc *docA, PDFRectangle *rect); + AnnotRichMedia(PDFDoc *docA, Dict *dict, Object *obj); + ~AnnotRichMedia(); + + Content* getContent() const; + + Settings* getSettings() const; + +private: + void initialize(PDFDoc *docA, Dict *dict); + + // required + Content *content; // RichMediaContent + + // optional + Settings *settings; // RichMediaSettings +}; + + +//------------------------------------------------------------------------ // Annots //------------------------------------------------------------------------ diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Array.cc index 230c3287683..230c3287683 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Array.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Array.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Array.h index e78e399baf2..e78e399baf2 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Array.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Array.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFont.cc index 20a297d6135..20a297d6135 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFont.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFont.h index bbdd0558e9f..bbdd0558e9f 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFont.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFont.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFontTables.cc index 5115b7bcf13..5115b7bcf13 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFontTables.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFontTables.h index eb45549efd2..eb45549efd2 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/BuiltinFontTables.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFontTables.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/CMap.cc index 6731ab5a1fa..6731ab5a1fa 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CMap.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/CMap.h index f4f5a9141c8..f4f5a9141c8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CMap.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CMap.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/CachedFile.cc index b0ae8388113..b0ae8388113 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CachedFile.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/CachedFile.h index b99ea1ecad4..b99ea1ecad4 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CachedFile.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CachedFile.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoFontEngine.cc index 1d611b59d3c..1d611b59d3c 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoFontEngine.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoFontEngine.h index 8c0dba116d5..8c0dba116d5 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoFontEngine.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoFontEngine.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.cc index a86ec120f20..1e201d38e36 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.cc @@ -27,7 +27,7 @@ // Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu> // Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2012 Patrick Pfeifer <p2000@mailinator.com> -// Copyright (C) 2012 Jason Crain <jason@aquaticape.us> +// Copyright (C) 2012, 2015 Jason Crain <jason@aquaticape.us> // Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> // // To see a description of the changes please see the Changelog file that @@ -1433,29 +1433,15 @@ static inline int splashFloor(SplashCoord x) { static cairo_surface_t *cairo_surface_create_similar_clip (cairo_t *cairo, cairo_content_t content) { - double x1, y1, x2, y2; - int width, height; - cairo_clip_extents (cairo, &x1, &y1, &x2, &y2); - cairo_matrix_t matrix; - cairo_get_matrix (cairo, &matrix); - //cairo_matrix_transform_point(&matrix, &x1, &y1); - //cairo_matrix_transform_point(&matrix, &x2, &y2);*/ - cairo_user_to_device(cairo, &x1, &y1); - cairo_user_to_device(cairo, &x2, &y2); - width = splashCeil(x2) - splashFloor(x1); - //XXX: negative matrix - ////height = splashCeil(y2) - splashFloor(y1); - height = splashFloor(y1) - splashCeil(y2); - cairo_surface_t *target = cairo_get_target (cairo); - cairo_surface_t *result; - - result = cairo_surface_create_similar (target, content, width, height); - double x_offset, y_offset; - cairo_surface_get_device_offset(target, &x_offset, &y_offset); - cairo_surface_set_device_offset(result, x_offset, y_offset); + cairo_pattern_t *pattern; + cairo_surface_t *surface = NULL; - - return result; + cairo_push_group_with_content (cairo, content); + pattern = cairo_pop_group (cairo); + cairo_pattern_get_surface (pattern, &surface); + cairo_surface_reference (surface); + cairo_pattern_destroy (pattern); + return surface; } diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.h index 33dde0c570a..33dde0c570a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoRescaleBox.cc index 3c96f45e5d3..3c96f45e5d3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoRescaleBox.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoRescaleBox.h index 072e8a9c80c..072e8a9c80c 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CairoRescaleBox.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CairoRescaleBox.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Catalog.cc index 04caa1c1f35..04caa1c1f35 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Catalog.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Catalog.h index bc9ce20b098..bc9ce20b098 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Catalog.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Catalog.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/CharCodeToUnicode.cc index 59b7c93e66f..5576a4a57d4 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CharCodeToUnicode.cc @@ -19,7 +19,7 @@ // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu> // Copyright (C) 2008 Vasile Gaburici <gaburici@cs.umd.edu> // Copyright (C) 2010 William Bader <williambader@hotmail.com> -// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net> +// Copyright (C) 2010 Jakub Wilk <jwilk@jwilk.net> // 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> diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/CharCodeToUnicode.h index 1672105a8f4..1672105a8f4 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CharCodeToUnicode.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CharCodeToUnicode.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/CharTypes.h index d0df630d0c9..d0df630d0c9 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CharTypes.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CharTypes.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/CompactFontTables.h index cfbfdaf5752..cfbfdaf5752 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CompactFontTables.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CompactFontTables.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/CurlCachedFile.cc index af4c2b60322..af4c2b60322 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CurlCachedFile.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/CurlCachedFile.h index 49882aba8ac..49882aba8ac 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlCachedFile.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CurlCachedFile.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/CurlPDFDocBuilder.cc index 5b02b14a784..5b02b14a784 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CurlPDFDocBuilder.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/CurlPDFDocBuilder.h index fb34862057c..fb34862057c 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/CurlPDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/CurlPDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/DCTStream.cc index bfdb0eaf80a..bfdb0eaf80a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/DCTStream.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/DCTStream.h index bc20a7aaab6..bc20a7aaab6 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/DCTStream.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/DCTStream.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/DateInfo.cc index 563204a1743..563204a1743 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/DateInfo.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/DateInfo.h index 116350f4134..116350f4134 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/DateInfo.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/DateInfo.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Decrypt.cc index ba44f959c31..ba44f959c31 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Decrypt.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Decrypt.h index 10a6386c6b5..10a6386c6b5 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Decrypt.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Decrypt.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Dict.cc index c2a94f4a1fa..c2a94f4a1fa 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Dict.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Dict.h index fba99edc513..fba99edc513 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Dict.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Dict.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Error.cc index 99ca3ad3f53..99ca3ad3f53 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Error.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Error.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Error.h index 9e11733d803..9e11733d803 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Error.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Error.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/ErrorCodes.h index b28528df564..b28528df564 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/ErrorCodes.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/ErrorCodes.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/FileSpec.cc index bac1eaea0d7..bac1eaea0d7 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/FileSpec.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/FileSpec.h index 9f2f6fcd131..9f2f6fcd131 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/FileSpec.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/FileSpec.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/FlateStream.cc index 7990dadd821..7990dadd821 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/FlateStream.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/FlateStream.h index 9e3835f042a..9e3835f042a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/FlateStream.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/FlateStream.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/FontEncodingTables.cc index 6ebef787421..6ebef787421 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/FontEncodingTables.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/FontEncodingTables.h index a417b324e48..a417b324e48 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/FontEncodingTables.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/FontEncodingTables.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/FontInfo.cc index 8fc89e9d827..8fc89e9d827 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/FontInfo.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/FontInfo.h index 615b6793de3..615b6793de3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/FontInfo.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/FontInfo.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Form.cc index 661ed8972df..a46a6590f27 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Form.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Form.cc @@ -1445,7 +1445,7 @@ Form::Form(PDFDoc *docA, Object* acroFormA) } if (!obj2.isDict()) { - error(errSyntaxWarning, -1, "Reference in Fields array to an invalid or non existant object"); + error(errSyntaxWarning, -1, "Reference in Fields array to an invalid or non existent object"); obj2.free(); oref.free(); continue; diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Form.h index 3778ff6f2ef..3778ff6f2ef 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Form.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Form.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Function.cc index 67283dffe9f..67283dffe9f 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Function.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Function.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Function.h index 90e2a768ad0..90e2a768ad0 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Function.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Function.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Gfx.cc index 07d95b355a8..07d95b355a8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Gfx.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Gfx.h index a82f9f4af24..a82f9f4af24 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Gfx.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Gfx.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/GfxFont.cc index 81f59037f7f..81f59037f7f 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/GfxFont.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/GfxFont.h index febb902922d..febb902922d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxFont.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/GfxFont.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/GfxState.cc index 3e9cac41534..cacccad3097 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/GfxState.cc @@ -6833,14 +6833,12 @@ GfxColorTransform *GfxState::getXYZ2DisplayTransform() { GfxColorTransform *transform; transform = XYZ2DisplayTransformRelCol; - if (renderingIntent != NULL) { - if (strcmp(renderingIntent, "AbsoluteColorimetric") == 0) { - transform = XYZ2DisplayTransformAbsCol; - } else if (strcmp(renderingIntent, "Saturation") == 0) { - transform = XYZ2DisplayTransformSat; - } else if (strcmp(renderingIntent, "Perceptual") == 0) { - transform = XYZ2DisplayTransformPerc; - } + if (strcmp(renderingIntent, "AbsoluteColorimetric") == 0) { + transform = XYZ2DisplayTransformAbsCol; + } else if (strcmp(renderingIntent, "Saturation") == 0) { + transform = XYZ2DisplayTransformSat; + } else if (strcmp(renderingIntent, "Perceptual") == 0) { + transform = XYZ2DisplayTransformPerc; } if (transform == NULL) { transform = XYZ2DisplayTransform; diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/GfxState.h index f018e93dd34..f018e93dd34 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/GfxState.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/GfxState_helpers.h index bc0024edd79..bc0024edd79 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/GfxState_helpers.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/GfxState_helpers.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/GlobalParams.cc index 7e110d05b15..e5434084c31 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/GlobalParams.cc @@ -27,7 +27,7 @@ // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net> // Copyright (C) 2010, 2012 Hib Eris <hib@hiberis.nl> // Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de> -// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net> +// Copyright (C) 2010 Jakub Wilk <jwilk@jwilk.net> // Copyright (C) 2011 Pino Toscano <pino@kde.org> // Copyright (C) 2011 Koji Otani <sho@bbr.jp> // Copyright (C) 2012 Yi Yang <ahyangyi@gmail.com> diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/GlobalParams.h index 16d615ae6d9..16d615ae6d9 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParams.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/GlobalParams.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/GlobalParamsWin.cc index f9f40ef4e29..f9f40ef4e29 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/GlobalParamsWin.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/GlobalParamsWin.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Hints.cc index bdd0d322612..bdd0d322612 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Hints.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Hints.h index f46c07f673b..f46c07f673b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Hints.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Hints.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/JArithmeticDecoder.cc index d23f7ea3887..d23f7ea3887 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/JArithmeticDecoder.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/JArithmeticDecoder.h index 3c3e6fed0e5..3c3e6fed0e5 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/JArithmeticDecoder.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/JArithmeticDecoder.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.cc index 66c1d2505e8..66c1d2505e8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.h index 1e14c5cf783..1e14c5cf783 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/JBIG2Stream.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/JPEG2000Stream.cc index 35e98b86ebc..35e98b86ebc 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/JPEG2000Stream.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/JPEG2000Stream.h index 73b6bdd97b8..73b6bdd97b8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/JPEG2000Stream.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/JPEG2000Stream.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/JPXStream.cc index 1476e6a0cfe..1476e6a0cfe 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/JPXStream.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/JPXStream.h index 30855431fb4..30855431fb4 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/JPXStream.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/JPXStream.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Lexer.cc index 952967a998a..952967a998a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Lexer.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Lexer.h index 02b6cdc6923..02b6cdc6923 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Lexer.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Lexer.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Linearization.cc index 33331d1af37..be041f96407 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Linearization.cc @@ -5,6 +5,7 @@ // This file is licensed under the GPLv2 or later // // Copyright 2010, 2012 Hib Eris <hib@hiberis.nl> +// Copyright 2015 Jason Crain <jason@aquaticape.us> // //======================================================================== @@ -211,7 +212,7 @@ int Linearization::getPageFirst() linDict.getDict()->lookupInt("P", NULL, &pageFirst); } - if ((pageFirst < 0) || (pageFirst > getNumPages())) { + if ((pageFirst < 0) || (pageFirst >= getNumPages())) { error(errSyntaxWarning, -1, "First page in linearization table is invalid"); return 0; } diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Linearization.h index 6728a750aba..6728a750aba 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Linearization.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Linearization.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Link.cc index 4ab5f52ceda..4ab5f52ceda 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Link.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Link.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Link.h index fc2abe60052..fc2abe60052 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Link.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Link.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/LocalPDFDocBuilder.cc index 6f6f1fca9f7..6f6f1fca9f7 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/LocalPDFDocBuilder.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/LocalPDFDocBuilder.h index c2b1d903885..c2b1d903885 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/LocalPDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/LocalPDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.36.0/poppler/Makefile.am index 3c943bad331..9a5d0267401 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Makefile.am @@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \ $(win32_libs) libpoppler_la_LDFLAGS = \ - -version-info 54:0:0 \ + -version-info 55:0:0 \ @create_shared_lib@ \ @auto_import_flags@ diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/MarkedContentOutputDev.cc index 7fdd8f54c53..7fdd8f54c53 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/MarkedContentOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/MarkedContentOutputDev.h index 4ea60c255a1..4ea60c255a1 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/MarkedContentOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/MarkedContentOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Movie.cc index f68b6adcd4d..f68b6adcd4d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Movie.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Movie.h index 1a162659179..1a162659179 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Movie.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Movie.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/NameToCharCode.cc index 5448dc4ce10..5448dc4ce10 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/NameToCharCode.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/NameToCharCode.h index 5b1092bb96b..5b1092bb96b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToCharCode.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/NameToCharCode.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/NameToUnicodeTable.h index 827edbaee60..827edbaee60 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/NameToUnicodeTable.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/NameToUnicodeTable.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Object.cc index d06bb39fb6d..d06bb39fb6d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Object.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Object.h index a4a4930ea9d..2a3766288a6 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Object.h @@ -16,7 +16,7 @@ // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org> // Copyright (C) 2008 Kees Cook <kees@outflux.net> // Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org> -// Copyright (C) 2009 Jakub Wilk <ubanus@users.sf.net> +// Copyright (C) 2009 Jakub Wilk <jwilk@jwilk.net> // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it> // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/OptionalContent.cc index e0d49bc9a5f..e0d49bc9a5f 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/OptionalContent.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/OptionalContent.h index 2e416462003..2e416462003 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/OptionalContent.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/OptionalContent.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Outline.cc index bd4e6d01b6d..bd4e6d01b6d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Outline.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Outline.h index 90190e69280..90190e69280 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Outline.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Outline.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/OutputDev.cc index ee3cf5a30ff..ee3cf5a30ff 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/OutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/OutputDev.h index e8a7a4794ce..e8a7a4794ce 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/OutputDev.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/OutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDoc.cc index 71a1efe269d..46c4544e75b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDoc.cc @@ -22,11 +22,11 @@ // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net> // Copyright (C) 2009, 2011 Axel Struebing <axel.struebing@freenet.de> // Copyright (C) 2010-2012, 2014 Hib Eris <hib@hiberis.nl> -// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net> +// Copyright (C) 2010 Jakub Wilk <jwilk@jwilk.net> // Copyright (C) 2010 Ilya Gorenbein <igorenbein@finjan.com> // Copyright (C) 2010 Srinivas Adicherla <srinivas.adicherla@geodesic.com> // Copyright (C) 2010 Philip Lorenz <lorenzph+freedesktop@gmail.com> -// Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2011-2015 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it> // Copyright (C) 2013, 2014 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com> @@ -1561,7 +1561,6 @@ void PDFDoc::replacePageDict(int pageNo, int rotate, void PDFDoc::markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset, int oldRefNum, int newRefNum) { - pageDict->remove("Names"); pageDict->remove("OpenAction"); pageDict->remove("Outlines"); pageDict->remove("StructTreeRoot"); @@ -1612,10 +1611,27 @@ GBool PDFDoc::markAnnotations(Object *annotsObj, XRef *xRef, XRef *countRef, Gui type.free(); continue; } else { - array->remove(i); + Object page; + getXRef()->fetch(obj2.getRef().num, obj2.getRef().gen, &page); + if (page.isDict()) { + Object pagetype; + Dict *dict = page.getDict(); + dict->lookup("Type", &pagetype); + if (!pagetype.isName() || strcmp(pagetype.getName(), "Page") != 0) { + obj1.free(); + obj2.free(); + type.free(); + page.free(); + pagetype.free(); + continue; + } + pagetype.free(); + } + page.free(); obj1.free(); obj2.free(); type.free(); + array->remove(i); modified = gTrue; continue; } diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDoc.h index 6c40f7b0c0c..6c40f7b0c0c 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDoc.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDoc.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocBuilder.h index d6eccf5487a..d6eccf5487a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocEncoding.cc index 79408346419..79408346419 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocEncoding.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocEncoding.h index 4f0840bb28a..4f0840bb28a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocEncoding.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocEncoding.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocFactory.cc index 1ec46477237..1ec46477237 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocFactory.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocFactory.h index dbceaa567ee..dbceaa567ee 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PDFDocFactory.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PDFDocFactory.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/PSOutputDev.cc index 7b93e3bf65a..7b93e3bf65a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PSOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PSOutputDev.h index 7318cafdf2a..7318cafdf2a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PSOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PSOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/PSTokenizer.cc index 05127f0d03c..05127f0d03c 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PSTokenizer.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PSTokenizer.h index fc2f053d3f2..fc2f053d3f2 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PSTokenizer.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PSTokenizer.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Page.cc index a4af3405b92..a4af3405b92 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Page.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Page.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Page.h index 2aaabae9b16..2aaabae9b16 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Page.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Page.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo.cc index 3153377f6d3..3153377f6d3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo.h index 960e710069d..960e710069d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo_p.h index 6cd5220d372..6cd5220d372 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PageLabelInfo_p.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo_p.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/PageTransition.cc index 441634c039f..441634c039f 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PageTransition.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PageTransition.h index e892c6c5051..e892c6c5051 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PageTransition.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PageTransition.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Parser.cc index 28a54607f5c..28a54607f5c 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Parser.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Parser.h index 1ce9445e19d..1ce9445e19d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Parser.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Parser.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/PopplerCache.cc index 6018a77b70f..6018a77b70f 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PopplerCache.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PopplerCache.h index 74010a2fa6b..74010a2fa6b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PopplerCache.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PopplerCache.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/PreScanOutputDev.cc index b2af18d86b8..b2af18d86b8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PreScanOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/PreScanOutputDev.h index 50fcbf22f73..50fcbf22f73 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/PreScanOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/PreScanOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/ProfileData.cc index a0c44747a56..a0c44747a56 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/ProfileData.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/ProfileData.h index 418ee010755..418ee010755 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/ProfileData.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/ProfileData.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Rendition.cc index c040bf2b4a8..c040bf2b4a8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Rendition.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Rendition.h index 75bfeff32c9..75bfeff32c9 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Rendition.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Rendition.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/SecurityHandler.cc index 63d8b4e1287..63d8b4e1287 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/SecurityHandler.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/SecurityHandler.h index c2991c8f375..c2991c8f375 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/SecurityHandler.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/SecurityHandler.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Sound.cc index 6129fdcb47d..6129fdcb47d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Sound.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Sound.h index acb0f8d9acd..acb0f8d9acd 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Sound.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Sound.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.cc index d9d5699a051..d9d5699a051 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.h index d34426c0f3c..d34426c0f3c 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/SplashOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/StdinCachedFile.cc index db966377bb0..db966377bb0 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/StdinCachedFile.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/StdinCachedFile.h index 5be6fa841a3..5be6fa841a3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinCachedFile.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/StdinCachedFile.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/StdinPDFDocBuilder.cc index 571ee46d7f6..571ee46d7f6 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/StdinPDFDocBuilder.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/StdinPDFDocBuilder.h index e9b2f47f636..e9b2f47f636 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/StdinPDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/StdinPDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Stream-CCITT.h index 7207729a4d1..7207729a4d1 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream-CCITT.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Stream-CCITT.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/Stream.cc index d2dd761c729..961767896c2 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Stream.cc @@ -31,6 +31,7 @@ // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com> // Copyright (C) 2013 Pino Toscano <pino@kde.org> // Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> +// Copyright (C) 2015 Jason Crain <jason@aquaticape.us> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -340,13 +341,8 @@ Stream *Stream::makeFilter(char *name, Stream *str, Object *params, int recursio } else if (!strcmp(name, "JBIG2Decode")) { if (params->isDict()) { XRef *xref = params->getDict()->getXRef(); - params->dictLookupNF("JBIG2Globals", &globals); - while (globals.isRef()) { - obj.free(); - globals.copy(&obj); - globals.free(); - obj.fetch(xref, &globals); - } + params->dictLookupNF("JBIG2Globals", &obj); + obj.fetch(xref, &globals, recursion); } str = new JBIG2Stream(str, &globals, &obj); globals.free(); diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/Stream.h index 00b2925b3d5..00b2925b3d5 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Stream.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/Stream.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/StructElement.cc index c6688208fee..c6688208fee 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/StructElement.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/StructElement.h index cd89a970ddb..cd89a970ddb 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/StructElement.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/StructElement.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/StructTreeRoot.cc index e46e3e28388..e46e3e28388 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/StructTreeRoot.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/StructTreeRoot.h index 3b1f3c84421..3b1f3c84421 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/StructTreeRoot.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/StructTreeRoot.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/TextOutputDev.cc index 16f099f291a..bbb371a30b8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/TextOutputDev.cc @@ -298,7 +298,7 @@ TextWord::~TextWord() { void TextWord::addChar(GfxState *state, TextFontInfo *fontA, double x, double y, double dx, double dy, int charPosA, int charLen, - CharCode c, Unicode u, Matrix textMatA) { + CharCode c, Unicode u, const Matrix &textMatA) { ensureCapacity(len+1); text[len] = u; charcode[len] = c; @@ -486,7 +486,7 @@ Unicode getCombiningChar(Unicode u) { GBool TextWord::addCombining(GfxState *state, TextFontInfo *fontA, double fontSizeA, double x, double y, double dx, double dy, int charPosA, int charLen, - CharCode c, Unicode u, Matrix textMatA) { + CharCode c, Unicode u, const Matrix &textMatA) { if (len == 0 || wMode != 0 || fontA->getWMode() != 0) return gFalse; diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/TextOutputDev.h index a0aa6f8a991..2aab94f5d15 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/TextOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/TextOutputDev.h @@ -17,7 +17,7 @@ // Copyright (C) 2006 Ed Catmur <ed@catmur.co.uk> // Copyright (C) 2007, 2008, 2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright (C) 2007 Adrian Johnson <ajohnson@redneon.com> -// Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2008, 2010, 2015 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2010 Brian Ewins <brian.ewins@gmail.com> // Copyright (C) 2012, 2013, 2015 Jason Crain <jason@aquaticape.us> // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de> @@ -132,7 +132,7 @@ public: // Add a character to the word. void addChar(GfxState *state, TextFontInfo *fontA, double x, double y, double dx, double dy, int charPosA, int charLen, - CharCode c, Unicode u, Matrix textMatA); + CharCode c, Unicode u, const Matrix &textMatA); // Attempt to add a character to the word as a combining character. // Either character u or the last character in the word must be an @@ -140,7 +140,7 @@ public: // the character was added. GBool addCombining(GfxState *state, TextFontInfo *fontA, double fontSizeA, double x, double y, double dx, double dy, int charPosA, int charLen, - CharCode c, Unicode u, Matrix textMatA); + CharCode c, Unicode u, const Matrix &textMatA); // Merge <word> onto the end of <this>. void merge(TextWord *word); diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/UTF.cc index 46007b73006..46007b73006 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UTF.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/UTF.h index 248c168cca5..248c168cca5 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UTF.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/UTF8.h index 34a07d4082f..34a07d4082f 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UTF8.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UTF8.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeCClassTables.h index 62f9ecc3657..62f9ecc3657 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCClassTables.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeCClassTables.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeCompTables.h index 68e2f86aee9..68e2f86aee9 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeCompTables.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeCompTables.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeDecompTables.h index 4bc34b18d99..4bc34b18d99 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeDecompTables.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeDecompTables.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMap.cc index 0528cdfc686..1319666779b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMap.cc @@ -13,7 +13,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net> +// Copyright (C) 2010 Jakub Wilk <jwilk@jwilk.net> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMap.h index ba7df2cfb99..ba7df2cfb99 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMap.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMap.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMapTables.h index 073e474e6be..073e474e6be 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeMapTables.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMapTables.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeTypeTable.cc index 721af9db6e5..721af9db6e5 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeTypeTable.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeTypeTable.h index 869aad9e6c6..869aad9e6c6 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/UnicodeTypeTable.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/UnicodeTypeTable.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/ViewerPreferences.cc index cba8d0ac512..cba8d0ac512 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/ViewerPreferences.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/ViewerPreferences.h index 8cdc4d40a73..8cdc4d40a73 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/ViewerPreferences.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/ViewerPreferences.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/XRef.cc index 1bbbdc51c25..1bbbdc51c25 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/XRef.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/XRef.h index 70065d8963e..70065d8963e 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/XRef.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/XRef.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.36.0/poppler/XpdfPluginAPI.cc index 834c681d991..834c681d991 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/XpdfPluginAPI.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.36.0/poppler/XpdfPluginAPI.h index 6ed890a8f1f..6ed890a8f1f 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/XpdfPluginAPI.h +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/XpdfPluginAPI.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.36.0/poppler/gen-unicode-tables.py index 282f6e52518..282f6e52518 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/gen-unicode-tables.py +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/gen-unicode-tables.py diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.36.0/poppler/poppler-config.h.cmake index b087a693f92..b087a693f92 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.cmake +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/poppler-config.h.cmake diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.36.0/poppler/poppler-config.h.in index f73d0f66ee9..f73d0f66ee9 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/poppler-config.h.in +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/poppler-config.h.in diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.36.0/poppler/strtok_r.cpp index 6483e0f7be9..6483e0f7be9 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/strtok_r.cpp +++ b/Build/source/libs/poppler/poppler-0.36.0/poppler/strtok_r.cpp diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.36.0/splash/Makefile.am index 5c265d6360c..5c265d6360c 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/Makefile.am diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/Splash.cc index e07fa06db2b..7453822d291 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/Splash.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/Splash.cc @@ -3208,6 +3208,8 @@ void Splash::arbitraryTransformMask(SplashImageMaskSource src, void *srcData, ((SplashCoord)y + 0.5 - section[i].yb0) * section[i].dxdyb, glyphMode); + if (unlikely(xa < 0)) + xa = 0; // make sure narrow images cover at least one pixel if (xa == xb) { ++xb; diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/Splash.h b/Build/source/libs/poppler/poppler-0.36.0/splash/Splash.h index 75764544fed..75764544fed 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/Splash.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/Splash.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashBitmap.cc index c905c97afb9..7c14b3161b1 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashBitmap.cc @@ -461,7 +461,7 @@ void SplashBitmap::getRGBLine(int yl, SplashColorPtr line) { } } -void SplashBitmap::getXBGRLine(int yl, SplashColorPtr line, bool useAlpha) { +void SplashBitmap::getXBGRLine(int yl, SplashColorPtr line, ConversionMode conversionMode) { SplashColor col; double c, m, y, k, c1, m1, y1, k1, r, g, b; @@ -501,16 +501,34 @@ void SplashBitmap::getXBGRLine(int yl, SplashColorPtr line, bool useAlpha) { y1 = 1 - y; k1 = 1 - k; cmykToRGBMatrixMultiplication(c, m, y, k, c1, m1, y1, k1, r, g, b); - *line++ = dblToByte(clip01(b)); - *line++ = dblToByte(clip01(g)); - *line++ = dblToByte(clip01(r)); - *line++ = useAlpha ? getAlpha(x, yl) : 255; + + if (conversionMode == conversionAlphaPremultiplied) { + const double a = getAlpha(x, yl) / 255.0; + + *line++ = dblToByte(clip01(b * a)); + *line++ = dblToByte(clip01(g * a)); + *line++ = dblToByte(clip01(r * a)); + } else { + *line++ = dblToByte(clip01(b)); + *line++ = dblToByte(clip01(g)); + *line++ = dblToByte(clip01(r)); + } + + if (conversionMode != conversionOpaque) { + *line++ = getAlpha(x, yl); + } else { + *line++ = 255; + } } } -GBool SplashBitmap::convertToXBGR(bool useAlpha) { +static inline Guchar div255(int x) { + return (Guchar)((x + (x >> 8) + 0x80) >> 8); +} + +GBool SplashBitmap::convertToXBGR(ConversionMode conversionMode) { if (mode == splashModeXBGR8) { - if (useAlpha) { + if (conversionMode != conversionOpaque) { // Copy the alpha channel into the fourth component so that XBGR becomes ABGR. const SplashColorPtr dbegin = data; const SplashColorPtr dend = data + rowSize * height; @@ -518,11 +536,20 @@ GBool SplashBitmap::convertToXBGR(bool useAlpha) { Guchar *const abegin = alpha; Guchar *const aend = alpha + width * height; - SplashColorPtr d = dbegin + 3; + SplashColorPtr d = dbegin; Guchar *a = abegin; - for(; d < dend && a < aend; d += 4, a += 1) { - *d = *a; + if (conversionMode == conversionAlphaPremultiplied) { + for (; d < dend && a < aend; d += 4, a += 1) { + d[0] = div255(d[0] * *a); + d[1] = div255(d[1] * *a); + d[2] = div255(d[2] * *a); + d[3] = *a; + } + } else { + for (d += 3; d < dend && a < aend; d += 4, a += 1) { + *d = *a; + } } } @@ -534,7 +561,7 @@ GBool SplashBitmap::convertToXBGR(bool useAlpha) { if (newdata != NULL) { for (int y = 0; y < height; y++) { unsigned char *row = newdata + y * newrowSize; - getXBGRLine(y, row, useAlpha); + getXBGRLine(y, row, conversionMode); } if (rowSize < 0) { gfree(data + (height - 1) * rowSize); diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashBitmap.h index 9fa7613f879..4417af73375 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashBitmap.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashBitmap.h @@ -76,11 +76,18 @@ public: SplashError writeImgFile(SplashImageFileFormat format, FILE *f, int hDPI, int vDPI, const char *compressionString = ""); SplashError writeImgFile(ImgWriter *writer, FILE *f, int hDPI, int vDPI); - GBool convertToXBGR(bool useAlpha = false); + enum ConversionMode + { + conversionOpaque, + conversionAlpha, + conversionAlphaPremultiplied + }; + + GBool convertToXBGR(ConversionMode conversionMode = conversionOpaque); void getPixel(int x, int y, SplashColorPtr pixel); void getRGBLine(int y, SplashColorPtr line); - void getXBGRLine(int y, SplashColorPtr line, bool useAlpha = false); + void getXBGRLine(int y, SplashColorPtr line, ConversionMode conversionMode = conversionOpaque); #if SPLASH_CMYK void getCMYKLine(int y, SplashColorPtr line); #endif diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashClip.cc index 85c6b11473d..85c6b11473d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashClip.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashClip.h index 5c0fdba99a7..5c0fdba99a7 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashClip.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashClip.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashErrorCodes.h index d1f81f85dd8..d1f81f85dd8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashErrorCodes.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashErrorCodes.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFont.cc index b785826d66b..b785826d66b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFont.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFont.h index 98cb29dfbba..98cb29dfbba 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFont.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFont.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontEngine.cc index 9fef8f007d1..9fef8f007d1 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontEngine.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontEngine.h index 11bbea74a80..11bbea74a80 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontEngine.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontEngine.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontFile.cc index f0dcf50384b..f0dcf50384b 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontFile.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontFile.h index d642af0a0ab..d642af0a0ab 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFTFontFile.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontFile.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFont.cc index 3d6d6b2343e..3d6d6b2343e 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFont.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFont.h index 78b00d2dcaf..78b00d2dcaf 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFont.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFont.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontEngine.cc index 73ef8de0877..73ef8de0877 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontEngine.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontEngine.h index 6502ea5a7fa..6502ea5a7fa 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontEngine.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontEngine.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFile.cc index 68e8608b6a7..68e8608b6a7 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFile.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFile.h index ec87504b9bc..ec87504b9bc 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFile.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFile.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFileID.cc index a66dabf61e3..a66dabf61e3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFileID.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFileID.h index cfd89ebb56a..cfd89ebb56a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashFontFileID.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashFontFileID.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashGlyphBitmap.h index c062c106e6a..c062c106e6a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashGlyphBitmap.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashGlyphBitmap.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashMath.h index ca73c2bd1f3..ca73c2bd1f3 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashMath.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashMath.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashPath.cc index bc4ccd524a4..bc4ccd524a4 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashPath.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashPath.h index 81273c613e5..81273c613e5 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPath.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashPath.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashPattern.cc index 28ca4995882..28ca4995882 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashPattern.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashPattern.h index e678c9e20e6..e678c9e20e6 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashPattern.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashPattern.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashScreen.cc index 68ccd7ddda0..68ccd7ddda0 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashScreen.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashScreen.h index a7fc4559148..a7fc4559148 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashScreen.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashScreen.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashState.cc index fd2789d02f9..fd2789d02f9 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashState.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashState.h index 2c603531cfd..2c603531cfd 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashState.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashState.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1Font.cc index 0fdfaaf5150..0fdfaaf5150 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1Font.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1Font.h index 1dbe66cd7fc..1dbe66cd7fc 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1Font.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1Font.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontEngine.cc index fb4b38dae88..fb4b38dae88 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontEngine.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontEngine.h index 268a01479b0..268a01479b0 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontEngine.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontEngine.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontFile.cc index 1832a916d9a..1832a916d9a 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontFile.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontFile.h index c094b6d8b29..c094b6d8b29 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashT1FontFile.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontFile.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashTypes.h index 5ea816007f8..5ea816007f8 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashTypes.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashTypes.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPath.cc index 27106ee3d14..27106ee3d14 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPath.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPath.h index 1c7040daa23..1c7040daa23 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPath.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPath.h diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPathScanner.cc index ac47881cb4f..ac47881cb4f 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.cc +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPathScanner.cc diff --git a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPathScanner.h index cc295cb68fe..cc295cb68fe 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/splash/SplashXPathScanner.h +++ b/Build/source/libs/poppler/poppler-0.36.0/splash/SplashXPathScanner.h diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac index 33891de21b1..686a3c38eec 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.35.0]) +m4_define([poppler_version], [0.36.0]) |