summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-01-08 07:43:02 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-01-08 07:43:02 +0000
commit6833c312ff9c627b6fffb29537efdadf2e9d412f (patch)
treeac6e8db6da405f91ded2ebf93facc6f3a2fd0fe7 /Build/source
parentdaa6be2d35b85a8e8eac876e12fb292579951c4c (diff)
poppler 0.30.0
git-svn-id: svn://tug.org/texlive/trunk@35992 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/libs/poppler/ChangeLog5
-rwxr-xr-xBuild/source/libs/poppler/configure30
-rw-r--r--Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc197
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog)7
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes)2
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX (renamed from Build/source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX)6
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/AUTHORS (renamed from Build/source/libs/poppler/poppler-0.29.0/AUTHORS)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/CMakeLists.txt (renamed from Build/source/libs/poppler/poppler-0.29.0/CMakeLists.txt)60
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/COPYING (renamed from Build/source/libs/poppler/poppler-0.29.0/COPYING)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.29.0/ChangeLog)186
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/ConfigureChecks.cmake (renamed from Build/source/libs/poppler/poppler-0.29.0/ConfigureChecks.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/INSTALL (renamed from Build/source/libs/poppler/poppler-0.29.0/INSTALL)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.29.0/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/NEWS (renamed from Build/source/libs/poppler/poppler-0.29.0/NEWS)18
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/README (renamed from Build/source/libs/poppler/poppler-0.29.0/README)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/README-XPDF (renamed from Build/source/libs/poppler/poppler-0.29.0/README-XPDF)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/TODO (renamed from Build/source/libs/poppler/poppler-0.29.0/TODO)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.29.0/config.h.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/config.h.in (renamed from Build/source/libs/poppler/poppler-0.29.0/config.h.in)6
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/configure.ac (renamed from Build/source/libs/poppler/poppler-0.29.0/configure.ac)100
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.h (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.h (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.h (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.h (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.h (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.h (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/fofi/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.29.0/fofi/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/GooHash.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/GooHash.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/GooHash.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/GooHash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/GooLikely.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/GooLikely.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/GooList.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/GooList.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/GooList.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/GooList.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/GooMutex.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/GooMutex.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/GooString.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/GooString.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/GooString.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/GooString.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/GooTimer.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/GooTimer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/GooTimer.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/GooTimer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/gfile.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/gfile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/gfile.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/gfile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/gmem.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/gmem.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/gmem.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/gmem.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/gmempp.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/gmempp.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/grandom.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/grandom.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/grandom.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/grandom.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/gstrtod.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/gstrtod.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/gstrtod.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/gstrtod.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/gtypes.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/gtypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/goo/gtypes_p.h (renamed from Build/source/libs/poppler/poppler-0.29.0/goo/gtypes_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/gtk-doc.make (renamed from Build/source/libs/poppler/poppler-0.29.0/gtk-doc.make)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-cairo-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-cairo-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-cpp-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-cpp-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-glib-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-glib-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-qt4-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-qt4-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-qt5-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-qt5-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-splash-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-splash-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler.pc.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Annot.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Annot.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Annot.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Annot.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Array.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Array.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Array.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Array.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CMap.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CMap.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Catalog.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Catalog.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Catalog.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Catalog.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CharTypes.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CharTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CompactFontTables.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CompactFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Dict.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Dict.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Dict.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Dict.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Error.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Error.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Error.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Error.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/ErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/ErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Form.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Form.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Form.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Form.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Function.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Function.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Function.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Function.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc)13
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Gfx.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Gfx.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState_helpers.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState_helpers.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParamsWin.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParamsWin.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Hints.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Hints.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Hints.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Hints.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc445
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.h)41
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Lexer.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Lexer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Lexer.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Lexer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Linearization.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Linearization.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Linearization.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Linearization.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Link.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Link.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Link.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Link.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Makefile.am)2
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Movie.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Movie.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Movie.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Movie.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/NameToUnicodeTable.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/NameToUnicodeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Object.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Object.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Object.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Object.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Outline.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Outline.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Outline.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Outline.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc)39
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.cc)50
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.h)14
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Page.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Page.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Page.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Page.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo_p.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Parser.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Parser.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Parser.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Parser.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Rendition.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Rendition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Rendition.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Rendition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Sound.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Sound.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Sound.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Sound.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Stream-CCITT.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Stream-CCITT.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Stream.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/Stream.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/StructElement.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/StructElement.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/StructElement.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/StructElement.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.cc)12
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UTF.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UTF.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UTF.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UTF.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UTF8.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UTF8.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCClassTables.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCClassTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCompTables.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeDecompTables.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeDecompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMapTables.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMapTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/XRef.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/XRef.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/XRef.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/XRef.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.h (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/gen-unicode-tables.py (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/gen-unicode-tables.py)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.cmake)2
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.in (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.in)2
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/poppler/strtok_r.cpp (renamed from Build/source/libs/poppler/poppler-0.29.0/poppler/strtok_r.cpp)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/Splash.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/Splash.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/Splash.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/Splash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashClip.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashClip.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashClip.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashClip.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFont.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFont.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashGlyphBitmap.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashGlyphBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashMath.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashMath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashPath.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashPath.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashState.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashState.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashState.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashState.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashTypes.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.cc (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.h (renamed from Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.h)0
-rw-r--r--Build/source/libs/poppler/version.ac4
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog2
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-01-mingw3225
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-1.9/src/Ghostscript.cpp8
299 files changed, 924 insertions, 352 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 3db0f80f441..cc2a804da49 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.30.0.
+ * version.ac: Adjust.
+
2014-12-05 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.29.0.
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index 0e93272c80f..12f413b1e73 100755
--- a/Build/source/libs/poppler/configure
+++ b/Build/source/libs/poppler/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.29.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.30.0.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -580,12 +580,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='poppler (TeX Live)'
PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.29.0'
-PACKAGE_STRING='poppler (TeX Live) 0.29.0'
+PACKAGE_VERSION='0.30.0'
+PACKAGE_STRING='poppler (TeX Live) 0.30.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.29.0/poppler/Array.cc"
+ac_unique_file="poppler-0.30.0/poppler/Array.cc"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1306,7 +1306,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poppler (TeX Live) 0.29.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.30.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1373,7 +1373,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.29.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.30.0:";;
esac
cat <<\_ACEOF
@@ -1486,7 +1486,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.29.0
+poppler (TeX Live) configure 0.30.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2076,7 +2076,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poppler (TeX Live) $as_me 0.29.0, which was
+It was created by poppler (TeX Live) $as_me 0.30.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3999,7 +3999,7 @@ fi
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.29.0'
+ VERSION='0.30.0'
# Some tools Automake needs.
@@ -6573,12 +6573,12 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.29.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.30.0/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.29.0"
+#define POPPLER_VERSION "0.30.0"
_ACEOF
@@ -6712,7 +6712,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.29.0
+POPPLER_TREE=poppler-0.30.0
ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7272,7 +7272,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.29.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.30.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7338,7 +7338,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poppler (TeX Live) config.status 0.29.0
+poppler (TeX Live) config.status 0.30.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7469,7 +7469,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.29.0/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.30.0/poppler/poppler-config.h.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/goo/Makefile") CONFIG_FILES="$CONFIG_FILES include/goo/Makefile" ;;
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc
deleted file mode 100644
index 703d471c99a..00000000000
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc
+++ /dev/null
@@ -1,197 +0,0 @@
-//========================================================================
-//
-// JPEG2000Stream.cc
-//
-// A JPX stream decoder using OpenJPEG
-//
-// Copyright 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
-// Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
-// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
-//
-// Licensed under GPLv2 or later
-//
-//========================================================================
-
-#include "JPEG2000Stream.h"
-
-#include "config.h"
-
-JPXStream::JPXStream(Stream *strA) : FilterStream(strA)
-{
- inited = gFalse;
- image = NULL;
- dinfo = NULL;
- npixels = 0;
- ncomps = 0;
-}
-
-JPXStream::~JPXStream() {
- delete str;
- close();
-}
-
-void JPXStream::reset() {
- counter = 0;
- ccounter = 0;
-}
-
-void JPXStream::close() {
- if (image != NULL) {
- opj_image_destroy(image);
- image = NULL;
- npixels = 0;
- }
- if (dinfo != NULL) {
- opj_destroy_decompress(dinfo);
- dinfo = NULL;
- }
-}
-
-Goffset JPXStream::getPos() {
- return counter * ncomps + ccounter;
-}
-
-int JPXStream::getChars(int nChars, Guchar *buffer) {
- for (int i = 0; i < nChars; ++i) {
- const int c = doGetChar();
- if (likely(c != EOF)) buffer[i] = c;
- else return i;
- }
- return nChars;
-}
-
-int JPXStream::getChar() {
- return doGetChar();
-}
-
-#define BUFFER_INITIAL_SIZE 4096
-
-void JPXStream::init()
-{
- Object oLen;
- if (getDict()) getDict()->lookup("Length", &oLen);
-
- int bufSize = BUFFER_INITIAL_SIZE;
- if (oLen.isInt()) bufSize = oLen.getInt();
- oLen.free();
-
-
- int length = 0;
- unsigned char *buf = str->toUnsignedChars(&length, bufSize);
- init2(buf, length, CODEC_JP2);
- free(buf);
-
- if (image) {
- npixels = image->comps[0].w * image->comps[0].h;
- ncomps = image->numcomps;
- for (int component = 0; component < ncomps; component++) {
- if (image->comps[component].data == NULL) {
- close();
- break;
- }
- unsigned char *cdata = (unsigned char *)image->comps[component].data;
- int adjust = 0;
- if (image->comps[component].prec > 8)
- adjust = image->comps[component].prec - 8;
- int sgndcorr = 0;
- if (image->comps[component].sgnd)
- sgndcorr = 1 << (image->comps[0].prec - 1);
- for (int i = 0; i < npixels; i++) {
- int r = image->comps[component].data[i];
- r += sgndcorr;
- if (adjust) {
- r = (r >> adjust)+((r >> (adjust-1))%2);
- if (unlikely(r > 255))
- r = 255;
- }
- *(cdata++) = r;
- }
- }
- } else
- npixels = 0;
-
- counter = 0;
- ccounter = 0;
- inited = gTrue;
-}
-
-static void libopenjpeg_error_callback(const char *msg, void * /*client_data*/) {
- error(errSyntaxError, -1, "{0:s}", msg);
-}
-
-static void libopenjpeg_warning_callback(const char *msg, void * /*client_data*/) {
- error(errSyntaxWarning, -1, "{0:s}", msg);
-}
-
-void JPXStream::init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format)
-{
- opj_cio_t *cio = NULL;
-
- /* Use default decompression parameters */
- opj_dparameters_t parameters;
- opj_set_default_decoder_parameters(&parameters);
-#ifdef WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG
- parameters.flags = OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
-#endif
-
- /* Configure the event manager to receive errors and warnings */
- opj_event_mgr_t event_mgr;
- memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
- event_mgr.error_handler = libopenjpeg_error_callback;
- event_mgr.warning_handler = libopenjpeg_warning_callback;
-
- /* Get the decoder handle of the format */
- dinfo = opj_create_decompress(format);
- if (dinfo == NULL) goto error;
-
- /* Catch events using our callbacks */
- opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, NULL);
-
- /* Setup the decoder decoding parameters */
- opj_setup_decoder(dinfo, &parameters);
-
- /* Open a byte stream */
- cio = opj_cio_open((opj_common_ptr)dinfo, buf, bufLen);
- if (cio == NULL) goto error;
-
- /* Decode the stream and fill the image structure */
- image = opj_decode(dinfo, cio);
-
- /* Close the byte stream */
- opj_cio_close(cio);
-
- if (image == NULL) goto error;
- else return;
-
-error:
- if (format == CODEC_JP2) {
- error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as JP2, trying as J2K.");
- init2(buf, bufLen, CODEC_J2K);
- } else if (format == CODEC_J2K) {
- error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as J2K, trying as JPT.");
- init2(buf, bufLen, CODEC_JPT);
- } else {
- error(errSyntaxError, -1, "Did no succeed opening JPX Stream.");
- }
-}
-
-int JPXStream::lookChar() {
- return doLookChar();
-}
-
-GooString *JPXStream::getPSFilter(int psLevel, const char *indent) {
- return NULL;
-}
-
-GBool JPXStream::isBinary(GBool last) {
- return str->isBinary(gTrue);
-}
-
-void JPXStream::getImageParams(int *bitsPerComponent, StreamColorSpaceMode *csMode) {
- if (inited == gFalse) init();
-
- *bitsPerComponent = 8;
- if (image && image->numcomps == 3) *csMode = streamCSDeviceRGB;
- else *csMode = streamCSDeviceGray;
-}
-
diff --git a/Build/source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.30.0-PATCHES/ChangeLog
index 16ffd02b874..9e1c0a10620 100644
--- a/Build/source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.30.0-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.30.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
2014-12-05 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported poppler-0.29.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes
index 92980bc4b1c..bf53ad987ab 100644
--- a/Build/source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.29.0 tree as obtained from:
+Changes applied to the poppler-0.30.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
diff --git a/Build/source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX
index 57e7fe17d21..89a45ee3774 100644
--- a/Build/source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.29.0.orig/goo/GooString.h poppler-0.29.0/goo/GooString.h
---- poppler-0.29.0.orig/goo/GooString.h 2014-10-07 22:41:15.000000000 +0200
-+++ poppler-0.29.0/goo/GooString.h 2014-11-04 10:20:40.567904859 +0100
+diff -ur poppler-0.30.0.orig/goo/GooString.h poppler-0.30.0/goo/GooString.h
+--- poppler-0.30.0.orig/goo/GooString.h 2014-10-07 22:41:15.000000000 +0200
++++ poppler-0.30.0/goo/GooString.h 2014-11-04 10:20:40.567904859 +0100
@@ -34,6 +34,21 @@
#endif
diff --git a/Build/source/libs/poppler/poppler-0.29.0/AUTHORS b/Build/source/libs/poppler/poppler-0.30.0/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.30.0/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.29.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.30.0/CMakeLists.txt
index 7fdb49a178d..5ed0b4490db 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.30.0/CMakeLists.txt
@@ -17,7 +17,7 @@ include(CheckFileOffsetBits)
CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "29")
+set(POPPLER_MINOR_VERSION "30")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -30,7 +30,7 @@ option(BUILD_CPP_TESTS "Whether compile the CPP test programs." ON)
option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
option(ENABLE_UTILS "Compile poppler command line utils." ON)
option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
-option(ENABLE_LIBOPENJPEG "Use libopenjpeg for JPX streams." ON)
+set(ENABLE_LIBOPENJPEG "auto" CACHE STRING "Use libopenjpeg for JPX streams. Possible values: auto, openjpeg1, openjpeg2. 'auto' prefers openjpeg1 over openjpeg2 if both are available. Unset to not use openjpeg.")
set(ENABLE_CMS "auto" CACHE STRING "Use color management system. Possible values: auto, lcms1, lcms2. 'auto' prefers lcms2 over lcms1 if both are available. Unset to disable color management system.")
option(ENABLE_LIBCURL "Build libcurl based HTTP support." OFF)
option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF)
@@ -151,11 +151,26 @@ if(ENABLE_ZLIB)
endif(ZLIB_FOUND)
set(ENABLE_ZLIB ${ZLIB_FOUND})
endif(ENABLE_ZLIB)
-if(ENABLE_LIBOPENJPEG)
+set(USE_OPENJPEG1 FALSE)
+set(USE_OPENJPEG2 FALSE)
+if(ENABLE_LIBOPENJPEG STREQUAL "auto")
find_package(LIBOPENJPEG)
- set(ENABLE_LIBOPENJPEG ${LIBOPENJPEG_FOUND})
- set(HAVE_OPENJPEG_H ON)
-endif(ENABLE_LIBOPENJPEG)
+ set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND})
+ set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND})
+ if(NOT LIBOPENJPEG_FOUND)
+ find_package(LIBOPENJPEG2)
+ set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND})
+ set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+ endif()
+elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg1")
+ find_package(LIBOPENJPEG)
+ set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND})
+ set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND})
+elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
+ find_package(LIBOPENJPEG2)
+ set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND})
+ set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+endif()
if(ENABLE_CMS STREQUAL "auto")
find_package(LCMS2)
set(USE_CMS ${LCMS2_FOUND})
@@ -225,6 +240,9 @@ endif(TIFF_FOUND)
if(LIBOPENJPEG_FOUND)
include_directories(${LIBOPENJPEG_INCLUDE_DIR})
endif(LIBOPENJPEG_FOUND)
+if(LIBOPENJPEG2_FOUND)
+ include_directories(${LIBOPENJPEG2_INCLUDE_DIRS})
+endif()
if(LCMS_FOUND)
include_directories(${LCMS_INCLUDE_DIR})
endif(LCMS_FOUND)
@@ -409,11 +427,19 @@ if(LIBOPENJPEG_FOUND)
poppler/JPEG2000Stream.cc
)
set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG_LIBRARIES})
-else (LIBOPENJPEG_FOUND)
+ add_definitions(-DUSE_OPENJPEG1)
+elseif (LIBOPENJPEG2_FOUND)
+ set(poppler_SRCS ${poppler_SRCS}
+ poppler/JPEG2000Stream.cc
+ )
+ add_definitions(-DUSE_OPENJPEG2)
+MESSAGE(${LIBOPENJPEG2_LIBRARIES})
+ set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG2_LIBRARIES})
+else ()
set(poppler_SRCS ${poppler_SRCS}
poppler/JPXStream.cc
)
-endif(LIBOPENJPEG_FOUND)
+endif()
if(USE_CMS)
if(LCMS_FOUND)
set(poppler_LIBS ${poppler_LIBS} ${LCMS_LIBRARIES})
@@ -443,7 +469,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 48.0.0 SOVERSION 48)
+set_target_properties(poppler PROPERTIES VERSION 49.0.0 SOVERSION 49)
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})
@@ -574,11 +600,15 @@ if(ENABLE_XPDF_HEADERS)
install(FILES
poppler/JPEG2000Stream.h
DESTINATION include/poppler)
- else(LIBOPENJPEG_FOUND)
+ elseif(LIBOPENJPEG2_FOUND)
+ install(FILES
+ poppler/JPEG2000Stream.h
+ DESTINATION include/poppler)
+ else()
install(FILES
poppler/JPXStream.h
DESTINATION include/poppler)
- endif(LIBOPENJPEG_FOUND)
+ endif()
if(ENABLE_SPLASH)
install(FILES
poppler/SplashOutputDev.h
@@ -678,7 +708,13 @@ show_end_message_yesno("use libpng" ENABLE_LIBPNG)
show_end_message_yesno("use libtiff" ENABLE_LIBTIFF)
show_end_message_yesno("use zlib" ENABLE_ZLIB)
show_end_message_yesno("use curl" ENABLE_LIBCURL)
-show_end_message_yesno("use libopenjpeg" LIBOPENJPEG_FOUND)
+show_end_message_yesno("use libopenjpeg" WITH_OPENJPEG)
+if(USE_OPENJPEG1)
+ message(" with openjpeg1")
+endif()
+if(USE_OPENJPEG2)
+ message(" with openjpeg2")
+endif()
show_end_message_yesno("use cms" USE_CMS)
if(LCMS_FOUND)
message(" with lcms1")
diff --git a/Build/source/libs/poppler/poppler-0.29.0/COPYING b/Build/source/libs/poppler/poppler-0.30.0/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/COPYING
+++ b/Build/source/libs/poppler/poppler-0.30.0/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.29.0/ChangeLog b/Build/source/libs/poppler/poppler-0.30.0/ChangeLog
index 01c35a00783..cccf0001f42 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.30.0/ChangeLog
@@ -1,3 +1,189 @@
+commit c13bffe92963c4969037695992f4c2776bbe973f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 4 23:17:42 2015 +0100
+
+ 0.30
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 18 ++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/CMakeLists.txt | 2 +-
+ cpp/Doxyfile | 2 +-
+ cpp/Makefile.am | 2 +-
+ poppler/Makefile.am | 2 +-
+ poppler/PDFDoc.cc | 1 +
+ poppler/TextOutputDev.cc | 2 +-
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 13 files changed, 31 insertions(+), 12 deletions(-)
+
+commit e499fdab2e96cb3069db7ac8ffa0df20ccccddc9
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Sun Jan 4 20:23:39 2015 +0100
+
+ extended openjpeg2 support
+
+ poppler/JPEG2000Stream.cc | 101
+ +++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 78 insertions(+), 23 deletions(-)
+
+commit 2841f3c34dd6366a70e4d6d307a08b3fbc3e9897
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Jan 4 20:22:47 2015 +0100
+
+ Cmake support for openjpeg2
+
+ With some tweaks from Albert
+
+ CMakeLists.txt | 56
+ +++++++++++++++++++++++++++++-------
+ cmake/modules/FindLIBOPENJPEG2.cmake | 30 +++++++++++++++++++
+ 2 files changed, 76 insertions(+), 10 deletions(-)
+
+commit 117af9c6bbd923954ef7de63adec8c22d51da1e4
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Jan 4 19:42:34 2015 +0100
+
+ Initial attempt at libopenjpeg2 support
+
+ OpenJPEG 2 has a new pkg-config name and API.
+
+ - Update configure.ac to find openjpeg 2 and provide V1/v2 macros
+ - Update JPEG2000Stream to use new API depending on openjpeg v1/v2
+ macros
+ - OpenJPEG 2.1 changed the API so provide a version macro to make
+ it easier
+ to handle the the 2.1 change and any future changes.
+ - Move openjpeg.h into the .cc file
+
+ configure.ac | 80 ++++++++----
+ poppler/JPEG2000Stream.cc | 313
+ +++++++++++++++++++++++++++++++++++++---------
+ poppler/JPEG2000Stream.h | 41 ++----
+ 3 files changed, 323 insertions(+), 111 deletions(-)
+
+commit 9caf7525409d699c16896653528486451123b485
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 4 18:48:02 2015 +0100
+
+ Make PSOutputDev accept a list of pages indeces
+
+ Instead of first, last
+
+ Bug #84833
+
+ Reviewed in the mailing list, see "Can anyone have a look at my
+ patch?"
+
+ glib/poppler-page.cc | 10 ++++++---
+ poppler/PSOutputDev.cc | 50
+ ++++++++++++++++++++++++-----------------
+ poppler/PSOutputDev.h | 14 +++++++-----
+ qt4/src/poppler-ps-converter.cc | 11 ++++++---
+ qt5/src/poppler-ps-converter.cc | 11 ++++++---
+ utils/pdftops.cc | 15 +++++++++----
+ 6 files changed, 71 insertions(+), 40 deletions(-)
+
+commit 173f182fb568843f97e7d45d1b16bebbd2aa7413
+Author: Li Junling <lijunling@sina.com>
+Date: Fri Jan 2 17:23:24 2015 +0100
+
+ Find last 'startxref' in the last 24K instead of the last 1K
+
+ Bug #85919
+
+ poppler/PDFDoc.cc | 38 ++++++++++++++++++++++----------------
+ 1 file changed, 22 insertions(+), 16 deletions(-)
+
+commit 0b1cd9403b8a240e58ec4f1832588d25f8295278
+Author: Jason Crain <jason@aquaticape.us>
+Date: Sat Dec 20 03:22:23 2014 -0600
+
+ Free BBox object on error
+
+ poppler/Gfx.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit acc33a6950031ac4a5c759d043d24df0cfa7e8b6
+Author: Jason Crain <jason@aquaticape.us>
+Date: Sat Dec 20 02:24:49 2014 -0600
+
+ Check for invalid matrix in annotation
+
+ Bug #84990
+
+ poppler/Gfx.cc | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+commit 56aff7d78658f586e3c4cd41685f189dafb3098a
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Tue Dec 23 15:49:15 2014 +0100
+
+ pdfunite: Support output intents, optional content and acroform
+
+ utils/pdfunite.cc | 116
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 116 insertions(+)
+
+commit 9e734063e6a6a4b9743c9aa27d3d3127b5a960d7
+Author: Jason Crain <jason@aquaticape.us>
+Date: Fri Dec 19 01:56:45 2014 -0600
+
+ Move array reallocation from visitLine to startLine
+
+ Fixes potential memory corruption from writing after end of lines
+ array.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=84555
+
+ poppler/TextOutputDev.cc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 0c47b769a77795bd866b6686b79fd20ad6f554bf
+Author: Daniel Macks <dmacks@netspace.org>
+Date: Sun Dec 14 18:52:48 2014 +0100
+
+ Only consider adding -fno-check-new if compiler supports it
+
+ Helps compiling on old clang's
+
+ Bug #76963
+
+ configure.ac | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+commit c9c90d50e3708f6fac313aa8b458aef6dba5dcfb
+Author: Hans-Peter Deifel <hpdeifel@gmx.de>
+Date: Fri Dec 12 13:09:51 2014 +0100
+
+ cpp: New API to set debug output function
+
+ Adds the global function set_debug_error_function, that allows users
+ to install their own function to print internal poppler errors.
+
+ cpp/poppler-global.cpp | 29 +++++++++++++++++++++++++++++
+ cpp/poppler-global.h | 5 +++++
+ cpp/poppler-private.cpp | 15 ++++++++++++---
+ cpp/poppler-private.h | 3 +++
+ 4 files changed, 49 insertions(+), 3 deletions(-)
+
+commit fa8f276a10911c97d2777fff3270771802bc3892
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 4 23:11:12 2014 +0100
+
+ 0.29.0
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 15 +++++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 7 files changed, 23 insertions(+), 8 deletions(-)
+
commit fee700cfecb9d7d5fa938704a5f457f15aaa4676
Author: Albert Astals Cid <aacid@kde.org>
Date: Mon Dec 1 20:52:42 2014 +0100
diff --git a/Build/source/libs/poppler/poppler-0.29.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.30.0/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.30.0/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.29.0/INSTALL b/Build/source/libs/poppler/poppler-0.30.0/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.30.0/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.29.0/Makefile.am b/Build/source/libs/poppler/poppler-0.30.0/Makefile.am
index 691512f4e3a..691512f4e3a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.30.0/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.29.0/NEWS b/Build/source/libs/poppler/poppler-0.30.0/NEWS
index 4bfd589d6e3..2ff8e1797bc 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/NEWS
+++ b/Build/source/libs/poppler/poppler-0.30.0/NEWS
@@ -1,3 +1,21 @@
+Release 0.30.0
+ core:
+ * Openjpeg2 support (openjpeg 1 is preferred). Bug #58906
+ * Fix potential memory corruption on TextSelectionDumper. Bug #84555
+ * Check for invalid matrix in annotation. Bug #84990
+ * Open some not conforming files. Bug #85919
+ * PSOutputDev: Accept a list of pages indeces instead of first, last. Bug #84833
+ * Fix memory leak on error condition
+
+ cpp:
+ * New API to set debug output function
+
+ build system:
+ * configure: Improve support with older clang versions. Bug #76963
+
+ utils:
+ * pdfunite: Support output intents, optional content and acroform
+
Release 0.29.0
core:
* Use correct LAB byte array for lcms input. Bug #86388
diff --git a/Build/source/libs/poppler/poppler-0.29.0/README b/Build/source/libs/poppler/poppler-0.30.0/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/README
+++ b/Build/source/libs/poppler/poppler-0.30.0/README
diff --git a/Build/source/libs/poppler/poppler-0.29.0/README-XPDF b/Build/source/libs/poppler/poppler-0.30.0/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.30.0/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.29.0/TODO b/Build/source/libs/poppler/poppler-0.30.0/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/TODO
+++ b/Build/source/libs/poppler/poppler-0.30.0/TODO
diff --git a/Build/source/libs/poppler/poppler-0.29.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.30.0/config.h.cmake
index 8ed1c92248e..8ed1c92248e 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.30.0/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.29.0/config.h.in b/Build/source/libs/poppler/poppler-0.30.0/config.h.in
index 12fb1a09ec6..c47d66d3e52 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/config.h.in
@@ -215,6 +215,12 @@
/* Defines if use lcms1 */
#undef USE_LCMS1
+/* Defined if using openjpeg1 */
+#undef USE_OPENJPEG1
+
+/* Defined if using openjpeg2 */
+#undef USE_OPENJPEG2
+
/* Version number of package */
#undef VERSION
diff --git a/Build/source/libs/poppler/poppler-0.29.0/configure.ac b/Build/source/libs/poppler/poppler-0.30.0/configure.ac
index 3bf36e0336b..b6429cf8ba1 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.30.0/configure.ac
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[29])
+m4_define([poppler_version_minor],[30])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
@@ -147,32 +147,57 @@ then
fi
-dnl Test for libopenjpeg. Versions prior to 1.4 do not provide a pkgconfig file.
+dnl ##### Test for libopenjpeg. Versions prior to 1.4 do not provide a pkgconfig file.
+openjpeg1="no"
+openjpeg2="no"
AC_ARG_ENABLE(libopenjpeg,
- AC_HELP_STRING([--disable-libopenjpeg],
- [Don't build against libopenjpeg.]),
- enable_libopenjpeg=$enableval,
- enable_libopenjpeg="try")
-if test x$enable_libopenjpeg = xyes; then
- PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg,
- [],
- [AC_CHECK_LIB([openjpeg], [opj_cio_open],
- LIBOPENJPEG_LIBS="-lopenjpeg",
- AC_MSG_ERROR("*** libopenjpeg library not found ***"))
- AC_CHECK_HEADERS([openjpeg.h],,
- AC_MSG_ERROR("*** libopenjpeg headers not found ***"))])
-elif test x$enable_libopenjpeg = xtry; then
+ AC_HELP_STRING([--enable-libopenjpeg=@<:@auto/openjpeg1/openjpeg2/none@:>@],
+ [Use openjpeg for JPEG2000 images. 'auto' prefers openjpeg1 over openjpeg2 if both are available due to regressions in openjpeg2 [[default=auto]]]),
+ [enable_libopenjpeg=$enableval],
+ [enable_libopenjpeg="auto"])
+
+openjpeg_header=yes
+
+dnl test for libopenjpeg1
+if test x$enable_libopenjpeg = xopenjpeg1 || test x$enable_libopenjpeg = xauto; then
PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg,
- [enable_libopenjpeg="yes"],
- [AC_CHECK_LIB([openjpeg], [opj_cio_open],
- [enable_libopenjpeg="yes"
- LIBOPENJPEG_LIBS="-lopenjpeg"],
- [enable_libopenjpeg="no"])
- AC_CHECK_HEADERS([openjpeg.h],,
- [enable_libopenjpeg="no"])])
+ [openjpeg1="yes"],
+ [AC_CHECK_LIB([openjpeg], [opj_cio_open],
+ [openjpeg1="yes"
+ LIBOPENJPEG_LIBS="-lopenjpeg"],[openjpeg_header=no])
+ AC_CHECK_HEADERS([openjpeg.h],,
+ [openjpeg="no"])])
+fi
+
+dnl test for libopenjpeg2
+if test x$openjpeg1 = xno; then
+ if test x$enable_libopenjpeg = xopenjpeg2 || test x$enable_libopenjpeg = xauto; then
+ PKG_CHECK_MODULES(LIBOPENJPEG, libopenjp2,
+ [openjpeg2=yes],[])
+ fi
+fi
+
+if test x$enable_libopenjpeg = xopenjpeg1 && test x$openjpeg1 = xno; then
+ if test x$openjpeg_header = xno; then
+ AC_MSG_ERROR("*** libopenjpeg headers not found ***")
+ else
+ AC_MSG_ERROR("*** libopenjpeg library not found ***")
+ fi
+fi
+
+if test x$enable_libopenjpeg = xopenjpeg2 && test x$openjpeg2 = xno; then
+ AC_MSG_ERROR("*** libopenjp2 library not found ***")
fi
-if test x$enable_libopenjpeg = xyes; then
+if test x$openjpeg1 = xyes || test x$openjpeg2 = xyes; then
+ enable_libopenjpeg=yes
+ if test x$openjpeg1 = xyes; then
+ AC_DEFINE(USE_OPENJPEG1, 1, [Defined if using openjpeg1])
+ fi
+ if test x$openjpeg2 = xyes; then
+ AC_DEFINE(USE_OPENJPEG2, 1, [Defined if using openjpeg2])
+ fi
+
AC_SUBST(LIBOPENJPEG_CFLAGS)
AC_SUBST(LIBOPENJPEG_LIBS)
AC_DEFINE(ENABLE_LIBOPENJPEG)
@@ -182,9 +207,11 @@ if test x$enable_libopenjpeg = xyes; then
[AC_DEFINE(WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG, 1, [OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag.])],
[])
])
+else
+ enable_libopenjpeg=no
fi
-AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$enable_libopenjpeg = xyes)
+AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$openjpeg1 = xyes || test x$openjpeg2 = xyes)
AH_TEMPLATE([ENABLE_LIBOPENJPEG],
[Use libopenjpeg instead of builtin jpeg2000 decoder.])
@@ -810,18 +837,32 @@ else
fi
AC_SUBST(TESTDATADIR)
+# some compilers do not support this flag (see bug #76963)
+fno_check_new=
+AC_MSG_CHECKING([for -fno-check-new compiler flag])
+AC_LANG_PUSH([C++])
+saved_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="-fno-check-new $CXXFLAGS"
+AC_TRY_COMPILE([], [],
+ [AC_MSG_RESULT([yes])
+ fno_check_new="-fno-check-new"],
+ AC_MSG_RESULT([no])
+)
+CXXFLAGS=$saved_CXXFLAGS
+AC_LANG_POP
+
if test "x$GCC" != xyes; then
enable_compile_warnings=no
fi
case "$enable_compile_warnings" in
no) ;;
- yes) CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-check-new -fno-common $CXXFLAGS";
+ yes) CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions $fno_check_new -fno-common $CXXFLAGS";
CFLAGS="-Wall $CFLAGS" ;;
kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef \
-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
-Wconversion -Wall -W -Wpointer-arith \
-Wwrite-strings -O2 -Wformat-security \
- -Wmissing-format-attribute -fno-exceptions -fno-check-new \
+ -Wmissing-format-attribute -fno-exceptions $fno_check_new \
-fno-common $CXXFLAGS" ;;
esac
@@ -910,6 +951,13 @@ echo " use libtiff: $enable_libtiff"
echo " use zlib: $enable_zlib"
echo " use libcurl: $enable_libcurl"
echo " use libopenjpeg: $enable_libopenjpeg"
+if test x$enable_libopenjpeg = xyes;then
+ if test x$openjpeg1 = xyes;then
+ echo " with openjpeg1"
+ else
+ echo " with openjpeg2"
+ fi
+fi
echo " use cms: $enable_cms"
if test x$enable_cms = xyes;then
if test x$lcms1 = xyes;then
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.cc
index 4759186edfe..4759186edfe 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.cc
index 827ebc7d7c3..827ebc7d7c3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.30.0/fofi/Makefile.am
index 4deb7d5e063..4deb7d5e063 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.30.0/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.30.0/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.30.0/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.30.0/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.30.0/goo/GooMutex.h
index b2714b048c7..b2714b048c7 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/GooString.cc
index 8591d95cd3e..8591d95cd3e 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.30.0/goo/GooString.h
index 0176d873646..0176d873646 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.30.0/goo/GooTimer.h
index ac64f6b4868..ac64f6b4868 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.30.0/goo/Makefile.am
index 370e85021be..370e85021be 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.cc
index 316008778b1..316008778b1 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/gfile.cc
index 3528bb357d8..3528bb357d8 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.30.0/goo/gfile.h
index 1365a9cf2ab..1365a9cf2ab 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.30.0/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/grandom.h b/Build/source/libs/poppler/poppler-0.30.0/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.30.0/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.30.0/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.30.0/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.30.0/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.30.0/gtk-doc.make
index e7916563d75..e7916563d75 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.30.0/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.30.0/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.30.0/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Annot.cc
index d35cb9b2697..d35cb9b2697 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Annot.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Annot.h
index 8fde6a6736b..8fde6a6736b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/CMap.cc
index 6731ab5a1fa..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.cc
index 4cf8d6b41af..4cf8d6b41af 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.cc
index 4e8abcfd94d..4e8abcfd94d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.h
index 8de391ae72b..8de391ae72b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Catalog.cc
index 039f63e1895..039f63e1895 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.cc
index 59b7c93e66f..59b7c93e66f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Dict.cc
index c2a94f4a1fa..c2a94f4a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Error.h
index 9e11733d803..9e11733d803 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Form.cc
index 661ed8972df..661ed8972df 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Function.cc
index 67283dffe9f..67283dffe9f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc
index 64a9d7ba3b4..6ad1b2c2884 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc
@@ -37,6 +37,7 @@
// Copyright (C) 2012 Even Rouault <even.rouault@mines-paris.org>
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2012 Lu Wang <coolwanglu@gmail.com>
+// Copyright (C) 2014 Jason Crain <jason@aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -5277,6 +5278,7 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
obj1.free();
} else {
obj1.free();
+ bboxObj.free();
error(errSyntaxError, getPos(), "Bad form bounding box value");
return;
}
@@ -5288,8 +5290,15 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
if (matrixObj.isArray() && matrixObj.arrayGetLength() >= 6) {
for (i = 0; i < 6; ++i) {
matrixObj.arrayGet(i, &obj1);
- m[i] = obj1.getNum();
- obj1.free();
+ if (likely(obj1.isNum())) {
+ m[i] = obj1.getNum();
+ obj1.free();
+ } else {
+ obj1.free();
+ matrixObj.free();
+ error(errSyntaxError, getPos(), "Bad form matrix");
+ return;
+ }
}
} else {
m[0] = 1; m[1] = 0;
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.cc
index 39f026ad6d4..39f026ad6d4 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.h
index 1be89750349..1be89750349 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState.cc
index 359c0d693ae..359c0d693ae 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState.h
index f018e93dd34..f018e93dd34 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.cc
index 3d88646f7b3..3d88646f7b3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.h
index c33a8024c04..c33a8024c04 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Hints.cc
index bdd0d322612..bdd0d322612 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.cc
index 0695dc5da0e..0695dc5da0e 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.h
index 0ee2518575c..0ee2518575c 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc
new file mode 100644
index 00000000000..2d48899904e
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc
@@ -0,0 +1,445 @@
+//========================================================================
+//
+// JPEG2000Stream.cc
+//
+// A JPX stream decoder using OpenJPEG
+//
+// Copyright 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
+// Copyright 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright 2013,2014 Adrian Johnson <ajohnson@redneon.com>
+//
+// Licensed under GPLv2 or later
+//
+//========================================================================
+
+#include "config.h"
+#include "JPEG2000Stream.h"
+#include <openjpeg.h>
+
+#define OPENJPEG_VERSION_ENCODE(major, minor, micro) ( \
+ ((major) * 10000) \
+ + ((minor) * 100) \
+ + ((micro) * 1))
+
+#ifdef USE_OPENJPEG2
+#ifdef OPJ_VERSION_MAJOR
+#define OPENJPEG_VERSION OPENJPEG_VERSION_ENCODE(OPJ_VERSION_MAJOR, OPJ_VERSION_MINOR, OPJ_VERSION_BUILD)
+#else
+// OpenJPEG started providing version macros in version 2.1.
+// If the version macro is not found, set the version to 2.0.0 and
+// assume there will be no API changes in 2.0.x.
+#define OPENJPEG_VERSION OPENJPEG_VERSION_ENCODE(2, 0, 0)
+#endif
+#endif
+
+struct JPXStreamPrivate {
+ opj_image_t *image;
+ int counter;
+ int ccounter;
+ int npixels;
+ int ncomps;
+ GBool inited;
+#ifdef USE_OPENJPEG1
+ opj_dinfo_t *dinfo;
+ void init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format);
+#endif
+#ifdef USE_OPENJPEG2
+ void init2(OPJ_CODEC_FORMAT format, unsigned char *data, int length);
+#endif
+};
+
+JPXStream::JPXStream(Stream *strA) : FilterStream(strA) {
+ priv = new JPXStreamPrivate;
+ priv->inited = gFalse;
+ priv->image = NULL;
+ priv->npixels = 0;
+ priv->ncomps = 0;
+#ifdef USE_OPENJPEG1
+ priv->dinfo = NULL;
+#endif
+}
+
+JPXStream::~JPXStream() {
+ delete str;
+ close();
+ delete priv;
+}
+
+void JPXStream::reset() {
+ priv->counter = 0;
+ priv->ccounter = 0;
+}
+
+void JPXStream::close() {
+ if (priv->image != NULL) {
+ opj_image_destroy(priv->image);
+ priv->image = NULL;
+ priv->npixels = 0;
+ }
+
+#ifdef USE_OPENJPEG1
+ if (priv->dinfo != NULL) {
+ opj_destroy_decompress(priv->dinfo);
+ priv->dinfo = NULL;
+ }
+#endif
+}
+
+Goffset JPXStream::getPos() {
+ return priv->counter * priv->ncomps + priv->ccounter;
+}
+
+int JPXStream::getChars(int nChars, Guchar *buffer) {
+ for (int i = 0; i < nChars; ++i) {
+ const int c = doGetChar();
+ if (likely(c != EOF)) buffer[i] = c;
+ else return i;
+ }
+ return nChars;
+}
+
+int JPXStream::getChar() {
+ return doGetChar();
+}
+
+int JPXStream::doLookChar() {
+ if (unlikely(priv->inited == gFalse))
+ init();
+
+ if (unlikely(priv->counter >= priv->npixels))
+ return EOF;
+
+ return ((unsigned char *)priv->image->comps[priv->ccounter].data)[priv->counter];
+}
+
+int JPXStream::lookChar() {
+ return doLookChar();
+}
+
+int JPXStream::doGetChar() {
+ int result = doLookChar();
+ if (++priv->ccounter == priv->ncomps) {
+ priv->ccounter = 0;
+ ++priv->counter;
+ }
+ return result;
+}
+
+GooString *JPXStream::getPSFilter(int psLevel, const char *indent) {
+ return NULL;
+}
+
+GBool JPXStream::isBinary(GBool last) {
+ return str->isBinary(gTrue);
+}
+
+void JPXStream::getImageParams(int *bitsPerComponent, StreamColorSpaceMode *csMode) {
+ if (priv->inited == gFalse)
+ init();
+
+ *bitsPerComponent = 8;
+ if (priv->image && priv->image->numcomps == 3)
+ *csMode = streamCSDeviceRGB;
+ else if (priv->image && priv->image->numcomps == 4)
+ *csMode = streamCSDeviceCMYK;
+ else
+ *csMode = streamCSDeviceGray;
+}
+
+
+static void libopenjpeg_error_callback(const char *msg, void * /*client_data*/) {
+ error(errSyntaxError, -1, "{0:s}", msg);
+}
+
+static void libopenjpeg_warning_callback(const char *msg, void * /*client_data*/) {
+ error(errSyntaxWarning, -1, "{0:s}", msg);
+}
+
+#ifdef USE_OPENJPEG1
+
+#define BUFFER_INITIAL_SIZE 4096
+
+void JPXStream::init()
+{
+ Object oLen;
+ if (getDict()) getDict()->lookup("Length", &oLen);
+
+ int bufSize = BUFFER_INITIAL_SIZE;
+ if (oLen.isInt()) bufSize = oLen.getInt();
+ oLen.free();
+
+ int length = 0;
+ unsigned char *buf = str->toUnsignedChars(&length, bufSize);
+ priv->init2(buf, length, CODEC_JP2);
+ free(buf);
+
+ if (priv->image) {
+ priv->npixels = priv->image->comps[0].w * priv->image->comps[0].h;
+ priv->ncomps = priv->image->numcomps;
+ for (int component = 0; component < priv->ncomps; component++) {
+ if (priv->image->comps[component].data == NULL) {
+ close();
+ break;
+ }
+ unsigned char *cdata = (unsigned char *)priv->image->comps[component].data;
+ int adjust = 0;
+ if (priv->image->comps[component].prec > 8)
+ adjust = priv->image->comps[component].prec - 8;
+ int sgndcorr = 0;
+ if (priv->image->comps[component].sgnd)
+ sgndcorr = 1 << (priv->image->comps[0].prec - 1);
+ for (int i = 0; i < priv->npixels; i++) {
+ int r = priv->image->comps[component].data[i];
+ r += sgndcorr;
+ if (adjust) {
+ r = (r >> adjust)+((r >> (adjust-1))%2);
+ if (unlikely(r > 255))
+ r = 255;
+ }
+ *(cdata++) = r;
+ }
+ }
+ } else
+ priv->npixels = 0;
+
+ priv->counter = 0;
+ priv->ccounter = 0;
+ priv->inited = gTrue;
+}
+
+void JPXStreamPrivate::init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format)
+{
+ opj_cio_t *cio = NULL;
+
+ /* Use default decompression parameters */
+ opj_dparameters_t parameters;
+ opj_set_default_decoder_parameters(&parameters);
+#ifdef WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG
+ parameters.flags = OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
+#endif
+
+ /* Configure the event manager to receive errors and warnings */
+ opj_event_mgr_t event_mgr;
+ memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+ event_mgr.error_handler = libopenjpeg_error_callback;
+ event_mgr.warning_handler = libopenjpeg_warning_callback;
+
+ /* Get the decoder handle of the format */
+ dinfo = opj_create_decompress(format);
+ if (dinfo == NULL) goto error;
+ /* Catch events using our callbacks */
+ opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, NULL);
+
+ /* Setup the decoder decoding parameters */
+ opj_setup_decoder(dinfo, &parameters);
+
+ /* Open a byte stream */
+ cio = opj_cio_open((opj_common_ptr)dinfo, buf, bufLen);
+ if (cio == NULL) goto error;
+
+ /* Decode the stream and fill the image structure */
+ image = opj_decode(dinfo, cio);
+
+ /* Close the byte stream */
+ opj_cio_close(cio);
+
+ if (image == NULL) goto error;
+ else return;
+
+error:
+ if (format == CODEC_JP2) {
+ error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as JP2, trying as J2K.");
+ init2(buf, bufLen, CODEC_J2K);
+ } else if (format == CODEC_J2K) {
+ error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as J2K, trying as JPT.");
+ init2(buf, bufLen, CODEC_JPT);
+ } else {
+ error(errSyntaxError, -1, "Did no succeed opening JPX Stream.");
+ }
+}
+#endif
+
+
+#ifdef USE_OPENJPEG2
+typedef struct JPXData_s
+{
+ unsigned char *data;
+ int size;
+ int pos;
+} JPXData;
+
+#define BUFFER_INITIAL_SIZE 4096
+
+static OPJ_SIZE_T jpxRead_callback(void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data)
+{
+ JPXData *jpxData = (JPXData *)p_user_data;
+ int len;
+
+ len = jpxData->size - jpxData->pos;
+ if (len < 0)
+ len = 0;
+ if (len == 0)
+ return (OPJ_SIZE_T)-1; /* End of file! */
+ if ((OPJ_SIZE_T)len > p_nb_bytes)
+ len = p_nb_bytes;
+ memcpy(p_buffer, jpxData->data + jpxData->pos, len);
+ jpxData->pos += len;
+ return len;
+}
+
+static OPJ_OFF_T jpxSkip_callback(OPJ_OFF_T skip, void * p_user_data)
+{
+ JPXData *jpxData = (JPXData *)p_user_data;
+
+ jpxData->pos += (skip > jpxData->size - jpxData->pos) ? jpxData->size - jpxData->pos : skip;
+ /* Always return input value to avoid "Problem with skipping JPEG2000 box, stream error" */
+ return skip;
+}
+
+static OPJ_BOOL jpxSeek_callback(OPJ_OFF_T seek_pos, void * p_user_data)
+{
+ JPXData *jpxData = (JPXData *)p_user_data;
+
+ if (seek_pos > jpxData->size)
+ return OPJ_FALSE;
+ jpxData->pos = seek_pos;
+ return OPJ_TRUE;
+}
+
+void JPXStream::init()
+{
+ Object oLen;
+ if (getDict()) getDict()->lookup("Length", &oLen);
+
+ int bufSize = BUFFER_INITIAL_SIZE;
+ if (oLen.isInt()) bufSize = oLen.getInt();
+ oLen.free();
+
+ int length = 0;
+ unsigned char *buf = str->toUnsignedChars(&length, bufSize);
+ priv->init2(OPJ_CODEC_JP2, buf, length);
+ gfree(buf);
+
+ if (priv->image) {
+ priv->npixels = priv->image->comps[0].w * priv->image->comps[0].h;
+ priv->ncomps = priv->image->numcomps;
+ for (int component = 0; component < priv->ncomps; component++) {
+ if (priv->image->comps[component].data == NULL) {
+ close();
+ break;
+ }
+ unsigned char *cdata = (unsigned char *)priv->image->comps[component].data;
+ int adjust = 0;
+ if (priv->image->comps[component].prec > 8)
+ adjust = priv->image->comps[component].prec - 8;
+ int sgndcorr = 0;
+ if (priv->image->comps[component].sgnd)
+ sgndcorr = 1 << (priv->image->comps[0].prec - 1);
+ for (int i = 0; i < priv->npixels; i++) {
+ int r = priv->image->comps[component].data[i];
+ r += sgndcorr;
+ if (adjust) {
+ r = (r >> adjust)+((r >> (adjust-1))%2);
+ if (unlikely(r > 255))
+ r = 255;
+ }
+ *(cdata++) = r;
+ }
+ }
+ } else {
+ priv->npixels = 0;
+ }
+
+ priv->counter = 0;
+ priv->ccounter = 0;
+ priv->inited = gTrue;
+}
+
+void JPXStreamPrivate::init2(OPJ_CODEC_FORMAT format, unsigned char *buf, int length)
+{
+ JPXData jpxData;
+
+ jpxData.data = buf;
+ jpxData.pos = 0;
+ jpxData.size = length;
+
+ opj_stream_t *stream;
+
+ stream = opj_stream_default_create(OPJ_TRUE);
+
+#if OPENJPEG_VERSION >= OPENJPEG_VERSION_ENCODE(2, 1, 0)
+ opj_stream_set_user_data (stream, &jpxData, NULL);
+#else
+ opj_stream_set_user_data (stream, &jpxData);
+#endif
+
+ opj_stream_set_read_function(stream, jpxRead_callback);
+ opj_stream_set_skip_function(stream, jpxSkip_callback);
+ opj_stream_set_seek_function(stream, jpxSeek_callback);
+ /* Set the length to avoid an assert */
+ opj_stream_set_user_data_length(stream, length);
+
+ opj_codec_t *decoder;
+
+ /* Use default decompression parameters */
+ opj_dparameters_t parameters;
+ opj_set_default_decoder_parameters(&parameters);
+ parameters.flags |= OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
+
+ /* Get the decoder handle of the format */
+ decoder = opj_create_decompress(format);
+ if (decoder == NULL) {
+ error(errSyntaxWarning, -1, "Unable to create decoder");
+ goto error;
+ }
+
+ /* Catch events using our callbacks */
+ opj_set_warning_handler(decoder, libopenjpeg_warning_callback, NULL);
+ opj_set_error_handler(decoder, libopenjpeg_error_callback, NULL);
+
+ /* Setup the decoder decoding parameters */
+ if (!opj_setup_decoder(decoder, &parameters)) {
+ error(errSyntaxWarning, -1, "Unable to set decoder parameters");
+ goto error;
+ }
+
+ /* Decode the stream and fill the image structure */
+ image = NULL;
+ if (!opj_read_header(stream, decoder, &image)) {
+ error(errSyntaxWarning, -1, "Unable to read header");
+ goto error;
+ }
+
+ /* Optional if you want decode the entire image */
+ if (!opj_set_decode_area(decoder, image, parameters.DA_x0,
+ parameters.DA_y0, parameters.DA_x1, parameters.DA_y1)){
+ error(errSyntaxWarning, -1, "X2");
+ goto error;
+ }
+
+ /* Get the decoded image */
+ if (!(opj_decode(decoder, stream, image) && opj_end_decompress(decoder, stream))) {
+ error(errSyntaxWarning, -1, "Unable to decode image");
+ goto error;
+ }
+
+ opj_destroy_codec(decoder);
+ opj_stream_destroy(stream);
+
+ if (image != NULL)
+ return;
+
+error:
+ opj_destroy_codec(decoder);
+ if (format == OPJ_CODEC_JP2) {
+ error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as JP2, trying as J2K.");
+ init2(OPJ_CODEC_J2K, buf, length);
+ } else if (format == OPJ_CODEC_J2K) {
+ error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as J2K, trying as JPT.");
+ init2(OPJ_CODEC_JPT, buf, length);
+ } else {
+ error(errSyntaxError, -1, "Did no succeed opening JPX Stream.");
+ }
+}
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h
index 3feccbef06d..50b758608dc 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h
@@ -6,7 +6,7 @@
//
// Copyright 2008, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
-// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2013,2014 Adrian Johnson <ajohnson@redneon.com>
//
// Licensed under GPLv2 or later
//
@@ -16,12 +16,13 @@
#ifndef JPEG2000STREAM_H
#define JPEG2000STREAM_H
-#include <openjpeg.h>
-
+#include "config.h"
#include "goo/gtypes.h"
#include "Object.h"
#include "Stream.h"
+struct JPXStreamPrivate;
+
class JPXStream: public FilterStream {
public:
@@ -37,37 +38,21 @@ public:
virtual GBool isBinary(GBool last = gTrue);
virtual void getImageParams(int *bitsPerComponent, StreamColorSpaceMode *csMode);
+ int readStream(int nChars, Guchar *buffer) {
+ return str->doGetChars(nChars, buffer);
+ }
private:
- void init();
- void init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format);
+ JPXStream(const JPXStream &other);
+ JPXStream& operator=(const JPXStream &other);
+ JPXStreamPrivate *priv;
+ void init();
virtual GBool hasGetChars() { return true; }
virtual int getChars(int nChars, Guchar *buffer);
- inline int doGetChar() {
- int result = doLookChar();
- if (++ccounter == ncomps) {
- ccounter = 0;
- ++counter;
- }
- return result;
- }
-
- inline int doLookChar() {
- if (unlikely(inited == gFalse)) init();
-
- if (unlikely(counter >= npixels)) return EOF;
-
- return ((unsigned char *)image->comps[ccounter].data)[counter];
- }
+ int doGetChar();
- opj_image_t *image;
- opj_dinfo_t *dinfo;
- int counter;
- int ccounter;
- int npixels;
- int ncomps;
- GBool inited;
+ int doLookChar();
};
#endif
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Lexer.cc
index 952967a998a..952967a998a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Link.cc
index 4ab5f52ceda..4ab5f52ceda 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.30.0/poppler/Makefile.am
index 01fe01e585d..e0c98d805e8 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 48:0:0 \
+ -version-info 49:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Object.h
index 15bea159857..15bea159857 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.cc
index ec8d3df18d8..71a1efe269d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.cc
@@ -31,6 +31,7 @@
// Copyright (C) 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
+// Copyright (C) 2015 Li Junling <lijunling@sina.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
@@ -1820,27 +1821,33 @@ Goffset PDFDoc::getStartXRef(GBool tryingToReconstruct)
int c, n, i;
// read last xrefSearchSize bytes
- str->setPos(xrefSearchSize, -1);
- for (n = 0; n < xrefSearchSize; ++n) {
- if ((c = str->getChar()) == EOF) {
- break;
+ int segnum = 0;
+ int maxXRefSearch = 24576;
+ if (str->getLength() < maxXRefSearch) maxXRefSearch = str->getLength();
+ for (; (xrefSearchSize - 16) * segnum < maxXRefSearch; segnum++) {
+ str->setPos((xrefSearchSize - 16) * segnum + xrefSearchSize, -1);
+ for (n = 0; n < xrefSearchSize; ++n) {
+ if ((c = str->getChar()) == EOF) {
+ break;
+ }
+ buf[n] = c;
}
- buf[n] = c;
- }
- buf[n] = '\0';
+ buf[n] = '\0';
- // find startxref
- for (i = n - 9; i >= 0; --i) {
- if (!strncmp(&buf[i], "startxref", 9)) {
+ // find startxref
+ for (i = n - 9; i >= 0; --i) {
+ if (!strncmp(&buf[i], "startxref", 9)) {
+ break;
+ }
+ }
+ if (i < 0) {
+ startXRefPos = 0;
+ } else {
+ for (p = &buf[i + 9]; isspace(*p); ++p);
+ startXRefPos = strToLongLong(p);
break;
}
}
- if (i < 0) {
- startXRefPos = 0;
- } else {
- for (p = &buf[i+9]; isspace(*p); ++p) ;
- startXRefPos = strToLongLong(p);
- }
}
}
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.h
index 6c40f7b0c0c..6c40f7b0c0c 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc
index 149bb620df2..b95df31066f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2006-2009, 2011-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2009, 2011-2013, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2007, 2008 Brad Hards <bradh@kde.org>
// Copyright (C) 2008, 2009 Koji Otani <sho@bbr.jp>
@@ -1074,7 +1074,7 @@ static void outputToFile(void *stream, const char *data, int len) {
PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
char *psTitle,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA, int paperHeightA,
GBool noCropA, GBool duplexA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
@@ -1136,7 +1136,7 @@ PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
}
init(outputToFile, f, fileTypeA, psTitle,
- doc, firstPage, lastPage, modeA,
+ doc, pages, modeA,
imgLLXA, imgLLYA, imgURXA, imgURYA, manualCtrlA,
paperWidthA, paperHeightA, noCropA, duplexA);
}
@@ -1144,7 +1144,7 @@ PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
char *psTitle,
PDFDoc *doc,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA, int paperHeightA,
GBool noCropA, GBool duplexA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
@@ -1174,7 +1174,7 @@ PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
forceRasterize = forceRasterizeA;
init(outputFuncA, outputStreamA, psGeneric, psTitle,
- doc, firstPage, lastPage, modeA,
+ doc, pages, modeA,
imgLLXA, imgLLYA, imgURXA, imgURYA, manualCtrlA,
paperWidthA, paperHeightA, noCropA, duplexA);
}
@@ -1214,7 +1214,7 @@ static bool pageDimensionEqual(int a, int b) {
void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
PSFileType fileTypeA, char *pstitle, PDFDoc *docA,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pagesA, PSOutMode modeA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
GBool manualCtrlA, int paperWidthA, int paperHeightA,
GBool noCropA, GBool duplexA) {
@@ -1222,7 +1222,12 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
PDFRectangle *box;
PSOutPaperSize *size;
GooList *names;
- int pg, w, h, i;
+ int w, h, i;
+
+ if (pagesA.empty()) {
+ ok = gFalse;
+ return;
+ }
// initialize
displayText = gTrue;
@@ -1249,9 +1254,8 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
}
Page *page;
paperSizes = new GooList();
- for (pg = (firstPage >= 1) ? firstPage : 1;
- pg <= lastPage && pg <= catalog->getNumPages();
- ++pg) {
+ for (size_t pgi = 0; pgi < pagesA.size(); ++pgi) {
+ const int pg = pagesA[pgi];
page = catalog->getPage(pg);
if (page == NULL)
paperMatch = gFalse;
@@ -1313,8 +1317,11 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
imgURY = paperHeight;
}
manualCtrl = manualCtrlA;
+ std::vector<int> pages;
if (mode == psModeForm) {
- lastPage = firstPage;
+ pages.push_back(pagesA[0]);
+ } else {
+ pages = pagesA;
}
processColors = 0;
inType3Char = gFalse;
@@ -1367,16 +1374,16 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
if (!manualCtrl) {
Page *page;
// this check is needed in case the document has zero pages
- if ((page = doc->getPage(firstPage))) {
- writeHeader(firstPage, lastPage,
+ if ((page = doc->getPage(pages[0]))) {
+ writeHeader(pages,
page->getMediaBox(),
page->getCropBox(),
page->getRotate(),
pstitle);
} else {
- error(errSyntaxError, -1, "Invalid page {0:d}", firstPage);
+ error(errSyntaxError, -1, "Invalid page {0:d}", pages[0]);
box = new PDFRectangle(0, 0, 1, 1);
- writeHeader(firstPage, lastPage, box, box, 0, pstitle);
+ writeHeader(pages, box, box, 0, pstitle);
delete box;
}
if (mode != psModeForm) {
@@ -1387,7 +1394,7 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
writePS("%%EndProlog\n");
writePS("%%BeginSetup\n");
}
- writeDocSetup(doc, catalog, firstPage, lastPage, duplexA);
+ writeDocSetup(doc, catalog, pages, duplexA);
if (mode != psModeForm) {
writePS("%%EndSetup\n");
}
@@ -1463,7 +1470,7 @@ PSOutputDev::~PSOutputDev() {
}
}
-void PSOutputDev::writeHeader(int firstPage, int lastPage,
+void PSOutputDev::writeHeader(const std::vector<int> &pages,
PDFRectangle *mediaBox, PDFRectangle *cropBox,
int pageRotate, char *psTitle) {
Object info, obj1;
@@ -1520,7 +1527,7 @@ void PSOutputDev::writeHeader(int firstPage, int lastPage,
i==0 ? "DocumentMedia:" : "+", size->name, size->w, size->h);
}
writePSFmt("%%BoundingBox: 0 0 {0:d} {1:d}\n", paperWidth, paperHeight);
- writePSFmt("%%Pages: {0:d}\n", lastPage - firstPage + 1);
+ writePSFmt("%%Pages: {0:d}\n", static_cast<int>(pages.size()));
writePS("%%EndComments\n");
if (!paperMatch) {
size = (PSOutPaperSize *)paperSizes->get(0);
@@ -1603,7 +1610,7 @@ void PSOutputDev::writeXpdfProcset() {
}
void PSOutputDev::writeDocSetup(PDFDoc *doc, Catalog *catalog,
- int firstPage, int lastPage,
+ const std::vector<int> &pages,
GBool duplexA) {
Page *page;
Dict *resDict;
@@ -1611,7 +1618,7 @@ void PSOutputDev::writeDocSetup(PDFDoc *doc, Catalog *catalog,
Object *acroForm;
Object obj1, obj2, obj3;
GooString *s;
- int pg, i;
+ int i;
if (mode == psModeForm) {
// swap the form and xpdf dicts
@@ -1619,7 +1626,8 @@ void PSOutputDev::writeDocSetup(PDFDoc *doc, Catalog *catalog,
} else {
writePS("xpdf begin\n");
}
- for (pg = firstPage; pg <= lastPage; ++pg) {
+ for (size_t pgi = 0; pgi < pages.size(); ++pgi) {
+ const int pg = pages[pgi];
page = doc->getPage(pg);
if (!page) {
error(errSyntaxError, -1, "Failed writing resources for page {0:d}", pg);
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h
index f30204deeb5..262ce14caab 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2006-2008, 2012, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2008, 2012, 2013, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007 Brad Hards <bradh@kde.org>
// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
@@ -93,9 +93,10 @@ class PSOutputDev: public OutputDev {
public:
// Open a PostScript output file, and write the prolog.
+ // pages has to be sorted in increasing order
PSOutputDev(const char *fileName, PDFDoc *docA,
char *psTitle,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA = -1, int paperHeightA = -1,
GBool noCrop = gFalse,
GBool duplexA = gTrue,
@@ -107,10 +108,11 @@ public:
void *customCodeCbkDataA = NULL);
// Open a PSOutputDev that will write to a generic stream.
+ // pages has to be sorted in increasing order
PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
char *psTitle,
PDFDoc *docA,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA = -1, int paperHeightA = -1,
GBool noCrop = gFalse,
GBool duplexA = gTrue,
@@ -160,7 +162,7 @@ public:
//----- header/trailer (used only if manualCtrl is true)
// Write the document-level header.
- void writeHeader(int firstPage, int lastPage,
+ void writeHeader(const std::vector<int> &pages,
PDFRectangle *mediaBox, PDFRectangle *cropBox,
int pageRotate, char *pstitle);
@@ -310,7 +312,7 @@ private:
void init(PSOutputFunc outputFuncA, void *outputStreamA,
PSFileType fileTypeA, char *pstitle, PDFDoc *doc,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pages, PSOutMode modeA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
GBool manualCtrlA, int paperWidthA, int paperHeightA,
GBool noCropA, GBool duplexA);
@@ -386,7 +388,7 @@ private:
GooString *filterPSName(GooString *name);
// Write the document-level setup.
- void writeDocSetup(PDFDoc *doc, Catalog *catalog, int firstPage, int lastPage, GBool duplexA);
+ void writeDocSetup(PDFDoc *doc, Catalog *catalog, const std::vector<int> &pages, GBool duplexA);
void writePSChar(char c);
void writePS(const char *s);
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Page.cc
index 98c13c14ff8..98c13c14ff8 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo_p.h
index 6cd5220d372..6cd5220d372 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Parser.cc
index 28a54607f5c..28a54607f5c 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.cc
index b2af18d86b8..b2af18d86b8 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.h
index 50fcbf22f73..50fcbf22f73 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.cc
index d6f55995b1c..d6f55995b1c 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.cc
index bfb07eb7315..bfb07eb7315 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.h
index efbb865c45b..efbb865c45b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream.cc
index 4c00ddb0d5d..4c00ddb0d5d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/StructElement.cc
index b1aaca8a58b..b1aaca8a58b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/StructElement.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/StructElement.h
index cd89a970ddb..cd89a970ddb 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/StructElement.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.cc
index e46e3e28388..e46e3e28388 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.h
index 3b1f3c84421..3b1f3c84421 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc
index 4b7ff406c3e..c9db1e7d19f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc
@@ -30,7 +30,7 @@
// Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
// Copyright (C) 2011 Sam Liao <phyomh@gmail.com>
// Copyright (C) 2012 Horst Prote <prote@fmi.uni-stuttgart.de>
-// Copyright (C) 2012, 2013 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2012, 2013, 2014 Jason Crain <jason@aquaticape.us>
// Copyright (C) 2012 Peter Breitenlohner <peb@mppmu.mpg.de>
// Copyright (C) 2013 José Aliste <jaliste@src.gnome.org>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
@@ -4072,6 +4072,11 @@ void TextSelectionDumper::startLine()
void TextSelectionDumper::finishLine()
{
+ if (nLines == linesSize) {
+ linesSize *= 2;
+ lines = (GooList **)grealloc(lines, linesSize * sizeof(GooList *));
+ }
+
if (words && words->getLength() > 0)
lines[nLines++] = words;
else if (words)
@@ -4088,11 +4093,6 @@ void TextSelectionDumper::visitLine (TextLine *line,
{
TextLineFrag frag;
- if (nLines == linesSize) {
- linesSize *= 2;
- lines = (GooList **)grealloc(lines, linesSize * sizeof(GooList *));
- }
-
frag.init(line, edge_begin, edge_end - edge_begin);
if (tableId >= 0 && frag.line->blk->tableId < 0) {
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.h
index 23fb3b726a9..23fb3b726a9 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/XRef.cc
index 1bbbdc51c25..1bbbdc51c25 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.h
index 6ed890a8f1f..6ed890a8f1f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.30.0/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.cmake
index d7918bc4e5d..b087a693f92 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.cmake
@@ -134,7 +134,7 @@
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2014 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2015 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
//------------------------------------------------------------------------
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.in
index a7d2efeb96d..f73d0f66ee9 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.in
@@ -134,7 +134,7 @@
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2014 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2015 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
//------------------------------------------------------------------------
diff --git a/Build/source/libs/poppler/poppler-0.29.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.30.0/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.30.0/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.30.0/splash/Makefile.am
index 5c265d6360c..5c265d6360c 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/Splash.cc
index fde272acbab..fde272acbab 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/Splash.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/Splash.h b/Build/source/libs/poppler/poppler-0.30.0/splash/Splash.h
index cf98e6c6824..cf98e6c6824 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/Splash.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.cc
index ac344f17c35..ac344f17c35 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.h
index 70509abcfaa..70509abcfaa 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.cc
index b785826d66b..b785826d66b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.cc
index f0dcf50384b..f0dcf50384b 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFont.cc
index 3d6d6b2343e..3d6d6b2343e 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.cc
index 968e8207362..968e8207362 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.h
index e678c9e20e6..e678c9e20e6 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashState.cc
index fd2789d02f9..fd2789d02f9 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashState.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashState.h
index 2c603531cfd..2c603531cfd 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashState.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.cc
index ac47881cb4f..ac47881cb4f 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.cc
diff --git a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.h
index cc295cb68fe..cc295cb68fe 100644
--- a/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index 27dab4080f0..aac07c92aff 100644
--- a/Build/source/libs/poppler/version.ac
+++ b/Build/source/libs/poppler/version.ac
@@ -1,5 +1,5 @@
dnl
-dnl Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2011-2015 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.29.0])
+m4_define([poppler_version], [0.30.0])
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog
index a5225a32a2a..485de034728 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog
@@ -1,7 +1,7 @@
2015-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* Import release 1.9.
- * patch-01-mingw32 (new): MinGW32 may not define RRF_RT_REG_SZ.
+ * patch-01-mingw32 (new): Oldish MinGW32 may not define this.
2014-09-15 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-01-mingw32 b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-01-mingw32
index 1f2243a855d..877dac8b566 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-01-mingw32
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-01-mingw32
@@ -1,13 +1,22 @@
diff -ur dvisvgm-1.9.orig/src/Ghostscript.cpp dvisvgm-1.9/src/Ghostscript.cpp
--- dvisvgm-1.9.orig/src/Ghostscript.cpp 2014-10-09 16:20:18.000000000 +0200
-+++ dvisvgm-1.9/src/Ghostscript.cpp 2015-01-07 12:53:17.108466555 +0100
-@@ -41,6 +41,9 @@
- #ifdef __WIN32__
++++ dvisvgm-1.9/src/Ghostscript.cpp 2015-01-07 13:42:12.049828785 +0100
+@@ -38,7 +38,8 @@
+
+ #ifndef HAVE_LIBGS
+
+-#ifdef __WIN32__
++/** RegGetValueA and RRF_RT_REG_SZ may not be defined for some oldish MinGW. */
++#if defined(__WIN32__) && defined(RRF_RT_REG_SZ)
/** Looks up the path of the Ghostscript DLL in the Windows registry and returns it.
* If there is no proper registry entry, the returned string is empty. */
-+#if !defined(RRF_RT_REG_SZ)
-+#define RRF_RT_REG_SZ 0x00000002
-+#endif
static string get_path_from_registry () {
- REGSAM mode = KEY_READ|KEY_QUERY_VALUE;
- #ifdef KEY_WOW64_64KEY
+@@ -96,7 +97,7 @@
+ if (const char *gsdll_path = FileFinder::lookup(gsdll))
+ return gsdll_path;
+ #endif // MIKTEX
+-#if defined(__WIN32__)
++#if defined(__WIN32__) && defined(RRF_RT_REG_SZ)
+ // try to look up the path of the Ghostscript DLL in the Windows registry
+ string gsdll_path = get_path_from_registry();
+ if (!gsdll_path.empty())
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Ghostscript.cpp
index 72aff92f384..061dfa17212 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Ghostscript.cpp
@@ -38,12 +38,10 @@ string Ghostscript::LIBGS_NAME;
#ifndef HAVE_LIBGS
-#ifdef __WIN32__
+/** RegGetValueA and RRF_RT_REG_SZ may not be defined for some oldish MinGW. */
+#if defined(__WIN32__) && defined(RRF_RT_REG_SZ)
/** Looks up the path of the Ghostscript DLL in the Windows registry and returns it.
* If there is no proper registry entry, the returned string is empty. */
-#if !defined(RRF_RT_REG_SZ)
-#define RRF_RT_REG_SZ 0x00000002
-#endif
static string get_path_from_registry () {
REGSAM mode = KEY_READ|KEY_QUERY_VALUE;
#ifdef KEY_WOW64_64KEY
@@ -99,7 +97,7 @@ static string get_libgs (const string &fname) {
if (const char *gsdll_path = FileFinder::lookup(gsdll))
return gsdll_path;
#endif // MIKTEX
-#if defined(__WIN32__)
+#if defined(__WIN32__) && defined(RRF_RT_REG_SZ)
// try to look up the path of the Ghostscript DLL in the Windows registry
string gsdll_path = get_path_from_registry();
if (!gsdll_path.empty())