diff options
Diffstat (limited to 'Build/source/libs/poppler')
-rw-r--r-- | Build/source/libs/poppler/ChangeLog | 5 | ||||
-rwxr-xr-x | Build/source/libs/poppler/configure | 30 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.22.0-PATCHES/ChangeLog) | 8 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-0.22.0-PATCHES/TL-Changes) | 5 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-01-disable-jpeg | 12 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-02-warnings (renamed from Build/source/libs/poppler/poppler-0.22.0-PATCHES/patch-02-warnings) | 30 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/AUTHORS (renamed from Build/source/libs/poppler/poppler-0.22.0/AUTHORS) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/CMakeLists.txt (renamed from Build/source/libs/poppler/poppler-0.22.0/CMakeLists.txt) | 4 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/COPYING (renamed from Build/source/libs/poppler/poppler-0.22.0/COPYING) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.22.0/ChangeLog) | 317 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/ConfigureChecks.cmake (renamed from Build/source/libs/poppler/poppler-0.22.0/ConfigureChecks.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/INSTALL (renamed from Build/source/libs/poppler/poppler-0.22.0/INSTALL) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.22.0/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/NEWS (renamed from Build/source/libs/poppler/poppler-0.22.0/NEWS) | 25 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/README (renamed from Build/source/libs/poppler/poppler-0.22.0/README) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/README-XPDF (renamed from Build/source/libs/poppler/poppler-0.22.0/README-XPDF) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/TODO (renamed from Build/source/libs/poppler/poppler-0.22.0/TODO) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.22.0/config.h.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/config.h.in (renamed from Build/source/libs/poppler/poppler-0.22.0/config.h.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/configure.ac (renamed from Build/source/libs/poppler/poppler-0.22.0/configure.ac) | 5 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiBase.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiBase.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiBase.h (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiBase.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiEncodings.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiEncodings.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiEncodings.h (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiEncodings.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiIdentifier.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiIdentifier.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiIdentifier.h (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiIdentifier.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiTrueType.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiTrueType.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiTrueType.h (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiTrueType.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1.h (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1C.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1C.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1C.h (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1C.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/fofi/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.22.0/fofi/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/FixedPoint.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/FixedPoint.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/FixedPoint.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/FixedPoint.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/GooHash.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/GooHash.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/GooHash.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/GooHash.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/GooLikely.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/GooLikely.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/GooList.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/GooList.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/GooList.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/GooList.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/GooMutex.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/GooMutex.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/GooString.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/GooString.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/GooString.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/GooString.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/GooTimer.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/GooTimer.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/GooTimer.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/GooTimer.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/ImgWriter.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/ImgWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/ImgWriter.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/ImgWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/JpegWriter.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/JpegWriter.cc) | 3 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/JpegWriter.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/JpegWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/PNGWriter.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/PNGWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/PNGWriter.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/PNGWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/TiffWriter.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/TiffWriter.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/TiffWriter.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/TiffWriter.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/gfile.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/gfile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/gfile.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/gfile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/gmem.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/gmem.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/gmem.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/gmem.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/gmempp.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/gmempp.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/grandom.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/grandom.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/grandom.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/grandom.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/gstrtod.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/gstrtod.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/gstrtod.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/gstrtod.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/gtypes.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/gtypes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/goo/gtypes_p.h (renamed from Build/source/libs/poppler/poppler-0.22.0/goo/gtypes_p.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/gtk-doc.make (renamed from Build/source/libs/poppler/poppler-0.22.0/gtk-doc.make) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-cairo-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-cairo-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-cairo.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-cairo.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-cairo.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-cairo.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-cpp-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-cpp-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-cpp.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-cpp.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-cpp.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-cpp.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-glib-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-glib-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-glib.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-glib.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-glib.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-glib.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-qt4-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-qt4-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-qt4.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-qt4.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-qt4.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-qt4.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-splash-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-splash-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-splash.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-splash.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-splash.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-splash.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler-uninstalled.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler.pc.cmake) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler.pc.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Annot.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Annot.cc) | 27 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Annot.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Annot.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Array.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Array.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Array.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Array.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/ArthurOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/ArthurOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/ArthurOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/ArthurOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFont.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFont.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFont.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFont.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFontTables.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFontTables.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFontTables.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFontTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CMap.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CMap.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CMap.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CMap.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CachedFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CachedFile.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CachedFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CairoFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CairoFontEngine.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CairoFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CairoFontEngine.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CairoOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CairoOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CairoOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CairoOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CairoRescaleBox.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CairoRescaleBox.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CairoRescaleBox.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CairoRescaleBox.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Catalog.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Catalog.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Catalog.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Catalog.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CharCodeToUnicode.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CharCodeToUnicode.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CharCodeToUnicode.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CharCodeToUnicode.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CharTypes.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CharTypes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CompactFontTables.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CompactFontTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CurlCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CurlCachedFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CurlCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CurlCachedFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CurlPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CurlPDFDocBuilder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/CurlPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/CurlPDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/DCTStream.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/DCTStream.cc) | 22 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/DCTStream.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/DCTStream.h) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/DateInfo.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/DateInfo.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/DateInfo.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/DateInfo.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Decrypt.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Decrypt.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Decrypt.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Decrypt.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Dict.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Dict.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Dict.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Dict.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Error.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Error.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Error.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Error.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/ErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/ErrorCodes.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/FileSpec.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/FileSpec.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/FileSpec.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/FileSpec.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/FlateStream.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/FlateStream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/FlateStream.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/FlateStream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/FontEncodingTables.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/FontEncodingTables.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/FontEncodingTables.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/FontEncodingTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/FontInfo.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/FontInfo.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/FontInfo.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/FontInfo.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Form.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Form.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Form.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Form.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Function.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Function.cc) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Function.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Function.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Gfx.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Gfx.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Gfx.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Gfx.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/GfxFont.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/GfxFont.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/GfxFont.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/GfxFont.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/GfxState.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/GfxState.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/GfxState.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/GfxState.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/GfxState_helpers.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/GfxState_helpers.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/GlobalParams.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/GlobalParams.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/GlobalParams.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/GlobalParams.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/GlobalParamsWin.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/GlobalParamsWin.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Hints.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Hints.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Hints.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Hints.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/JArithmeticDecoder.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/JArithmeticDecoder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/JArithmeticDecoder.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/JArithmeticDecoder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/JBIG2Stream.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/JBIG2Stream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/JBIG2Stream.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/JBIG2Stream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/JPEG2000Stream.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/JPEG2000Stream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/JPEG2000Stream.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/JPEG2000Stream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/JPXStream.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/JPXStream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/JPXStream.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/JPXStream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Lexer.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Lexer.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Lexer.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Lexer.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Linearization.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Linearization.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Linearization.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Linearization.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Link.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Link.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Link.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Link.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/LocalPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/LocalPDFDocBuilder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/LocalPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/LocalPDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Makefile.am) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Movie.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Movie.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Movie.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Movie.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/NameToCharCode.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/NameToCharCode.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/NameToCharCode.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/NameToCharCode.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/NameToUnicodeTable.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/NameToUnicodeTable.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Object.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Object.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Object.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Object.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/OptionalContent.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/OptionalContent.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/OptionalContent.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/OptionalContent.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Outline.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Outline.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Outline.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Outline.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/OutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/OutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/OutputDev.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/OutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDoc.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDoc.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDoc.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDoc.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocEncoding.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocEncoding.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocEncoding.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocEncoding.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocFactory.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocFactory.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocFactory.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocFactory.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PSOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PSOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PSOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PSOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PSTokenizer.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PSTokenizer.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PSTokenizer.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PSTokenizer.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Page.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Page.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Page.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Page.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PageLabelInfo.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PageLabelInfo.cc) | 10 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PageLabelInfo.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PageLabelInfo.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PageTransition.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PageTransition.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PageTransition.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PageTransition.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Parser.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Parser.cc) | 15 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Parser.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Parser.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PopplerCache.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PopplerCache.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PopplerCache.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PopplerCache.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PreScanOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PreScanOutputDev.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/PreScanOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/PreScanOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/ProfileData.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/ProfileData.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/ProfileData.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/ProfileData.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Rendition.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Rendition.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Rendition.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Rendition.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/SecurityHandler.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/SecurityHandler.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/SecurityHandler.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/SecurityHandler.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Sound.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Sound.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Sound.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Sound.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/SplashOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/SplashOutputDev.cc) | 14 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/SplashOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/SplashOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/StdinCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/StdinCachedFile.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/StdinCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/StdinCachedFile.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/StdinPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/StdinPDFDocBuilder.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/StdinPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/StdinPDFDocBuilder.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Stream-CCITT.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Stream-CCITT.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Stream.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Stream.cc) | 27 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/Stream.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/Stream.h) | 6 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/TextOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/TextOutputDev.cc) | 3 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/TextOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/TextOutputDev.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UTF.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UTF.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UTF.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UTF.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UTF8.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UTF8.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeCClassTables.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeCClassTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeCompTables.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeCompTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeDecompTables.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeDecompTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeMap.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeMap.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeMap.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeMap.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeMapTables.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeMapTables.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeTypeTable.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeTypeTable.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeTypeTable.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeTypeTable.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/ViewerPreferences.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/ViewerPreferences.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/ViewerPreferences.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/ViewerPreferences.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/XRef.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/XRef.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/XRef.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/XRef.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/XpdfPluginAPI.cc (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/XpdfPluginAPI.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/XpdfPluginAPI.h (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/XpdfPluginAPI.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/gen-unicode-tables.py (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/gen-unicode-tables.py) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/poppler-config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/poppler-config.h.cmake) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/poppler-config.h.in (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/poppler-config.h.in) | 2 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler-0.22.2/poppler/strtok_r.cpp (renamed from Build/source/libs/poppler/poppler-0.22.0/poppler/strtok_r.cpp) | 0 | ||||
-rw-r--r-- | Build/source/libs/poppler/poppler/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/libs/poppler/version.ac | 4 |
244 files changed, 501 insertions, 93 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog index e92baf61774..304211e1e49 100644 --- a/Build/source/libs/poppler/ChangeLog +++ b/Build/source/libs/poppler/ChangeLog @@ -1,3 +1,8 @@ +2013-03-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import poppler-0.22.2. + * version.ac: Adjust. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Allow subdir-objects. diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure index 07d0ddbdeff..868e55eb817 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 for TeX Live 0.22.0. +# Generated by GNU Autoconf 2.69 for poppler for TeX Live 0.22.2. # # Report bugs to <tex-k@tug.org>. # @@ -580,12 +580,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='poppler for TeX Live' PACKAGE_TARNAME='poppler-for-tex-live' -PACKAGE_VERSION='0.22.0' -PACKAGE_STRING='poppler for TeX Live 0.22.0' +PACKAGE_VERSION='0.22.2' +PACKAGE_STRING='poppler for TeX Live 0.22.2' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' -ac_unique_file="poppler-0.22.0/poppler/Array.cc" +ac_unique_file="poppler-0.22.2/poppler/Array.cc" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1300,7 +1300,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 for TeX Live 0.22.0 to adapt to many kinds of systems. +\`configure' configures poppler for TeX Live 0.22.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1367,7 +1367,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler for TeX Live 0.22.0:";; + short | recursive ) echo "Configuration of poppler for TeX Live 0.22.2:";; esac cat <<\_ACEOF @@ -1480,7 +1480,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler for TeX Live configure 0.22.0 +poppler for TeX Live configure 0.22.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1887,7 +1887,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 for TeX Live $as_me 0.22.0, which was +It was created by poppler for TeX Live $as_me 0.22.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3751,7 +3751,7 @@ fi # Define the identity of the package. PACKAGE='poppler-for-tex-live' - VERSION='0.22.0' + VERSION='0.22.2' # Some tools Automake needs. @@ -5999,12 +5999,12 @@ fi ac_config_headers="$ac_config_headers config.h" -ac_config_headers="$ac_config_headers poppler/poppler-config.h:poppler-0.22.0/poppler/poppler-config.h.in" +ac_config_headers="$ac_config_headers poppler/poppler-config.h:poppler-0.22.2/poppler/poppler-config.h.in" cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.22.0" +#define POPPLER_VERSION "0.22.2" _ACEOF @@ -6097,7 +6097,7 @@ fi $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h -POPPLER_TREE=poppler-0.22.0 +POPPLER_TREE=poppler-0.22.2 ac_config_files="$ac_config_files Makefile poppler/Makefile goo/Makefile fofi/Makefile" @@ -6649,7 +6649,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 for TeX Live $as_me 0.22.0, which was +This file was extended by poppler for TeX Live $as_me 0.22.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6715,7 +6715,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 for TeX Live config.status 0.22.0 +poppler for TeX Live config.status 0.22.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -6846,7 +6846,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "poppler/poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler/poppler-config.h:poppler-0.22.0/poppler/poppler-config.h.in" ;; + "poppler/poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler/poppler-config.h:poppler-0.22.2/poppler/poppler-config.h.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "poppler/Makefile") CONFIG_FILES="$CONFIG_FILES poppler/Makefile" ;; "goo/Makefile") CONFIG_FILES="$CONFIG_FILES goo/Makefile" ;; diff --git a/Build/source/libs/poppler/poppler-0.22.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/ChangeLog index 89888346a52..2019fd58d5b 100644 --- a/Build/source/libs/poppler/poppler-0.22.0-PATCHES/ChangeLog +++ b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/ChangeLog @@ -1,3 +1,11 @@ +2013-03-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.22.2 source tree from: + http://poppler.freedesktop.org/ + * patch-02-warnings: Adapted. + + * patch-01-disable-jpeg (new): We build without libjpeg. + 2012-12-31 Peter Breitenlohner <peb@mppmu.mpg.de> Imported poppler-0.22.0 source tree from: diff --git a/Build/source/libs/poppler/poppler-0.22.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/TL-Changes index a12c8d9f7dd..709f142201f 100644 --- a/Build/source/libs/poppler/poppler-0.22.0-PATCHES/TL-Changes +++ b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/TL-Changes @@ -1,4 +1,4 @@ -Changes applied to the poppler-0.22.0 tree as obtained from: +Changes applied to the poppler-0.22.2 tree as obtained from: http://poppler.freedesktop.org/ Removed: @@ -25,6 +25,3 @@ Removed unused dirs: test utils -Removed execute permission: - goo/GooTimer.h - diff --git a/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-01-disable-jpeg b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-01-disable-jpeg new file mode 100644 index 00000000000..af41df1adbc --- /dev/null +++ b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-01-disable-jpeg @@ -0,0 +1,12 @@ +diff -ur -N poppler-0.22.2.orig/poppler/Stream.h poppler-0.22.2/poppler/Stream.h +--- poppler-0.22.2.orig/poppler/Stream.h 2013-03-08 16:36:25.000000000 +0100 ++++ poppler-0.22.2/poppler/Stream.h 2013-03-12 10:45:21.752691733 +0100 +@@ -850,7 +850,7 @@ + class DCTStream: public FilterStream { + public: + +- DCTStream(Stream *strA, int colorXformA); ++ DCTStream(Stream *strA, int colorXformA, Object *dict); + virtual ~DCTStream(); + virtual StreamKind getKind() { return strDCT; } + virtual void reset(); diff --git a/Build/source/libs/poppler/poppler-0.22.0-PATCHES/patch-02-warnings b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-02-warnings index 7005780d152..a3497aef8ba 100644 --- a/Build/source/libs/poppler/poppler-0.22.0-PATCHES/patch-02-warnings +++ b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-02-warnings @@ -1,6 +1,6 @@ -diff -ur poppler-0.22.0.orig/poppler/GfxState.cc poppler-0.22.0/poppler/GfxState.cc ---- poppler-0.22.0.orig/poppler/GfxState.cc 2012-12-29 19:10:14.000000000 +0100 -+++ poppler-0.22.0/poppler/GfxState.cc 2012-12-31 18:31:11.556637007 +0100 +diff -ur poppler-0.22.2.orig/poppler/GfxState.cc poppler-0.22.2/poppler/GfxState.cc +--- poppler-0.22.2.orig/poppler/GfxState.cc 2013-02-20 21:09:05.000000000 +0100 ++++ poppler-0.22.2/poppler/GfxState.cc 2013-03-12 09:42:59.000000000 +0100 @@ -3433,7 +3433,7 @@ getParameterRange(&sMin, &sMax, xMin, yMin, xMax, yMax); @@ -10,9 +10,9 @@ diff -ur poppler-0.22.0.orig/poppler/GfxState.cc poppler-0.22.0/poppler/GfxState maxSize = std::max<int>(maxSize, 2); { -diff -ur poppler-0.22.0.orig/poppler/GfxState.h poppler-0.22.0/poppler/GfxState.h ---- poppler-0.22.0.orig/poppler/GfxState.h 2012-12-28 01:17:05.000000000 +0100 -+++ poppler-0.22.0/poppler/GfxState.h 2012-12-31 18:31:11.560620942 +0100 +diff -ur poppler-0.22.2.orig/poppler/GfxState.h poppler-0.22.2/poppler/GfxState.h +--- poppler-0.22.2.orig/poppler/GfxState.h 2013-02-20 21:09:05.000000000 +0100 ++++ poppler-0.22.2/poppler/GfxState.h 2013-03-12 09:42:59.000000000 +0100 @@ -101,7 +101,7 @@ } @@ -22,9 +22,9 @@ diff -ur poppler-0.22.0.orig/poppler/GfxState.h poppler-0.22.0/poppler/GfxState. } static inline double byteToDbl(Guchar x) { -diff -ur poppler-0.22.0.orig/poppler/Hints.cc poppler-0.22.0/poppler/Hints.cc ---- poppler-0.22.0.orig/poppler/Hints.cc 2012-12-28 01:17:03.000000000 +0100 -+++ poppler-0.22.0/poppler/Hints.cc 2012-12-31 18:31:11.560620942 +0100 +diff -ur poppler-0.22.2.orig/poppler/Hints.cc poppler-0.22.2/poppler/Hints.cc +--- poppler-0.22.2.orig/poppler/Hints.cc 2013-02-20 21:09:05.000000000 +0100 ++++ poppler-0.22.2/poppler/Hints.cc 2013-03-12 09:42:59.000000000 +0100 @@ -415,7 +415,7 @@ { Guint bit, bits; @@ -48,9 +48,9 @@ diff -ur poppler-0.22.0.orig/poppler/Hints.cc poppler-0.22.0/poppler/Hints.cc return bit | bits; } -diff -ur poppler-0.22.0.orig/poppler/Lexer.cc poppler-0.22.0/poppler/Lexer.cc ---- poppler-0.22.0.orig/poppler/Lexer.cc 2012-12-28 01:17:03.000000000 +0100 -+++ poppler-0.22.0/poppler/Lexer.cc 2012-12-31 18:31:11.560620942 +0100 +diff -ur poppler-0.22.2.orig/poppler/Lexer.cc poppler-0.22.2/poppler/Lexer.cc +--- poppler-0.22.2.orig/poppler/Lexer.cc 2013-02-20 21:09:05.000000000 +0100 ++++ poppler-0.22.2/poppler/Lexer.cc 2013-03-12 09:42:59.000000000 +0100 @@ -216,7 +216,7 @@ overflownUnsignedInteger = gTrue; xf = xi * 10.0 + (c - '0'); @@ -60,9 +60,9 @@ diff -ur poppler-0.22.0.orig/poppler/Lexer.cc poppler-0.22.0/poppler/Lexer.cc } } else { xi = xi * 10 + (c - '0'); -diff -ur poppler-0.22.0.orig/poppler/Stream.cc poppler-0.22.0/poppler/Stream.cc ---- poppler-0.22.0.orig/poppler/Stream.cc 2012-12-28 01:17:03.000000000 +0100 -+++ poppler-0.22.0/poppler/Stream.cc 2012-12-31 18:31:11.560620942 +0100 +diff -ur poppler-0.22.2.orig/poppler/Stream.cc poppler-0.22.2/poppler/Stream.cc +--- poppler-0.22.2.orig/poppler/Stream.cc 2013-03-08 16:38:39.000000000 +0100 ++++ poppler-0.22.2/poppler/Stream.cc 2013-03-12 09:42:59.000000000 +0100 @@ -480,7 +480,7 @@ Guchar *p; diff --git a/Build/source/libs/poppler/poppler-0.22.0/AUTHORS b/Build/source/libs/poppler/poppler-0.22.2/AUTHORS index a785e403211..a785e403211 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/AUTHORS +++ b/Build/source/libs/poppler/poppler-0.22.2/AUTHORS diff --git a/Build/source/libs/poppler/poppler-0.22.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.22.2/CMakeLists.txt index 913615cc092..4643ae02da3 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/CMakeLists.txt +++ b/Build/source/libs/poppler/poppler-0.22.2/CMakeLists.txt @@ -16,7 +16,7 @@ test_big_endian(WORDS_BIGENDIAN) set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "22") -set(POPPLER_MICRO_VERSION "0") +set(POPPLER_MICRO_VERSION "2") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches @@ -396,7 +396,7 @@ add_library(poppler STATIC ${poppler_SRCS}) else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 34.0.0 SOVERSION 34) +set_target_properties(poppler PROPERTIES VERSION 35.0.0 SOVERSION 35) 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.22.0/COPYING b/Build/source/libs/poppler/poppler-0.22.2/COPYING index d511905c164..d511905c164 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/COPYING +++ b/Build/source/libs/poppler/poppler-0.22.2/COPYING diff --git a/Build/source/libs/poppler/poppler-0.22.0/ChangeLog b/Build/source/libs/poppler/poppler-0.22.2/ChangeLog index 23e6d9fed3c..5abaa86c7ce 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/ChangeLog +++ b/Build/source/libs/poppler/poppler-0.22.2/ChangeLog @@ -1,3 +1,320 @@ +commit 5db6585c2b02dd4071f1adabd53509506333dcf8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Mar 8 16:38:49 2013 +0100 + + Make the non jpeglib based DCTStream compile + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6402e291e1f9374fbaf4de3b97b21f43d38d6ab8 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Fri Mar 8 16:37:11 2013 +0100 + + Workaround broken jpeg stream definitions + + Bug #61994 + + poppler/DCTStream.cc | 22 +++++++++++++++++++--- + poppler/DCTStream.h | 6 +++++- + poppler/Stream.cc | 8 ++++---- + poppler/Stream.h | 4 ++-- + 4 files changed, 30 insertions(+), 10 deletions(-) + +commit 4e142b60790638e4495b4fd6551702470cf4c38f +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Mar 4 20:12:01 2013 +0100 + + Make sure we don't try to paint in x < 0 + + Fixes crash in KDE bug #315432 + + splash/Splash.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a766740cf5a5a7580935a026bf15fbd668aa0fdf +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Fri Mar 1 19:12:22 2013 +0100 + + Restore CTM on early exits + + Bug #61413 + + poppler/SplashOutputDev.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 39882dfecdccc00db353946a31d395582ee37022 +Author: José Aliste <jaliste@src.gnome.org> +Date: Wed Feb 27 01:33:38 2013 +0100 + + Correct rendering of underline and strike out annotations + + Current code assumes that the text to underline or strike out is + horizontal. + Fixes bug #61518 + + poppler/Annot.cc | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +commit 8d62625610746ad70ffb88d845791fa03f5e35cc +Author: Thomas Fischer <fischer@unix-ag.uni-kl.de> +Date: Wed Feb 20 21:07:10 2013 +0100 + + height -> maskHeight + + Bug #61168 + + utils/ImageOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8fb243bf11a979af8bfa36427436940706c9f71d +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 19 23:59:17 2013 +0100 + + Initialize cSrcNonIso[3] in splashModeXBGR8 + + Fixes valgrind warning + + splash/Splash.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8a0199a0247c1a03a4d64375ca8bc900570d1817 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 19 23:11:46 2013 +0100 + + Fix indent + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1389aa41b2984de9da7bb66c11485f6c6aeaea41 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 19 22:25:56 2013 +0100 + + fix indent + + splash/Splash.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ffd33e7b5aea44bc54a74f433f6bfff859b913dd +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 19 11:31:22 2013 +0100 + + Fix missing ) here too + + README.contributors | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 14466ecc320387c9b6568280614a96e6f56309b4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 19 11:31:02 2013 +0100 + + Forgot my C here + + poppler/PageLabelInfo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 47f30fa96e62fc215c0e80f42517908760ef8065 +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Feb 18 20:38:10 2013 +1100 + + Minor rewording of contributor README + + README.contributors | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 95609be551fc4413874b8980010be70fbbab112a +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Feb 18 19:47:19 2013 +0100 + + Use the toLatin function in PageLabelInfo::indexToLabel + + Wonder why Kristian never enabled it? + Fixes bug #61034 + + poppler/PageLabelInfo.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 5c7057c61ed6e270e001c1f86632f265bebb6890 +Author: Nuno Araujo <nuno.araujo@russo79.com> +Date: Tue Feb 12 23:54:47 2013 +0100 + + Fix the build with automake-1.13 + + autogen.sh | 17 +++++++++-------- + configure.ac | 3 +-- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 9fc4b9f7a7e6105a6fd85aed9c21b78742e89ddd +Author: Peter Breitenlohner <peb@mppmu.mpg.de> +Date: Tue Feb 12 22:58:17 2013 +0100 + + true->TRUE + + Fixes compilation with jpeglib9 + + goo/JpegWriter.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit dca21f86359b6b2a925f7b05a2f36ab854cefbce +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 10 11:47:21 2013 +0100 + + 0.22.1 + + CMakeLists.txt | 2 +- + NEWS | 9 +++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 13 insertions(+), 4 deletions(-) + +commit e8e9245f6a4884da3940fc281b7ff1a42d7f5964 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 10 11:43:14 2013 +0100 + + Update C year here too + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ebbacd897e2b529d1c3637b6af438b8dcc1d7ce8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 10 11:42:21 2013 +0100 + + Update C + + poppler/Parser.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3db9472e2b016f1b411174273f27848193ab18e5 +Author: José Aliste <jaliste@src.gnome.org> +Date: Fri Jan 18 15:22:03 2013 +0100 + + Add a null check for gfxFont + + Bug #59561 + + poppler/TextOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4b69217f72f3fd313f73df059eb1e6294878a95e +Author: Peter Dyballa <Peter_Dyballa@Freenet.DE> +Date: Fri Jan 11 00:32:46 2013 +0100 + + Use CPPFLAGS for CPPFLAGS not CFLAGS + + Bug #59186 + + m4/libjpeg.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8b6dc55e530b2f5ede6b9dfb64aafdd1d5836492 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 10 22:31:52 2013 +0100 + + Fix invalid memory access in 1150.pdf.asan.8.69 + + splash/Splash.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit e14b6e9c13d35c9bd1e0c50906ace8e707816888 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 10 20:52:02 2013 +0100 + + Fix invalid memory access in 2030.pdf.asan.69.463 + + poppler/Function.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 0388837f01bc467045164f9ddaff787000a8caaa +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 10 20:29:06 2013 +0100 + + Fix another invalid memory access in 1091.pdf.asan.72.42 + + poppler/Stream.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 957aa252912cde85d76c41e9710b33425a82b696 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 10 19:16:19 2013 +0100 + + Fix invalid memory accesses in 1091.pdf.asan.72.42 + + splash/Splash.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit bbc2d8918fe234b7ef2c480eb148943922cc0959 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 10 19:07:48 2013 +0100 + + Fix invalid memory accesses in 1036.pdf.asan.23.17 + + splash/Splash.cc | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit a9b8ab4657dec65b8b86c225d12c533ad7e984e2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 9 22:56:45 2013 +0100 + + Fix crash in broken file 1031.pdf.asan.48.15 + + splash/Splash.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 7266a634e01e20648cc877371edc95651d30d4fc +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 9 22:52:45 2013 +0100 + + Forgot the C of the last commit + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a205e71a2dbe0c8d4f4905a76a3f79ec522eacec +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 9 22:47:28 2013 +0100 + + Do not crash in broken documents like 1007.pdf.asan.48.4 + + splash/Splash.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit b1026b5978c385328f2a15a2185c599a563edf91 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 9 22:17:09 2013 +0100 + + Initialize refLine totally + + Fixes uninitialized memory read in 1004.pdf.asan.7.3 + + poppler/Stream.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit bef2c42f381c74fdb8bbb43babe1a93a0e229fb0 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Thu Jan 3 15:27:36 2013 +1030 + + Parser: return error if stream encountered when allowStreams = false + + Opening a PDF file where the first object is a stream prints a + "Command token too long" error message. This is caused by the + Linearization check in Linearization::Linearization reading objects + with allowStreams = false. The Parser ignores the "stream" token and + tries reading the next token which is usually binary data. Setting + allowStreams to true will not work since the stream length is often an + indirect object and at this point the XRef has not been created. + + Fix this by making Parser return an error object if the "stream" token + is encountered when allowStreams is false. + + Bug 58966 + + poppler/Parser.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + commit 801f7feea79e5bc3b5417566552e4df1e6b8a51c Author: Albert Astals Cid <aacid@kde.org> Date: Sat Dec 29 19:22:54 2012 +0100 diff --git a/Build/source/libs/poppler/poppler-0.22.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.22.2/ConfigureChecks.cmake index 6e547ed65cb..6e547ed65cb 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/ConfigureChecks.cmake +++ b/Build/source/libs/poppler/poppler-0.22.2/ConfigureChecks.cmake diff --git a/Build/source/libs/poppler/poppler-0.22.0/INSTALL b/Build/source/libs/poppler/poppler-0.22.2/INSTALL index 56b077d6a0b..56b077d6a0b 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/INSTALL +++ b/Build/source/libs/poppler/poppler-0.22.2/INSTALL diff --git a/Build/source/libs/poppler/poppler-0.22.0/Makefile.am b/Build/source/libs/poppler/poppler-0.22.2/Makefile.am index a9f5db1cad6..a9f5db1cad6 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.22.2/Makefile.am diff --git a/Build/source/libs/poppler/poppler-0.22.0/NEWS b/Build/source/libs/poppler/poppler-0.22.2/NEWS index 22e9a0b1a07..c3865576839 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/NEWS +++ b/Build/source/libs/poppler/poppler-0.22.2/NEWS @@ -1,3 +1,28 @@ +Release 0.22.2 + core: + * Correct rendering of underline and strike out annotations (Bug #61518) + * Workaround broken jpeg stream definitions (Bug #61994) + * SplashOutputDev: Restore CTM on early exits (Bug #61413) + * SplashOutputDev: Make sure we don't try to paint in x < 0 (KDE Bug #315432) + * Fix latin page labels. (Bug #61034) + * Fix compilation with jpeglib9 + * Fix minor valgrind warning + + utils: + * pdfimages: Fix extraction of some images (Bug #61168) + + build system: + * Fix the build with automake-1.13 + +Release 0.22.1 + core: + * Fix crash in some pdf files when extracting text (Bug #59561) + * Fix crashes in wrongly formed files + * Fix wrong warning when opening some files (Bug #58966) + + build system: + * Improve autoconf jpeglib.h detection (Bug #59186) + Release 0.22.0 core: * Fix crash in invalid files that define a <= 0 bits per image value diff --git a/Build/source/libs/poppler/poppler-0.22.0/README b/Build/source/libs/poppler/poppler-0.22.2/README index fa223900fbf..fa223900fbf 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/README +++ b/Build/source/libs/poppler/poppler-0.22.2/README diff --git a/Build/source/libs/poppler/poppler-0.22.0/README-XPDF b/Build/source/libs/poppler/poppler-0.22.2/README-XPDF index e97791ce5b2..e97791ce5b2 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/README-XPDF +++ b/Build/source/libs/poppler/poppler-0.22.2/README-XPDF diff --git a/Build/source/libs/poppler/poppler-0.22.0/TODO b/Build/source/libs/poppler/poppler-0.22.2/TODO index e067c2a3156..e067c2a3156 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/TODO +++ b/Build/source/libs/poppler/poppler-0.22.2/TODO diff --git a/Build/source/libs/poppler/poppler-0.22.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.22.2/config.h.cmake index cde219f1e76..cde219f1e76 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/config.h.cmake +++ b/Build/source/libs/poppler/poppler-0.22.2/config.h.cmake diff --git a/Build/source/libs/poppler/poppler-0.22.0/config.h.in b/Build/source/libs/poppler/poppler-0.22.2/config.h.in index a29b012bad5..a29b012bad5 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/config.h.in +++ b/Build/source/libs/poppler/poppler-0.22.2/config.h.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/configure.ac b/Build/source/libs/poppler/poppler-0.22.2/configure.ac index c2d6bdd476f..fc77b2284e0 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/configure.ac +++ b/Build/source/libs/poppler/poppler-0.22.2/configure.ac @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[22]) -m4_define([poppler_version_micro],[0]) +m4_define([poppler_version_micro],[2]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) AC_PREREQ(2.59) @@ -8,8 +8,7 @@ AC_INIT([poppler],[poppler_version],[https://bugs.freedesktop.org/enter_bug.cgi? AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -AM_CONFIG_HEADER(config.h) -AM_CONFIG_HEADER(poppler/poppler-config.h) +AC_CONFIG_HEADERS([config.h poppler/poppler-config.h]) AC_C_BIGENDIAN dnl ##### Initialize libtool. diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiBase.cc index 86bafd80208..86bafd80208 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiBase.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiBase.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiBase.h index d613acd2bb1..d613acd2bb1 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiBase.h +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiBase.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiEncodings.cc index 5cea6fab7f1..5cea6fab7f1 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiEncodings.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiEncodings.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiEncodings.h index ab80ad362a6..ab80ad362a6 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiEncodings.h +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiEncodings.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiIdentifier.cc index d8ee7e0e509..d8ee7e0e509 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiIdentifier.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiIdentifier.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiIdentifier.h index af1323b76d6..af1323b76d6 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiIdentifier.h +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiIdentifier.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiTrueType.cc index cd11d6ff2c6..cd11d6ff2c6 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiTrueType.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiTrueType.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiTrueType.h index b40a44a8d70..b40a44a8d70 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiTrueType.h +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiTrueType.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1.cc index 8fa10a016b6..8fa10a016b6 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1.h index f4e29b4ef0b..f4e29b4ef0b 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1.h +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1C.cc index c4595a3260e..c4595a3260e 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1C.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1C.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1C.h index 698dccd77fd..698dccd77fd 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/FoFiType1C.h +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/FoFiType1C.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.22.2/fofi/Makefile.am index c4654dd28b9..c4654dd28b9 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/fofi/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.22.2/fofi/Makefile.am diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/FixedPoint.cc index 26b2f0fe890..26b2f0fe890 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/FixedPoint.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/FixedPoint.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.22.2/goo/FixedPoint.h index 99749802db7..99749802db7 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/FixedPoint.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/FixedPoint.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/GooHash.cc index f4a92f17506..f4a92f17506 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/GooHash.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/GooHash.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.22.2/goo/GooHash.h index eda19e31409..eda19e31409 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/GooHash.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/GooHash.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.22.2/goo/GooLikely.h index 724ccf00870..724ccf00870 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/GooLikely.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/GooLikely.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/GooList.cc index 6ce4952dc6a..6ce4952dc6a 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/GooList.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/GooList.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.22.2/goo/GooList.h index c83a0e36a8a..c83a0e36a8a 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/GooList.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/GooList.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.22.2/goo/GooMutex.h index 3f53a626a67..3f53a626a67 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/GooMutex.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/GooMutex.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/GooString.cc index d35161d87ad..d35161d87ad 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/GooString.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/GooString.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.22.2/goo/GooString.h index b24051b6b67..b24051b6b67 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/GooString.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/GooString.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/GooTimer.cc index c766c6bf2e4..c766c6bf2e4 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/GooTimer.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/GooTimer.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.22.2/goo/GooTimer.h index d77373e90c1..d77373e90c1 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/GooTimer.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/GooTimer.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/ImgWriter.cc index a30d26d89ad..a30d26d89ad 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/ImgWriter.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/ImgWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.22.2/goo/ImgWriter.h index 8feb3511e4d..8feb3511e4d 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/ImgWriter.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/ImgWriter.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/JpegWriter.cc index 09f9b7b6bc6..9b7c5051838 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/JpegWriter.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/JpegWriter.cc @@ -8,6 +8,7 @@ // Copyright (C) 2010, 2012 Adrian Johnson <ajohnson@redneon.com> // Copyright (C) 2010 Harry Roberts <harry.roberts@midnight-labs.org> // Copyright (C) 2011 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de> // //======================================================================== @@ -117,7 +118,7 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI) // Set quality if (priv->quality >= 0 && priv->quality <= 100) { - jpeg_set_quality(&priv->cinfo, priv->quality, true); + jpeg_set_quality(&priv->cinfo, priv->quality, TRUE); } // Use progressive mode diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.22.2/goo/JpegWriter.h index d69bbbb8dda..d69bbbb8dda 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/JpegWriter.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/JpegWriter.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.22.2/goo/Makefile.am index 0764e79ca18..0764e79ca18 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/Makefile.am diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/PNGWriter.cc index b775600c0a3..b775600c0a3 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/PNGWriter.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/PNGWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.22.2/goo/PNGWriter.h index c73c96426b8..c73c96426b8 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/PNGWriter.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/PNGWriter.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/TiffWriter.cc index d372a5bdfce..d372a5bdfce 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/TiffWriter.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/TiffWriter.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.22.2/goo/TiffWriter.h index 52fdd53efa5..52fdd53efa5 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/TiffWriter.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/TiffWriter.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/gfile.cc index b075b2baf6d..b075b2baf6d 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/gfile.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/gfile.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.22.2/goo/gfile.h index 4e1102381e2..4e1102381e2 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/gfile.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/gfile.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/gmem.cc index c1c607ac3f3..c1c607ac3f3 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/gmem.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/gmem.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.22.2/goo/gmem.h index 898f33933f9..898f33933f9 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/gmem.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/gmem.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/gmempp.cc index a70338ca3ce..a70338ca3ce 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/gmempp.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/gmempp.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/grandom.cc index 1237175420b..1237175420b 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/grandom.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/grandom.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/grandom.h b/Build/source/libs/poppler/poppler-0.22.2/goo/grandom.h index 45fa791aba8..45fa791aba8 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/grandom.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/grandom.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.22.2/goo/gstrtod.cc index cd1d5b554f7..cd1d5b554f7 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/gstrtod.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/gstrtod.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.22.2/goo/gstrtod.h index e8abdadf53e..e8abdadf53e 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/gstrtod.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/gstrtod.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.22.2/goo/gtypes.h index b7a2dd2d268..b7a2dd2d268 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/gtypes.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/gtypes.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.22.2/goo/gtypes_p.h index cc4866e1389..cc4866e1389 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/goo/gtypes_p.h +++ b/Build/source/libs/poppler/poppler-0.22.2/goo/gtypes_p.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.22.2/gtk-doc.make index 9841de47922..9841de47922 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/gtk-doc.make +++ b/Build/source/libs/poppler/poppler-0.22.2/gtk-doc.make diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-cairo-uninstalled.pc.in index 2458eb20df8..2458eb20df8 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-cairo-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-cairo-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.22.2/poppler-cairo.pc.cmake index b32f118314b..b32f118314b 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-cairo.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-cairo.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-cairo.pc.in index 367a5b690bf..367a5b690bf 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-cairo.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-cairo.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-cpp-uninstalled.pc.in index af3640eb2c1..af3640eb2c1 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-cpp-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-cpp-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.22.2/poppler-cpp.pc.cmake index 3f56b3d9d90..3f56b3d9d90 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-cpp.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-cpp.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-cpp.pc.in index a7e97c25dfe..a7e97c25dfe 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-cpp.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-cpp.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-glib-uninstalled.pc.in index 5506c4e53ac..5506c4e53ac 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-glib-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-glib-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.22.2/poppler-glib.pc.cmake index e15e6699a43..e15e6699a43 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-glib.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-glib.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-glib.pc.in index cd30feb728f..cd30feb728f 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-glib.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-glib.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-qt4-uninstalled.pc.in index 3a336c6c294..3a336c6c294 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-qt4-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-qt4-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.22.2/poppler-qt4.pc.cmake index b17fd5d8453..b17fd5d8453 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-qt4.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-qt4.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-qt4.pc.in index 306ae46e0b0..306ae46e0b0 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-qt4.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-qt4.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-splash-uninstalled.pc.in index 436ecdb8f1b..436ecdb8f1b 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-splash-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-splash-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.22.2/poppler-splash.pc.cmake index cb95b3d2d27..cb95b3d2d27 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-splash.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-splash.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-splash.pc.in index cf3491fc7cf..cf3491fc7cf 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-splash.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-splash.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler-uninstalled.pc.in index 6076e80c5b3..6076e80c5b3 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler-uninstalled.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler-uninstalled.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.22.2/poppler.pc.cmake index f1aebedbefd..f1aebedbefd 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler.pc.cmake +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler.pc.cmake diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.22.2/poppler.pc.in index 8605b28673b..8605b28673b 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler.pc.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler.pc.in diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Annot.cc index dae0f62214c..064b55078a4 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Annot.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Annot.cc @@ -23,7 +23,7 @@ // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu> // Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com> // Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com> -// Copyright (C) 2011 José Aliste <jaliste@src.gnome.org> +// Copyright (C) 2011, 2013 José Aliste <jaliste@src.gnome.org> // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it> // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2012 Tobias Koenig <tokoe@kdab.com> @@ -3601,14 +3601,15 @@ void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) { appearBuf->append ("[] 0 d 1 w\n"); for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) { - double x1, x2, y3; + double x3, y3, x4, y4; - x1 = quadrilaterals->getX1(i); - x2 = quadrilaterals->getX2(i); + x3 = quadrilaterals->getX3(i); y3 = quadrilaterals->getY3(i); + x4 = quadrilaterals->getX4(i); + y4 = quadrilaterals->getY4(i); - appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y3); - appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x2, y3); + appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x3, y3); + appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x4, y4); appearBuf->append ("S\n"); } break; @@ -3620,17 +3621,21 @@ void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) { appearBuf->append ("[] 0 d 1 w\n"); for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) { - double x1, y1, x2, y3; - double h2; + double x1, y1, x2, y2; + double x3, y3, x4, y4; x1 = quadrilaterals->getX1(i); y1 = quadrilaterals->getY1(i); x2 = quadrilaterals->getX2(i); + y2 = quadrilaterals->getY2(i); + + x3 = quadrilaterals->getX3(i); y3 = quadrilaterals->getY3(i); - h2 = (y1 - y3) / 2.0; + x4 = quadrilaterals->getX4(i); + y4 = quadrilaterals->getY4(i); - appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y3+h2); - appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x2, y3+h2); + appearBuf->appendf ("{0:.2f} {1:.2f} m\n", (x1+x3)/2., (y1+y3)/2.); + appearBuf->appendf ("{0:.2f} {1:.2f} l\n", (x2+x4)/2., (y2+y4)/2.); appearBuf->append ("S\n"); } break; diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Annot.h index 68ddeb7911f..68ddeb7911f 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Annot.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Annot.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Array.cc index cb2243296f6..cb2243296f6 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Array.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Array.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Array.h index 666a409c2d2..666a409c2d2 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Array.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Array.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/ArthurOutputDev.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/ArthurOutputDev.cc index a1cb89db537..a1cb89db537 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/ArthurOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/ArthurOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/ArthurOutputDev.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/ArthurOutputDev.h index ed631a053ef..ed631a053ef 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/ArthurOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/ArthurOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFont.cc index 20a297d6135..20a297d6135 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFont.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFont.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFont.h index bbdd0558e9f..bbdd0558e9f 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFont.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFont.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFontTables.cc index 5115b7bcf13..5115b7bcf13 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFontTables.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFontTables.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFontTables.h index eb45549efd2..eb45549efd2 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/BuiltinFontTables.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/BuiltinFontTables.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/CMap.cc index 13f293a4aea..13f293a4aea 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CMap.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CMap.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/CMap.h index f4f5a9141c8..f4f5a9141c8 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CMap.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CMap.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/CachedFile.cc index 4c20daefcdd..4c20daefcdd 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CachedFile.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CachedFile.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/CachedFile.h index b99ea1ecad4..b99ea1ecad4 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CachedFile.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CachedFile.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoFontEngine.cc index c4493e87a3a..c4493e87a3a 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoFontEngine.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoFontEngine.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoFontEngine.h index 63353489f2c..63353489f2c 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoFontEngine.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoFontEngine.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoOutputDev.cc index 441ca45f8f1..441ca45f8f1 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoOutputDev.h index a699a7b45c6..a699a7b45c6 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoRescaleBox.cc index 3c96f45e5d3..3c96f45e5d3 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoRescaleBox.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoRescaleBox.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoRescaleBox.h index 072e8a9c80c..072e8a9c80c 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CairoRescaleBox.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CairoRescaleBox.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Catalog.cc index cf6dff0a573..cf6dff0a573 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Catalog.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Catalog.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Catalog.h index ef469ec85b5..ef469ec85b5 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Catalog.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Catalog.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/CharCodeToUnicode.cc index 16ba6d48649..16ba6d48649 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CharCodeToUnicode.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CharCodeToUnicode.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/CharCodeToUnicode.h index 1672105a8f4..1672105a8f4 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CharCodeToUnicode.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CharCodeToUnicode.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/CharTypes.h index d0df630d0c9..d0df630d0c9 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CharTypes.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CharTypes.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/CompactFontTables.h index cfbfdaf5752..cfbfdaf5752 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CompactFontTables.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CompactFontTables.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/CurlCachedFile.cc index af4c2b60322..af4c2b60322 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CurlCachedFile.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CurlCachedFile.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/CurlCachedFile.h index 49882aba8ac..49882aba8ac 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CurlCachedFile.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CurlCachedFile.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/CurlPDFDocBuilder.cc index 5b02b14a784..5b02b14a784 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CurlPDFDocBuilder.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CurlPDFDocBuilder.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/CurlPDFDocBuilder.h index fb34862057c..fb34862057c 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/CurlPDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/CurlPDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/DCTStream.cc index 6302c8b6adf..decfd0f06ef 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/DCTStream.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/DCTStream.cc @@ -10,7 +10,7 @@ // Copyright 2010 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright 2011 Daiki Ueno <ueno@unixuser.org> // Copyright 2011 Tomas Hoger <thoger@redhat.com> -// Copyright 2012 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de> // //======================================================================== @@ -60,9 +60,20 @@ static void str_term_source(j_decompress_ptr cinfo) { } -DCTStream::DCTStream(Stream *strA, int colorXformA) : +DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict) : FilterStream(strA) { colorXform = colorXformA; + if (dict != NULL) { + Object obj; + + dict->dictLookup("Width", &obj); + err.width = (obj.isInt() && obj.getInt() <= JPEG_MAX_DIMENSION) ? obj.getInt() : 0; + obj.free(); + dict->dictLookup("Height", &obj); + err.height = (obj.isInt() && obj.getInt() <= JPEG_MAX_DIMENSION) ? obj.getInt() : 0; + obj.free(); + } else + err.height = err.width = 0; init(); } @@ -74,7 +85,12 @@ DCTStream::~DCTStream() { static void exitErrorHandler(jpeg_common_struct *error) { j_decompress_ptr cinfo = (j_decompress_ptr)error; str_error_mgr * err = (struct str_error_mgr *)cinfo->err; - longjmp(err->setjmp_buffer, 1); + if (cinfo->err->msg_code == JERR_IMAGE_TOO_BIG && err->width != 0 && err->height != 0) { + cinfo->image_height = err->height; + cinfo->image_width = err->width; + } else { + longjmp(err->setjmp_buffer, 1); + } } void DCTStream::init() diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/DCTStream.h index 55bd985d1d7..7a566ced0a0 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/DCTStream.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/DCTStream.h @@ -9,6 +9,7 @@ // Copyright 2005-2007, 2009-2011 Albert Astals Cid <aacid@kde.org> // Copyright 2010 Carlos Garcia Campos <carlosgc@gnome.org> // Copyright 2011 Daiki Ueno <ueno@unixuser.org> +// Copyright 2013 Thomas Freitag <Thomas.Freitag@alfa.de> // //======================================================================== @@ -43,6 +44,7 @@ extern "C" { #include <jpeglib.h> +#include <jerror.h> } struct str_src_mgr { @@ -55,12 +57,14 @@ struct str_src_mgr { struct str_error_mgr { struct jpeg_error_mgr pub; jmp_buf setjmp_buffer; + int width; + int height; }; class DCTStream: public FilterStream { public: - DCTStream(Stream *strA, int colorXformA); + DCTStream(Stream *strA, int colorXformA, Object *dict); virtual ~DCTStream(); virtual StreamKind getKind() { return strDCT; } virtual void reset(); diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/DateInfo.cc index 563204a1743..563204a1743 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/DateInfo.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/DateInfo.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/DateInfo.h index 116350f4134..116350f4134 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/DateInfo.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/DateInfo.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Decrypt.cc index 44f696192c1..44f696192c1 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Decrypt.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Decrypt.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Decrypt.h index c049f5c9a59..c049f5c9a59 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Decrypt.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Decrypt.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Dict.cc index c4f667bf505..c4f667bf505 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Dict.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Dict.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Dict.h index 897f221346a..897f221346a 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Dict.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Dict.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Error.cc index ce71820b214..ce71820b214 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Error.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Error.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Error.h index d7a0991fd54..d7a0991fd54 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Error.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Error.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/ErrorCodes.h index b28528df564..b28528df564 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/ErrorCodes.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/ErrorCodes.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/FileSpec.cc index bac1eaea0d7..bac1eaea0d7 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/FileSpec.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/FileSpec.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/FileSpec.h index 9f2f6fcd131..9f2f6fcd131 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/FileSpec.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/FileSpec.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/FlateStream.cc index 7990dadd821..7990dadd821 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/FlateStream.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/FlateStream.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/FlateStream.h index 9e3835f042a..9e3835f042a 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/FlateStream.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/FlateStream.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/FontEncodingTables.cc index 6ebef787421..6ebef787421 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/FontEncodingTables.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/FontEncodingTables.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/FontEncodingTables.h index a417b324e48..a417b324e48 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/FontEncodingTables.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/FontEncodingTables.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/FontInfo.cc index 35d5f5f2097..35d5f5f2097 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/FontInfo.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/FontInfo.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/FontInfo.h index db90440da73..db90440da73 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/FontInfo.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/FontInfo.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Form.cc index 78c25e3aa93..78c25e3aa93 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Form.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Form.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Form.h index ef67748aa69..ef67748aa69 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Form.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Form.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Function.cc index 1dece2d5904..2f94a54a307 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Function.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Function.cc @@ -13,7 +13,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2006, 2008-2010 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2006, 2008-2010, 2013 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net> // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com> // Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com> @@ -1111,6 +1111,10 @@ void PSStack::copy(int n) { error(errSyntaxError, -1, "Stack underflow in PostScript function"); return; } + if (unlikely(sp - n > psStackSize)) { + error(errSyntaxError, -1, "Stack underflow in PostScript function"); + return; + } if (!checkOverflow(n)) { return; } diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Function.h index 90e2a768ad0..90e2a768ad0 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Function.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Function.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Gfx.cc index 5c9ed35c396..5c9ed35c396 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Gfx.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Gfx.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Gfx.h index 7c42f14d7ed..7c42f14d7ed 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Gfx.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Gfx.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/GfxFont.cc index ea22af8272c..ea22af8272c 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/GfxFont.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/GfxFont.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/GfxFont.h index f9806681102..f9806681102 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/GfxFont.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/GfxFont.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/GfxState.cc index b8a888f2194..b8a888f2194 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/GfxState.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/GfxState.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/GfxState.h index cdbf3e84d7e..cdbf3e84d7e 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/GfxState.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/GfxState.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/GfxState_helpers.h index bc0024edd79..bc0024edd79 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/GfxState_helpers.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/GfxState_helpers.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/GlobalParams.cc index 6efdd0c0b9c..6efdd0c0b9c 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/GlobalParams.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/GlobalParams.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/GlobalParams.h index bc11684f268..bc11684f268 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/GlobalParams.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/GlobalParams.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/GlobalParamsWin.cc index b76e1564c32..b76e1564c32 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/GlobalParamsWin.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/GlobalParamsWin.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Hints.cc index af67182cbdd..af67182cbdd 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Hints.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Hints.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Hints.h index d598e796beb..d598e796beb 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Hints.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Hints.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/JArithmeticDecoder.cc index d23f7ea3887..d23f7ea3887 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/JArithmeticDecoder.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/JArithmeticDecoder.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/JArithmeticDecoder.h index 3c3e6fed0e5..3c3e6fed0e5 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/JArithmeticDecoder.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/JArithmeticDecoder.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/JBIG2Stream.cc index afba8c6118d..afba8c6118d 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/JBIG2Stream.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/JBIG2Stream.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/JBIG2Stream.h index c518aa5e6ca..c518aa5e6ca 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/JBIG2Stream.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/JBIG2Stream.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/JPEG2000Stream.cc index e2fd8086b53..e2fd8086b53 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/JPEG2000Stream.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/JPEG2000Stream.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/JPEG2000Stream.h index 5aed32d4594..5aed32d4594 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/JPEG2000Stream.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/JPEG2000Stream.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/JPXStream.cc index 1476e6a0cfe..1476e6a0cfe 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/JPXStream.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/JPXStream.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/JPXStream.h index 30855431fb4..30855431fb4 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/JPXStream.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/JPXStream.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Lexer.cc index d24c01fcd18..d24c01fcd18 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Lexer.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Lexer.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Lexer.h index 284479dfbfa..284479dfbfa 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Lexer.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Lexer.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Linearization.cc index 33331d1af37..33331d1af37 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Linearization.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Linearization.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Linearization.h index 6728a750aba..6728a750aba 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Linearization.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Linearization.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Link.cc index b5b2bd3aef2..b5b2bd3aef2 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Link.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Link.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Link.h index fc2abe60052..fc2abe60052 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Link.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Link.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/LocalPDFDocBuilder.cc index 6f6f1fca9f7..6f6f1fca9f7 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/LocalPDFDocBuilder.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/LocalPDFDocBuilder.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/LocalPDFDocBuilder.h index c2b1d903885..c2b1d903885 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/LocalPDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/LocalPDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.22.2/poppler/Makefile.am index c25ab03b9cd..9b29591e3bf 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Makefile.am +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Makefile.am @@ -177,7 +177,7 @@ libpoppler_la_LIBADD = \ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 35:0:0 @create_shared_lib@ @auto_import_flags@ if ENABLE_XPDF_HEADERS diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Movie.cc index f68b6adcd4d..f68b6adcd4d 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Movie.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Movie.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Movie.h index 1a162659179..1a162659179 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Movie.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Movie.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/NameToCharCode.cc index 5448dc4ce10..5448dc4ce10 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/NameToCharCode.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/NameToCharCode.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/NameToCharCode.h index 5b1092bb96b..5b1092bb96b 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/NameToCharCode.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/NameToCharCode.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/NameToUnicodeTable.h index 74645ab2878..74645ab2878 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/NameToUnicodeTable.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/NameToUnicodeTable.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Object.cc index 1963b7f88d4..1963b7f88d4 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Object.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Object.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Object.h index c885d739fb3..c885d739fb3 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Object.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Object.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/OptionalContent.cc index e0d49bc9a5f..e0d49bc9a5f 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/OptionalContent.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/OptionalContent.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/OptionalContent.h index 02c9a471e33..02c9a471e33 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/OptionalContent.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/OptionalContent.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Outline.cc index bd4e6d01b6d..bd4e6d01b6d 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Outline.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Outline.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Outline.h index 90190e69280..90190e69280 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Outline.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Outline.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/OutputDev.cc index 54580d0c106..54580d0c106 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/OutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/OutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/OutputDev.h index f540d57348b..f540d57348b 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/OutputDev.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/OutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDoc.cc index 0d78588cf53..0d78588cf53 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDoc.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDoc.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDoc.h index 4562346506d..4562346506d 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDoc.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDoc.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocBuilder.h index d6eccf5487a..d6eccf5487a 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocEncoding.cc index 79408346419..79408346419 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocEncoding.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocEncoding.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocEncoding.h index 4f0840bb28a..4f0840bb28a 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocEncoding.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocEncoding.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocFactory.cc index 1ec46477237..1ec46477237 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocFactory.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocFactory.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocFactory.h index dbceaa567ee..dbceaa567ee 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PDFDocFactory.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PDFDocFactory.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/PSOutputDev.cc index 95be97faba3..95be97faba3 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PSOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PSOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/PSOutputDev.h index 6f290969777..6f290969777 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PSOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PSOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/PSTokenizer.cc index 05127f0d03c..05127f0d03c 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PSTokenizer.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PSTokenizer.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/PSTokenizer.h index fc2f053d3f2..fc2f053d3f2 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PSTokenizer.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PSTokenizer.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Page.cc index 8c2065b347c..8c2065b347c 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Page.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Page.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Page.h index a6098edc808..a6098edc808 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Page.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Page.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/PageLabelInfo.cc index a099d11a699..7a422990384 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PageLabelInfo.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PageLabelInfo.cc @@ -3,7 +3,7 @@ // This file is under the GPLv2 or later license // // Copyright (C) 2005-2006 Kristian Høgsberg <krh@redhat.com> -// Copyright (C) 2005, 2009 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2005, 2009, 2013 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2011 Simon Kellner <kellner@kit.edu> // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it> // @@ -136,7 +136,6 @@ static int fromLatin(const char *buffer) return -1; } -#ifdef TEST static void toLatin(int number, GooString *str, GBool uppercase) { char base, letter; int i, count; @@ -152,7 +151,6 @@ static void toLatin(int number, GooString *str, GBool uppercase) { for (i = 0; i < count; i++) str->append(letter); } -#endif PageLabelInfo::Interval::Interval(Object *dict, int baseA) { Object obj; @@ -332,9 +330,11 @@ GBool PageLabelInfo::indexToLabel(int index, GooString *label) case Interval::UppercaseRoman: toRoman(number, &number_string, gTrue); break; - case Interval::UppercaseLatin: case Interval::LowercaseLatin: - number = 0; + toLatin(number, &number_string, gFalse); + break; + case Interval::UppercaseLatin: + toLatin(number, &number_string, gTrue); break; case Interval::None: break; diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/PageLabelInfo.h index 960e710069d..960e710069d 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PageLabelInfo.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PageLabelInfo.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/PageTransition.cc index 3fbd0de2802..3fbd0de2802 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PageTransition.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PageTransition.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/PageTransition.h index e892c6c5051..e892c6c5051 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PageTransition.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PageTransition.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Parser.cc index 5b80293b134..69304c4d6af 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Parser.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Parser.cc @@ -17,6 +17,7 @@ // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com> // Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com> // Copyright (C) 2012 Hib Eris <hib@hiberis.nl> +// Copyright (C) 2013 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 @@ -125,14 +126,14 @@ Object *Parser::getObj(Object *obj, GBool simpleOnly, } // stream objects are not allowed inside content streams or // object streams - if (allowStreams && buf2.isCmd("stream")) { - if ((str = makeStream(obj, fileKey, encAlgorithm, keyLength, - objNum, objGen, recursion + 1, - strict))) { - obj->initStream(str); + if (buf2.isCmd("stream")) { + if (allowStreams && (str = makeStream(obj, fileKey, encAlgorithm, keyLength, + objNum, objGen, recursion + 1, + strict))) { + obj->initStream(str); } else { - obj->free(); - obj->initError(); + obj->free(); + obj->initError(); } } else { shift(); diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Parser.h index 5ab40995fc3..5ab40995fc3 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Parser.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Parser.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/PopplerCache.cc index 6018a77b70f..6018a77b70f 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PopplerCache.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PopplerCache.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/PopplerCache.h index 74010a2fa6b..74010a2fa6b 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PopplerCache.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PopplerCache.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/PreScanOutputDev.cc index 3a86d526f12..3a86d526f12 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PreScanOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PreScanOutputDev.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/PreScanOutputDev.h index 5260a3b7ace..5260a3b7ace 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/PreScanOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/PreScanOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/ProfileData.cc index a0c44747a56..a0c44747a56 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/ProfileData.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/ProfileData.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/ProfileData.h index 418ee010755..418ee010755 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/ProfileData.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/ProfileData.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Rendition.cc index c040bf2b4a8..c040bf2b4a8 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Rendition.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Rendition.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Rendition.h index 75bfeff32c9..75bfeff32c9 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Rendition.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Rendition.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/SecurityHandler.cc index a48449af578..a48449af578 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/SecurityHandler.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/SecurityHandler.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/SecurityHandler.h index c2991c8f375..c2991c8f375 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/SecurityHandler.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/SecurityHandler.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Sound.cc index 6129fdcb47d..6129fdcb47d 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Sound.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Sound.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Sound.h index acb0f8d9acd..acb0f8d9acd 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Sound.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Sound.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/SplashOutputDev.cc index 6f2d4d6ae96..0426b1839dc 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/SplashOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/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-2012 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2009-2013 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> @@ -4109,8 +4109,10 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx1, Catalog *ca state->concatCTM(1, 0, 0, 1, bbox[0], bbox[1]); ctm = state->getCTM(); for (i = 0; i < 6; ++i) { - if (!isfinite(ctm[i])) + if (!isfinite(ctm[i])) { + state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]); return gFalse; + } } matc[4] = x0 * xStep * ctm[0] + y0 * yStep * ctm[2] + ctm[4]; matc[5] = x0 * xStep * ctm[1] + y0 * yStep * ctm[3] + ctm[5]; @@ -4152,8 +4154,10 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx1, Catalog *ca repeatX = x1 - x0; repeatY = y1 - y0; } else { - if ((unsigned long) result_width * result_height > 0x800000L) + if ((unsigned long) result_width * result_height > 0x800000L) { + state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]); return gFalse; + } while(fabs(kx) > 16384 || fabs(ky) > 16384) { // limit pattern bitmap size m1.m[0] /= 2; @@ -4184,8 +4188,10 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx1, Catalog *ca matc[2] = ctm[2]; matc[3] = ctm[3]; - if (surface_width == 0 || surface_height == 0) + if (surface_width == 0 || surface_height == 0) { + state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]); return gFalse; + } m1.transform(bbox[0], bbox[1], &kx, &ky); m1.m[4] = -kx; m1.m[5] = -ky; diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/SplashOutputDev.h index de7934d48a5..de7934d48a5 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/SplashOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/SplashOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/StdinCachedFile.cc index db966377bb0..db966377bb0 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/StdinCachedFile.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/StdinCachedFile.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/StdinCachedFile.h index 5be6fa841a3..5be6fa841a3 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/StdinCachedFile.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/StdinCachedFile.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/StdinPDFDocBuilder.cc index 571ee46d7f6..571ee46d7f6 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/StdinPDFDocBuilder.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/StdinPDFDocBuilder.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/StdinPDFDocBuilder.h index e9b2f47f636..e9b2f47f636 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/StdinPDFDocBuilder.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/StdinPDFDocBuilder.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Stream-CCITT.h index 7207729a4d1..7207729a4d1 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Stream-CCITT.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Stream-CCITT.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/Stream.cc index d6078c6f417..03ad91edaf9 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Stream.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Stream.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Jeff Muizelaar <jeff@infidigm.net> -// Copyright (C) 2006-2010, 2012 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2006-2010, 2012, 2013 Albert Astals Cid <aacid@kde.org> // Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com> // Copyright (C) 2008 Julien Rebetez <julien@fhtagn.net> // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> @@ -23,7 +23,7 @@ // Copyright (C) 2010 Hib Eris <hib@hiberis.nl> // Copyright (C) 2010 Tomas Hoger <thoger@redhat.com> // Copyright (C) 2011, 2012 William Bader <williambader@hotmail.com> -// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2012 Oliver Sander <sander@mi.fu-berlin.de> // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it> // Copyright (C) 2012 Even Rouault <even.rouault@mines-paris.org> @@ -157,7 +157,7 @@ Stream *Stream::addFilters(Object *dict) { dict->dictLookup("DP", ¶ms); } if (obj.isName()) { - str = makeFilter(obj.getName(), str, ¶ms); + str = makeFilter(obj.getName(), str, ¶ms, dict); } else if (obj.isArray()) { for (i = 0; i < obj.arrayGetLength(); ++i) { obj.arrayGet(i, &obj2); @@ -183,7 +183,7 @@ Stream *Stream::addFilters(Object *dict) { return str; } -Stream *Stream::makeFilter(char *name, Stream *str, Object *params) { +Stream *Stream::makeFilter(char *name, Stream *str, Object *params, Object *dict) { int pred; // parameters int colors; int bits; @@ -284,7 +284,7 @@ Stream *Stream::makeFilter(char *name, Stream *str, Object *params) { } obj.free(); } - str = new DCTStream(str, colorXform); + str = new DCTStream(str, colorXform, dict); } else if (!strcmp(name, "FlateDecode") || !strcmp(name, "Fl")) { pred = 1; columns = 1; @@ -1712,8 +1712,9 @@ int CCITTFaxStream::lookChar() { for (i = 0; i < columns && codingLine[i] < columns; ++i) { refLine[i] = codingLine[i]; } - refLine[i++] = columns; - refLine[i] = columns; + for (; i < columns + 2; ++i) { + refLine[i] = columns; + } codingLine[0] = 0; a0i = 0; b1i = 0; @@ -2386,7 +2387,8 @@ GBool CCITTFaxStream::isBinary(GBool last) { // clip [-256,511] --> [0,255] #define dctClipOffset 256 -static Guchar dctClip[768]; +#define dctClipLength 768 +static Guchar dctClip[dctClipLength]; static int dctClipInit = 0; // zig zag decode map @@ -2408,7 +2410,7 @@ static const int dctZigZag[64] = { 63 }; -DCTStream::DCTStream(Stream *strA, int colorXformA): +DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict): FilterStream(strA) { int i, j; @@ -3342,7 +3344,12 @@ void DCTStream::transformDataUnit(Gushort *quantTable, // convert to 8-bit integers for (i = 0; i < 64; ++i) { - dataOut[i] = dctClip[dctClipOffset + 128 + ((dataIn[i] + 8) >> 4)]; + const int ix = dctClipOffset + 128 + ((dataIn[i] + 8) >> 4); + if (unlikely(ix < 0 || ix >= dctClipLength)) { + dataOut[i] = 0; + } else { + dataOut[i] = dctClip[ix]; + } } } diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/Stream.h index 20b5fd6d421..c472c412093 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/Stream.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/Stream.h @@ -20,7 +20,7 @@ // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com> // Copyright (C) 2010 Hib Eris <hib@hiberis.nl> // Copyright (C) 2011, 2012 William Bader <williambader@hotmail.com> -// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de> // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it> // // To see a description of the changes please see the Changelog file that @@ -224,7 +224,7 @@ private: virtual GBool hasGetChars() { return false; } virtual int getChars(int nChars, Guchar *buffer); - Stream *makeFilter(char *name, Stream *str, Object *params); + Stream *makeFilter(char *name, Stream *str, Object *params, Object *dict = NULL); int ref; // reference count }; @@ -850,7 +850,7 @@ struct DCTHuffTable { class DCTStream: public FilterStream { public: - DCTStream(Stream *strA, int colorXformA); + DCTStream(Stream *strA, int colorXformA, Object *dict); virtual ~DCTStream(); virtual StreamKind getKind() { return strDCT; } virtual void reset(); diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/TextOutputDev.cc index a2198dfd039..b0b53fc587f 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/TextOutputDev.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/TextOutputDev.cc @@ -32,6 +32,7 @@ // Copyright (C) 2012 Horst Prote <prote@fmi.uni-stuttgart.de> // Copyright (C) 2012 Jason Crain <jason@aquaticape.us> // Copyright (C) 2012 Peter Breitenlohner <peb@mppmu.mpg.de> +// Copyright (C) 2013 José Aliste <jaliste@src.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 @@ -2252,7 +2253,7 @@ void TextPage::beginWord(GfxState *state) { // for vertical writing mode, the lines are effectively rotated 90 // degrees - if (state->getFont()->getWMode()) { + if (gfxFont && gfxFont->getWMode()) { rot = (rot + 1) & 3; } diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/TextOutputDev.h index 100f23e0431..100f23e0431 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/TextOutputDev.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/TextOutputDev.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/UTF.cc index 42c783630ab..42c783630ab 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UTF.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UTF.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/UTF.h index 248c168cca5..248c168cca5 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UTF.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UTF.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/UTF8.h index 34a07d4082f..34a07d4082f 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UTF8.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UTF8.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeCClassTables.h index 62f9ecc3657..62f9ecc3657 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeCClassTables.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeCClassTables.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeCompTables.h index 68e2f86aee9..68e2f86aee9 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeCompTables.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeCompTables.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeDecompTables.h index 4bc34b18d99..4bc34b18d99 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeDecompTables.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeDecompTables.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeMap.cc index 0528cdfc686..0528cdfc686 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeMap.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeMap.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeMap.h index ba7df2cfb99..ba7df2cfb99 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeMap.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeMap.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeMapTables.h index 073e474e6be..073e474e6be 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeMapTables.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeMapTables.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeTypeTable.cc index 721af9db6e5..721af9db6e5 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeTypeTable.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeTypeTable.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeTypeTable.h index 869aad9e6c6..869aad9e6c6 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/UnicodeTypeTable.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/UnicodeTypeTable.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/ViewerPreferences.cc index cba8d0ac512..cba8d0ac512 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/ViewerPreferences.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/ViewerPreferences.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/ViewerPreferences.h index 8cdc4d40a73..8cdc4d40a73 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/ViewerPreferences.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/ViewerPreferences.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/XRef.cc index 81e939ad1e9..81e939ad1e9 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/XRef.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/XRef.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/XRef.h index 9af4a139faa..9af4a139faa 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/XRef.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/XRef.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.22.2/poppler/XpdfPluginAPI.cc index 834c681d991..834c681d991 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/XpdfPluginAPI.cc +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/XpdfPluginAPI.cc diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.22.2/poppler/XpdfPluginAPI.h index b0165c0a72a..b0165c0a72a 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/XpdfPluginAPI.h +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/XpdfPluginAPI.h diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.22.2/poppler/gen-unicode-tables.py index 282f6e52518..282f6e52518 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/gen-unicode-tables.py +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/gen-unicode-tables.py diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.22.2/poppler/poppler-config.h.cmake index 2425f6a6cf7..13a92fe5c91 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/poppler-config.h.cmake +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/poppler-config.h.cmake @@ -117,7 +117,7 @@ //------------------------------------------------------------------------ // copyright notice -#define popplerCopyright "Copyright 2005-2012 The Poppler Developers - http://poppler.freedesktop.org" +#define popplerCopyright "Copyright 2005-2013 The Poppler Developers - http://poppler.freedesktop.org" #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" //------------------------------------------------------------------------ diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.22.2/poppler/poppler-config.h.in index 5c56ea4bc61..11b5691c9f4 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/poppler-config.h.in +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/poppler-config.h.in @@ -117,7 +117,7 @@ //------------------------------------------------------------------------ // copyright notice -#define popplerCopyright "Copyright 2005-2012 The Poppler Developers - http://poppler.freedesktop.org" +#define popplerCopyright "Copyright 2005-2013 The Poppler Developers - http://poppler.freedesktop.org" #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" //------------------------------------------------------------------------ diff --git a/Build/source/libs/poppler/poppler-0.22.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.22.2/poppler/strtok_r.cpp index 6483e0f7be9..6483e0f7be9 100644 --- a/Build/source/libs/poppler/poppler-0.22.0/poppler/strtok_r.cpp +++ b/Build/source/libs/poppler/poppler-0.22.2/poppler/strtok_r.cpp diff --git a/Build/source/libs/poppler/poppler/Makefile.in b/Build/source/libs/poppler/poppler/Makefile.in index 71d903c579b..47feeeb28d7 100644 --- a/Build/source/libs/poppler/poppler/Makefile.in +++ b/Build/source/libs/poppler/poppler/Makefile.in @@ -49,7 +49,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am \ - $(top_srcdir)/poppler-0.22.0/poppler/poppler-config.h.in + $(top_srcdir)/poppler-0.22.2/poppler/poppler-config.h.in subdir = poppler ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -225,7 +225,7 @@ poppler-config.h: stamp-h2 @if test ! -f $@; then rm -f stamp-h2; else :; fi @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi -stamp-h2: $(top_srcdir)/poppler-0.22.0/poppler/poppler-config.h.in $(top_builddir)/config.status +stamp-h2: $(top_srcdir)/poppler-0.22.2/poppler/poppler-config.h.in $(top_builddir)/config.status @rm -f stamp-h2 cd $(top_builddir) && $(SHELL) ./config.status poppler/poppler-config.h diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac index 026c7fdc412..1c99ca97448 100644 --- a/Build/source/libs/poppler/version.ac +++ b/Build/source/libs/poppler/version.ac @@ -1,5 +1,5 @@ dnl -dnl Copyright (C) 2011-2012 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current poppler version -m4_define([poppler_version], [0.22.0]) +m4_define([poppler_version], [0.22.2]) |