diff options
Diffstat (limited to 'Build/source/libs')
-rw-r--r-- | Build/source/libs/README | 2 | ||||
-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.26.5-PATCHES/patch-10-UTF-16BE | 116 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.26.5-PATCHES/ChangeLog) | 8 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-0.26.5-PATCHES/TL-Changes) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0-PATCHES/patch-02-LLONG_MAX (renamed from Build/source/libs/poppler/poppler-0.26.5-PATCHES/patch-02-LLONG_MAX) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/AUTHORS (renamed from Build/source/libs/poppler/poppler-0.26.5/AUTHORS) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/CMakeLists.txt (renamed from Build/source/libs/poppler/poppler-0.26.5/CMakeLists.txt) | 22 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/COPYING (renamed from Build/source/libs/poppler/poppler-0.26.5/COPYING) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.26.5/ChangeLog) | 1063 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/ConfigureChecks.cmake (renamed from Build/source/libs/poppler/poppler-0.26.5/ConfigureChecks.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/INSTALL (renamed from Build/source/libs/poppler/poppler-0.26.5/INSTALL) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.26.5/Makefile.am) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/NEWS (renamed from Build/source/libs/poppler/poppler-0.26.5/NEWS) | 40 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/README (renamed from Build/source/libs/poppler/poppler-0.26.5/README) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/README-XPDF (renamed from Build/source/libs/poppler/poppler-0.26.5/README-XPDF) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/TODO (renamed from Build/source/libs/poppler/poppler-0.26.5/TODO) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.26.5/config.h.cmake) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/config.h.in (renamed from Build/source/libs/poppler/poppler-0.26.5/config.h.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/configure.ac (renamed from Build/source/libs/poppler/poppler-0.26.5/configure.ac) | 40 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiBase.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.h (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiBase.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiEncodings.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.h (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiEncodings.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiIdentifier.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.h (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiIdentifier.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiTrueType.cc) | 12 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.h (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiTrueType.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1.cc) | 3 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.h (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1C.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.h (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1C.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/fofi/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.26.5/fofi/Makefile.am) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/FixedPoint.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/FixedPoint.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/GooHash.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/GooHash.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/GooHash.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/GooHash.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/GooLikely.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/GooLikely.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/GooList.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/GooList.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/GooList.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/GooList.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/GooMutex.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/GooMutex.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/GooString.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/GooString.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/GooString.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/GooString.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/GooTimer.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/GooTimer.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/GooTimer.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/GooTimer.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/ImgWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/ImgWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/JpegWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/JpegWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/Makefile.am) | 38 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/NetPBMWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/NetPBMWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/PNGWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/PNGWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/TiffWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/TiffWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/gfile.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/gfile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/gfile.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/gfile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/gmem.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/gmem.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/gmem.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/gmem.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/gmempp.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/gmempp.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/grandom.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/grandom.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/grandom.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/grandom.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/gstrtod.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/gstrtod.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/gstrtod.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/gstrtod.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/gtypes.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/gtypes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/goo/gtypes_p.h (renamed from Build/source/libs/poppler/poppler-0.26.5/goo/gtypes_p.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/gtk-doc.make (renamed from Build/source/libs/poppler/poppler-0.26.5/gtk-doc.make) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-cairo-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-cairo-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-cairo.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-cairo.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-cpp-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-cpp-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-cpp.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-cpp.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-glib-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-glib-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-glib.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-glib.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-qt4-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-qt4-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-qt4.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-qt4.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-qt5-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-qt5-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-qt5.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-qt5.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-splash-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-splash-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-splash.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-splash.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler.pc.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Annot.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Annot.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Annot.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Annot.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Array.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Array.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Array.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Array.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFont.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFont.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFontTables.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFontTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CMap.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CMap.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CMap.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CMap.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CachedFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CachedFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CairoFontEngine.cc) | 12 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CairoFontEngine.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CairoOutputDev.cc) | 90 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CairoOutputDev.h) | 4 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CairoRescaleBox.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CairoRescaleBox.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Catalog.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Catalog.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Catalog.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Catalog.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CharCodeToUnicode.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CharCodeToUnicode.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CharTypes.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CharTypes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CompactFontTables.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CompactFontTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CurlCachedFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CurlCachedFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CurlPDFDocBuilder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/CurlPDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/DCTStream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/DCTStream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/DateInfo.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/DateInfo.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Decrypt.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Decrypt.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Dict.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Dict.cc) | 7 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Dict.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Dict.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Error.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Error.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Error.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Error.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/ErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/ErrorCodes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/FileSpec.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/FileSpec.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/FlateStream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/FlateStream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/FontEncodingTables.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/FontEncodingTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/FontInfo.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/FontInfo.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Form.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Form.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Form.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Form.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Function.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Function.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Function.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Function.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Gfx.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Gfx.cc) | 5 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Gfx.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Gfx.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/GfxFont.cc) | 29 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/GfxFont.h) | 7 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/GfxState.cc) | 10 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/GfxState.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState_helpers.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/GfxState_helpers.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/GlobalParams.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/GlobalParams.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParamsWin.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/GlobalParamsWin.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Hints.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Hints.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Hints.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Hints.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/JArithmeticDecoder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/JArithmeticDecoder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/JBIG2Stream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/JBIG2Stream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/JPEG2000Stream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/JPEG2000Stream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/JPXStream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/JPXStream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Lexer.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Lexer.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Lexer.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Lexer.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Linearization.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Linearization.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Linearization.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Linearization.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Link.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Link.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Link.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Link.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/LocalPDFDocBuilder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/LocalPDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Makefile.am) | 118 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/MarkedContentOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/MarkedContentOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Movie.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Movie.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Movie.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Movie.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/NameToCharCode.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/NameToCharCode.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/NameToUnicodeTable.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/NameToUnicodeTable.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Object.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Object.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Object.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Object.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/OptionalContent.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/OptionalContent.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Outline.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Outline.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Outline.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Outline.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/OutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/OutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDoc.cc) | 160 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDoc.h) | 14 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocEncoding.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocEncoding.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocFactory.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocFactory.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PSOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PSOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PSTokenizer.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PSTokenizer.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Page.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Page.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Page.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Page.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PageLabelInfo.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PageLabelInfo.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo_p.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PageLabelInfo_p.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PageTransition.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PageTransition.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Parser.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Parser.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Parser.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Parser.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PopplerCache.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PopplerCache.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PreScanOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/PreScanOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/ProfileData.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/ProfileData.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Rendition.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Rendition.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Rendition.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Rendition.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/SecurityHandler.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/SecurityHandler.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Sound.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Sound.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Sound.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Sound.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/SplashOutputDev.cc) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/SplashOutputDev.h) | 8 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/StdinCachedFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/StdinCachedFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/StdinPDFDocBuilder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/StdinPDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Stream-CCITT.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Stream-CCITT.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Stream.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Stream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/Stream.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/Stream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/StructElement.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/StructElement.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/StructElement.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/StructElement.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/StructTreeRoot.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/StructTreeRoot.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/TextOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/TextOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UTF.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UTF.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UTF.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UTF.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UTF8.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UTF8.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCClassTables.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeCClassTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCompTables.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeCompTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeDecompTables.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeDecompTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeMap.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeMap.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMapTables.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeMapTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeTypeTable.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeTypeTable.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/ViewerPreferences.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/ViewerPreferences.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/XRef.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/XRef.cc) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/XRef.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/XRef.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/XpdfPluginAPI.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.h (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/XpdfPluginAPI.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/gen-unicode-tables.py (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/gen-unicode-tables.py) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/poppler-config.h.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.in (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/poppler-config.h.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/poppler/strtok_r.cpp (renamed from Build/source/libs/poppler/poppler-0.26.5/poppler/strtok_r.cpp) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/Makefile.am) | 42 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/Splash.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/Splash.cc) | 24 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/Splash.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/Splash.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashBitmap.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashBitmap.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashClip.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashClip.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashClip.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashClip.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashErrorCodes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFont.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFont.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontEngine.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontEngine.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontFile.cc) | 8 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFont.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFont.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFont.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFont.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontEngine.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontEngine.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFileID.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFileID.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashGlyphBitmap.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashGlyphBitmap.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashMath.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashMath.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashPath.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashPath.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashPath.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashPath.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashPattern.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashPattern.h) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashScreen.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashScreen.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashState.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashState.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashState.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashState.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1Font.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1Font.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontEngine.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontEngine.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashTypes.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashTypes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPath.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPath.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.cc (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPathScanner.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.h (renamed from Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPathScanner.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/version.ac | 2 |
298 files changed, 1566 insertions, 397 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README index 9bdc0723760..68f61969367 100644 --- a/Build/source/libs/README +++ b/Build/source/libs/README @@ -49,7 +49,7 @@ mpfr 3.1.2 - checked 13mar13 pixman 0.32.6 - checked 7jul14 http://cairographics.org/releases/ -poppler 0.26.5 - checked 29sep14 +poppler 0.28.0 - checked 4nov14 http://poppler.freedesktop.org/ - used by luatex and xetex potrace 1.11 - checked 12apr13 diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog index b3591d3fc53..ebca79c302e 100644 --- a/Build/source/libs/poppler/ChangeLog +++ b/Build/source/libs/poppler/ChangeLog @@ -1,3 +1,8 @@ +2014-11-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import poppler-0.28.0. + * version.ac: Adjust. + 2014-09-29 Peter Breitenlohner <peb@mppmu.mpg.de> Import poppler-0.26.5. diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in index 7895f00690d..5081680bcc8 100644 --- a/Build/source/libs/poppler/Makefile.in +++ b/Build/source/libs/poppler/Makefile.in @@ -80,7 +80,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/config.h.in \ - $(top_srcdir)/poppler-0.26.5/poppler/poppler-config.h.in \ + $(top_srcdir)/poppler-0.28.0/poppler/poppler-config.h.in \ $(top_srcdir)/../../build-aux/depcomp ChangeLog \ ../../build-aux/compile ../../build-aux/config.guess \ ../../build-aux/config.sub ../../build-aux/depcomp \ @@ -578,7 +578,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.26.5/poppler/poppler-config.h.in $(top_builddir)/config.status +stamp-h2: $(top_srcdir)/poppler-0.28.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 5c09a34e152..30debd44628 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.26.5. +# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.28.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.26.5' -PACKAGE_STRING='poppler (TeX Live) 0.26.5' +PACKAGE_VERSION='0.28.0' +PACKAGE_STRING='poppler (TeX Live) 0.28.0' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' -ac_unique_file="poppler-0.26.5/poppler/Array.cc" +ac_unique_file="poppler-0.28.0/poppler/Array.cc" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1304,7 +1304,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures poppler (TeX Live) 0.26.5 to adapt to many kinds of systems. +\`configure' configures poppler (TeX Live) 0.28.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1371,7 +1371,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler (TeX Live) 0.26.5:";; + short | recursive ) echo "Configuration of poppler (TeX Live) 0.28.0:";; esac cat <<\_ACEOF @@ -1484,7 +1484,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler (TeX Live) configure 0.26.5 +poppler (TeX Live) configure 0.28.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2074,7 +2074,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by poppler (TeX Live) $as_me 0.26.5, which was +It was created by poppler (TeX Live) $as_me 0.28.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3997,7 +3997,7 @@ fi # Define the identity of the package. PACKAGE='poppler--tex-live-' - VERSION='0.26.5' + VERSION='0.28.0' # Some tools Automake needs. @@ -6473,12 +6473,12 @@ fi ac_config_headers="$ac_config_headers config.h" -ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.26.5/poppler/poppler-config.h.in" +ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.28.0/poppler/poppler-config.h.in" cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.26.5" +#define POPPLER_VERSION "0.28.0" _ACEOF @@ -6612,7 +6612,7 @@ fi $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h -POPPLER_TREE=poppler-0.26.5 +POPPLER_TREE=poppler-0.28.0 ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile" @@ -7172,7 +7172,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by poppler (TeX Live) $as_me 0.26.5, which was +This file was extended by poppler (TeX Live) $as_me 0.28.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7238,7 +7238,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -poppler (TeX Live) config.status 0.26.5 +poppler (TeX Live) config.status 0.28.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -7369,7 +7369,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.26.5/poppler/poppler-config.h.in" ;; + "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.28.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.26.5-PATCHES/patch-10-UTF-16BE b/Build/source/libs/poppler/poppler-0.26.5-PATCHES/patch-10-UTF-16BE deleted file mode 100644 index 56a5fc497ad..00000000000 --- a/Build/source/libs/poppler/poppler-0.26.5-PATCHES/patch-10-UTF-16BE +++ /dev/null @@ -1,116 +0,0 @@ -diff -ur poppler-0.26.5.orig/goo/GooString.h poppler-0.26.5/goo/GooString.h ---- poppler-0.26.5.orig/goo/GooString.h 2014-05-24 13:44:20.000000000 +0200 -+++ poppler-0.26.5/goo/GooString.h 2014-10-08 14:23:48.000000000 +0200 -@@ -17,7 +17,7 @@ - // - // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com> - // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com> --// Copyright (C) 2008-2010, 2012 Albert Astals Cid <aacid@kde.org> -+// Copyright (C) 2008-2010, 2012, 2014 Albert Astals Cid <aacid@kde.org> - // Copyright (C) 2012-2014 Fabio D'Urso <fabiodurso@hotmail.it> - // Copyright (C) 2013 Jason Crain <jason@aquaticape.us> - // -@@ -62,6 +62,10 @@ - class GooString { - public: - -+ // a special value telling that the length of the string is not given -+ // so it must be calculated from the strings -+ static const int CALC_STRING_LEN = -1; -+ - // Create an empty string. - GooString(); - -@@ -186,9 +190,6 @@ - // results in sizeof(GooString) be a multiple of 16. - // 24 makes sizeof(GooString) to be 32. - static const int STR_STATIC_SIZE = 24; -- // a special value telling that the length of the string is not given -- // so it must be calculated from the strings -- static const int CALC_STRING_LEN = -1; - - int roundedSize(int len); - -diff -ur poppler-0.26.5.orig/poppler/StructElement.cc poppler-0.26.5/poppler/StructElement.cc ---- poppler-0.26.5.orig/poppler/StructElement.cc 2014-04-26 17:37:22.000000000 +0200 -+++ poppler-0.26.5/poppler/StructElement.cc 2014-10-08 14:23:48.000000000 +0200 -@@ -5,6 +5,8 @@ - // This file is licensed under the GPLv2 or later - // - // Copyright 2013, 2014 Igalia S.L. -+// Copyright 2014 Luigi Scarso <luigi.scarso@gmail.com> -+// Copyright 2014 Albert Astals Cid <aacid@kde.org> - // - //======================================================================== - -@@ -677,11 +679,11 @@ - // Attribute - //------------------------------------------------------------------------ - --Attribute::Attribute(const char *nameA, Object *valueA): -+Attribute::Attribute(const char *nameA, int nameLenA, Object *valueA): - type(UserProperty), - owner(UserProperties), - revision(0), -- name(nameA), -+ name(nameA, nameLenA), - value(), - hidden(gFalse), - formatted(NULL) -@@ -789,10 +791,13 @@ - { - Object obj, value; - const char *name = NULL; -+ int nameLen = GooString::CALC_STRING_LEN; - -- if (property->lookup("N", &obj)->isString()) -- name = obj.getString()->getCString(); -- else if (obj.isName()) -+ if (property->lookup("N", &obj)->isString()) { -+ GooString *s = obj.getString(); -+ name = s->getCString(); -+ nameLen = s->getLength(); -+ } else if (obj.isName()) - name = obj.getName(); - else { - error(errSyntaxError, -1, "N object is wrong type ({0:s})", obj.getTypeName()); -@@ -807,7 +812,7 @@ - return NULL; - } - -- Attribute *attribute = new Attribute(name, &value); -+ Attribute *attribute = new Attribute(name, nameLen, &value); - value.free(); - obj.free(); - -diff -ur poppler-0.26.5.orig/poppler/StructElement.h poppler-0.26.5/poppler/StructElement.h ---- poppler-0.26.5.orig/poppler/StructElement.h 2014-04-26 17:37:22.000000000 +0200 -+++ poppler-0.26.5/poppler/StructElement.h 2014-10-08 14:23:48.000000000 +0200 -@@ -5,6 +5,8 @@ - // This file is licensed under the GPLv2 or later - // - // Copyright 2013, 2014 Igalia S.L. -+// Copyright 2014 Luigi Scarso <luigi.scarso@gmail.com> -+// Copyright 2014 Albert Astals Cid <aacid@kde.org> - // - //======================================================================== - -@@ -74,7 +76,7 @@ - Attribute(Type type, Object *value); - - // Creates an UserProperty attribute, with an arbitrary name and value. -- Attribute(const char *name, Object *value); -+ Attribute(const char *name, int nameLen, Object *value); - - GBool isOk() const { return type != Unknown; } - -@@ -86,7 +88,8 @@ - Object *getValue() const { return &value; } - static Object *getDefaultValue(Type type); - -- const char *getName() const { return type == UserProperty ? name.getCString() : getTypeName(); } -+ // The caller gets the ownership of the return GooString and is responsible of deleting it -+ GooString *getName() const { return type == UserProperty ? name.copy() : new GooString(getTypeName()); } - - // The revision is optional, and defaults to zero. - Guint getRevision() const { return revision; } diff --git a/Build/source/libs/poppler/poppler-0.26.5-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.28.0-PATCHES/ChangeLog index 87235a32045..eb46aee57e9 100644 --- a/Build/source/libs/poppler/poppler-0.26.5-PATCHES/ChangeLog +++ b/Build/source/libs/poppler/poppler-0.28.0-PATCHES/ChangeLog @@ -1,3 +1,11 @@ +2014-11-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.28.0 source tree from: + http://poppler.freedesktop.org/ + + * patch-02-LLONG_MAX: Adapted. + * patch-10-UTF-16BE (removed): Included upstream. + 2014-10-08 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-10-UTF-16BE (new): Backport from poppler git diff --git a/Build/source/libs/poppler/poppler-0.26.5-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.28.0-PATCHES/TL-Changes index b248377c4e7..61bbc4a65d2 100644 --- a/Build/source/libs/poppler/poppler-0.26.5-PATCHES/TL-Changes +++ b/Build/source/libs/poppler/poppler-0.28.0-PATCHES/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the poppler-0.26.5 tree as obtained from: +Changes applied to the poppler-0.28.0 tree as obtained from: http://poppler.freedesktop.org/ Removed: diff --git a/Build/source/libs/poppler/poppler-0.26.5-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.28.0-PATCHES/patch-02-LLONG_MAX index e51af0ce97d..21569fa4439 100644 --- a/Build/source/libs/poppler/poppler-0.26.5-PATCHES/patch-02-LLONG_MAX +++ b/Build/source/libs/poppler/poppler-0.28.0-PATCHES/patch-02-LLONG_MAX @@ -1,6 +1,6 @@ -diff -ur poppler-0.26.5.orig/goo/GooString.h poppler-0.26.5/goo/GooString.h ---- poppler-0.26.5.orig/goo/GooString.h 2014-04-26 17:37:22.000000000 +0200 -+++ poppler-0.26.5/goo/GooString.h 2014-05-24 13:44:20.000000000 +0200 +diff -ur poppler-0.28.0.orig/goo/GooString.h poppler-0.28.0/goo/GooString.h +--- poppler-0.28.0.orig/goo/GooString.h 2014-10-07 22:41:15.000000000 +0200 ++++ poppler-0.28.0/goo/GooString.h 2014-11-04 10:20:40.567904859 +0100 @@ -34,6 +34,21 @@ #endif diff --git a/Build/source/libs/poppler/poppler-0.26.5/AUTHORS b/Build/source/libs/poppler/poppler-0.28.0/AUTHORS index a785e403211..a785e403211 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/AUTHORS +++ b/Build/source/libs/poppler/poppler-0.28.0/AUTHORS diff --git a/Build/source/libs/poppler/poppler-0.26.5/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.28.0/CMakeLists.txt index 02c82cac5ca..7178d25a851 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/CMakeLists.txt +++ b/Build/source/libs/poppler/poppler-0.28.0/CMakeLists.txt @@ -17,8 +17,8 @@ include(CheckFileOffsetBits) CHECK_FILE_OFFSET_BITS() set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "26") -set(POPPLER_MICRO_VERSION "5") +set(POPPLER_MINOR_VERSION "28") +set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches @@ -232,6 +232,22 @@ if(LCMS2_FOUND) include_directories(${LCMS2_INCLUDE_DIR}) endif(LCMS2_FOUND) +# Recent versions of poppler-data install a .pc file. +# Use it to determine the encoding data path, if available. +# Default to the same prefix otherwise. +pkg_check_modules(POPPLER_DATA poppler-data) +if(POPPLER_DATA_FOUND) + execute_process(COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=poppler_datadir poppler-data + RESULT_VARIABLE _result_var + OUTPUT_VARIABLE _output_var OUTPUT_STRIP_TRAILING_WHITESPACE) + if(_result_var STREQUAL "0" AND NOT _output_var STREQUAL "") + set(POPPLER_DATADIR "${_output_var}") + endif(_result_var STREQUAL "0" AND NOT _output_var STREQUAL "") +endif(POPPLER_DATA_FOUND) +if(NOT DEFINED POPPLER_DATADIR) + set(POPPLER_DATADIR "${CMAKE_INSTALL_PREFIX}/share/poppler") +endif(NOT DEFINED POPPLER_DATADIR) + if(DEFINED COMPILE_WARNINGS) else(DEFINED COMPILE_WARNINGS) set(COMPILE_WARNINGS "yes") @@ -427,7 +443,7 @@ add_library(poppler STATIC ${poppler_SRCS}) else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 46.0.0 SOVERSION 46) +set_target_properties(poppler PROPERTIES VERSION 47.0.0 SOVERSION 47) 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.26.5/COPYING b/Build/source/libs/poppler/poppler-0.28.0/COPYING index d511905c164..d511905c164 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/COPYING +++ b/Build/source/libs/poppler/poppler-0.28.0/COPYING diff --git a/Build/source/libs/poppler/poppler-0.26.5/ChangeLog b/Build/source/libs/poppler/poppler-0.28.0/ChangeLog index c478589d8c2..e395b330610 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/ChangeLog +++ b/Build/source/libs/poppler/poppler-0.28.0/ChangeLog @@ -1,3 +1,601 @@ +commit 0a9c38076f1555196029372b7e08714b43c7a58d +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 3 21:43:28 2014 +0100 + + Update (C) + + fofi/FoFiType1.cc | 1 + + poppler/PDFDoc.cc | 4 ++-- + poppler/PDFDoc.h | 2 +- + poppler/XRef.cc | 2 +- + qt4/src/poppler-annotation-private.h | 2 +- + qt4/src/poppler-annotation.cc | 2 +- + qt4/src/poppler-page.cc | 2 +- + qt4/src/poppler-qt4.h | 2 +- + qt5/src/poppler-annotation-private.h | 2 +- + qt5/src/poppler-annotation.cc | 2 +- + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-qt5.h | 2 +- + utils/pdfdetach.cc | 1 + + utils/pdftocairo-win32.cc | 12 ++++++++++++ + utils/pdftocairo-win32.h | 12 ++++++++++++ + utils/pdftocairo.cc | 3 ++- + 16 files changed, 40 insertions(+), 13 deletions(-) + +commit 73cf1e87c9803bbe4271be297b486d9932677d46 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 3 21:37:13 2014 +0100 + + Need to dist this file + + utils/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2fd0cd652cfc03c9af35a59192729e4ed26e8146 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 3 19:20:23 2014 +0100 + + Fix memory leaks when running pdfseparate + + Bug #84768 + + poppler/PDFDoc.cc | 102 + +++++++++++++++++++++------------------------------ + poppler/PDFDoc.h | 2 +- + utils/pdfseparate.cc | 8 +++- + utils/pdfunite.cc | 4 +- + 4 files changed, 50 insertions(+), 66 deletions(-) + +commit d6ea8acbb348fdb43601a963ba5407e933565003 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Mon Nov 3 19:11:25 2014 +0100 + + fix crash in Xref::getEntry + + Bug 85234 + + poppler/XRef.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bd142810b9f66b017a58b3e1840d4d72794f1ef4 +Author: Jason Crain <jason@aquaticape.us> +Date: Thu May 15 02:22:44 2014 -0500 + + cairo: Use matrix to determine pattern size + + https://bugs.freedesktop.org/show_bug.cgi?id=33364 + + poppler/CairoOutputDev.cc | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +commit 06dd7dc337c7db6122329e98783a126d59035aff +Author: Hib Eris <hib@hiberis.nl> +Date: Thu May 29 12:45:33 2014 +0200 + + Include windows.h, not Windows.h + + Fixes building on file systems that are case sensitive, e.g. when + cross compiling on Linux for win32. + + https://bugs.freedesktop.org/show_bug.cgi?id=79407 + + qt4/tests/stress-threads-qt4.cpp | 2 +- + qt5/tests/stress-threads-qt5.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 76a350b11160ac203a41b27fbc85a3264bfe4735 +Author: Carlos Garcia Campos <cgarcia@igalia.com> +Date: Thu Oct 30 18:25:06 2014 +0100 + + regtest: Try to fix again the paths of the resources in the generated + HTML report + + Use always relatives paths for the resources under the out directory, + and absolute paths for all other resources when no-absolute-path + command + line option is used. + + regtest/HTMLReport.py | 47 + +++++++++++++++++++++++------------------------ + 1 file changed, 23 insertions(+), 24 deletions(-) + +commit c93d6b264dc77c46c72281d966bf826274a43d15 +Author: Carlos Garcia Campos <cgarcia@igalia.com> +Date: Wed Oct 29 17:37:06 2014 +0100 + + regtest: respect --no-absolute-paths when creating the pretty + diff links + + regtest/HTMLReport.py | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit 9f953e47a6ea92d806aeea61e227af54c889c6be +Author: Carlos Garcia Campos <cgarcia@igalia.com> +Date: Mon Oct 27 19:53:28 2014 +0100 + + regtest: Add an option to create the HTML report without absolute + paths + + It uses the paths as received from the command line attributes. + + regtest/HTMLReport.py | 15 +++++++++++---- + regtest/commands/create-report.py | 4 ++++ + 2 files changed, 15 insertions(+), 4 deletions(-) + +commit 3d840231bc6f0714da361493ef32913af2eb78d7 +Author: Carlos Garcia Campos <cgarcia@igalia.com> +Date: Sun Oct 26 12:09:28 2014 +0100 + + regtest: Fix png diff generation with python-pil pillow fork + + Use from PIL import Image instead of just import Image, since pillow + only doesn't support import Image without using PIL.Image. + + regtest/backends/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68e58ec5465efc289d85ae104941db92450a3168 +Author: Carlos Garcia Campos <cgarcia@igalia.com> +Date: Sun Oct 26 11:21:23 2014 +0100 + + regtest: Limit the number of worker threads to the number of documents + to test + + We are always spawning all the threads even if the documents to + test is + less than the worker threads. Also optimize the case of running + only one + test to not spwn any thread. + + regtest/TestRun.py | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) + +commit 7c21b95852e891060cd2e276949acf0945306ab7 +Author: Carlos Garcia Campos <cgarcia@igalia.com> +Date: Sun Oct 26 11:08:45 2014 +0100 + + regtest: Allow to run groups of tests individually + + Now it's possible to pass more than one argument to run-tests + command and + optionally the docs directory. When more than one test is passed + and the + docs directory is not provided, the common base path of all passed + tests + is used as docs directory. The tests passed can be documents or + directories, using absolute paths or paths relative to the docs + directory. + This also allows us to update the refs for a group of tests. + + regtest/TestRun.py | 26 ++++++++++++++++++++++++-- + regtest/Utils.py | 7 +++++-- + regtest/commands/run-tests.py | 29 ++++++++++++++++++++--------- + 3 files changed, 49 insertions(+), 13 deletions(-) + +commit 53be607edc18a861aeb0b6663bac3c05de46c84c +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Oct 24 11:35:17 2014 +0200 + + Fix warning on unused variable in pdftocairo.cc + + Fixes warning: + + CXX pdftocairo-pdftocairo.o + pdftocairo.cc:130:14: warning: ‘setupdlg’ defined but not used + [-Wunused-variable] + static GBool setupdlg = gFalse; + ^ + + https://bugs.freedesktop.org/show_bug.cgi?id=85400 + + utils/pdftocairo.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit f966b8766d40b2c912e69a1e17ef8cc4bd52be95 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Oct 21 16:42:27 2014 +0200 + + fofi: Fix a crash when parsing an invalid font due to a integer + overflow + + This fixes a crash rendering trust_metrics.f2495.f0.pdf. + + fofi/FoFiType1.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4963332ca4db13d8a9186b06d2aa0d59abbc10ee +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Oct 5 21:58:37 2014 +1030 + + pdftocairo: add -printdlg output option for win32 + + when set the win32 print dialog is displayed before printing + + configure.ac | 2 +- + utils/pdftocairo-win32.cc | 303 + ++++++++++++++++++++++++++++++++++++++++++++-- + utils/pdftocairo-win32.h | 14 +-- + utils/pdftocairo.1 | 14 ++- + utils/pdftocairo.cc | 31 ++++- + 5 files changed, 337 insertions(+), 27 deletions(-) + +commit d8fe025c36f555a5438677e20df803eee216bb13 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Oct 5 18:11:09 2014 +1030 + + pdftocairo: add a -setupdlg option that will the show printer + properties + + dialog when printing to a win32 printer. + + utils/pdftocairo-win32.cc | 22 +++++++++++++++++++--- + utils/pdftocairo-win32.h | 3 ++- + utils/pdftocairo.1 | 5 +++++ + utils/pdftocairo.cc | 24 ++++++++++++++++-------- + 4 files changed, 42 insertions(+), 12 deletions(-) + +commit c091aa14513859ab76223f5e4e6055d92082433c +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Sep 14 20:43:47 2014 +0930 + + pdftocairo: fix a number of bugs in win32 printing + + - make origPageSizes work + - make landscape pages work + - make -noshrink option work + - return actual page size in use back to main() so fit page transform + works + - hdc should be destroyed after cairo surface + - improve option parsing and rename duplex values + - Add third call to DocumentProperties as discussed in bug 79936 + - fix error messages + + utils/pdftocairo-win32.cc | 181 + ++++++++++++++++++++++++++-------------------- + utils/pdftocairo-win32.h | 2 +- + utils/pdftocairo.1 | 5 +- + utils/pdftocairo.cc | 49 ++++++------- + 4 files changed, 132 insertions(+), 105 deletions(-) + +commit cc3b39d49c656e912a7461212f3bb4e58c6444e7 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Fri Sep 12 18:17:49 2014 +0930 + + make pdftocairo-win32.cc a standalone .cc file + + instead of #including it in pdftocairo.cc + + utils/CMakeLists.txt | 1 + + utils/Makefile.am | 3 +- + utils/pdftocairo-win32.cc | 74 + +++++++++++++++++++++++------------------------ + utils/pdftocairo-win32.h | 22 ++++++++++++++ + utils/pdftocairo.cc | 24 +++++++++------ + 5 files changed, 77 insertions(+), 47 deletions(-) + +commit 700205af19ef1ae5f2c713d118ebd5dd4a0afba3 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Sep 7 20:18:36 2014 +0930 + + pdftocairo: Allow an output file for win32 printing to be specified + + Can be used for testing win32 print output without wasting paper. + + utils/pdftocairo-win32.cc | 12 ++++++++---- + utils/pdftocairo.1 | 4 ++++ + utils/pdftocairo.cc | 13 +++++++------ + 3 files changed, 19 insertions(+), 10 deletions(-) + +commit 40d3ae87befad489fd8c0b38ff2561a0782cae0b +Author: Rodrigo Rivas Costa <rodrigorivascosta@gmail.com> +Date: Sat Sep 6 21:04:10 2014 +0930 + + Add support for printing to a Windows printer from pdftocairo + + Bug 79936 + + configure.ac | 2 +- + utils/pdftocairo-win32.cc | 219 + ++++++++++++++++++++++++++++++++++++++++++++++ + utils/pdftocairo.1 | 23 ++++- + utils/pdftocairo.cc | 61 ++++++++++--- + 4 files changed, 292 insertions(+), 13 deletions(-) + +commit ee4a389872d86b619c677888da8f13f1f6c54472 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Mon Oct 20 22:32:30 2014 +1030 + + PDFDoc: fix crash when getPage() returns NULL + + Bug 85235 + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0c3f53e34ec287dab2784e1f3411ad06b62dffc7 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Mon Oct 20 22:17:20 2014 +1030 + + PDFDOC: Check for EOF when reading raw stream + + Bug 85233 + + poppler/PDFDoc.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 88dbd4df0998233939b4a51cedbfc65c58a315f9 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Oct 19 22:47:15 2014 +1030 + + pdfdetach: fix crash when getPage() returns null + + Bug 85145 + + utils/pdfdetach.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit e0179304cdef615fcf639046410d214fd5b5f276 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Oct 19 21:36:39 2014 +1030 + + cairo: fix crash when no group color space + + Bug 85137 + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 745f1241bf903969e50f0e1139641e389a9c331f +Author: Scott West <scott.gregory.west@gmail.com> +Date: Tue Oct 7 23:54:52 2014 +0200 + + Fix memory leak in Dict.remove. + + The entry was previously just overwritten now it is freed + + Small fixes by Albert oo + + Bug #84607 + + poppler/Dict.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit b8810703ca76f0bbc8185ab87679cf18eb006d52 +Author: Luigi Scarso <luigi.scarso@gmail.com> +Date: Tue Oct 7 22:45:05 2014 +0200 + + Make Attribute::getName() work when UTF-16BE is used + + Contains some ideas by me + Bug #84722 + + goo/GooString.h | 9 +++++---- + poppler/StructElement.cc | 17 +++++++++++------ + poppler/StructElement.h | 7 +++++-- + 3 files changed, 21 insertions(+), 12 deletions(-) + +commit 96a04336c7a6331727724125686a0d6f42f19f46 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Mon Oct 6 10:21:51 2014 +1030 + + cairo: only embed mime data if image decode map is identity + + https://bugs.launchpad.net/ubuntu/+source/cairo/+bug/1317517 + + poppler/CairoOutputDev.cc | 19 ++++++++++++++++--- + poppler/CairoOutputDev.h | 3 ++- + 2 files changed, 18 insertions(+), 4 deletions(-) + +commit 18541054bebce3f9d4729629785bf140d67d2da0 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Wed Sep 24 21:20:42 2014 +0930 + + cairo: Only embed mime data for gray/rgb/cmyk colorspaces + + Bug 80719 + + poppler/CairoOutputDev.cc | 39 +++++++++++++++++++++++++++++++-------- + poppler/CairoOutputDev.h | 2 +- + 2 files changed, 32 insertions(+), 9 deletions(-) + +commit cbf2652c483d7010fc36191c8b209a57eeec93d8 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Thu Jan 26 00:37:17 2012 +1030 + + cairo: don't render text when text matrix is not invertable + + Emulates acroread behavior. + + Bug 78042 + + poppler/CairoOutputDev.cc | 14 +++++++++----- + poppler/CairoOutputDev.h | 1 + + 2 files changed, 10 insertions(+), 5 deletions(-) + +commit 4fe17e97a4bd7873caad771c446199b282039697 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 5 11:30:43 2014 +0200 + + glib: Build introspection linking to the uninstalled libraries + + https://bugs.freedesktop.org/show_bug.cgi?id=84526 + + glib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a2477da56a4d1c534175940d7c01a9d3db6c72d4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Oct 1 22:33:11 2014 +0200 + + Fix 303287ebdad0de9fb2655c4d7eab627c0045ea04 + + It may happen that j is bigger than macGlyphNames size, so don't + try to access it + + fofi/FoFiTrueType.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit ce95ecda450361496aedd5d5cd0bf47fd2c66703 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 30 19:50:20 2014 +0200 + + Fix assert in 5068.asan.0.6052.pdf + + poppler/Gfx.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 01723aa17e836e818158dbdc56df642a290be300 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Tue Sep 30 18:48:47 2014 +0200 + + Map Standard/Expert encoding ligatures to AGLFN names + + for use with substitute fonts that are not compatible with the + Standard 14 fonts. + + Bug 80093 + + poppler/CairoFontEngine.cc | 12 +++++++++--- + poppler/GfxFont.cc | 29 ++++++++++++++++++++++++++++- + poppler/GfxFont.h | 7 ++++++- + splash/SplashFTFontFile.cc | 8 ++++++++ + 4 files changed, 51 insertions(+), 5 deletions(-) + +commit 529db4a94607c1ad909764d26f740c601bbe896f +Author: Hib Eris <hib@hiberis.nl> +Date: Mon Sep 29 22:59:15 2014 +0200 + + Fix build with --disable-utils + + Since 21b5fd655ce45b90668d1416d21c526ab7eb3ad6, building Poppler + fails when configured + with '--disable-utils'. + + Bug #84448 + + Makefile.am | 6 +----- + utils/Makefile.am | 4 ++++ + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit c54f6aceed983a221d88ce5c21becbf8aab2931b +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Mon Sep 29 21:42:46 2014 +0200 + + use alt colorspace to get CMYK values for an ICC based CMYK colorspace + + The reason for the pale image is that GfxICCBasedColorSpace::getCMYK() + uses the cms transformation to get RGB values and the convert it + back to CMYK even for a ICC based CMYK colorspace instead of just + returning the CMYK values itself. + + Bug #79019 + + poppler/GfxState.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 21b5fd655ce45b90668d1416d21c526ab7eb3ad6 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Sep 14 11:20:23 2014 +0200 + + Refactor Makefiles to build a noinst library for parsing args + + Prevents this automake warning about possible forward-incompatibility: + + $ ./autogen.sh + ... + cpp/tests/Makefile.am:16: warning: source file + '$(top_srcdir)/utils/parseargs.cc' is in a subdirectory, + cpp/tests/Makefile.am:16: but option 'subdir-objects' is disabled + automake: warning: possible forward-incompatibility. + automake: At least a source file is in a subdirectory, but the + 'subdir-objects' + automake: automake option hasn't been enabled. For now, the + corresponding output + automake: object file(s) will be placed in the top-level directory. + However, + automake: this behaviour will change in future Automake versions: + they will + automake: unconditionally cause object files to be placed in the + same subdirectory + automake: of the corresponding sources. + automake: You are advised to start using 'subdir-objects' option + throughout your + automake: project, to avoid future incompatibilities. + cpp/tests/Makefile.am:20: warning: source file + '$(top_srcdir)/utils/parseargs.cc' is in a subdirectory, + cpp/tests/Makefile.am:20: but option 'subdir-objects' is disabled + parallel-tests: installing './test-driver' + test/Makefile.am:58: warning: source file '../utils/parseargs.cc' + is in a subdirectory, + test/Makefile.am:58: but option 'subdir-objects' is disabled + + $ automake --version + automake (GNU automake) 1.14.1 + ... + + https://bugs.freedesktop.org/show_bug.cgi?id=83839 + + cpp/tests/Makefile.am | 3 +-- + test/Makefile.am | 8 ++++---- + utils/.gitignore | 2 ++ + utils/Makefile.am | 42 ++++++++++++++++++------------------------ + 4 files changed, 25 insertions(+), 30 deletions(-) + +commit 70a851b0cc58241d1f2f6bc48af2614595326c8f +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Sep 6 21:16:04 2014 +0930 + + Update .gitignore + + .gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit d44e7e3560bdc79253df98db05385dce3e8ccbb4 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Sep 6 21:53:21 2014 +0930 + + Don't use -fPIC on mingw + + it emits a warning for every file stating that -fPIC is ignored + + configure.ac | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 2723371b2e2f7684301ea1c5272ab49851f28c03 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Sep 6 21:19:46 2014 +0930 + + make autogen.sh work with variables with spaces + + eg ./autogen.sh CXXFLAGS="-O0 -g3" + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ebc814a7e31511308bbcd8856d0356f4d7cc74be +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Sep 14 11:45:12 2014 +0200 + + Add compile to .gitignore + + Automake automatically creates a wrapper script called 'compile' for + compilers which do not understand '-c -o'. + + $ automake --version + automake (GNU automake) 1.14.1 + + https://bugs.freedesktop.org/show_bug.cgi?id=83840 + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 8ce31485faa26994c52f4d032cc5a8355aba23d1 +Merge: 4589ce1 303287e +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Sep 26 00:40:43 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit 303287ebdad0de9fb2655c4d7eab627c0045ea04 Author: Thomas Freitag <Thomas.Freitag@alfa.de> Date: Fri Sep 26 00:25:38 2014 +0200 @@ -20,6 +618,24 @@ Date: Fri Sep 12 19:22:20 2014 +0200 glib/poppler-input-stream.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) +commit 4589ce17caf94e7c5fa856906d3a8cc08e999d73 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Sep 12 19:22:20 2014 +0200 + + glib: Fix use of uninitialized members in PopplerInputStream + + https://bugs.freedesktop.org/show_bug.cgi?id=82630 + + glib/poppler-input-stream.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit fe67324d450c356b7c876cf50da705156112513a +Merge: e62e18e f74a596 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Aug 21 21:39:52 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit f74a5964078224c01bd5642aabc928d185bb0b69 Author: Albert Astals Cid <aacid@kde.org> Date: Thu Aug 21 20:07:54 2014 +0200 @@ -53,6 +669,80 @@ Date: Thu Aug 21 19:58:35 2014 +0200 goo/gfile.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) +commit e62e18e1b318d6fa664d236723de3c06ae43e86b +Author: Jehan Pagès <jehan@zemarmot.net> +Date: Tue Aug 12 21:05:03 2014 +0200 + + poppler: use poppler-data pkg-config for both cmake and autotools + builds + + CMakeLists.txt | 16 ++++++++++++++++ + config.h.cmake | 2 +- + configure.ac | 7 ++++++- + 3 files changed, 23 insertions(+), 2 deletions(-) + +commit 572c60764bbbd2080bfd7a926c646ad20b467aea +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Aug 12 18:12:45 2014 +0200 + + Makefile.am cleanups + + Bug #79411 + + configure.ac | 13 +++-- + cpp/Makefile.am | 66 +++++++++++++------------ + cpp/tests/Makefile.am | 13 ++--- + fofi/Makefile.am | 6 +-- + glib/Makefile.am | 29 ++++++----- + glib/demo/Makefile.am | 18 +++---- + glib/reference/Makefile.am | 3 +- + goo/Makefile.am | 38 +++++++-------- + poppler/Makefile.am | 118 + ++++++++++++++++++++++----------------------- + qt4/demos/Makefile.am | 59 +++++++++++------------ + qt4/src/Makefile.am | 31 ++++++------ + qt4/tests/Makefile.am | 97 +++++++++++++------------------------ + qt5/demos/Makefile.am | 59 +++++++++++------------ + qt5/src/Makefile.am | 27 ++++++----- + qt5/tests/Makefile.am | 98 ++++++++++++++----------------------- + splash/Makefile.am | 42 ++++++++-------- + test/Makefile.am | 68 +++++++++----------------- + utils/Makefile.am | 97 ++++++++++++++++++------------------- + 18 files changed, 405 insertions(+), 477 deletions(-) + +commit 4a4fe80d85a31b10822c7cd8eb5a0698bf306a52 +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Aug 1 07:16:36 2014 +0200 + + glib-demo: Replace use of deprecated gtk stock items + + https://bugs.freedesktop.org/show_bug.cgi?id=82384 + + glib/demo/annots.c | 8 ++++---- + glib/demo/attachments.c | 4 ++-- + glib/demo/main.c | 6 +++--- + glib/demo/page.c | 6 +++--- + glib/demo/utils.c | 4 ++-- + 5 files changed, 14 insertions(+), 14 deletions(-) + +commit ec6bad36cf5e9521f35285a3295976c05a69f76a +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Aug 1 07:51:10 2014 +0200 + + glib-demo: Remove use of deprecated gtk_dialog_get_action_area() + + https://bugs.freedesktop.org/show_bug.cgi?id=82385 + + glib/demo/main.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit b72a534d6c7d8bc026812b68f9d9ac6bf9a2200a +Merge: f2e4154 ef3f758 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 3 01:06:57 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit ef3f7585fac086de0919aa0bb0ef91a5070ac23e Author: Jiri Slaby <jirislaby@gmail.com> Date: Sun Aug 3 01:05:00 2014 +0200 @@ -81,6 +771,19 @@ Date: Sun Aug 3 01:01:35 2014 +0200 poppler/SplashOutputDev.cc | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) +commit f2e4154eff52b86e62490a3ccba470824c9cf436 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Sat Jul 26 00:12:37 2014 +0200 + + pdfseparate: additonal handling for annotations + + Bug #77549 + + poppler/PDFDoc.cc | 46 ++++++++++++++++++++++++++++------------------ + poppler/PDFDoc.h | 6 +++--- + utils/pdfunite.cc | 2 +- + 3 files changed, 32 insertions(+), 22 deletions(-) + commit e7825f7cbbe7cc9c324fcb34c2e0dcae75f4172a Author: Carlos Garcia Campos <carlosgc@gnome.org> Date: Fri Jul 25 15:45:55 2014 +0200 @@ -90,6 +793,15 @@ Date: Fri Jul 25 15:45:55 2014 +0200 glib/poppler-page.cc | 4 ++++ 1 file changed, 4 insertions(+) +commit b729bf92ea1522a1eed9579e53e7580215cb9555 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 25 15:45:55 2014 +0200 + + glib: Fix a memory leak when getting text layout and attributes + + glib/poppler-page.cc | 4 ++++ + 1 file changed, 4 insertions(+) + commit a1ecff0f0ab81fe76f63244250d96e7ef275f402 Author: Carlos Garcia Campos <carlosgc@gnome.org> Date: Fri Jul 25 11:25:42 2014 +0200 @@ -112,6 +824,28 @@ Date: Thu Jul 24 19:47:22 2014 +0200 poppler/Annot.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) +commit f302864ed354b313ec39433f65ca3b107b55789d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 25 11:25:42 2014 +0200 + + glib: Return NULL in poppler_annot_get_contents also for empty strings + + glib/poppler-annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 13a5c5f4b61d05f2d18f94ad15e210a47021a576 +Author: Anuj Khare <khareanuj18@gmail.com> +Date: Thu Jul 24 19:47:22 2014 +0200 + + annots: Fix a crash when adding annot without contents + + Having no content in an annotation results in a crash when generating + its appearance, since the contents pointer is dereferenced. + For consistency, the same has been done in Annot::initialize. + + poppler/Annot.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + commit 94ea9d8e1631abfbb8cc078100942d46b1356970 Author: Carlos Garcia Campos <carlosgc@gnome.org> Date: Thu Jul 24 10:46:17 2014 +0200 @@ -127,6 +861,42 @@ Date: Thu Jul 24 10:46:17 2014 +0200 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 33 deletions(-) +commit 02c127b355bb8a98684a5d0af063c60b8bfd09dd +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 24 10:46:17 2014 +0200 + + cairo: Make sure we always push a transparency group in + setSoftMaskFromImageMask() + + Because that's what unsetSoftMaskFromImageMask() assumes. + + https://bugs.freedesktop.org/show_bug.cgi?id=81624 + + poppler/CairoOutputDev.cc | 64 + +++++++++++++++++++++++------------------------ + 1 file changed, 31 insertions(+), 33 deletions(-) + +commit c841a703c4c1750fd7ac0d04c6c3e7d4af80b8fa +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jul 21 00:29:28 2014 +0200 + + Improve Overprintmode and shadings + + Bug #80998 + + poppler/SplashOutputDev.cc | 6 ++++-- + poppler/SplashOutputDev.h | 8 +++++++- + splash/Splash.cc | 24 ++++++++++++++++++++++-- + splash/SplashPattern.h | 6 +++++- + 4 files changed, 38 insertions(+), 6 deletions(-) + +commit ce782112746f629a8e7be6f2daf6ece6ab19917d +Merge: 2c0cb68 26372cf +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jul 20 20:35:13 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit 26372cfae029a1124e042855c58bf5b70f281c76 Author: Ed Porras <ed@moto-research.com> Date: Sun Jul 20 20:33:48 2014 +0200 @@ -179,6 +949,13 @@ Date: Thu Jul 17 07:33:10 2014 +0200 glib/poppler-media.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +commit 2c0cb689910e8579bf428b3999bcac0cb27b0e51 +Merge: 0b639cd 1161e72 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jul 12 17:21:07 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit 1161e728de9ca7c9a5fb0e24c4a5e4a79c65a849 Author: Thomas Freitag <Thomas.Freitag@alfa.de> Date: Sat Jul 12 17:04:42 2014 +0200 @@ -200,6 +977,13 @@ Date: Sat Jul 12 08:35:45 2014 +0200 poppler/poppler-config.h.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) +commit 0b639cd2ac1071f5b741031a78d8e2bc18d2b7d7 +Merge: bb16c71 a5ad55b +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 11 00:32:46 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit a5ad55b7cb9dc4e62754954291e4ecb8e05b5d67 Author: Albert Astals Cid <aacid@kde.org> Date: Fri Jul 11 00:32:07 2014 +0200 @@ -246,6 +1030,25 @@ Date: Thu May 29 16:58:55 2014 +0200 poppler/poppler-config.h.in | 2 ++ 1 file changed, 2 insertions(+) +commit bb16c7162c73b871e26f508823c0ee259b7e5420 +Author: Hib Eris <hib@hiberis.nl> +Date: Sat Jun 7 12:00:52 2014 +0200 + + Move automake version check from autogen.sh to configure.ac + + https://bugs.freedesktop.org/show_bug.cgi?id=79797 + + autogen.sh | 18 ------------------ + configure.ac | 2 +- + 2 files changed, 1 insertion(+), 19 deletions(-) + +commit 74c72223cf609e7c24594f95cab6f9865ad562ac +Merge: f8f7b3a 47a947f +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 11 00:23:04 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit 47a947f1dc664793a7037888a46a297a46c79d6c Author: Hib Eris <hib@hiberis.nl> Date: Thu Jun 19 10:11:21 2014 +0200 @@ -257,6 +1060,13 @@ Date: Thu Jun 19 10:11:21 2014 +0200 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +commit f8f7b3a61bc7eb1e569c25a630b5e127b5dcae62 +Merge: 805ff76 aa6205d +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jul 9 00:23:22 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit aa6205d195c56a77e897bad125bf213aba138422 Author: Jason Crain <jason@aquaticape.us> Date: Mon Jul 7 23:52:39 2014 -0500 @@ -271,6 +1081,17 @@ Date: Mon Jul 7 23:52:39 2014 -0500 configure.ac | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) +commit 805ff76112ebfd57276ea78f1f0891abc61a6c03 +Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> +Date: Mon Apr 11 16:26:11 2011 -0500 + + Do not dist gir_DATA + + See https://bugzilla.gnome.org/show_bug.cgi?id=621611 for rationale. + + glib/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + commit e5862155b1c549b6774bb4f25c09c45857ff1734 Author: Hib Eris <hib@hiberis.nl> Date: Wed Jun 4 20:58:56 2014 +0200 @@ -372,6 +1193,13 @@ Date: Thu Jun 19 19:57:31 2014 +0200 utils/pdftohtml.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) +commit 8a5e59c6ea7ccd0ecbdb4b37bf3fe4e74e1c0e8e +Merge: 1b70533 310fbee +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 18 00:37:03 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit 310fbeec692b02d555e3e8dd6c851be11b25e26a Author: Albert Astals Cid <aacid@kde.org> Date: Wed Jun 18 00:31:48 2014 +0200 @@ -413,6 +1241,156 @@ Date: Wed Jun 18 00:31:48 2014 +0200 poppler/Lexer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +commit 1b705331019b155f2138d4b9f5a5bd03ec59193d +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 17:07:15 2014 +0200 + + [glib] doc: Move poppler_date_parse to utility functions section + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-docs.sgml | 1 + + glib/reference/poppler-sections.txt | 7 ++++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit d661553b0a13855aa5a1240e9c04a0e49dafd910 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 16:11:26 2014 +0200 + + [glib] doc: Document PopplerFindFlags:POPPLER_FIND_DEFAULT + + Fixes warning: + DOC Building XML + ../../glib/poppler.h:157: warning: Value description for + PopplerFindFlags::POPPLER_FIND_DEFAULT is missing in source code + comment + block. + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/poppler.h | 1 + + 1 file changed, 1 insertion(+) + +commit 237a1402ab836d10eb5fdc1aa6ceccabea10a316 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 16:07:14 2014 +0200 + + [glib] doc: Use <emphasis> instead of <em> + + Fixes: + DOC Building HTML + Element em in namespace '' encountered in para, but no template + matches. + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/poppler-structure-element.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 66abf3992228be2559542e9d2753f45f06ae7728 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 16:02:01 2014 +0200 + + [glib] doc: Add PopplerBackend documentation + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/poppler.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit a30ec8e4abe3875aad068c83265b47f9beea33d1 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 15:05:52 2014 +0200 + + [glib] doc: Add missing POPPLER_TYPE_POINT + + And while we are here, also move poppler_point_get_type() and + poppler_quadrilateral_get_type() to private subsection. + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 6eb0537ac5163356c8e8f689d2408fa695e99423 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 14:59:15 2014 +0200 + + [glib] doc: Fix typo + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 96adcad85d76409cb8ed4266a08ae776b42661e4 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 14:53:42 2014 +0200 + + [glib] doc: Add poppler_annot_set_flags() to documentation + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 1 + + 1 file changed, 1 insertion(+) + +commit f3519352c70537009cc6bd660c0bd3e727db8b8a +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 14:38:13 2014 +0200 + + [glib] doc: Move PopplerFindFlags to PopplerPage section + + And also add the missing POPPLER_TYPE_FIND_FLAGS and + poppler_find_flags_get_type. + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 45b0d49330d9d089b2480b91e418924a490c82ce +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 14:22:28 2014 +0200 + + [glib] doc: Move PopplerPrintFlags to PopplerPage section + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ce357147d17004a2772ca3b32d106da511bba360 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 13:22:51 2014 +0200 + + [glib] doc: Move poppler_get_{version, backend} documentation to + features section + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 1bfd6b69e7e98d4b3e6e891a46b58c9109b8c14c +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Jun 8 12:57:25 2014 +0200 + + [glib] doc: Move PopplerColor documentation to it's own section + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/poppler-page.cc | 6 ++++++ + glib/reference/poppler-docs.sgml | 1 + + glib/reference/poppler-sections.txt | 21 +++++++++++++++------ + 3 files changed, 22 insertions(+), 6 deletions(-) + +commit 2dd9b95fd910023a7d9d23f2c2e41dcab91d3c31 +Merge: fed71eb b36d27b +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 6 21:43:49 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit b36d27b42417d15866a5729409e39d6f7c2b0289 Author: Hib Eris <hib@hiberis.nl> Date: Fri Jun 6 21:42:10 2014 +0200 @@ -424,6 +1402,32 @@ Date: Fri Jun 6 21:42:10 2014 +0200 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +commit fed71ebd8e43e24eace9dcebe24bd318ff3d04a6 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu May 29 13:22:05 2014 +0200 + + Change pagenum arguments in PDFDoc::markAnnotations from Guint to int + + Bug #79410 + Fixes compile warning: + + CXX PDFDoc.lo + PDFDoc.cc: In member function 'GBool PDFDoc::markAnnotations(Object*, + XRef*, XRef*, Guint, Guint, Guint)': + PDFDoc.cc:1607:40: warning: comparison between signed and unsigned + integer expressions [-Wsign-compare] + if (obj2.getRef().num == oldPageNum) { + ^ + PDFDoc.cc:1617:47: warning: comparison between signed and unsigned + integer expressions [-Wsign-compare] + } else if (obj2.getRef().num == newPageNum) { + + https://bugs.freedesktop.org/show_bug.cgi?id=79410 + + poppler/PDFDoc.cc | 4 ++-- + poppler/PDFDoc.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + commit f5e702060a84362bfdf75260531920d4ba8b7333 Author: Pino Toscano <pino@kde.org> Date: Sat May 24 15:59:42 2014 +0200 @@ -447,6 +1451,33 @@ Date: Fri May 23 20:05:41 2014 +0200 qt5/src/Doxyfile | 2 +- 6 files changed, 17 insertions(+), 5 deletions(-) +commit 93373cd113d046b65538fe983b46842d689a2112 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 11 18:31:10 2014 +0200 + + Qt: Add a new page->annotations() call that let's you specify subtypes + + This way we don't return annotations you may not be interested in + + qt4/src/poppler-annotation-private.h | 4 +-- + qt4/src/poppler-annotation.cc | 48 + ++++++++++++++++++++++++++++++++++-- + qt4/src/poppler-page.cc | 7 +++++- + qt4/src/poppler-qt4.h | 14 +++++++++++ + qt5/src/poppler-annotation-private.h | 4 +-- + qt5/src/poppler-annotation.cc | 48 + ++++++++++++++++++++++++++++++++++-- + qt5/src/poppler-page.cc | 7 +++++- + qt5/src/poppler-qt5.h | 15 +++++++++++ + 8 files changed, 137 insertions(+), 10 deletions(-) + +commit d2892cd893e4379914a08e66682ed5c423743a41 +Merge: 0844220 7e9fc61 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 7 22:27:41 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit 7e9fc61e287889eefd6b08ef5991d31fed79cafd Author: Albert Astals Cid <aacid@kde.org> Date: Wed May 7 22:25:59 2014 +0200 @@ -461,6 +1492,13 @@ Date: Wed May 7 22:25:59 2014 +0200 configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) +commit 0844220347f984c3d9b04fe53e690ee0e8c74afe +Merge: 84278d8 0a6c1ff +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 7 21:56:07 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit 0a6c1ff777aa23c7a5654b313b639e66600883b9 Author: Thomas Freitag <Thomas.Freitag@alfa.de> Date: Wed May 7 21:54:46 2014 +0200 @@ -475,6 +1513,13 @@ Date: Wed May 7 21:54:46 2014 +0200 utils/pdfunite.cc | 9 +++- 3 files changed, 162 insertions(+), 4 deletions(-) +commit 84278d8adbb1f6e9a28588fcb4db30c9ef70adde +Merge: 7b94b11 5b2cdef +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 4 22:21:25 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit 5b2cdef49a8a0a92fd323fbe45841a5098a42ece Author: Olly Betts <olly@survex.com> Date: Sun May 4 22:20:30 2014 +0200 @@ -486,6 +1531,13 @@ Date: Sun May 4 22:20:30 2014 +0200 poppler/GfxFont.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) +commit 7b94b119f07713af7b8b9f1ac3ea3f1d35c1e240 +Merge: c859d2b bae836c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 4 16:21:24 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + commit bae836cd3dd3511ca9cf4745626142334bafd1a6 Author: Marek Kasik <mkasik@redhat.com> Date: Sun May 4 16:20:33 2014 +0200 @@ -512,6 +1564,17 @@ Date: Wed Apr 30 09:25:31 2014 +0200 glib/poppler-structure-element.h | 3 --- 1 file changed, 3 deletions(-) +commit c859d2b891a115c79d04db14463791dfb1c46a20 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Apr 30 09:25:31 2014 +0200 + + glib: Fix multiple definition of PopplerTextSpan + + https://bugs.freedesktop.org/show_bug.cgi?id=78103 + + glib/poppler-structure-element.h | 3 --- + 1 file changed, 3 deletions(-) + commit 9a68daee2b3c7f8a992ee47c0e9ac78b346d4348 Author: Albert Astals Cid <aacid@kde.org> Date: Fri Apr 25 01:01:08 2014 +0200 diff --git a/Build/source/libs/poppler/poppler-0.26.5/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.28.0/ConfigureChecks.cmake index d3f57325720..d3f57325720 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/ConfigureChecks.cmake +++ b/Build/source/libs/poppler/poppler-0.28.0/ConfigureChecks.cmake diff --git a/Build/source/libs/poppler/poppler-0.26.5/INSTALL b/Build/source/libs/poppler/poppler-0.28.0/INSTALL index 56b077d6a0b..56b077d6a0b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/INSTALL +++ b/Build/source/libs/poppler/poppler-0.28.0/INSTALL diff --git a/Build/source/libs/poppler/poppler-0.26.5/Makefile.am b/Build/source/libs/poppler/poppler-0.28.0/Makefile.am index e7e5bace9d4..691512f4e3a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.28.0/Makefile.am @@ -31,11 +31,7 @@ cpp_subdir = cpp cpp_pc_file = poppler-cpp.pc endif -if BUILD_UTILS -utils_subdir = utils -endif - -SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir) +SUBDIRS = goo fofi $(splash_subdir) poppler utils $(glib_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir) EXTRA_DIST = \ README-XPDF \ diff --git a/Build/source/libs/poppler/poppler-0.26.5/NEWS b/Build/source/libs/poppler/poppler-0.28.0/NEWS index 7f9822f8252..97b94c8a8b8 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/NEWS +++ b/Build/source/libs/poppler/poppler-0.28.0/NEWS @@ -1,9 +1,45 @@ -Release 0.26.5 +Release 0.28.0 core: - * Fix rendering of broken file with a wrong embedded font. Bug #84270 + * Fix rendering of file with a wrong embedded font. Bug #84270 + * Use alt colorspace to get CMYK values for an ICC based CMYK colorspace. Bug #79019 + * Map Standard/Expert encoding ligatures to AGLFN names. Bug #80093 + * Make Attribute::getName() work when UTF-16BE is used. Bug #84722 + * Fix memory leak in Dict::remove. Bug #84607 + * Fix crashes in broken files + * SplashOutputDev: Improve Overprintmode and shadings. Bug #80998 + * CairoOutputDev: fix crash when no group color space. Bug #85137 + * CairoOutputDev: Don't render text when text matrix is not invertable. Bug #78042 + * CairoOutputDev: Only embed mime data for gray/rgb/cmyk colorspaces. Bug #80719 + * CairoOutputDev: Only embed mime data if image decode map is identity + * cairo: Use matrix to determine pattern size. Bug #33364 + * Fix compile warnings + * regression test improvements glib: * Fix use of uninitialized members in PopplerInputStream. Bug #82630 + * Documentation improvements + * Do not dist gir_DATA + * Remove use of GTK deprecated functions. Bug #82384. Bug #82385 + * Build introspection linking to the uninstalled libraries. Big #84526 + + qt4: + * Add a new Page::annotations() that let's you specify subtypes + + qt5: + * Add a new Page::annotations() that let's you specify subtypes + + utils: + * pdfseparate: additonal handling for annotations. Bug #77549 + * pdfdetach: fix crash when getPage() returns null. Bug #85145 + * pdftocairo: Add support for printing to a Windows printer. Bug #79936 + + build system: + * Move automake version check from autogen.sh to configure.ac. Bug #79797 + * Makefile.am cleanups. Bug #79411 + * Use poppler-data pkg-config + * Make autogen.sh work with variables with spaces + * Don't use -fPIC on mingw + * Fix build with --disable-utils. Bug #84448 Release 0.26.4 core: diff --git a/Build/source/libs/poppler/poppler-0.26.5/README b/Build/source/libs/poppler/poppler-0.28.0/README index fa223900fbf..fa223900fbf 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/README +++ b/Build/source/libs/poppler/poppler-0.28.0/README diff --git a/Build/source/libs/poppler/poppler-0.26.5/README-XPDF b/Build/source/libs/poppler/poppler-0.28.0/README-XPDF index e97791ce5b2..e97791ce5b2 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/README-XPDF +++ b/Build/source/libs/poppler/poppler-0.28.0/README-XPDF diff --git a/Build/source/libs/poppler/poppler-0.26.5/TODO b/Build/source/libs/poppler/poppler-0.28.0/TODO index e067c2a3156..e067c2a3156 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/TODO +++ b/Build/source/libs/poppler/poppler-0.28.0/TODO diff --git a/Build/source/libs/poppler/poppler-0.26.5/config.h.cmake b/Build/source/libs/poppler/poppler-0.28.0/config.h.cmake index b707ba72249..8ed1c92248e 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/config.h.cmake +++ b/Build/source/libs/poppler/poppler-0.28.0/config.h.cmake @@ -169,7 +169,7 @@ #define PACKAGE_VERSION "${POPPLER_VERSION}" /* Poppler data dir */ -#define POPPLER_DATADIR "${CMAKE_INSTALL_PREFIX}/share/poppler" +#define POPPLER_DATADIR "${POPPLER_DATADIR}" /* Support for curl based doc builder is compiled in. */ #cmakedefine POPPLER_HAS_CURL_SUPPORT 1 diff --git a/Build/source/libs/poppler/poppler-0.26.5/config.h.in b/Build/source/libs/poppler/poppler-0.28.0/config.h.in index 12fb1a09ec6..12fb1a09ec6 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/config.h.in +++ b/Build/source/libs/poppler/poppler-0.28.0/config.h.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/configure.ac b/Build/source/libs/poppler/poppler-0.28.0/configure.ac index 5f2a424a320..df8b5d562f5 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/configure.ac +++ b/Build/source/libs/poppler/poppler-0.28.0/configure.ac @@ -1,12 +1,12 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[26]) -m4_define([poppler_version_micro],[5]) +m4_define([poppler_version_minor],[28]) +m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) AC_PREREQ(2.59) AC_INIT([poppler],[poppler_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=poppler]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([1.7 foreign]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([config.h poppler/poppler-config.h]) AC_C_BIGENDIAN @@ -48,7 +48,7 @@ case "$host_os" in ;; mingw*) os_win32=yes - win32_libs="-lgdi32" + win32_libs="-lgdi32 -lwinspool -lcomdlg32" create_shared_lib="-no-undefined" auto_import_flags="-Wl,--enable-auto-import" @@ -105,7 +105,12 @@ if test x$enable_relocatable = xyes; then fi fi -AC_DEFINE_DIR(POPPLER_DATADIR, "{datarootdir}/poppler", [Poppler data dir]) +dnl ##### Check for installed poppler-data. Use the same datarootdir as default otherwise. +PKG_CHECK_EXISTS(poppler-data, + [POPPLER_DATADIR=`$PKG_CONFIG --variable=poppler_datadir poppler-data` + AC_DEFINE_DIR(POPPLER_DATADIR, "{POPPLER_DATADIR}", [Poppler data dir])], + [AC_DEFINE_DIR(POPPLER_DATADIR, "{datarootdir}/poppler", [Poppler data dir])] + ) dnl ##### Checks for header files. AC_PATH_XTRA @@ -465,6 +470,7 @@ fi CAIRO_VERSION="1.10.0" AC_SUBST(CAIRO_VERSION) +CAIRO_DEPS="cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION)" AC_ARG_ENABLE(cairo-output, AC_HELP_STRING([--disable-cairo-output], [Don't build the cairo graphics backend.]), @@ -472,9 +478,9 @@ AC_ARG_ENABLE(cairo-output, enable_cairo_output="try") use_cairo="" if test x$enable_cairo_output = xyes; then - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION) + PKG_CHECK_MODULES(CAIRO, $CAIRO_DEPS) elif test x$enable_cairo_output = xtry; then - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION, + PKG_CHECK_MODULES(CAIRO, $CAIRO_DEPS, [enable_cairo_output="yes"], [enable_cairo_output="no" use_cairo="no (requires cairo >= $CAIRO_VERSION)"]) @@ -699,15 +705,19 @@ fi AM_CONDITIONAL(BUILD_POPPLER_CPP, test "x$enable_poppler_cpp" = "xyes") +GTK_TEST_DEPS='gtk+-3.0 >= 3.8 gdk-pixbuf-2.0' +if test x$enable_cairo_output = xyes; then + GTK_TEST_DEPS="$GTK_TEST_DEPS $CAIRO_DEPS" +fi AC_ARG_ENABLE(gtk-test, AC_HELP_STRING([--disable-gtk-test], [Don't compile GTK+ test program.]), enable_gtk_test=$enableval, enable_gtk_test="try") if test x$enable_gtk_test = xyes; then - PKG_CHECK_MODULES(GTK_TEST, gtk+-3.0 >= 3.8 gdk-pixbuf-2.0) + PKG_CHECK_MODULES(GTK_TEST, $GTK_TEST_DEPS) elif test x$enable_gtk_test = xtry; then - PKG_CHECK_MODULES(GTK_TEST, gtk+-3.0 >= 3.8 gdk-pixbuf-2.0, + PKG_CHECK_MODULES(GTK_TEST, $GTK_TEST_DEPS, [enable_gtk_test="yes"], [enable_gtk_test="no"]) fi @@ -812,7 +822,17 @@ case "$enable_compile_warnings" in -Wmissing-format-attribute -fno-exceptions -fno-check-new \ -fno-common $CXXFLAGS" ;; esac -CXXFLAGS="-fPIC $CXXFLAGS"; + +case "$host_os" in + mingw*) + # mingw prints "warning: -fPIC ignored for target (all code is position independent)" + # for every file + ;; + *) + CXXFLAGS="-fPIC $CXXFLAGS"; + ;; +esac + case `$PKG_CONFIG --version` in 0.?|0.1[0-7]) diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.cc index 86bafd80208..86bafd80208 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiBase.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.h index d613acd2bb1..d613acd2bb1 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiBase.h +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.cc index 5cea6fab7f1..5cea6fab7f1 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiEncodings.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.h index ab80ad362a6..ab80ad362a6 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiEncodings.h +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.cc index be28e2568eb..be28e2568eb 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiIdentifier.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.h index af1323b76d6..af1323b76d6 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiIdentifier.h +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.cc index 456de9026b4..4759186edfe 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiTrueType.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.cc @@ -16,7 +16,7 @@ // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de> // Copyright (C) 2007 Koji Otani <sho@bbr.jp> // Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> -// Copyright (C) 2008, 2009, 2012 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2008, 2009, 2012, 2014 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com> // Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com> @@ -1470,9 +1470,13 @@ void FoFiTrueType::readPostTable() { m = getU8(stringPos, &ok); if (!ok || !checkRegion(stringPos + 1, m)) { stringIdx = savedStringIdx; - ok = gTrue; - nameToGID->removeInt(macGlyphNames[j]); - nameToGID->add(new GooString(macGlyphNames[0]), i); + if (j < 258) { + ok = gTrue; + nameToGID->removeInt(macGlyphNames[j]); + nameToGID->add(new GooString(macGlyphNames[0]), i); + } else { + goto err; + } } else { name = new GooString((char *)&file[stringPos + 1], m); nameToGID->removeInt(name); diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.h index b40a44a8d70..b40a44a8d70 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiTrueType.h +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.cc index 8fa10a016b6..827ebc7d7c3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.cc @@ -16,6 +16,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) 2014 Carlos Garcia Campos <carlosgc@gnome.org> // // 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 @@ -263,7 +264,7 @@ void FoFiType1::parse() { } else { break; } - for (; *p >= '0' && *p < '0' + base; ++p) { + for (; *p >= '0' && *p < '0' + base && code < INT_MAX / (base + (*p - '0')); ++p) { code = code * base + (*p - '0'); } for (; *p == ' ' || *p == '\t'; ++p) ; diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.h index f4e29b4ef0b..f4e29b4ef0b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1.h +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.cc index c4595a3260e..c4595a3260e 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1C.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.h index 698dccd77fd..698dccd77fd 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/FoFiType1C.h +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.28.0/fofi/Makefile.am index c4654dd28b9..4deb7d5e063 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/fofi/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.28.0/fofi/Makefile.am @@ -1,6 +1,3 @@ -INCLUDES = \ - -I$(top_srcdir) - noinst_LTLIBRARIES = libfofi.la if ENABLE_XPDF_HEADERS @@ -26,3 +23,6 @@ libfofi_la_SOURCES = \ FoFiType1C.cc \ FoFiIdentifier.cc \ FoFiType1C.h + +libfofi_la_CPPFLAGS = \ + -I$(top_srcdir) diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.cc index 26b2f0fe890..26b2f0fe890 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/FixedPoint.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.h index 99749802db7..99749802db7 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/FixedPoint.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/GooHash.cc index f4a92f17506..f4a92f17506 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/GooHash.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/GooHash.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.28.0/goo/GooHash.h index eda19e31409..eda19e31409 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/GooHash.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/GooHash.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.28.0/goo/GooLikely.h index 724ccf00870..724ccf00870 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/GooLikely.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/GooLikely.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/GooList.cc index 6ce4952dc6a..6ce4952dc6a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/GooList.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/GooList.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/GooList.h b/Build/source/libs/poppler/poppler-0.28.0/goo/GooList.h index c83a0e36a8a..c83a0e36a8a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/GooList.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/GooList.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.28.0/goo/GooMutex.h index b2714b048c7..b2714b048c7 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/GooMutex.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/GooMutex.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/GooString.cc index 8591d95cd3e..8591d95cd3e 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/GooString.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/GooString.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/GooString.h b/Build/source/libs/poppler/poppler-0.28.0/goo/GooString.h index 0176d873646..0176d873646 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/GooString.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/GooString.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/GooTimer.cc index c766c6bf2e4..c766c6bf2e4 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/GooTimer.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/GooTimer.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.28.0/goo/GooTimer.h index ac64f6b4868..ac64f6b4868 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/GooTimer.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/GooTimer.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.cc index a30d26d89ad..a30d26d89ad 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/ImgWriter.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.h index 8feb3511e4d..8feb3511e4d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/ImgWriter.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.cc index 9b7c5051838..9b7c5051838 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/JpegWriter.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.h index d69bbbb8dda..d69bbbb8dda 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/JpegWriter.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.28.0/goo/Makefile.am index a48b20ec493..370e85021be 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/Makefile.am @@ -24,6 +24,24 @@ poppler_goo_include_HEADERS = \ endif +libgoo_la_SOURCES = \ + gfile.cc \ + gmempp.cc \ + GooHash.cc \ + GooList.cc \ + GooTimer.cc \ + GooString.cc \ + gmem.cc \ + FixedPoint.cc \ + NetPBMWriter.cc \ + PNGWriter.cc \ + JpegWriter.cc \ + TiffWriter.cc \ + ImgWriter.cc \ + gtypes_p.h \ + gstrtod.cc \ + grandom.cc + if BUILD_LIBJPEG libjpeg_includes = $(LIBJPEG_CFLAGS) endif @@ -40,27 +58,9 @@ if BUILD_LIBPNG libpng_includes = $(LIBPNG_CFLAGS) endif -INCLUDES = \ +libgoo_la_CPPFLAGS = \ -I$(top_srcdir) \ $(libjpeg_includes) \ $(libtiff_includes) \ $(libjpeg2000_includes) \ $(libpng_includes) - -libgoo_la_SOURCES = \ - gfile.cc \ - gmempp.cc \ - GooHash.cc \ - GooList.cc \ - GooTimer.cc \ - GooString.cc \ - gmem.cc \ - FixedPoint.cc \ - NetPBMWriter.cc \ - PNGWriter.cc \ - JpegWriter.cc \ - TiffWriter.cc \ - ImgWriter.cc \ - gtypes_p.h \ - gstrtod.cc \ - grandom.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.cc index fca00b26b1a..fca00b26b1a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/NetPBMWriter.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.h index 21a19ee7508..21a19ee7508 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/NetPBMWriter.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.cc index c9d5199d040..c9d5199d040 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/PNGWriter.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.h index 90a298e7ef3..90a298e7ef3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/PNGWriter.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.cc index 316008778b1..316008778b1 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/TiffWriter.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.h index 52fdd53efa5..52fdd53efa5 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/TiffWriter.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/gfile.cc index 3528bb357d8..3528bb357d8 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/gfile.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/gfile.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/gfile.h b/Build/source/libs/poppler/poppler-0.28.0/goo/gfile.h index 1365a9cf2ab..1365a9cf2ab 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/gfile.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/gfile.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/gmem.cc index c1c607ac3f3..c1c607ac3f3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/gmem.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/gmem.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/gmem.h b/Build/source/libs/poppler/poppler-0.28.0/goo/gmem.h index 898f33933f9..898f33933f9 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/gmem.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/gmem.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/gmempp.cc index a70338ca3ce..a70338ca3ce 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/gmempp.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/gmempp.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/grandom.cc index 1237175420b..1237175420b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/grandom.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/grandom.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/grandom.h b/Build/source/libs/poppler/poppler-0.28.0/goo/grandom.h index 45fa791aba8..45fa791aba8 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/grandom.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/grandom.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.28.0/goo/gstrtod.cc index cd1d5b554f7..cd1d5b554f7 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/gstrtod.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/gstrtod.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.28.0/goo/gstrtod.h index e8abdadf53e..e8abdadf53e 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/gstrtod.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/gstrtod.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.28.0/goo/gtypes.h index a8d4519497e..a8d4519497e 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/gtypes.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/gtypes.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.28.0/goo/gtypes_p.h index cc4866e1389..cc4866e1389 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/goo/gtypes_p.h +++ b/Build/source/libs/poppler/poppler-0.28.0/goo/gtypes_p.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/gtk-doc.make b/Build/source/libs/poppler/poppler-0.28.0/gtk-doc.make index e7916563d75..e7916563d75 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/gtk-doc.make +++ b/Build/source/libs/poppler/poppler-0.28.0/gtk-doc.make diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo-uninstalled.pc.in index 2458eb20df8..2458eb20df8 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-cairo-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.cmake index b32f118314b..b32f118314b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-cairo.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.in index 367a5b690bf..367a5b690bf 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-cairo.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp-uninstalled.pc.in index af3640eb2c1..af3640eb2c1 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-cpp-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.cmake index 3f56b3d9d90..3f56b3d9d90 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-cpp.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.in index a7e97c25dfe..a7e97c25dfe 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-cpp.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-glib-uninstalled.pc.in index 5506c4e53ac..5506c4e53ac 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-glib-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-glib-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.cmake index e15e6699a43..e15e6699a43 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-glib.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.in index cd30feb728f..cd30feb728f 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-glib.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4-uninstalled.pc.in index 3a336c6c294..3a336c6c294 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt4-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.cmake index b17fd5d8453..b17fd5d8453 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt4.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.in index 306ae46e0b0..306ae46e0b0 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt4.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5-uninstalled.pc.in index a91e1d5a3bd..a91e1d5a3bd 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt5-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.cmake index b4d87b76675..b4d87b76675 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt5.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.in index cda4c6f80fe..cda4c6f80fe 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-qt5.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-splash-uninstalled.pc.in index 436ecdb8f1b..436ecdb8f1b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-splash-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-splash-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.cmake index cb95b3d2d27..cb95b3d2d27 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-splash.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.in index cf3491fc7cf..cf3491fc7cf 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-splash.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler-uninstalled.pc.in index 6076e80c5b3..6076e80c5b3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.28.0/poppler.pc.cmake index f1aebedbefd..f1aebedbefd 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler.pc.in b/Build/source/libs/poppler/poppler-0.28.0/poppler.pc.in index 8605b28673b..8605b28673b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler.pc.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler.pc.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Annot.cc index d35cb9b2697..d35cb9b2697 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Annot.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Annot.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Annot.h index 8fde6a6736b..8fde6a6736b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Annot.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Annot.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Array.cc index 230c3287683..230c3287683 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Array.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Array.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Array.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Array.h index e78e399baf2..e78e399baf2 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Array.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Array.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.cc index 20a297d6135..20a297d6135 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFont.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.h index bbdd0558e9f..bbdd0558e9f 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFont.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.cc index 5115b7bcf13..5115b7bcf13 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFontTables.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.h index eb45549efd2..eb45549efd2 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/BuiltinFontTables.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/CMap.cc index 6731ab5a1fa..6731ab5a1fa 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CMap.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CMap.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/CMap.h index f4f5a9141c8..f4f5a9141c8 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CMap.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CMap.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.cc index b0ae8388113..b0ae8388113 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CachedFile.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.h index b99ea1ecad4..b99ea1ecad4 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CachedFile.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.cc index 1546594f9ea..4cf8d6b41af 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoFontEngine.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.cc @@ -21,7 +21,7 @@ // Copyright (C) 2006, 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright (C) 2007 Koji Otani <sho@bbr.jp> // Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk> -// Copyright (C) 2008, 2012 Adrian Johnson <ajohnson@redneon.com> +// Copyright (C) 2008, 2012, 2014 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2009 Darren Kenny <darren.kenny@sun.com> // Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> // Copyright (C) 2010 Jan Kümmel <jan+freedesktop@snorc.org> @@ -395,7 +395,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, GfxFontType fontType; GfxFontLoc *fontLoc; char **enc; - char *name; + const char *name; FoFiTrueType *ff; FoFiType1C *ff1c; Ref ref; @@ -457,7 +457,13 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, for (i = 0; i < 256; ++i) { codeToGID[i] = 0; if ((name = enc[i])) { - codeToGID[i] = FT_Get_Name_Index(face, name); + codeToGID[i] = FT_Get_Name_Index(face, (char*)name); + if (codeToGID[i] == 0) { + name = GfxFont::getAlternateName(name); + if (name) { + codeToGID[i] = FT_Get_Name_Index(face, (char*)name); + } + } } } break; diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.h index 8c0dba116d5..8c0dba116d5 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoFontEngine.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.cc index 1c67b5c1c8d..e08fe5cdca8 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.cc @@ -147,6 +147,7 @@ CairoOutputDev::CairoOutputDev() { inUncoloredPattern = gFalse; inType3Char = gFalse; t3_glyph_has_bbox = gFalse; + text_matrix_valid = gTrue; groupColorSpaceStack = NULL; maskStack = NULL; @@ -283,6 +284,8 @@ void CairoOutputDev::restoreState(GfxState *state) { if (cairo_shape) cairo_restore (cairo_shape); + text_matrix_valid = gTrue; + /* These aren't restored by cairo_restore() since we keep them in * the output device. */ updateFillColor(state); @@ -657,11 +660,13 @@ void CairoOutputDev::updateFont(GfxState *state) { */ invert_matrix = matrix; if (cairo_matrix_invert(&invert_matrix)) { - error(errSyntaxWarning, -1, "font matrix not invertible\n"); + error(errSyntaxWarning, -1, "font matrix not invertible"); + text_matrix_valid = gFalse; return; } cairo_set_font_matrix (cairo, &matrix); + text_matrix_valid = gTrue; } /* Tolerance in pixels for checking if strokes are horizontal or vertical @@ -837,11 +842,13 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat cairo_pattern_t *pattern; cairo_surface_t *surface; cairo_matrix_t matrix; + cairo_matrix_t pattern_matrix; cairo_t *old_cairo; double xMin, yMin, xMax, yMax; double width, height; int surface_width, surface_height; StrokePathClip *strokePathTmp; + GBool adjusted_stroke_width_tmp; width = bbox[2] - bbox[0]; height = bbox[3] - bbox[1]; @@ -850,8 +857,18 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat return gFalse; /* TODO: implement the other cases here too */ - surface_width = (int) ceil (width); - surface_height = (int) ceil (height); + // Find the width and height of the transformed pattern + cairo_get_matrix (cairo, &matrix); + cairo_matrix_init (&pattern_matrix, mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); + cairo_matrix_multiply (&matrix, &matrix, &pattern_matrix); + + double widthX = width, widthY = 0; + cairo_matrix_transform_distance (&matrix, &widthX, &widthY); + surface_width = ceil (sqrt (widthX * widthX + widthY * widthY)); + + double heightX = 0, heightY = height; + cairo_matrix_transform_distance (&matrix, &heightX, &heightY); + surface_height = ceil (sqrt (heightX * heightX + heightY * heightY)); surface = cairo_surface_create_similar (cairo_get_target (cairo), CAIRO_CONTENT_COLOR_ALPHA, @@ -862,11 +879,13 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat old_cairo = cairo; cairo = cairo_create (surface); cairo_surface_destroy (surface); + cairo_scale (cairo, surface_width / width, surface_height / height); box.x1 = bbox[0]; box.y1 = bbox[1]; box.x2 = bbox[2]; box.y2 = bbox[3]; strokePathTmp = strokePathClip; strokePathClip = NULL; + adjusted_stroke_width_tmp = adjusted_stroke_width; gfx = new Gfx(doc, this, resDict, &box, NULL, NULL, NULL, gfxA->getXRef()); if (paintType == 2) inUncoloredPattern = gTrue; @@ -875,6 +894,7 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat inUncoloredPattern = gFalse; delete gfx; strokePathClip = strokePathTmp; + adjusted_stroke_width = adjusted_stroke_width_tmp; pattern = cairo_pattern_create_for_surface (cairo_get_target (cairo)); cairo_destroy (cairo); @@ -888,8 +908,7 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat cairo_matrix_init_scale (&matrix, surface_width / width, surface_height / height); cairo_pattern_set_matrix (pattern, &matrix); - cairo_matrix_init (&matrix, mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); - cairo_transform (cairo, &matrix); + cairo_transform (cairo, &pattern_matrix); cairo_set_source (cairo, pattern); cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); if (strokePathClip) { @@ -1250,10 +1269,8 @@ void CairoOutputDev::endString(GfxState *state) // ignore empty strings and invisible text -- this is used by // Acrobat Capture render = state->getRender(); - if (render == 3 || glyphCount == 0) { - gfree(glyphs); - glyphs = NULL; - return; + if (render == 3 || glyphCount == 0 || !text_matrix_valid) { + goto finish; } if (!(render & 1)) { @@ -1305,6 +1322,7 @@ void CairoOutputDev::endString(GfxState *state) } } +finish: gfree (glyphs); glyphs = NULL; if (use_show_text_glyphs) { @@ -1620,7 +1638,7 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha, cairo_t *maskCtx = cairo_create(source); //XXX: hopefully this uses the correct color space */ - if (!alpha) { + if (!alpha && groupColorSpaceStack->cs) { GfxRGB backdropColorRGB; groupColorSpaceStack->cs->getRGB(backdropColor, &backdropColorRGB); /* paint the backdrop */ @@ -2571,7 +2589,7 @@ void CairoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *s cairo_surface_mark_dirty (image); - setMimeData(str, ref, image); + setMimeData(state, str, ref, colorMap, image); pattern = cairo_pattern_create_for_surface (image); cairo_surface_destroy (image); @@ -2674,24 +2692,60 @@ GBool CairoOutputDev::getStreamData (Stream *str, char **buffer, int *length) return gTrue; } -void CairoOutputDev::setMimeData(Stream *str, Object *ref, cairo_surface_t *image) +static GBool colorMapHasIdentityDecodeMap(GfxImageColorMap *colorMap) +{ + for (int i = 0; i < colorMap->getNumPixelComps(); i++) { + if (colorMap->getDecodeLow(i) != 0.0 || colorMap->getDecodeHigh(i) != 1.0) + return gFalse; + } + return gTrue; +} + +void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref, + GfxImageColorMap *colorMap, cairo_surface_t *image) { char *strBuffer; int len; Object obj; + GfxColorSpace *colorSpace; if (!printing || !(str->getKind() == strDCT || str->getKind() == strJPX)) return; + str->getDict()->lookup("ColorSpace", &obj); + colorSpace = GfxColorSpace::parse(&obj, this, state); + obj.free(); + // colorspace in stream dict may be different from colorspace in jpx // data - if (str->getKind() == strJPX) { - GBool hasColorSpace = !str->getDict()->lookup("ColorSpace", &obj)->isNull(); - obj.free(); - if (hasColorSpace) - return; + if (str->getKind() == strJPX && colorSpace) + return; + + // only embed mime data for gray, rgb, and cmyk colorspaces. + if (colorSpace) { + GfxColorSpaceMode mode = colorSpace->getMode(); + delete colorSpace; + switch (mode) { + case csDeviceGray: + case csCalGray: + case csDeviceRGB: + case csCalRGB: + case csDeviceCMYK: + case csICCBased: + break; + + case csLab: + case csIndexed: + case csSeparation: + case csDeviceN: + case csPattern: + return; + } } + if (!colorMapHasIdentityDecodeMap(colorMap)) + return; + if (getStreamData (str->getNextStream(), &strBuffer, &len)) { cairo_status_t st; @@ -2909,7 +2963,7 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, filter = getFilterForSurface (image, interpolate); if (!inlineImg) /* don't read stream twice if it is an inline image */ - setMimeData(str, ref, image); + setMimeData(state, str, ref, colorMap, image); pattern = cairo_pattern_create_for_surface (image); cairo_surface_destroy (image); diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.h index 28f97fdda32..8de391ae72b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.h @@ -276,7 +276,8 @@ protected: cairo_filter_t getFilterForSurface(cairo_surface_t *image, GBool interpolate); GBool getStreamData (Stream *str, char **buffer, int *length); - void setMimeData(Stream *str, Object *ref, cairo_surface_t *image); + void setMimeData(GfxState *state, Stream *str, Object *ref, + GfxImageColorMap *colorMap, cairo_surface_t *image); void fillToStrokePathClip(GfxState *state); void alignStrokeCoords(GfxSubpath *subpath, int i, double *x, double *y); @@ -315,6 +316,7 @@ protected: GBool needFontUpdate; // set when the font needs to be updated GBool printing; GBool use_show_text_glyphs; + GBool text_matrix_valid; cairo_surface_t *surface; cairo_glyph_t *glyphs; int glyphCount; diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.cc index 3c96f45e5d3..3c96f45e5d3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoRescaleBox.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.h index 072e8a9c80c..072e8a9c80c 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CairoRescaleBox.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Catalog.cc index 039f63e1895..039f63e1895 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Catalog.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Catalog.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Catalog.h index bc9ce20b098..bc9ce20b098 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Catalog.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Catalog.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.cc index 59b7c93e66f..59b7c93e66f 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CharCodeToUnicode.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.h index 1672105a8f4..1672105a8f4 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CharCodeToUnicode.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/CharTypes.h index d0df630d0c9..d0df630d0c9 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CharTypes.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CharTypes.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/CompactFontTables.h index cfbfdaf5752..cfbfdaf5752 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CompactFontTables.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CompactFontTables.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.cc index af4c2b60322..af4c2b60322 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CurlCachedFile.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.h index 49882aba8ac..49882aba8ac 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CurlCachedFile.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.cc index 5b02b14a784..5b02b14a784 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CurlPDFDocBuilder.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.h index fb34862057c..fb34862057c 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/CurlPDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.cc index bfdb0eaf80a..bfdb0eaf80a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/DCTStream.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.h index bc20a7aaab6..bc20a7aaab6 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/DCTStream.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.cc index 563204a1743..563204a1743 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/DateInfo.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.h index 116350f4134..116350f4134 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/DateInfo.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.cc index ba44f959c31..ba44f959c31 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Decrypt.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.h index 10a6386c6b5..10a6386c6b5 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Decrypt.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Dict.cc index 4cf42dcd2c1..c2a94f4a1fa 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Dict.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Dict.cc @@ -16,10 +16,11 @@ // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com> // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com> // Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org> -// Copyright (C) 2008, 2010, 2013 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2008, 2010, 2013, 2014 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2010 PaweÅ‚ Wiejacha <pawel.wiejacha@gmail.com> // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it> // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2014 Scott West <scott.gregory.west@gmail.com> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -198,6 +199,8 @@ void Dict::remove(const char *key) { const int pos = binarySearch(key, entries, length); if (pos != -1) { length -= 1; + gfree(entries[pos].key); + entries[pos].val.free(); if (pos != length) { memmove(&entries[pos], &entries[pos + 1], (length - pos) * sizeof(DictEntry)); } @@ -220,6 +223,8 @@ void Dict::remove(const char *key) { return; } //replace the deleted entry with the last entry + gfree(entries[i].key); + entries[i].val.free(); length -= 1; tmp = entries[length]; if (i!=length) //don't copy the last entry if it is deleted diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Dict.h index fba99edc513..fba99edc513 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Dict.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Dict.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Error.cc index 99ca3ad3f53..99ca3ad3f53 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Error.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Error.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Error.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Error.h index 9e11733d803..9e11733d803 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Error.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Error.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/ErrorCodes.h index b28528df564..b28528df564 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/ErrorCodes.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/ErrorCodes.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.cc index bac1eaea0d7..bac1eaea0d7 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/FileSpec.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.h index 9f2f6fcd131..9f2f6fcd131 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/FileSpec.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.cc index 7990dadd821..7990dadd821 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/FlateStream.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.h index 9e3835f042a..9e3835f042a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/FlateStream.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.cc index 6ebef787421..6ebef787421 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/FontEncodingTables.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.h index a417b324e48..a417b324e48 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/FontEncodingTables.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.cc index 8fc89e9d827..8fc89e9d827 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/FontInfo.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.h index 615b6793de3..615b6793de3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/FontInfo.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Form.cc index 661ed8972df..661ed8972df 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Form.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Form.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Form.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Form.h index 3778ff6f2ef..3778ff6f2ef 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Form.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Form.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Function.cc index 67283dffe9f..67283dffe9f 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Function.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Function.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Function.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Function.h index 90e2a768ad0..90e2a768ad0 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Function.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Function.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Gfx.cc index 90bf41e4965..6bf7ec54421 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Gfx.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Gfx.cc @@ -980,7 +980,10 @@ void Gfx::opSetDash(Object args[], int numArgs) { } else { dash = (double *)gmallocn(length, sizeof(double)); for (i = 0; i < length; ++i) { - dash[i] = a->get(i, &obj)->getNum(); + a->get(i, &obj); + if (obj.isNum()) { + dash[i] = obj.getNum(); + } obj.free(); } } diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Gfx.h index a82f9f4af24..a82f9f4af24 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Gfx.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Gfx.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.cc index 6f6a125050d..39f026ad6d4 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/GfxFont.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.cc @@ -26,7 +26,7 @@ // Copyright (C) 2009 Peter Kerzum <kerzum@yandex-team.ru> // Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu> // Copyright (C) 2011 Axel Strübing <axel.struebing@freenet.de> -// Copyright (C) 2011, 2012 Adrian Johnson <ajohnson@redneon.com> +// Copyright (C) 2011, 2012, 2014 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2012 Yi Yang <ahyangyi@gmail.com> // Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de> @@ -913,6 +913,33 @@ char *GfxFont::readEmbFontFile(XRef *xref, int *len) { return buf; } + +struct AlternateNameMap { + const char *name; + const char *alt; +}; + +static const AlternateNameMap alternateNameMap[] = +{ + { "fi", "f_i" }, + { "fl", "f_l" }, + { "ff", "f_f" }, + { "ffi", "f_f_i" }, + { "ffl", "f_f_l" }, + { 0, 0 } +}; + +const char *GfxFont::getAlternateName(const char *name) { + const AlternateNameMap *map = alternateNameMap; + while (map->name) { + if (strcmp(name, map->name) == 0) { + return map->alt; + } + map++; + } + return 0; +} + //------------------------------------------------------------------------ // Gfx8BitFont //------------------------------------------------------------------------ diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.h index f9806681102..1be89750349 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/GfxFont.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.h @@ -20,7 +20,7 @@ // Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net> // Copyright (C) 2007 Koji Otani <sho@bbr.jp> // Copyright (C) 2011 Axel Strübing <axel.struebing@freenet.de> -// Copyright (C) 2011, 2012 Adrian Johnson <ajohnson@redneon.com> +// Copyright (C) 2011, 2012, 2014 Adrian Johnson <ajohnson@redneon.com> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -263,6 +263,11 @@ public: // Return the name of the encoding GooString *getEncodingName() { return encodingName; } + // Return AGLFN names of ligatures in the Standard and Expert encodings + // for use with fonts that are not compatible with the Standard 14 fonts. + // http://sourceforge.net/adobe/aglfn/wiki/AGL%20Specification/ + static const char *getAlternateName(const char *name); + protected: virtual ~GfxFont(); diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState.cc index eb11777cef5..eae85dc3856 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/GfxState.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState.cc @@ -18,7 +18,7 @@ // Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright (C) 2006-2014 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2009, 2012 Koji Otani <sho@bbr.jp> -// Copyright (C) 2009, 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2009, 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2009 Christian Persch <chpe@gnome.org> // Copyright (C) 2010 PaweÅ‚ Wiejacha <pawel.wiejacha@gmail.com> // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com> @@ -2189,7 +2189,7 @@ void GfxICCBasedColorSpace::getCMYKLine(Guchar *in, Guchar *out, int length) { #ifdef USE_CMS if (lineTransform != NULL && lineTransform->getTransformPixelType() == PT_CMYK) { transform->doTransform(in,out,length); - } else if (lineTransform != NULL) { + } else if (lineTransform != NULL && nComps != 4) { GfxColorComp c, m, y, k; Guchar* tmp = (Guchar *)gmallocn(3 * length, sizeof(Guchar)); getRGBLine(in, tmp, length); @@ -2232,7 +2232,7 @@ void GfxICCBasedColorSpace::getDeviceNLine(Guchar *in, Guchar *out, int length) *out++ = 0; } gfree(tmp); - } else if (lineTransform != NULL) { + } else if (lineTransform != NULL && nComps != 4) { GfxColorComp c, m, y, k; Guchar* tmp = (Guchar *)gmallocn(3 * length, sizeof(Guchar)); getRGBLine(in, tmp, length); @@ -2302,7 +2302,7 @@ void GfxICCBasedColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) { unsigned int value = (out[0] << 24) + (out[1] << 16) + (out[2] << 8) + out[3]; cmsCache.insert(std::pair<unsigned int, unsigned int>(key, value)); } - } else { + } else if (nComps != 4 && transform != NULL && transform->getTransformPixelType() == PT_RGB) { GfxRGB rgb; GfxColorComp c, m, y, k; @@ -2321,6 +2321,8 @@ void GfxICCBasedColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) { cmyk->m = m - k; cmyk->y = y - k; cmyk->k = k; + } else { + alt->getCMYK(color, cmyk); } #else alt->getCMYK(color, cmyk); diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState.h index 106b2c0bf00..106b2c0bf00 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/GfxState.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState_helpers.h index bc0024edd79..bc0024edd79 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/GfxState_helpers.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState_helpers.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.cc index 3d88646f7b3..3d88646f7b3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/GlobalParams.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.h index c33a8024c04..c33a8024c04 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/GlobalParams.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParamsWin.cc index 084b49bf639..084b49bf639 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/GlobalParamsWin.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParamsWin.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Hints.cc index bdd0d322612..bdd0d322612 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Hints.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Hints.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Hints.h index f46c07f673b..f46c07f673b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Hints.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Hints.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.cc index d23f7ea3887..d23f7ea3887 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/JArithmeticDecoder.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.h index 3c3e6fed0e5..3c3e6fed0e5 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/JArithmeticDecoder.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.cc index 0695dc5da0e..0695dc5da0e 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/JBIG2Stream.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.h index 0ee2518575c..0ee2518575c 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/JBIG2Stream.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.cc index 703d471c99a..703d471c99a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/JPEG2000Stream.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.h index 3feccbef06d..3feccbef06d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/JPEG2000Stream.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.cc index 1476e6a0cfe..1476e6a0cfe 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/JPXStream.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.h index 30855431fb4..30855431fb4 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/JPXStream.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Lexer.cc index 952967a998a..952967a998a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Lexer.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Lexer.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Lexer.h index 02b6cdc6923..02b6cdc6923 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Lexer.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Lexer.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Linearization.cc index 33331d1af37..33331d1af37 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Linearization.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Linearization.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Linearization.h index 6728a750aba..6728a750aba 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Linearization.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Linearization.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Link.cc index 4ab5f52ceda..4ab5f52ceda 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Link.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Link.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Link.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Link.h index fc2abe60052..fc2abe60052 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Link.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Link.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.cc index 6f6f1fca9f7..6f6f1fca9f7 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/LocalPDFDocBuilder.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.h index c2b1d903885..c2b1d903885 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/LocalPDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.28.0/poppler/Makefile.am index ce6f4b2d17d..54f2197d739 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Makefile.am @@ -1,3 +1,16 @@ +CFLAGS+=$(PTHREAD_CFLAGS) +CXXFLAGS+=$(PTHREAD_CFLAGS) + +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/goo + +lib_LTLIBRARIES = libpoppler.la + +if BUILD_CAIRO_OUTPUT +noinst_LTLIBRARIES = libpoppler-cairo.la +endif + if BUILD_SPLASH_OUTPUT splash_sources = \ @@ -15,26 +28,6 @@ splash_libs = \ endif -if BUILD_CAIRO_OUTPUT - -poppler_cairo = libpoppler-cairo.la - -cairo_includes = \ - $(CAIRO_CFLAGS) - -cairo_libs = \ - $(CAIRO_LIBS) - -libpoppler_cairo_la_SOURCES = \ - CairoFontEngine.cc \ - CairoFontEngine.h \ - CairoOutputDev.cc \ - CairoOutputDev.h \ - CairoRescaleBox.cc \ - CairoRescaleBox.h - -endif - if BUILD_LIBJPEG libjpeg_sources = \ @@ -120,45 +113,6 @@ cms_includes = $(LCMS_CFLAGS) cms_libs = $(LCMS_LIBS) endif -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/goo \ - $(cms_includes) \ - $(splash_includes) \ - $(cairo_includes) \ - $(libjpeg_includes) \ - $(libtiff_includes) \ - $(libjpeg2000_includes) \ - $(libpng_includes) \ - $(libcurl_includes) \ - $(FREETYPE_CFLAGS) \ - $(FONTCONFIG_CFLAGS) - -lib_LTLIBRARIES = libpoppler.la - -noinst_LTLIBRARIES = $(poppler_cairo) - -CFLAGS+=$(PTHREAD_CFLAGS) -CXXFLAGS+=$(PTHREAD_CFLAGS) - -libpoppler_la_LIBADD = \ - $(top_builddir)/goo/libgoo.la \ - $(top_builddir)/fofi/libfofi.la \ - $(cms_libs) \ - $(splash_libs) \ - $(libtiff_libs) \ - $(libjpeg_libs) \ - $(libpng_libs) \ - $(zlib_libs) \ - $(libcurl_libs) \ - $(libjpeg2000_libs) \ - $(FREETYPE_LIBS) \ - $(FONTCONFIG_LIBS) \ - $(PTHREAD_LIBS) \ - $(win32_libs) - -libpoppler_la_LDFLAGS = -version-info 46:0:0 @create_shared_lib@ @auto_import_flags@ - if ENABLE_XPDF_HEADERS poppler_includedir = $(includedir)/poppler @@ -244,7 +198,6 @@ endif libpoppler_la_SOURCES = \ $(splash_sources) \ - $(cairo_sources) \ $(libjpeg_sources) \ $(zlib_sources) \ $(libjpeg2000_sources) \ @@ -314,6 +267,51 @@ libpoppler_la_SOURCES = \ Sound.cc \ XpdfPluginAPI.cc +libpoppler_la_CPPFLAGS = \ + $(cms_includes) \ + $(splash_includes) \ + $(libjpeg_includes) \ + $(libtiff_includes) \ + $(libjpeg2000_includes) \ + $(libpng_includes) \ + $(libcurl_includes) \ + $(FREETYPE_CFLAGS) \ + $(FONTCONFIG_CFLAGS) \ + $(AM_CPPFLAGS) + +libpoppler_la_LIBADD = \ + $(top_builddir)/goo/libgoo.la \ + $(top_builddir)/fofi/libfofi.la \ + $(cms_libs) \ + $(splash_libs) \ + $(libtiff_libs) \ + $(libjpeg_libs) \ + $(libpng_libs) \ + $(zlib_libs) \ + $(libcurl_libs) \ + $(libjpeg2000_libs) \ + $(FREETYPE_LIBS) \ + $(FONTCONFIG_LIBS) \ + $(PTHREAD_LIBS) \ + $(win32_libs) + +libpoppler_la_LDFLAGS = \ + -version-info 47:0:0 \ + @create_shared_lib@ \ + @auto_import_flags@ + +libpoppler_cairo_la_SOURCES = \ + CairoFontEngine.cc \ + CairoFontEngine.h \ + CairoOutputDev.cc \ + CairoOutputDev.h \ + CairoRescaleBox.cc \ + CairoRescaleBox.h + +libpoppler_cairo_la_CPPFLAGS = \ + $(CAIRO_CFLAGS) \ + $(AM_CPPFLAGS) + EXTRA_DIST = gen-unicode-tables.py \ GlobalParamsWin.cc \ PageLabelInfo_p.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.cc index 7fdd8f54c53..7fdd8f54c53 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/MarkedContentOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.h index 4ea60c255a1..4ea60c255a1 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/MarkedContentOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Movie.cc index f68b6adcd4d..f68b6adcd4d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Movie.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Movie.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Movie.h index 1a162659179..1a162659179 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Movie.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Movie.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.cc index 5448dc4ce10..5448dc4ce10 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/NameToCharCode.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.h index 5b1092bb96b..5b1092bb96b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/NameToCharCode.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToUnicodeTable.h index 827edbaee60..827edbaee60 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/NameToUnicodeTable.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToUnicodeTable.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Object.cc index d06bb39fb6d..d06bb39fb6d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Object.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Object.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Object.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Object.h index 15bea159857..15bea159857 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Object.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Object.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.cc index e0d49bc9a5f..e0d49bc9a5f 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/OptionalContent.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.h index 2e416462003..2e416462003 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/OptionalContent.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Outline.cc index bd4e6d01b6d..bd4e6d01b6d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Outline.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Outline.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Outline.h index 90190e69280..90190e69280 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Outline.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Outline.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.cc index ee3cf5a30ff..ee3cf5a30ff 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/OutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.h index e8a7a4794ce..e8a7a4794ce 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/OutputDev.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.cc index e427d2b40ff..04237fc3d39 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDoc.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.cc @@ -21,14 +21,14 @@ // Copyright (C) 2009 Eric Toombs <ewtoombs@uwaterloo.ca> // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net> // Copyright (C) 2009, 2011 Axel Struebing <axel.struebing@freenet.de> -// Copyright (C) 2010-2012 Hib Eris <hib@hiberis.nl> +// Copyright (C) 2010-2012, 2014 Hib Eris <hib@hiberis.nl> // Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.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) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it> -// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> +// Copyright (C) 2013, 2014 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com> // Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com> // @@ -626,7 +626,7 @@ int PDFDoc::savePageAs(GooString *name, int pageNo) int keyLength; xref->getEncryptionParameters(&fileKey, &encAlgorithm, &keyLength); - if (pageNo < 1 || pageNo > getNumPages()) { + if (pageNo < 1 || pageNo > getNumPages() || !getCatalog()->getPage(pageNo)) { error(errInternal, -1, "Illegal pageNo: {0:d}({1:d})", pageNo, getNumPages() ); return errOpenFile; } @@ -637,7 +637,7 @@ int PDFDoc::savePageAs(GooString *name, int pageNo) replacePageDict(pageNo, getCatalog()->getPage(pageNo)->getRotate(), getCatalog()->getPage(pageNo)->getMediaBox(), - cropBox, NULL); + cropBox); Ref *refPage = getCatalog()->getPageRef(pageNo); Object page; getXRef()->fetch(refPage->num, refPage->gen, &page); @@ -649,8 +649,6 @@ int PDFDoc::savePageAs(GooString *name, int pageNo) outStr = new FileOutStream(f,0); yRef = new XRef(getXRef()->getTrailerDict()); - Object encrypt; - getXRef()->getTrailerDict()->dictLookup("Encrypt", &encrypt); if (secHdlr != NULL && !secHdlr->isUnencrypted()) { yRef->setEncryption(secHdlr->getPermissionFlags(), @@ -659,7 +657,7 @@ int PDFDoc::savePageAs(GooString *name, int pageNo) countRef = new XRef(); Object *trailerObj = getXRef()->getTrailerDict(); if (trailerObj->isDict()) { - markPageObjects(trailerObj->getDict(), yRef, countRef, 0); + markPageObjects(trailerObj->getDict(), yRef, countRef, 0, refPage->num, rootNum + 2); } yRef->add(0, 65535, 0, gFalse); writeHeader(outStr, getPDFMajorVersion(), getPDFMinorVersion()); @@ -669,7 +667,7 @@ int PDFDoc::savePageAs(GooString *name, int pageNo) getXRef()->getDocInfo(&infoObj); if (infoObj.isDict()) { Dict *infoDict = infoObj.getDict(); - markPageObjects(infoDict, yRef, countRef, 0); + markPageObjects(infoDict, yRef, countRef, 0, refPage->num, rootNum + 2); if (trailerObj->isDict()) { Dict *trailerDict = trailerObj->getDict(); Object ref; @@ -698,11 +696,11 @@ int PDFDoc::savePageAs(GooString *name, int pageNo) Dict *pagesDict = pagesObj.getDict(); pagesDict->lookup("Resources", &resourcesObj); if (resourcesObj.isDict()) - markPageObjects(resourcesObj.getDict(), yRef, countRef, 0); - markPageObjects(catDict, yRef, countRef, 0); + markPageObjects(resourcesObj.getDict(), yRef, countRef, 0, refPage->num, rootNum + 2); + markPageObjects(catDict, yRef, countRef, 0, refPage->num, rootNum + 2); Dict *pageDict = page.getDict(); - markPageObjects(pageDict, yRef, countRef, 0); + markPageObjects(pageDict, yRef, countRef, 0, refPage->num, rootNum + 2); pageDict->lookupNF("Annots", &annotsObj); if (!annotsObj.isNull()) { markAnnotations(&annotsObj, yRef, countRef, 0, refPage->num, rootNum + 2); @@ -777,6 +775,7 @@ int PDFDoc::savePageAs(GooString *name, int pageNo) fclose(f); delete yRef; delete countRef; + delete outStr; return errNone; } @@ -1039,6 +1038,10 @@ void PDFDoc::writeRawStream (Stream* str, OutStream* outStr) str->unfilteredReset(); for (Goffset i = 0; i < length; i++) { int c = str->getUnfilteredChar(); + if (unlikely(c == EOF)) { + error (errSyntaxError, -1, "PDFDoc::writeRawStream: EOF reading stream"); + break; + } outStr->printf("%c", c); } str->reset(); @@ -1426,16 +1429,26 @@ void PDFDoc::writeHeader(OutStream *outStr, int major, int minor) outStr->printf("%%\xE2\xE3\xCF\xD3\n"); } -void PDFDoc::markDictionnary (Dict* dict, XRef * xRef, XRef *countRef, Guint numOffset) +void PDFDoc::markDictionnary (Dict* dict, XRef * xRef, XRef *countRef, Guint numOffset, int oldRefNum, int newRefNum) { Object obj1; for (int i=0; i<dict->getLength(); i++) { - markObject(dict->getValNF(i, &obj1), xRef, countRef, numOffset); + const char *key = dict->getKey(i); + if (strcmp(key, "Annots") != 0) { + markObject(dict->getValNF(i, &obj1), xRef, countRef, numOffset, oldRefNum, newRefNum); + } else { + Object annotsObj; + dict->getValNF(i, &annotsObj); + if (!annotsObj.isNull()) { + markAnnotations(&annotsObj, xRef, countRef, 0, oldRefNum, newRefNum); + annotsObj.free(); + } + } obj1.free(); } } -void PDFDoc::markObject (Object* obj, XRef *xRef, XRef *countRef, Guint numOffset) +void PDFDoc::markObject (Object* obj, XRef *xRef, XRef *countRef, Guint numOffset, int oldRefNum, int newRefNum) { Array *array; Object obj1; @@ -1444,17 +1457,17 @@ void PDFDoc::markObject (Object* obj, XRef *xRef, XRef *countRef, Guint numOffse case objArray: array = obj->getArray(); for (int i=0; i<array->getLength(); i++) { - markObject(array->getNF(i, &obj1), xRef, countRef, numOffset); + markObject(array->getNF(i, &obj1), xRef, countRef, numOffset, oldRefNum, newRefNum); obj1.free(); } break; case objDict: - markDictionnary (obj->getDict(), xRef, countRef, numOffset); + markDictionnary (obj->getDict(), xRef, countRef, numOffset, oldRefNum, newRefNum); break; case objStream: { Stream *stream = obj->getStream(); - markDictionnary (stream->getDict(), xRef, countRef, numOffset); + markDictionnary (stream->getDict(), xRef, countRef, numOffset, oldRefNum, newRefNum); } break; case objRef: @@ -1480,7 +1493,7 @@ void PDFDoc::markObject (Object* obj, XRef *xRef, XRef *countRef, Guint numOffse } Object obj1; getXRef()->fetch(obj->getRef().num, obj->getRef().gen, &obj1); - markObject(&obj1, xRef, countRef, numOffset); + markObject(&obj1, xRef, countRef, numOffset, oldRefNum, newRefNum); obj1.free(); } break; @@ -1491,83 +1504,64 @@ void PDFDoc::markObject (Object* obj, XRef *xRef, XRef *countRef, Guint numOffse void PDFDoc::replacePageDict(int pageNo, int rotate, PDFRectangle *mediaBox, - PDFRectangle *cropBox, Object *pageCTM) + PDFRectangle *cropBox) { Ref *refPage = getCatalog()->getPageRef(pageNo); Object page; getXRef()->fetch(refPage->num, refPage->gen, &page); Dict *pageDict = page.getDict(); + pageDict->remove("MediaBoxssdf"); pageDict->remove("MediaBox"); pageDict->remove("CropBox"); pageDict->remove("ArtBox"); pageDict->remove("BleedBox"); pageDict->remove("TrimBox"); pageDict->remove("Rotate"); - Object *mediaBoxObj = new Object(); - mediaBoxObj->initArray(getXRef()); - Object *murx = new Object(); - murx->initReal(mediaBox->x1); - Object *mury = new Object(); - mury->initReal(mediaBox->y1); - Object *mllx = new Object(); - mllx->initReal(mediaBox->x2); - Object *mlly = new Object(); - mlly->initReal(mediaBox->y2); - mediaBoxObj->arrayAdd(murx); - mediaBoxObj->arrayAdd(mury); - mediaBoxObj->arrayAdd(mllx); - mediaBoxObj->arrayAdd(mlly); - pageDict->add(copyString("MediaBox"), mediaBoxObj); + Object mediaBoxObj; + mediaBoxObj.initArray(getXRef()); + Object murx; + murx.initReal(mediaBox->x1); + Object mury; + mury.initReal(mediaBox->y1); + Object mllx; + mllx.initReal(mediaBox->x2); + Object mlly; + mlly.initReal(mediaBox->y2); + mediaBoxObj.arrayAdd(&murx); + mediaBoxObj.arrayAdd(&mury); + mediaBoxObj.arrayAdd(&mllx); + mediaBoxObj.arrayAdd(&mlly); + pageDict->add(copyString("MediaBox"), &mediaBoxObj); if (cropBox != NULL) { - Object *cropBoxObj = new Object(); - cropBoxObj->initArray(getXRef()); - Object *curx = new Object(); - curx->initReal(cropBox->x1); - Object *cury = new Object(); - cury->initReal(cropBox->y1); - Object *cllx = new Object(); - cllx->initReal(cropBox->x2); - Object *clly = new Object(); - clly->initReal(cropBox->y2); - cropBoxObj->arrayAdd(curx); - cropBoxObj->arrayAdd(cury); - cropBoxObj->arrayAdd(cllx); - cropBoxObj->arrayAdd(clly); - pageDict->add(copyString("CropBox"), cropBoxObj); - pageDict->add(copyString("TrimBox"), cropBoxObj); + Object cropBoxObj; + cropBoxObj.initArray(getXRef()); + Object curx; + curx.initReal(cropBox->x1); + Object cury; + cury.initReal(cropBox->y1); + Object cllx; + cllx.initReal(cropBox->x2); + Object clly; + clly.initReal(cropBox->y2); + cropBoxObj.arrayAdd(&curx); + cropBoxObj.arrayAdd(&cury); + cropBoxObj.arrayAdd(&cllx); + cropBoxObj.arrayAdd(&clly); + pageDict->add(copyString("CropBox"), &cropBoxObj); + cropBoxObj.getArray()->incRef(); + pageDict->add(copyString("TrimBox"), &cropBoxObj); } else { - pageDict->add(copyString("TrimBox"), mediaBoxObj); - } - Object *rotateObj = new Object(); - rotateObj->initInt(rotate); - pageDict->add(copyString("Rotate"), rotateObj); - if (pageCTM != NULL) { - Object *contents = new Object(); - Ref cmRef = getXRef()->addIndirectObject(pageCTM); - Object *ref = new Object(); - ref->initRef(cmRef.num, cmRef.gen); - pageDict->lookupNF("Contents", contents); - Object *newContents = new Object(); - newContents->initArray(getXRef()); - if (contents->getType() == objRef) { - newContents->arrayAdd(ref); - newContents->arrayAdd(contents); - } else { - newContents->arrayAdd(ref); - for (int i = 0; i < contents->arrayGetLength(); i++) { - Object *contentEle = new Object(); - contents->arrayGetNF(i, contentEle); - newContents->arrayAdd(contentEle); - } - } - pageDict->remove("Contents"); - pageDict->add(copyString("Contents"), newContents); + mediaBoxObj.getArray()->incRef(); + pageDict->add(copyString("TrimBox"), &mediaBoxObj); } + Object rotateObj; + rotateObj.initInt(rotate); + pageDict->add(copyString("Rotate"), &rotateObj); getXRef()->setModifiedObject(&page, *refPage); page.free(); } -void PDFDoc::markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset) +void PDFDoc::markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset, int oldRefNum, int newRefNum) { pageDict->remove("Names"); pageDict->remove("OpenAction"); @@ -1583,13 +1577,13 @@ void PDFDoc::markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint n strcmp(key, "Annots") != 0 && strcmp(key, "P") != 0 && strcmp(key, "Root") != 0) { - markObject(&value, xRef, countRef, numOffset); + markObject(&value, xRef, countRef, numOffset, oldRefNum, newRefNum); } value.free(); } } -GBool PDFDoc::markAnnotations(Object *annotsObj, XRef *xRef, XRef *countRef, Guint numOffset, Guint oldPageNum, Guint newPageNum) { +GBool PDFDoc::markAnnotations(Object *annotsObj, XRef *xRef, XRef *countRef, Guint numOffset, int oldPageNum, int newPageNum) { Object annots; GBool modified = gFalse; annotsObj->fetch(getXRef(), &annots); @@ -1631,7 +1625,7 @@ GBool PDFDoc::markAnnotations(Object *annotsObj, XRef *xRef, XRef *countRef, Gui obj2.free(); } type.free(); - markPageObjects(dict, xRef, countRef, numOffset); + markPageObjects(dict, xRef, countRef, numOffset, oldPageNum, newPageNum); } obj1.free(); array->getNF(i, &obj1); @@ -1681,7 +1675,7 @@ GBool PDFDoc::markAnnotations(Object *annotsObj, XRef *xRef, XRef *countRef, Gui return modified; } -void PDFDoc::markAcroForm(Object *afObj, XRef *xRef, XRef *countRef, Guint numOffset, Guint oldPageNum, Guint newPageNum) { +void PDFDoc::markAcroForm(Object *afObj, XRef *xRef, XRef *countRef, Guint numOffset, int oldRefNum, int newRefNum) { Object acroform; GBool modified = gFalse; afObj->fetch(getXRef(), &acroform); @@ -1690,11 +1684,11 @@ void PDFDoc::markAcroForm(Object *afObj, XRef *xRef, XRef *countRef, Guint numOf for (int i=0; i < dict->getLength(); i++) { if (strcmp(dict->getKey(i), "Fields") == 0) { Object fields; - modified = markAnnotations(dict->getValNF(i, &fields), xRef, countRef, numOffset, oldPageNum, newPageNum); + modified = markAnnotations(dict->getValNF(i, &fields), xRef, countRef, numOffset, oldRefNum, newRefNum); fields.free(); } else { Object obj; - markObject(dict->getValNF(i, &obj), xRef, countRef, numOffset); + markObject(dict->getValNF(i, &obj), xRef, countRef, numOffset, oldRefNum, newRefNum); obj.free(); } } diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.h index d8064e9dc4c..6c40f7b0c0c 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDoc.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.h @@ -20,7 +20,7 @@ // Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright (C) 2009 Eric Toombs <ewtoombs@uwaterloo.ca> // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net> -// Copyright (C) 2010 Hib Eris <hib@hiberis.nl> +// Copyright (C) 2010, 2014 Hib Eris <hib@hiberis.nl> // Copyright (C) 2010 Srinivas Adicherla <srinivas.adicherla@geodesic.com> // Copyright (C) 2011, 2013, 2014 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it> @@ -247,10 +247,10 @@ public: void *getGUIData() { return guiData; } // rewrite pageDict with MediaBox, CropBox and new page CTM - void replacePageDict(int pageNo, int rotate, PDFRectangle *mediaBox, PDFRectangle *cropBox, Object *pageCTM); - void markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset); - GBool markAnnotations(Object *annots, XRef *xRef, XRef *countRef, Guint numOffset, Guint oldPageNum, Guint newPageNum); - void markAcroForm(Object *acrpForm, XRef *xRef, XRef *countRef, Guint numOffset, Guint oldPageNum, Guint newPageNum); + void replacePageDict(int pageNo, int rotate, PDFRectangle *mediaBox, PDFRectangle *cropBox); + void markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset, int oldRefNum, int newRefNum); + GBool markAnnotations(Object *annots, XRef *xRef, XRef *countRef, Guint numOffset, int oldPageNum, int newPageNum); + void markAcroForm(Object *acrpForm, XRef *xRef, XRef *countRef, Guint numOffset, int oldPageNum, int newPageNum); // write all objects used by pageDict to outStr Guint writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset, GBool combine = gFalse); static void writeObject (Object *obj, OutStream* outStr, XRef *xref, Guint numOffset, Guchar *fileKey, @@ -267,8 +267,8 @@ public: private: // insert referenced objects in XRef - void markDictionnary (Dict* dict, XRef *xRef, XRef *countRef, Guint numOffset); - void markObject (Object *obj, XRef *xRef, XRef *countRef, Guint numOffset); + void markDictionnary (Dict* dict, XRef *xRef, XRef *countRef, Guint numOffset, int oldRefNum, int newRefNum); + void markObject (Object *obj, XRef *xRef, XRef *countRef, Guint numOffset, int oldRefNum, int newRefNum); static void writeDictionnary (Dict* dict, OutStream* outStr, XRef *xRef, Guint numOffset, Guchar *fileKey, CryptAlgorithm encAlgorithm, int keyLength, int objNum, int objGen); diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocBuilder.h index d6eccf5487a..d6eccf5487a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.cc index 79408346419..79408346419 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocEncoding.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.h index 4f0840bb28a..4f0840bb28a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocEncoding.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.cc index 1ec46477237..1ec46477237 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocFactory.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.h index dbceaa567ee..dbceaa567ee 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PDFDocFactory.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.cc index 149bb620df2..149bb620df2 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PSOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.h index f30204deeb5..f30204deeb5 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PSOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.cc index 05127f0d03c..05127f0d03c 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PSTokenizer.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.h index fc2f053d3f2..fc2f053d3f2 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PSTokenizer.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Page.cc index ecdff32f693..ecdff32f693 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Page.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Page.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Page.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Page.h index 2aaabae9b16..2aaabae9b16 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Page.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Page.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.cc index 3153377f6d3..3153377f6d3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PageLabelInfo.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.h index 960e710069d..960e710069d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PageLabelInfo.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo_p.h index 6cd5220d372..6cd5220d372 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PageLabelInfo_p.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo_p.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.cc index 441634c039f..441634c039f 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PageTransition.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.h index e892c6c5051..e892c6c5051 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PageTransition.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Parser.cc index 28a54607f5c..28a54607f5c 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Parser.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Parser.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Parser.h index 1ce9445e19d..1ce9445e19d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Parser.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Parser.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.cc index 6018a77b70f..6018a77b70f 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PopplerCache.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.h index 74010a2fa6b..74010a2fa6b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PopplerCache.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.cc index b2af18d86b8..b2af18d86b8 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PreScanOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.h index 50fcbf22f73..50fcbf22f73 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/PreScanOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.cc index a0c44747a56..a0c44747a56 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/ProfileData.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.h index 418ee010755..418ee010755 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/ProfileData.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Rendition.cc index c040bf2b4a8..c040bf2b4a8 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Rendition.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Rendition.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Rendition.h index 75bfeff32c9..75bfeff32c9 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Rendition.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Rendition.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.cc index d6f55995b1c..d6f55995b1c 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/SecurityHandler.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.h index c2991c8f375..c2991c8f375 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/SecurityHandler.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Sound.cc index 6129fdcb47d..6129fdcb47d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Sound.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Sound.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Sound.h index acb0f8d9acd..acb0f8d9acd 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Sound.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Sound.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.cc index fd0f8419fb7..0eaeb79f989 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/SplashOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.cc @@ -20,7 +20,7 @@ // Copyright (C) 2006 Scott Turner <scotty1024@mac.com> // Copyright (C) 2007 Koji Otani <sho@bbr.jp> // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com> -// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2009-2014 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright (C) 2009 William Bader <williambader@hotmail.com> // Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de> @@ -151,6 +151,7 @@ SplashGouraudPattern::SplashGouraudPattern(GBool bDirectColorTranslationA, bDirectColorTranslation = bDirectColorTranslationA; shadingA->getColorSpace()->getDefaultColor(&srcColor); convertGfxColor(defaultColor, mode, shadingA->getColorSpace(), &srcColor); + gfxMode = shadingA->getColorSpace()->getMode(); } SplashGouraudPattern::~SplashGouraudPattern() { @@ -199,6 +200,7 @@ SplashUnivariatePattern::SplashUnivariatePattern(SplashColorMode colorModeA, Gfx stateA->getUserClipBBox(&xMin, &yMin, &xMax, &yMax); shadingA->setupCache(&ctm, xMin, yMin, xMax, yMax); + gfxMode = shadingA->getColorSpace()->getMode(); } SplashUnivariatePattern::~SplashUnivariatePattern() { @@ -4404,7 +4406,7 @@ GBool SplashOutputDev::univariateShadedFill(GfxState *state, SplashUnivariatePat pattern->getShading()->getColorSpace()->createMapping(bitmap->getSeparationList(), SPOT_NCOMPS); #endif setOverprintMask(pattern->getShading()->getColorSpace(), state->getFillOverprint(), - state->getOverprintMode(), state->getFillColor()); + state->getOverprintMode(), NULL); retVal = (splash->shadedFill(path, pattern->getShading()->getHasBBox(), pattern) == splashOk); state->clearPath(); setVectorAntialias(vaa); diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.h index ce1d50d0fdd..efbb865c45b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/SplashOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.h @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Takashi Iwai <tiwai@suse.de> -// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2009-2014 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com> // Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com> @@ -75,12 +75,15 @@ public: virtual GfxUnivariateShading *getShading() { return shading; } + virtual GBool isCMYK() { return gfxMode == csDeviceCMYK; } + protected: Matrix ictm; double t0, t1, dt; GfxUnivariateShading *shading; GfxState *state; SplashColorMode colorMode; + GfxColorSpaceMode gfxMode; }; class SplashAxialPattern: public SplashUnivariatePattern { @@ -115,6 +118,8 @@ public: virtual GBool isStatic() { return gFalse; } + virtual GBool isCMYK() { return gfxMode == csDeviceCMYK; } + virtual GBool isParameterized() { return shading->isParameterized(); } virtual int getNTriangles() { return shading->getNTriangles(); } virtual void getTriangle(int i, double *x0, double *y0, double *color0, @@ -129,6 +134,7 @@ private: GfxState *state; GBool bDirectColorTranslation; SplashColorMode mode; + GfxColorSpaceMode gfxMode; }; // see GfxState.h, GfxRadialShading diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.cc index db966377bb0..db966377bb0 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/StdinCachedFile.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.h index 5be6fa841a3..5be6fa841a3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/StdinCachedFile.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.cc index 571ee46d7f6..571ee46d7f6 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/StdinPDFDocBuilder.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.h index e9b2f47f636..e9b2f47f636 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/StdinPDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream-CCITT.h index 7207729a4d1..7207729a4d1 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Stream-CCITT.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream-CCITT.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream.cc index 4c00ddb0d5d..4c00ddb0d5d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Stream.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream.h index 00b2925b3d5..00b2925b3d5 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/Stream.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/StructElement.cc index b1aaca8a58b..b1aaca8a58b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/StructElement.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/StructElement.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/StructElement.h index cd89a970ddb..cd89a970ddb 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/StructElement.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/StructElement.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.cc index e46e3e28388..e46e3e28388 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/StructTreeRoot.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.h index 3b1f3c84421..3b1f3c84421 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/StructTreeRoot.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.cc index 4b7ff406c3e..4b7ff406c3e 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/TextOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.h index 23fb3b726a9..23fb3b726a9 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/TextOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF.cc index 46007b73006..46007b73006 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UTF.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF.h index 248c168cca5..248c168cca5 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UTF.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF8.h index 34a07d4082f..34a07d4082f 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UTF8.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF8.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCClassTables.h index 62f9ecc3657..62f9ecc3657 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeCClassTables.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCClassTables.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCompTables.h index 68e2f86aee9..68e2f86aee9 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeCompTables.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCompTables.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeDecompTables.h index 4bc34b18d99..4bc34b18d99 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeDecompTables.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeDecompTables.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.cc index 0528cdfc686..0528cdfc686 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeMap.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.h index ba7df2cfb99..ba7df2cfb99 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeMap.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMapTables.h index 073e474e6be..073e474e6be 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeMapTables.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMapTables.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.cc index 721af9db6e5..721af9db6e5 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeTypeTable.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.h index 869aad9e6c6..869aad9e6c6 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/UnicodeTypeTable.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.cc index cba8d0ac512..cba8d0ac512 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/ViewerPreferences.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.h index 8cdc4d40a73..8cdc4d40a73 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/ViewerPreferences.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/XRef.cc index 2560e3dcf67..1bbbdc51c25 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/XRef.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/XRef.cc @@ -22,7 +22,7 @@ // Copyright (C) 2010 Hib Eris <hib@hiberis.nl> // Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@kabelmail.de> // Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it> -// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> +// Copyright (C) 2013, 2014 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2013 Pino Toscano <pino@kde.org> // // To see a description of the changes please see the Changelog file that @@ -1568,7 +1568,7 @@ GBool XRef::parseEntry(Goffset offset, XRefEntry *entry) void XRef::readXRefUntil(int untilEntryNum, std::vector<int> *xrefStreamObjsNum) { std::vector<Goffset> followedPrev; - while (prevXRefOffset && (untilEntryNum == -1 || entries[untilEntryNum].type == xrefEntryNone)) { + while (prevXRefOffset && (untilEntryNum == -1 || (untilEntryNum < size && entries[untilEntryNum].type == xrefEntryNone))) { bool followed = false; for (size_t j = 0; j < followedPrev.size(); j++) { if (followedPrev.at(j) == prevXRefOffset) { @@ -1606,7 +1606,7 @@ void XRef::readXRefUntil(int untilEntryNum, std::vector<int> *xrefStreamObjsNum) XRefEntry *XRef::getEntry(int i, GBool complainIfMissing) { - if (entries[i].type == xrefEntryNone) { + if (i >= size || entries[i].type == xrefEntryNone) { if ((!xRefStream) && mainXRefEntriesOffset) { if (!parseEntry(mainXRefEntriesOffset + 20*i, &entries[i])) { diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/XRef.h index 70065d8963e..70065d8963e 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/XRef.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/XRef.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.cc index 834c681d991..834c681d991 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/XpdfPluginAPI.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.h index 6ed890a8f1f..6ed890a8f1f 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/XpdfPluginAPI.h +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.28.0/poppler/gen-unicode-tables.py index 282f6e52518..282f6e52518 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/gen-unicode-tables.py +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/gen-unicode-tables.py diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.cmake index d7918bc4e5d..d7918bc4e5d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/poppler-config.h.cmake +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.cmake diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.in index a7d2efeb96d..a7d2efeb96d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/poppler-config.h.in +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.in diff --git a/Build/source/libs/poppler/poppler-0.26.5/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.28.0/poppler/strtok_r.cpp index 6483e0f7be9..6483e0f7be9 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/poppler/strtok_r.cpp +++ b/Build/source/libs/poppler/poppler-0.28.0/poppler/strtok_r.cpp diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.28.0/splash/Makefile.am index 4330c53aabf..5c265d6360c 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/Makefile.am @@ -1,24 +1,3 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/goo \ - $(libjpeg_includes) \ - $(libtiff_includes) \ - $(libpng_includes) \ - $(FREETYPE_CFLAGS) - -# SplashBitmap includes JpegWriter.h, TiffWriter.h, PNGWriter.h -if BUILD_LIBJPEG -libjpeg_includes = $(LIBJPEG_CFLAGS) -endif - -if BUILD_LIBTIFF -libtiff_includes = $(LIBTIFF_CFLAGS) -endif - -if BUILD_LIBPNG -libpng_includes = $(LIBPNG_CFLAGS) -endif - noinst_LTLIBRARIES = libsplash.la if ENABLE_XPDF_HEADERS @@ -71,3 +50,24 @@ libsplash_la_SOURCES = \ SplashT1FontFile.cc \ SplashXPath.cc \ SplashXPathScanner.cc + +# SplashBitmap includes JpegWriter.h, TiffWriter.h, PNGWriter.h +if BUILD_LIBJPEG +libjpeg_includes = $(LIBJPEG_CFLAGS) +endif + +if BUILD_LIBTIFF +libtiff_includes = $(LIBTIFF_CFLAGS) +endif + +if BUILD_LIBPNG +libpng_includes = $(LIBPNG_CFLAGS) +endif + +libsplash_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/goo \ + $(libjpeg_includes) \ + $(libtiff_includes) \ + $(libpng_includes) \ + $(FREETYPE_CFLAGS) diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/Splash.cc index 8d0765bd3fe..fde272acbab 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/Splash.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/Splash.cc @@ -361,9 +361,29 @@ void Splash::pipeRun(SplashPipe *pipe) { // dynamic pattern if (pipe->pattern) { if (!pipe->pattern->getColor(pipe->x, pipe->y, pipe->cSrcVal)) { - pipeIncX(pipe); - return; + pipeIncX(pipe); + return; } +#if SPLASH_CMYK + if (bitmap->mode == splashModeCMYK8 || bitmap->mode == splashModeDeviceN8) { + if (state->fillOverprint && state->overprintMode && pipe->pattern->isCMYK()) { + Guint mask = 15; + if (pipe->cSrcVal[0] == 0) { + mask &= ~1; + } + if (pipe->cSrcVal[1] == 0) { + mask &= ~2; + } + if (pipe->cSrcVal[2] == 0) { + mask &= ~4; + } + if (pipe->cSrcVal[3] == 0) { + mask &= ~8; + } + state->overprintMask = mask; + } + } +#endif } if (pipe->noTransparency && !state->blendFunc) { diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/Splash.h b/Build/source/libs/poppler/poppler-0.28.0/splash/Splash.h index cf98e6c6824..cf98e6c6824 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/Splash.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/Splash.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.cc index ac344f17c35..ac344f17c35 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashBitmap.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.h index 70509abcfaa..70509abcfaa 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashBitmap.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashClip.cc index 85c6b11473d..85c6b11473d 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashClip.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashClip.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashClip.h index 5c0fdba99a7..5c0fdba99a7 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashClip.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashClip.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashErrorCodes.h index d1f81f85dd8..d1f81f85dd8 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashErrorCodes.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashErrorCodes.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.cc index b785826d66b..b785826d66b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFont.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.h index 98cb29dfbba..98cb29dfbba 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFont.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.cc index 9fef8f007d1..9fef8f007d1 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontEngine.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.h index 11bbea74a80..11bbea74a80 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontEngine.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.cc index 34f6ce5c6b4..f0dcf50384b 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontFile.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.cc @@ -12,6 +12,7 @@ // under GPL version 2 or later // // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de> +// Copyright (C) 2014 Adrian Johnson <ajohnson@redneon.com> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -28,6 +29,7 @@ #include "goo/gmem.h" #include "goo/GooString.h" +#include "poppler/GfxFont.h" #include "SplashFTFontEngine.h" #include "SplashFTFont.h" #include "SplashFTFontFile.h" @@ -57,6 +59,12 @@ SplashFontFile *SplashFTFontFile::loadType1Font(SplashFTFontEngine *engineA, codeToGIDA[i] = 0; if ((name = encA[i])) { codeToGIDA[i] = (int)FT_Get_Name_Index(faceA, (char *)name); + if (codeToGIDA[i] == 0) { + name = GfxFont::getAlternateName(name); + if (name) { + codeToGIDA[i] = FT_Get_Name_Index(faceA, (char *)name); + } + } } } diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.h index d642af0a0ab..d642af0a0ab 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFTFontFile.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFont.cc index 3d6d6b2343e..3d6d6b2343e 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFont.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFont.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFont.h index 78b00d2dcaf..78b00d2dcaf 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFont.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFont.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.cc index 968e8207362..968e8207362 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontEngine.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.h index 6502ea5a7fa..6502ea5a7fa 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontEngine.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.cc index 68e8608b6a7..68e8608b6a7 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFile.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.h index ec87504b9bc..ec87504b9bc 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFile.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.cc index a66dabf61e3..a66dabf61e3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFileID.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.h index cfd89ebb56a..cfd89ebb56a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashFontFileID.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashGlyphBitmap.h index c062c106e6a..c062c106e6a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashGlyphBitmap.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashGlyphBitmap.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashMath.h index ca73c2bd1f3..ca73c2bd1f3 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashMath.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashMath.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPath.cc index bc4ccd524a4..bc4ccd524a4 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashPath.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPath.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPath.h index 81273c613e5..81273c613e5 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashPath.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPath.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.cc index 28ca4995882..28ca4995882 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashPattern.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.h index 42c1660f126..e678c9e20e6 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashPattern.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.h @@ -11,7 +11,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2010, 2011 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2010, 2011, 2014 Thomas Freitag <Thomas.Freitag@alfa.de> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -52,6 +52,8 @@ public: // value for all pixels. virtual GBool isStatic() = 0; + // Returns true if this pattern colorspace is CMYK. + virtual GBool isCMYK() = 0; private: }; @@ -74,6 +76,8 @@ public: virtual GBool isStatic() { return gTrue; } + virtual GBool isCMYK() { return gFalse; } + private: SplashColor color; diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.cc index 68ccd7ddda0..68ccd7ddda0 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashScreen.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.h index a7fc4559148..a7fc4559148 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashScreen.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashState.cc index fd2789d02f9..fd2789d02f9 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashState.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashState.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashState.h index 2c603531cfd..2c603531cfd 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashState.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashState.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.cc index 0fdfaaf5150..0fdfaaf5150 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1Font.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.h index 1dbe66cd7fc..1dbe66cd7fc 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1Font.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.cc index fb4b38dae88..fb4b38dae88 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontEngine.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.h index 268a01479b0..268a01479b0 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontEngine.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.cc index 1832a916d9a..1832a916d9a 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontFile.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.h index c094b6d8b29..c094b6d8b29 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashT1FontFile.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashTypes.h index 5ea816007f8..5ea816007f8 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashTypes.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashTypes.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.cc index 27106ee3d14..27106ee3d14 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPath.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.h index 1c7040daa23..1c7040daa23 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPath.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.h diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.cc index ac47881cb4f..ac47881cb4f 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPathScanner.cc +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.cc diff --git a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.h index cc295cb68fe..cc295cb68fe 100644 --- a/Build/source/libs/poppler/poppler-0.26.5/splash/SplashXPathScanner.h +++ b/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.h diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac index 43822b3af0b..0cabf88176c 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.26.5]) +m4_define([poppler_version], [0.28.0]) |