summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-12 09:16:27 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-12 09:16:27 +0000
commit651ca331cd7943896e894fd42cf13fa1d012347f (patch)
tree8a911c2b5c3f6fb05b53a5a03ccd2614c24ac2c1 /Build/source
parent4403160cd26a0ba4eb014d69bfb9dcd568f64fc6 (diff)
freetype 2.6
git-svn-id: svn://tug.org/texlive/trunk@37505 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/libs/poppler/ChangeLog5
-rw-r--r--Build/source/libs/poppler/Makefile.in4
-rwxr-xr-xBuild/source/libs/poppler/configure38
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.32.0-PATCHES/ChangeLog)7
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-0.32.0-PATCHES/TL-Changes)2
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0-PATCHES/patch-02-LLONG_MAX (renamed from Build/source/libs/poppler/poppler-0.32.0-PATCHES/patch-02-LLONG_MAX)6
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/AUTHORS (renamed from Build/source/libs/poppler/poppler-0.32.0/AUTHORS)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/CMakeLists.txt (renamed from Build/source/libs/poppler/poppler-0.32.0/CMakeLists.txt)4
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/COPYING (renamed from Build/source/libs/poppler/poppler-0.32.0/COPYING)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.32.0/ChangeLog)2210
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/ConfigureChecks.cmake (renamed from Build/source/libs/poppler/poppler-0.32.0/ConfigureChecks.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/INSTALL (renamed from Build/source/libs/poppler/poppler-0.32.0/INSTALL)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.32.0/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/NEWS (renamed from Build/source/libs/poppler/poppler-0.32.0/NEWS)25
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/README (renamed from Build/source/libs/poppler/poppler-0.32.0/README)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/README-XPDF (renamed from Build/source/libs/poppler/poppler-0.32.0/README-XPDF)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/TODO (renamed from Build/source/libs/poppler/poppler-0.32.0/TODO)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.32.0/config.h.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/config.h.in (renamed from Build/source/libs/poppler/poppler-0.32.0/config.h.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/configure.ac (renamed from Build/source/libs/poppler/poppler-0.32.0/configure.ac)4
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiBase.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiBase.h (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiEncodings.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiEncodings.h (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiIdentifier.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiIdentifier.h (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiTrueType.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiTrueType.h (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1.h (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1C.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1C.h (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/fofi/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.32.0/fofi/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/FixedPoint.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/FixedPoint.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/GooHash.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/GooHash.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/GooHash.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/GooHash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/GooLikely.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/GooLikely.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/GooList.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/GooList.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/GooList.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/GooList.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/GooMutex.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/GooMutex.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/GooString.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/GooString.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/GooString.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/GooString.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/GooTimer.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/GooTimer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/GooTimer.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/GooTimer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/ImgWriter.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/ImgWriter.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/JpegWriter.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/JpegWriter.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/NetPBMWriter.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/NetPBMWriter.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/PNGWriter.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/PNGWriter.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/TiffWriter.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/TiffWriter.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/gfile.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/gfile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/gfile.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/gfile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/gmem.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/gmem.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/gmem.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/gmem.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/gmempp.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/gmempp.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/grandom.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/grandom.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/grandom.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/grandom.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/gstrtod.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/gstrtod.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/gstrtod.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/gstrtod.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/gtypes.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/gtypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/goo/gtypes_p.h (renamed from Build/source/libs/poppler/poppler-0.32.0/goo/gtypes_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/gtk-doc.make (renamed from Build/source/libs/poppler/poppler-0.32.0/gtk-doc.make)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-cairo-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-cairo-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-cairo.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-cairo.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-cpp-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-cpp-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-cpp.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-cpp.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-glib-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-glib-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-glib.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-glib.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-qt4-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-qt4-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-qt4.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-qt4.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-qt5-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-qt5-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-qt5.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-qt5.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-splash-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-splash-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-splash.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-splash.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler-uninstalled.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler-uninstalled.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler.pc.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Annot.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Annot.cc)20
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Annot.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Annot.h)4
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Array.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Array.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Array.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Array.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFont.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFont.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFontTables.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFontTables.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CMap.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CMap.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CachedFile.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CairoFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.cc)17
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CairoFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CairoOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CairoOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CairoRescaleBox.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CairoRescaleBox.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Catalog.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Catalog.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Catalog.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Catalog.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CharCodeToUnicode.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CharCodeToUnicode.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CharTypes.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CharTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CompactFontTables.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CompactFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CurlCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CurlCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CurlPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/CurlPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/DCTStream.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/DCTStream.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/DateInfo.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/DateInfo.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Decrypt.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Decrypt.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Dict.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Dict.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Dict.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Dict.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Error.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Error.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Error.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Error.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/ErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/ErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/FileSpec.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/FileSpec.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/FlateStream.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/FlateStream.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/FontEncodingTables.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/FontEncodingTables.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/FontInfo.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/FontInfo.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Form.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Form.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Form.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Form.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Function.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Function.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Function.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Function.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Gfx.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Gfx.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Gfx.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Gfx.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/GfxFont.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.cc)36
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/GfxFont.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.h)2
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState_helpers.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState_helpers.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParams.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParams.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParamsWin.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParamsWin.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Hints.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Hints.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Hints.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Hints.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/JArithmeticDecoder.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/JArithmeticDecoder.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/JBIG2Stream.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/JBIG2Stream.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/JPEG2000Stream.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/JPEG2000Stream.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/JPXStream.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/JPXStream.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Lexer.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Lexer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Lexer.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Lexer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Linearization.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Linearization.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Linearization.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Linearization.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Link.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Link.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Link.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Link.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/LocalPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/LocalPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Makefile.am)2
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/MarkedContentOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/MarkedContentOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Movie.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Movie.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Movie.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Movie.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/NameToCharCode.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/NameToCharCode.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/NameToUnicodeTable.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/NameToUnicodeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Object.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Object.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Object.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Object.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/OptionalContent.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/OptionalContent.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Outline.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Outline.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Outline.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Outline.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/OutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/OutputDev.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDoc.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDoc.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocEncoding.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocEncoding.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocFactory.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocFactory.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PSOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.cc)138
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PSOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.h)11
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PSTokenizer.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PSTokenizer.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Page.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Page.cc)18
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Page.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Page.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo_p.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo_p.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PageTransition.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PageTransition.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Parser.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Parser.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Parser.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Parser.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PopplerCache.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PopplerCache.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PreScanOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/PreScanOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/ProfileData.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/ProfileData.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Rendition.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Rendition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Rendition.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Rendition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/SecurityHandler.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/SecurityHandler.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Sound.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Sound.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Sound.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Sound.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/SplashOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.cc)12
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/SplashOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/StdinCachedFile.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/StdinCachedFile.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/StdinPDFDocBuilder.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/StdinPDFDocBuilder.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Stream-CCITT.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Stream-CCITT.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Stream.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Stream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/Stream.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/StructElement.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/StructElement.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/StructElement.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/StructElement.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/StructTreeRoot.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/StructTreeRoot.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/TextOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.cc)419
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/TextOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.h)31
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UTF.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UTF.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UTF.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UTF.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UTF8.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UTF8.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeCClassTables.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCClassTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeCompTables.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeDecompTables.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeDecompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMap.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMap.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMapTables.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMapTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeTypeTable.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeTypeTable.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/ViewerPreferences.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/ViewerPreferences.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/XRef.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/XRef.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/XRef.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/XRef.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/XpdfPluginAPI.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/XpdfPluginAPI.h (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/gen-unicode-tables.py (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/gen-unicode-tables.py)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/poppler-config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/poppler-config.h.in (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/poppler/strtok_r.cpp (renamed from Build/source/libs/poppler/poppler-0.32.0/poppler/strtok_r.cpp)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/Splash.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/Splash.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/Splash.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/Splash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashBitmap.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashBitmap.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashClip.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashClip.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashClip.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashClip.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFont.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFont.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontFile.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFont.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFont.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFile.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFile.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFileID.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFileID.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashGlyphBitmap.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashGlyphBitmap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashMath.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashMath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashPath.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashPath.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashPattern.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashPattern.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashScreen.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashScreen.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashState.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashState.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashState.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashState.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1Font.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1Font.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontEngine.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontFile.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontFile.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashTypes.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPath.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPath.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPathScanner.cc (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPathScanner.h (renamed from Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.h)0
-rw-r--r--Build/source/libs/poppler/version.ac2
296 files changed, 1788 insertions, 1229 deletions
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 87452a23298..13ddda1356d 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.33.0.
+ * version.ac: Adjust.
+
2015-03-08 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.32.0.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 167d0fad5b9..ebc4a6bdc64 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -276,7 +276,7 @@ am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing \
- $(top_srcdir)/poppler-0.32.0/poppler/poppler-config.h.in \
+ $(top_srcdir)/poppler-0.33.0/poppler/poppler-config.h.in \
../../build-aux/compile ../../build-aux/config.guess \
../../build-aux/config.sub ../../build-aux/depcomp \
../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -597,7 +597,7 @@ poppler-config.h: stamp-h2
@test -f $@ || rm -f stamp-h2
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
-stamp-h2: $(top_srcdir)/poppler-0.32.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.33.0/poppler/poppler-config.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status poppler-config.h
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index c9ec0cfea47..36291629017 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.32.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.33.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.32.0'
-PACKAGE_STRING='poppler (TeX Live) 0.32.0'
+PACKAGE_VERSION='0.33.0'
+PACKAGE_STRING='poppler (TeX Live) 0.33.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.32.0/poppler/Array.cc"
+ac_unique_file="poppler-0.33.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.32.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.33.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.32.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.33.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.32.0
+poppler (TeX Live) configure 0.33.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.32.0, which was
+It was created by poppler (TeX Live) $as_me 0.33.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.32.0'
+ VERSION='0.33.0'
# Some tools Automake needs.
@@ -4145,13 +4145,13 @@ else
if test "x$enable_compiler_warnings" != xno; then
kpse_cv_warning_cflags="-Wimplicit -Wreturn-type"
case `$CC -dumpversion` in #(
- 3.4.* | 4.*) :
+ 3.4.* | 4.* | 5.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wdeclaration-after-statement" ;; #(
*) :
;;
esac
case `$CC -dumpversion` in #(
- 3.[234].* | 4.*) :
+ 3.[234].* | 4.* | 5.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wno-unknown-pragmas" ;; #(
*) :
;;
@@ -4163,7 +4163,7 @@ esac
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wparentheses -Wswitch -Wtrigraphs -Wpointer-arith"
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wcast-qual -Wcast-align -Wwrite-strings"
case `$CC -dumpversion` in #(
- 3.4.* | 4.*) :
+ 3.4.* | 4.* | 5.*) :
kpse_cv_warning_cflags="$kpse_cv_warning_cflags -Wold-style-definition" ;; #(
*) :
;;
@@ -5318,7 +5318,7 @@ if test "x$enable_compiler_warnings" != xno; then
;;
esac
case `$CXX -dumpversion` in #(
- 3.[234].* | 4.*) :
+ 3.[234].* | 4.* | 5.*) :
kpse_cv_warning_cxxflags="$kpse_cv_warning_cxxflags -Wno-unknown-pragmas" ;; #(
*) :
;;
@@ -6573,12 +6573,12 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.32.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.33.0/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.32.0"
+#define POPPLER_VERSION "0.33.0"
_ACEOF
@@ -6712,7 +6712,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.32.0
+POPPLER_TREE=poppler-0.33.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.32.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.33.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.32.0
+poppler (TeX Live) config.status 0.33.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.32.0/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.33.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.32.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.33.0-PATCHES/ChangeLog
index 3c45002c302..6a2495cc233 100644
--- a/Build/source/libs/poppler/poppler-0.32.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.33.0-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.33.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
2015-03-08 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported poppler-0.32.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.32.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.33.0-PATCHES/TL-Changes
index d1de678e427..7c0f1e7457a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.33.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.32.0 tree as obtained from:
+Changes applied to the poppler-0.33.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
diff --git a/Build/source/libs/poppler/poppler-0.32.0-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.33.0-PATCHES/patch-02-LLONG_MAX
index 8885d67111a..aba3105f874 100644
--- a/Build/source/libs/poppler/poppler-0.32.0-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.33.0-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.32.0.orig/goo/GooString.h poppler-0.32.0/goo/GooString.h
---- poppler-0.32.0.orig/goo/GooString.h 2014-10-07 22:41:15.000000000 +0200
-+++ poppler-0.32.0/goo/GooString.h 2014-11-04 10:20:40.567904859 +0100
+diff -ur poppler-0.33.0.orig/goo/GooString.h poppler-0.33.0/goo/GooString.h
+--- poppler-0.33.0.orig/goo/GooString.h 2014-10-07 22:41:15.000000000 +0200
++++ poppler-0.33.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.32.0/AUTHORS b/Build/source/libs/poppler/poppler-0.33.0/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.33.0/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.32.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.33.0/CMakeLists.txt
index 301760cfd36..f77e366fb60 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.33.0/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ECM_FOUND)
endif()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "32")
+set(POPPLER_MINOR_VERSION "33")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -474,7 +474,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 51.0.0 SOVERSION 51)
+set_target_properties(poppler PROPERTIES VERSION 52.0.0 SOVERSION 52)
target_link_libraries(poppler ${poppler_LIBS})
target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/Build/source/libs/poppler/poppler-0.32.0/COPYING b/Build/source/libs/poppler/poppler-0.33.0/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/COPYING
+++ b/Build/source/libs/poppler/poppler-0.33.0/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.32.0/ChangeLog b/Build/source/libs/poppler/poppler-0.33.0/ChangeLog
index 1aa10948972..1d774030be9 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.33.0/ChangeLog
@@ -1,21 +1,235 @@
+commit 2b2fb719aa5ffe32fbc3fb500444b1643b1c6099
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu May 14 20:17:12 2015 +0200
+
+ Add missing (C)
+
+ poppler/Annot.cc | 1 +
+ poppler/Annot.h | 2 +-
+ poppler/CairoFontEngine.cc | 1 +
+ poppler/Page.cc | 3 ++-
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+
+commit ae76b75c6a5383eb52f58fba0faba69ae8698ef9
+Author: William Bader <williambader@hotmail.com>
+Date: Thu May 14 20:06:22 2015 +0200
+
+ Fix regression in pdftops parameter passing
+
+ Recent changes to the command line processing moved some options
+ from GlobalParams to PSOutputDev.
+ The options used to be set by calling setters in GlobalParams before
+ creating the PSOutputDev.
+ Now the options are set by calling setters in PSOutputDev after it
+ is created.
+ The problem is that PSOutputDev() calls init() which uses options
+ that now can not be set until later after PSOutputDev() returns.
+ These patches split some of the code of init() into a new postInit()
+ that is automatically called later after the pdftops main program
+ has had a chance to set the command line options.
+ When I was looking through the code, I also fixed a misspelling of
+ sanitizedTitle as sanitizedTile.
+
+ Bug #89827
+
+ poppler/PSOutputDev.cc | 138
+ +++++++++++++++++++++++++++++++------------------
+ poppler/PSOutputDev.h | 11 ++--
+ 2 files changed, 96 insertions(+), 53 deletions(-)
+
+commit c516b341a9c2e0c9a985bc14ad3cae73bf10fb02
+Author: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun May 3 15:27:19 2015 +0200
+
+ Fix invalid shell comparaison in libtiff test
+
+ Bug #115523
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 040b316f0cb1ac933dce616fabe24c93f96fe1cd
+Author: Jason Crain <jason@aquaticape.us>
+Date: Sat Apr 18 12:44:47 2015 -0500
+
+ glib: Fix segfault when creating PopplerAction
+
+ Screen annotations and form fields currently pass a NULL pointer to
+ _poppler_action_new. Pass the PopplerDocument instead.
+
+ Bug #90093
+
+ glib/poppler-annot.cc | 4 ++--
+ glib/poppler-form-field.cc | 2 +-
+ glib/poppler-page.cc | 2 +-
+ glib/poppler-private.h | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 056ee89122385bc2df7cb2c05e1cb1770af8ecce
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Apr 18 12:16:56 2015 +0200
+
+ glib: Add poppler_annot_markup_set_popup_rectangle()
+
+ It updates the popup rectangle of a markup annotation that already
+ has a
+ popup associated.
+
+ glib/poppler-annot.cc | 31 +++++++++++++++++++++++++++++++
+ glib/poppler-annot.h | 2 ++
+ glib/reference/poppler-sections.txt | 1 +
+ 3 files changed, 34 insertions(+)
+
+commit 1aae63ebc6fffe9fa1a2898e4ed733c22e312015
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Apr 18 11:46:41 2015 +0200
+
+ annots: Add popup annots without a markup annot associated to the
+ list of annots
+
+ For consistency with Annots::createAnnot().
+
+ poppler/Annot.h | 2 +-
+ poppler/Page.cc | 6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 05ef3f9feee760544108c68e0d45d1de25fd8901
+Author: Philipp Reinkemeier <philipp.reinkemeier@offis.de>
+Date: Mon Feb 16 09:11:58 2015 +0100
+
+ annots: Fixed adding annotation of Subtype Popup to pdf page
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=89136
+
+ poppler/Annot.cc | 19 +++++++++++++++++++
+ poppler/Page.cc | 11 ++++++++++-
+ 2 files changed, 29 insertions(+), 1 deletion(-)
+
+commit 8ca43bebf36f8da085917f28230e25524de4f4f4
+Author: Jason Crain <jason@aquaticape.us>
+Date: Tue Mar 24 02:51:47 2015 -0500
+
+ cairo: Fix memory leak in CairoFreeTypeFont::create
+
+ - Free embedded font data in _ft_done_face when the cairo font is
+ destroyed.
+ - Free embedded font data if _ft_new_face finds it's a duplicate of an
+ already open font.
+ - Free embedded font data and codeToGID array if font creation fails.
+
+ Bug #89952
+
+ poppler/CairoFontEngine.cc | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+commit edc7bb4fe7b5e718431de12bee1d95036d06efa0
+Author: Jason Crain <jason@aquaticape.us>
+Date: Sat Apr 4 18:40:48 2015 +0200
+
+ Combine base characters and diacritical marks
+
+ LaTeX adds base characters and diacritical marks as separate
+ characters. When a base character and diacritical mark are drawn over
+ each other, this patch converts them into a combining character
+ sequence.
+
+ Bug #87215
+ C# poppler-0.31.0.tar.xz
+
+ poppler/TextOutputDev.cc | 419
+ ++++++++++++++++++++++++++++++++++-------------
+ poppler/TextOutputDev.h | 31 +++-
+ 2 files changed, 336 insertions(+), 114 deletions(-)
+
+commit 96c35dfde6722ff8c5ef7ff59e37be90d273acab
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Mar 27 22:42:34 2015 +0100
+
+ pdftohtml: Set exit status adecuately
+
+ Based on a patch by Matt Atkinson <mutley456@ntlworld.com>
+ Bug #83609
+
+ utils/pdftohtml.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 0969801c12a6ec0fbc079c8203cece9c70466955
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 26 16:08:20 2015 +0100
+
+ Fix previous commit about initializing on failure
+
+ It's the nComps of the destination not of the origin we need
+
+ poppler/SplashOutputDev.cc | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+commit ede6d00688fcf0e3c843b0a507304f5a98395d41
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 26 15:44:40 2015 +0100
+
+ memset on error to have reproducible outputs
+
+ poppler/SplashOutputDev.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 4bb2c9b98299f429752b4c60820cea31ef05f7e0
+Author: Jason Crain <jason@aquaticape.us>
+Date: Wed Mar 25 21:04:19 2015 +0100
+
+ Use width from W array for WMode positioning
+
+ Bug #89621
+
+ poppler/GfxFont.cc | 36 ++++++++++++------------------------
+ poppler/GfxFont.h | 2 ++
+ 2 files changed, 14 insertions(+), 24 deletions(-)
+
+commit 033dbbd7fef8c04c7f4961455cc1cd8d6d1bd93b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 15 14:06:15 2015 +0100
+
+ Fix the previous pdfDocEncoding fix
+
+ Since actually the previous fix didn't account for non ascii
+ characters as output of pdfDocEncoding
+
+ qt4/src/poppler-private.cc | 36 +++++++++++++++---------------------
+ qt5/src/poppler-private.cc | 36 +++++++++++++++---------------------
+ 2 files changed, 30 insertions(+), 42 deletions(-)
+
+commit bc8076d8f638ccb44f8e3b94aaae96850b025deb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 15 13:32:41 2015 +0100
+
+ Fix PDF Text String -> QString conversion
+
+ If they are not UTF16-BE they are in PDFDocEncoding (not ascii)
+
+ Fixes KDE bug #344849
+
+ qt4/src/poppler-private.cc | 5 +++--
+ qt5/src/poppler-private.cc | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
commit d7cc90a8b60d7e353db6e0acdd0b789485e32972
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 7 15:04:52 2015 +0100
+Date: Sat Mar 7 15:04:52 2015 +0100
0.32.0
- CMakeLists.txt | 4 ++--
- NEWS | 16 ++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt5/src/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 16 ++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
7 files changed, 23 insertions(+), 7 deletions(-)
commit c13297d154ded11721fe7d3abdba459ca628cef8
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 7 14:58:10 2015 +0100
+Date: Sat Mar 7 14:58:10 2015 +0100
Update (C)
@@ -25,7 +239,7 @@ Date: Sat Mar 7 14:58:10 2015 +0100
commit c909964bff671d5ff0d8eee5f613ded4562f8afd
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 7 14:54:43 2015 +0100
+Date: Sat Mar 7 14:54:43 2015 +0100
Do not assert on broken document
@@ -36,7 +250,7 @@ Date: Sat Mar 7 14:54:43 2015 +0100
commit 3705fcee0309c50b5fecd563e8e466cbe2c5972b
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Fri Mar 6 15:19:58 2015 +0100
+Date: Fri Mar 6 15:19:58 2015 +0100
Fix Wrong colour shown when GouraudTriangleShFill uses a DeviceN
colorspace
@@ -48,7 +262,7 @@ Date: Fri Mar 6 15:19:58 2015 +0100
commit b7fde1ec83a5fff9bec73becc22e581583a30d43
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 25 21:51:34 2015 +0100
+Date: Wed Feb 25 21:51:34 2015 +0100
Fix last commit regression
@@ -63,7 +277,7 @@ Date: Wed Feb 25 21:51:34 2015 +0100
commit 7980fe868a8ef2ee3315f0bcb606c448d6604039
Author: William Bader <williambader@hotmail.com>
-Date: Wed Feb 25 15:00:33 2015 +0100
+Date: Wed Feb 25 15:00:33 2015 +0100
Fix uninitialized variable in Splash::pipeRun
@@ -74,7 +288,7 @@ Date: Wed Feb 25 15:00:33 2015 +0100
commit 57b6b78a0831fb31c06fd1bc6e9803de524f9d2d
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Tue Feb 24 23:34:57 2015 +0100
+Date: Tue Feb 24 23:34:57 2015 +0100
pdfseparate: use always an unique instance for PDFDoc for savePageAs
@@ -83,7 +297,7 @@ Date: Tue Feb 24 23:34:57 2015 +0100
commit 8a30d219df71ead323649ff0dfd4a724b5e7bd18
Author: William Bader <williambader@hotmail.com>
-Date: Sat Feb 21 23:55:10 2015 +0100
+Date: Sat Feb 21 23:55:10 2015 +0100
Fix memcpy introduced in ec956ab8552dbe10fac4e649951042bddc424b7d
@@ -92,7 +306,7 @@ Date: Sat Feb 21 23:55:10 2015 +0100
commit ec956ab8552dbe10fac4e649951042bddc424b7d
Author: William Bader <williambader@hotmail.com>
-Date: Tue Feb 17 22:55:14 2015 +0100
+Date: Tue Feb 17 22:55:14 2015 +0100
Reduce use of gmalloc() in GooString::appendfv()
@@ -103,7 +317,7 @@ Date: Tue Feb 17 22:55:14 2015 +0100
commit 132ef18324f62c1f2a08dcd794b379fadaa4daf5
Author: Petr Gajdos <pgajdos@suse.cz>
-Date: Wed Feb 11 19:37:21 2015 +0100
+Date: Wed Feb 11 19:37:21 2015 +0100
Annot BG/BC: Empty Array means no color
@@ -112,7 +326,7 @@ Date: Wed Feb 11 19:37:21 2015 +0100
commit bf4aae25a244b1033a2479b9a8f633224f7d5de5
Author: William Bader <williambader@hotmail.com>
-Date: Wed Feb 11 17:35:40 2015 +0100
+Date: Wed Feb 11 17:35:40 2015 +0100
Off by one fix to the previous crash fix
@@ -121,7 +335,7 @@ Date: Wed Feb 11 17:35:40 2015 +0100
commit 97dd46bae5424818ca808c20506d7d96f7b85fb5
Author: William Bader <williambader@hotmail.com>
-Date: Mon Feb 9 22:30:51 2015 +0100
+Date: Mon Feb 9 22:30:51 2015 +0100
pdftops: Add aaRaster and overprint to man file
@@ -130,7 +344,7 @@ Date: Mon Feb 9 22:30:51 2015 +0100
commit c114a90063d755639d2b0dbf816690a66b54bee0
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 8 00:24:11 2015 +0100
+Date: Sun Feb 8 00:24:11 2015 +0100
Fix crash in fuzzed file from Bug #84988
@@ -139,7 +353,7 @@ Date: Sun Feb 8 00:24:11 2015 +0100
commit 22895623e6cd2a5923f552421d44cc80cab77dd8
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 7 22:28:21 2015 +0100
+Date: Sat Feb 7 22:28:21 2015 +0100
Fix malformed file crash from bug #86854
@@ -148,7 +362,7 @@ Date: Sat Feb 7 22:28:21 2015 +0100
commit cdb7ad95f7c8fbf63ade040d8a07ec96467042fc
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 7 22:21:16 2015 +0100
+Date: Sat Feb 7 22:21:16 2015 +0100
Fix malformed file crash in bug #85243
@@ -157,7 +371,7 @@ Date: Sat Feb 7 22:21:16 2015 +0100
commit 6641b935e1fc0c4151a723b6b476d987b8324ed2
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 7 21:58:23 2015 +0100
+Date: Sat Feb 7 21:58:23 2015 +0100
If ECM is around include the sanitizers module
@@ -170,18 +384,18 @@ Date: Sat Feb 7 21:58:23 2015 +0100
commit 92e41685dcef538a7fc669ca357ce9f448a8078e
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 7 21:54:39 2015 +0100
+Date: Sat Feb 7 21:54:39 2015 +0100
Fix crash in malformed file from bug #85275
poppler/SplashOutputDev.cc | 4 ++--
- splash/Splash.cc | 10 +++++++++-
+ splash/Splash.cc | 10 +++++++++-
splash/SplashBitmap.cc | 4 ++--
3 files changed, 13 insertions(+), 5 deletions(-)
commit 9842b3b00492eda21297d5d65f769f77a565f6ac
Author: Aleksei Volkov <Aleksei Volkov>
-Date: Sat Feb 7 20:46:26 2015 +0100
+Date: Sat Feb 7 20:46:26 2015 +0100
No need to check for hmtx, freetype does for us
@@ -192,47 +406,47 @@ Date: Sat Feb 7 20:46:26 2015 +0100
commit 4849eb43892640062c485e48ba7a29b5a0cc9587
Author: William Bader <williambader@hotmail.com>
-Date: Sat Feb 7 16:41:53 2015 +0100
+Date: Sat Feb 7 16:41:53 2015 +0100
Make the colorpsace optimization and option and not the default
Bug #88971
poppler/PSOutputDev.cc | 25 ++++++++++++++++---------
- poppler/PSOutputDev.h | 4 ++++
- utils/pdftops.1 | 10 +++++++++-
- utils/pdftops.cc | 4 ++++
+ poppler/PSOutputDev.h | 4 ++++
+ utils/pdftops.1 | 10 +++++++++-
+ utils/pdftops.cc | 4 ++++
4 files changed, 33 insertions(+), 10 deletions(-)
commit 8e16e423a718b92514885e771e31048f1ae2a766
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Feb 5 20:18:13 2015 +0100
+Date: Thu Feb 5 20:18:13 2015 +0100
0.31.0
And copyright updating
- CMakeLists.txt | 4 ++--
- NEWS | 17 +++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ CMakeLists.txt | 4 ++--
+ NEWS | 17 +++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
poppler/CairoOutputDev.cc | 1 +
poppler/CairoOutputDev.h | 1 +
poppler/JBIG2Stream.cc | 1 +
- poppler/JBIG2Stream.h | 1 +
- poppler/Makefile.am | 2 +-
- poppler/Stream.cc | 1 +
+ poppler/JBIG2Stream.h | 1 +
+ poppler/Makefile.am | 2 +-
+ poppler/Stream.cc | 1 +
qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt4/src/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
qt5/src/CMakeLists.txt | 2 +-
- qt5/src/Doxyfile | 2 +-
- qt5/src/Makefile.am | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
16 files changed, 33 insertions(+), 11 deletions(-)
commit f932315e559a7857d9c5642eb04efc0d2b717789
Author: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
-Date: Tue Jan 20 22:05:29 2015 +1030
+Date: Tue Jan 20 22:05:29 2015 +1030
cairo: support embedding JBIG2 image data
@@ -242,66 +456,66 @@ Date: Tue Jan 20 22:05:29 2015 +1030
++++++++++++++++++++++++++++++++++++++--------
poppler/CairoOutputDev.h | 3 ++
poppler/JBIG2Stream.cc | 9 +++-
- poppler/JBIG2Stream.h | 4 +-
- poppler/Stream.cc | 13 +++++-
+ poppler/JBIG2Stream.h | 4 +-
+ poppler/Stream.cc | 13 +++++-
5 files changed, 121 insertions(+), 25 deletions(-)
commit 78abf540057181b708c546aee421f81a1dd58331
Author: Adam Reichold <adamreichold@myopera.com>
-Date: Wed Jan 21 22:30:45 2015 +0100
+Date: Wed Jan 21 22:30:45 2015 +0100
Worlds -> Words
qt4/src/poppler-page.cc | 4 ++--
- qt4/src/poppler-qt4.h | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
qt4/tests/check_search.cpp | 4 ++--
qt5/src/poppler-page.cc | 4 ++--
- qt5/src/poppler-qt5.h | 2 +-
+ qt5/src/poppler-qt5.h | 2 +-
qt5/tests/check_search.cpp | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
commit 027eac4e565576ca2e7042e21426e28abd775d98
Author: Adam Reichold <adamreichold@myopera.com>
-Date: Tue Jan 20 00:09:09 2015 +0100
+Date: Tue Jan 20 00:09:09 2015 +0100
Expose whole-words search option in Qt frontends
qt4/src/poppler-page-private.h | 5 +-
- qt4/src/poppler-page.cc | 114
+ qt4/src/poppler-page.cc | 114
+++++++++++++++++++++++++------------
- qt4/src/poppler-qt4.h | 44 +++++++++++++-
- qt4/tests/check_search.cpp | 112 +++++++++++++++++++++++++++++++-----
+ qt4/src/poppler-qt4.h | 44 +++++++++++++-
+ qt4/tests/check_search.cpp | 112 +++++++++++++++++++++++++++++++-----
qt5/src/poppler-page-private.h | 5 +-
- qt5/src/poppler-page.cc | 116
+ qt5/src/poppler-page.cc | 116
+++++++++++++++++++++++++------------
- qt5/src/poppler-qt5.h | 46 +++++++++++++--
- qt5/tests/check_search.cpp | 126
+ qt5/src/poppler-qt5.h | 46 +++++++++++++--
+ qt5/tests/check_search.cpp | 126
+++++++++++++++++++++++++++++++++--------
8 files changed, 447 insertions(+), 121 deletions(-)
commit 30a0baa353c374165e5f411efc4203746f14a74d
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 18 15:39:53 2015 +0100
+Date: Sun Jan 18 15:39:53 2015 +0100
Move more variables from GlobalParams to PSOutputDev
- poppler/CairoFontEngine.cc | 4 +-
- poppler/GfxFont.cc | 15 ++---
- poppler/GfxFont.h | 7 ++-
+ poppler/CairoFontEngine.cc | 4 +-
+ poppler/GfxFont.cc | 15 ++---
+ poppler/GfxFont.h | 7 ++-
poppler/GlobalParams.cc | 144
---------------------------------------------
poppler/GlobalParams.h | 28 ---------
poppler/PSOutputDev.cc | 121 +++++++++++++++++++------------------
- poppler/PSOutputDev.h | 30 +++++++++-
- poppler/SplashOutputDev.cc | 2 +-
- qt4/src/ArthurOutputDev.cc | 4 +-
- qt5/src/ArthurOutputDev.cc | 4 +-
- utils/pdftops.cc | 36 ++++--------
+ poppler/PSOutputDev.h | 30 +++++++++-
+ poppler/SplashOutputDev.cc | 2 +-
+ qt4/src/ArthurOutputDev.cc | 4 +-
+ qt5/src/ArthurOutputDev.cc | 4 +-
+ utils/pdftops.cc | 36 ++++--------
11 files changed, 116 insertions(+), 279 deletions(-)
commit 8fed995c3457d64669ae12901450b7c811599dba
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 18 14:52:53 2015 +0100
+Date: Sun Jan 18 14:52:53 2015 +0100
Forgot to delete this in the previous commit
@@ -310,20 +524,20 @@ Date: Sun Jan 18 14:52:53 2015 +0100
commit 4992ff7fa062462507733494827fdad7eaaa95b3
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 18 13:57:36 2015 +0100
+Date: Sun Jan 18 13:57:36 2015 +0100
Move raster mono and resolution from GlobalParams to PSOutputDev
poppler/GlobalParams.cc | 32 --------------------------------
poppler/GlobalParams.h | 7 -------
poppler/PSOutputDev.cc | 18 +++++++-----------
- poppler/PSOutputDev.h | 6 ++++++
- utils/pdftops.cc | 7 ++++---
+ poppler/PSOutputDev.h | 6 ++++++
+ utils/pdftops.cc | 7 ++++---
5 files changed, 17 insertions(+), 53 deletions(-)
commit 54908f675eda96c363528198e8c530921df2f45a
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 18 13:34:45 2015 +0100
+Date: Sun Jan 18 13:34:45 2015 +0100
Move psUncompressPreloadedImages from GlobalParams to PSOutputDev
@@ -335,12 +549,12 @@ Date: Sun Jan 18 13:34:45 2015 +0100
poppler/GlobalParams.cc | 16 ----------------
poppler/GlobalParams.h | 3 ---
poppler/PSOutputDev.cc | 9 +++++----
- poppler/PSOutputDev.h | 2 ++
+ poppler/PSOutputDev.h | 2 ++
4 files changed, 7 insertions(+), 23 deletions(-)
commit 136d7aa5e79f153dfcb216c58598e33a8ff16630
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 18 13:28:26 2015 +0100
+Date: Sun Jan 18 13:28:26 2015 +0100
Remove declared but not defined function
@@ -349,7 +563,7 @@ Date: Sun Jan 18 13:28:26 2015 +0100
commit fdba9154d9a176759c765180805e608d4959c34e
Author: Adam Reichold <adamreichold@myopera.com>
-Date: Fri Jan 16 19:57:59 2015 +0100
+Date: Fri Jan 16 19:57:59 2015 +0100
pdftoppm: parse the flags earlier and only once
@@ -358,7 +572,7 @@ Date: Fri Jan 16 19:57:59 2015 +0100
commit 6b072500b5ac936631be6b29b7d5a591848a18f3
Author: William Bader <williambader@hotmail.com>
-Date: Wed Jan 14 23:28:03 2015 +0100
+Date: Wed Jan 14 23:28:03 2015 +0100
Add rasterization option to pdftops
@@ -373,19 +587,19 @@ Date: Wed Jan 14 23:28:03 2015 +0100
++-----------------------------------------
poppler/GlobalParams.h | 16 +++---------
poppler/PSOutputDev.cc | 14 +++++------
- poppler/PSOutputDev.h | 5 +++-
+ poppler/PSOutputDev.h | 5 +++-
poppler/SplashOutputDev.cc | 19 ++++++--------
poppler/SplashOutputDev.h | 11 +++++---
qt4/src/poppler-page.cc | 7 +++---
qt5/src/poppler-page.cc | 7 +++---
- utils/pdftohtml.cc | 9 +++----
- utils/pdftoppm.cc | 49 ++++++++++++++++++++++++++----------
- utils/pdftops.cc | 14 ++++++++++-
+ utils/pdftohtml.cc | 9 +++----
+ utils/pdftoppm.cc | 49 ++++++++++++++++++++++++++----------
+ utils/pdftops.cc | 14 ++++++++++-
12 files changed, 96 insertions(+), 118 deletions(-)
commit dc9751e6ac47a708ba6e7a68560bdce6a2e4a010
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jan 9 15:50:02 2015 +0100
+Date: Fri Jan 9 15:50:02 2015 +0100
Compile++
@@ -394,7 +608,7 @@ Date: Fri Jan 9 15:50:02 2015 +0100
commit d91876a0c7a936b1f6f461d80131d7586a6c1a5e
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 8 20:13:06 2015 +0100
+Date: Thu Jan 8 20:13:06 2015 +0100
Accept malformed documents whose root is a Page instead of a Pages
@@ -407,7 +621,7 @@ Date: Thu Jan 8 20:13:06 2015 +0100
commit 7ce86b9be058408eb567d8d0b9747853a66c116f
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 8 17:35:28 2015 +0100
+Date: Thu Jan 8 17:35:28 2015 +0100
Remove assert in gouraudFillTriangle
@@ -422,7 +636,7 @@ Date: Thu Jan 8 17:35:28 2015 +0100
commit 9e9df4b20d17478996780008bc9802a857d173fc
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 8 17:01:52 2015 +0100
+Date: Thu Jan 8 17:01:52 2015 +0100
Fix crash on broken document
@@ -433,7 +647,7 @@ Date: Thu Jan 8 17:01:52 2015 +0100
commit 636faafcb84b856580398f7883b6406d645c85d1
Author: Adam Reichold <adamreichold@myopera.com>
-Date: Tue Jan 6 22:57:20 2015 +0100
+Date: Tue Jan 6 22:57:20 2015 +0100
JPEG2000Stream: Inline doGetChar and doLookChar
@@ -444,28 +658,28 @@ Date: Tue Jan 6 22:57:20 2015 +0100
commit c13bffe92963c4969037695992f4c2776bbe973f
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 4 23:17:42 2015 +0100
+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 +-
+ 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 +-
+ 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
+Date: Sun Jan 4 20:23:39 2015 +0100
extended openjpeg2 support
@@ -475,20 +689,20 @@ Date: Sun Jan 4 20:23:39 2015 +0100
commit 2841f3c34dd6366a70e4d6d307a08b3fbc3e9897
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Jan 4 20:22:47 2015 +0100
+Date: Sun Jan 4 20:22:47 2015 +0100
Cmake support for openjpeg2
With some tweaks from Albert
- CMakeLists.txt | 56
+ 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
+Date: Sun Jan 4 19:42:34 2015 +0100
Initial attempt at libopenjpeg2 support
@@ -502,7 +716,7 @@ Date: Sun Jan 4 19:42:34 2015 +0100
to handle the the 2.1 change and any future changes.
- Move openjpeg.h into the .cc file
- configure.ac | 80 ++++++++----
+ configure.ac | 80 ++++++++----
poppler/JPEG2000Stream.cc | 313
+++++++++++++++++++++++++++++++++++++---------
poppler/JPEG2000Stream.h | 41 ++----
@@ -510,7 +724,7 @@ Date: Sun Jan 4 19:42:34 2015 +0100
commit 9caf7525409d699c16896653528486451123b485
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 4 18:48:02 2015 +0100
+Date: Sun Jan 4 18:48:02 2015 +0100
Make PSOutputDev accept a list of pages indeces
@@ -521,18 +735,18 @@ Date: Sun Jan 4 18:48:02 2015 +0100
Reviewed in the mailing list, see "Can anyone have a look at my
patch?"
- glib/poppler-page.cc | 10 ++++++---
- poppler/PSOutputDev.cc | 50
+ glib/poppler-page.cc | 10 ++++++---
+ poppler/PSOutputDev.cc | 50
++++++++++++++++++++++++-----------------
- poppler/PSOutputDev.h | 14 +++++++-----
+ poppler/PSOutputDev.h | 14 +++++++-----
qt4/src/poppler-ps-converter.cc | 11 ++++++---
qt5/src/poppler-ps-converter.cc | 11 ++++++---
- utils/pdftops.cc | 15 +++++++++----
+ 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
+Date: Fri Jan 2 17:23:24 2015 +0100
Find last 'startxref' in the last 24K instead of the last 1K
@@ -543,7 +757,7 @@ Date: Fri Jan 2 17:23:24 2015 +0100
commit 0b1cd9403b8a240e58ec4f1832588d25f8295278
Author: Jason Crain <jason@aquaticape.us>
-Date: Sat Dec 20 03:22:23 2014 -0600
+Date: Sat Dec 20 03:22:23 2014 -0600
Free BBox object on error
@@ -552,7 +766,7 @@ Date: Sat Dec 20 03:22:23 2014 -0600
commit acc33a6950031ac4a5c759d043d24df0cfa7e8b6
Author: Jason Crain <jason@aquaticape.us>
-Date: Sat Dec 20 02:24:49 2014 -0600
+Date: Sat Dec 20 02:24:49 2014 -0600
Check for invalid matrix in annotation
@@ -563,7 +777,7 @@ Date: Sat Dec 20 02:24:49 2014 -0600
commit 56aff7d78658f586e3c4cd41685f189dafb3098a
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Tue Dec 23 15:49:15 2014 +0100
+Date: Tue Dec 23 15:49:15 2014 +0100
pdfunite: Support output intents, optional content and acroform
@@ -573,7 +787,7 @@ Date: Tue Dec 23 15:49:15 2014 +0100
commit 9e734063e6a6a4b9743c9aa27d3d3127b5a960d7
Author: Jason Crain <jason@aquaticape.us>
-Date: Fri Dec 19 01:56:45 2014 -0600
+Date: Fri Dec 19 01:56:45 2014 -0600
Move array reallocation from visitLine to startLine
@@ -587,7 +801,7 @@ Date: Fri Dec 19 01:56:45 2014 -0600
commit 0c47b769a77795bd866b6686b79fd20ad6f554bf
Author: Daniel Macks <dmacks@netspace.org>
-Date: Sun Dec 14 18:52:48 2014 +0100
+Date: Sun Dec 14 18:52:48 2014 +0100
Only consider adding -fno-check-new if compiler supports it
@@ -600,7 +814,7 @@ Date: Sun Dec 14 18:52:48 2014 +0100
commit c9c90d50e3708f6fac313aa8b458aef6dba5dcfb
Author: Hans-Peter Deifel <hpdeifel@gmx.de>
-Date: Fri Dec 12 13:09:51 2014 +0100
+Date: Fri Dec 12 13:09:51 2014 +0100
cpp: New API to set debug output function
@@ -608,41 +822,41 @@ Date: Fri Dec 12 13:09:51 2014 +0100
to install their own function to print internal poppler errors.
cpp/poppler-global.cpp | 29 +++++++++++++++++++++++++++++
- cpp/poppler-global.h | 5 +++++
+ cpp/poppler-global.h | 5 +++++
cpp/poppler-private.cpp | 15 ++++++++++++---
- cpp/poppler-private.h | 3 +++
+ 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
+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 +-
+ 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
+Date: Mon Dec 1 20:52:42 2014 +0100
Run dos2unix as suggested by Volker Grabsch
- splash/SplashState.h | 278 ++++++++++----------
+ splash/SplashState.h | 278 ++++++++++----------
test/perf-test-preview-dummy.cc | 44 ++--
- test/perf-test-preview-win.cc | 544
+ test/perf-test-preview-win.cc | 544
++++++++++++++++++++--------------------
3 files changed, 433 insertions(+), 433 deletions(-)
commit d3fe0661c6dc6050e14cd5cb4afa089b7d7d66b0
Author: Richard PALO <richard@netbsd.org>
-Date: Sun Nov 30 22:46:22 2014 +0100
+Date: Sun Nov 30 22:46:22 2014 +0100
warning: "_FILE_OFFSET_BITS" redefined
@@ -654,7 +868,7 @@ Date: Sun Nov 30 22:46:22 2014 +0100
commit 18884065e11fee82506915095619107a43172ecb
Author: Richard PALO <richard@netbsd.org>
-Date: Sun Nov 30 22:36:29 2014 +0100
+Date: Sun Nov 30 22:36:29 2014 +0100
The isfinite macro is defined on SunOS under c99
@@ -665,7 +879,7 @@ Date: Sun Nov 30 22:36:29 2014 +0100
commit bcb470064dd9f75ab0b0a0d9b7319fe8f1e558ae
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Tue Nov 25 05:53:38 2014 +1030
+Date: Tue Nov 25 05:53:38 2014 +1030
cofigure: print "no" instead of "auto" if lcms not found
@@ -674,7 +888,7 @@ Date: Tue Nov 25 05:53:38 2014 +1030
commit 832046c57ab2909d329340f1c941b29e8246ff73
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Fri Nov 28 11:08:34 2014 +0100
+Date: Fri Nov 28 11:08:34 2014 +0100
Use correct LAB byte array for lcms input
@@ -682,12 +896,12 @@ Date: Fri Nov 28 11:08:34 2014 +0100
poppler/GfxState.cc | 51
++++++++++++++++++++++++++++++++++++++-------------
- poppler/GfxState.h | 4 +++-
+ poppler/GfxState.h | 4 +++-
2 files changed, 41 insertions(+), 14 deletions(-)
commit a604bc3a2ed9f9181aa3b12d795608fcf5e08220
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Fri Nov 14 11:56:50 2014 +0100
+Date: Fri Nov 14 11:56:50 2014 +0100
Solve blend mode problem in CYMK and DeviceN for separable blend modes
@@ -699,23 +913,23 @@ Date: Fri Nov 14 11:56:50 2014 +0100
commit b7802ff39db270dda2aa20f005fb87c22ed34137
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Fri Nov 14 11:47:38 2014 +0100
+Date: Fri Nov 14 11:47:38 2014 +0100
Use Default colorspaces if present instead of Device colorspaces
Fixes part of #68986
poppler/CairoOutputDev.cc | 4 +-
- poppler/Gfx.cc | 40 +++++-----
- poppler/GfxState.cc | 197
+ poppler/Gfx.cc | 40 +++++-----
+ poppler/GfxState.cc | 197
++++++++++++++++++++++++++++++++++------------
- poppler/GfxState.h | 31 ++++----
- poppler/Page.cc | 4 +-
+ poppler/GfxState.h | 31 ++++----
+ poppler/Page.cc | 4 +-
5 files changed, 188 insertions(+), 88 deletions(-)
commit 07aa6f4030418883d8d45a8dfa3d80d2dadca4e7
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Thu Nov 13 12:26:25 2014 +0100
+Date: Thu Nov 13 12:26:25 2014 +0100
write correct size in trailer dict
@@ -726,20 +940,20 @@ Date: Thu Nov 13 12:26:25 2014 +0100
commit 51e7c29cabedc72e097023e6d8d6d68ed43fa20c
Author: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Fri Nov 7 18:30:36 2014 +0100
+Date: Fri Nov 7 18:30:36 2014 +0100
regtest: Update references also for tests that no longer crash
We are currently updating the refs only when we have checksums to
compare, but if a test used to crash there's no md5 file in refs.
- regtest/TestRun.py | 2 ++
+ regtest/TestRun.py | 2 ++
regtest/backends/__init__.py | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+)
commit d205908930d5dc4ec3a1a1a2c2b93fbb92c2c867
Author: William Bader <williambader@hotmail.com>
-Date: Wed Nov 5 20:23:49 2014 +0100
+Date: Wed Nov 5 20:23:49 2014 +0100
Make it proper C
@@ -748,19 +962,19 @@ Date: Wed Nov 5 20:23:49 2014 +0100
commit fa1d636b00210b9c52787ab3c833fe9aa2e293fa
Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Nov 4 20:00:08 2014 +0100
+Date: Tue Nov 4 20:00:08 2014 +0100
0.28.1
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit 7debbb05df18afc86df8a4fd37980728ec2e5788
Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Nov 4 19:29:58 2014 +0100
+Date: Tue Nov 4 19:29:58 2014 +0100
Fix typo
@@ -769,26 +983,26 @@ Date: Tue Nov 4 19:29:58 2014 +0100
commit d5489ef37742227176e800390a990f2b882d9710
Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Nov 4 01:27:05 2014 +0100
+Date: Tue Nov 4 01:27:05 2014 +0100
0.28.0
- CMakeLists.txt | 6 +++---
- NEWS | 43 +++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
- poppler/Makefile.am | 2 +-
+ CMakeLists.txt | 6 +++---
+ NEWS | 43 +++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt4/src/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
qt5/src/CMakeLists.txt | 2 +-
- qt5/src/Doxyfile | 2 +-
- qt5/src/Makefile.am | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
11 files changed, 56 insertions(+), 13 deletions(-)
commit f87115a1129e4e03802769181a3392c8dce3192a
Author: Hib Eris <hib@hiberis.nl>
-Date: Tue Nov 4 01:25:18 2014 +0100
+Date: Tue Nov 4 01:25:18 2014 +0100
Don't ship the moc files
@@ -798,31 +1012,31 @@ Date: Tue Nov 4 01:25:18 2014 +0100
commit 0a9c38076f1555196029372b7e08714b43c7a58d
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Nov 3 21:43:28 2014 +0100
+Date: Mon Nov 3 21:43:28 2014 +0100
Update (C)
- fofi/FoFiType1.cc | 1 +
- poppler/PDFDoc.cc | 4 ++--
- poppler/PDFDoc.h | 2 +-
- poppler/XRef.cc | 2 +-
+ fofi/FoFiType1.cc | 1 +
+ poppler/PDFDoc.cc | 4 ++--
+ poppler/PDFDoc.h | 2 +-
+ poppler/XRef.cc | 2 +-
qt4/src/poppler-annotation-private.h | 2 +-
- qt4/src/poppler-annotation.cc | 2 +-
- qt4/src/poppler-page.cc | 2 +-
- qt4/src/poppler-qt4.h | 2 +-
+ qt4/src/poppler-annotation.cc | 2 +-
+ qt4/src/poppler-page.cc | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
qt5/src/poppler-annotation-private.h | 2 +-
- qt5/src/poppler-annotation.cc | 2 +-
- qt5/src/poppler-page.cc | 2 +-
- qt5/src/poppler-qt5.h | 2 +-
- utils/pdfdetach.cc | 1 +
- utils/pdftocairo-win32.cc | 12 ++++++++++++
- utils/pdftocairo-win32.h | 12 ++++++++++++
- utils/pdftocairo.cc | 3 ++-
+ qt5/src/poppler-annotation.cc | 2 +-
+ qt5/src/poppler-page.cc | 2 +-
+ qt5/src/poppler-qt5.h | 2 +-
+ utils/pdfdetach.cc | 1 +
+ utils/pdftocairo-win32.cc | 12 ++++++++++++
+ utils/pdftocairo-win32.h | 12 ++++++++++++
+ utils/pdftocairo.cc | 3 ++-
16 files changed, 40 insertions(+), 13 deletions(-)
commit 73cf1e87c9803bbe4271be297b486d9932677d46
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Nov 3 21:37:13 2014 +0100
+Date: Mon Nov 3 21:37:13 2014 +0100
Need to dist this file
@@ -831,7 +1045,7 @@ Date: Mon Nov 3 21:37:13 2014 +0100
commit 2fd0cd652cfc03c9af35a59192729e4ed26e8146
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Nov 3 19:20:23 2014 +0100
+Date: Mon Nov 3 19:20:23 2014 +0100
Fix memory leaks when running pdfseparate
@@ -846,7 +1060,7 @@ Date: Mon Nov 3 19:20:23 2014 +0100
commit d6ea8acbb348fdb43601a963ba5407e933565003
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Mon Nov 3 19:11:25 2014 +0100
+Date: Mon Nov 3 19:11:25 2014 +0100
fix crash in Xref::getEntry
@@ -857,7 +1071,7 @@ Date: Mon Nov 3 19:11:25 2014 +0100
commit bd142810b9f66b017a58b3e1840d4d72794f1ef4
Author: Jason Crain <jason@aquaticape.us>
-Date: Thu May 15 02:22:44 2014 -0500
+Date: Thu May 15 02:22:44 2014 -0500
cairo: Use matrix to determine pattern size
@@ -868,7 +1082,7 @@ Date: Thu May 15 02:22:44 2014 -0500
commit 06dd7dc337c7db6122329e98783a126d59035aff
Author: Hib Eris <hib@hiberis.nl>
-Date: Thu May 29 12:45:33 2014 +0200
+Date: Thu May 29 12:45:33 2014 +0200
Include windows.h, not Windows.h
@@ -883,7 +1097,7 @@ Date: Thu May 29 12:45:33 2014 +0200
commit 76a350b11160ac203a41b27fbc85a3264bfe4735
Author: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Thu Oct 30 18:25:06 2014 +0100
+Date: Thu Oct 30 18:25:06 2014 +0100
regtest: Try to fix again the paths of the resources in the generated
HTML report
@@ -899,7 +1113,7 @@ Date: Thu Oct 30 18:25:06 2014 +0100
commit c93d6b264dc77c46c72281d966bf826274a43d15
Author: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Wed Oct 29 17:37:06 2014 +0100
+Date: Wed Oct 29 17:37:06 2014 +0100
regtest: respect --no-absolute-paths when creating the pretty
diff links
@@ -909,20 +1123,20 @@ Date: Wed Oct 29 17:37:06 2014 +0100
commit 9f953e47a6ea92d806aeea61e227af54c889c6be
Author: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Mon Oct 27 19:53:28 2014 +0100
+Date: Mon Oct 27 19:53:28 2014 +0100
regtest: Add an option to create the HTML report without absolute
paths
It uses the paths as received from the command line attributes.
- regtest/HTMLReport.py | 15 +++++++++++----
+ regtest/HTMLReport.py | 15 +++++++++++----
regtest/commands/create-report.py | 4 ++++
2 files changed, 15 insertions(+), 4 deletions(-)
commit 3d840231bc6f0714da361493ef32913af2eb78d7
Author: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Sun Oct 26 12:09:28 2014 +0100
+Date: Sun Oct 26 12:09:28 2014 +0100
regtest: Fix png diff generation with python-pil pillow fork
@@ -934,7 +1148,7 @@ Date: Sun Oct 26 12:09:28 2014 +0100
commit 68e58ec5465efc289d85ae104941db92450a3168
Author: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Sun Oct 26 11:21:23 2014 +0100
+Date: Sun Oct 26 11:21:23 2014 +0100
regtest: Limit the number of worker threads to the number of documents
to test
@@ -950,7 +1164,7 @@ Date: Sun Oct 26 11:21:23 2014 +0100
commit 7c21b95852e891060cd2e276949acf0945306ab7
Author: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Sun Oct 26 11:08:45 2014 +0100
+Date: Sun Oct 26 11:08:45 2014 +0100
regtest: Allow to run groups of tests individually
@@ -965,14 +1179,14 @@ Date: Sun Oct 26 11:08:45 2014 +0100
directory.
This also allows us to update the refs for a group of tests.
- regtest/TestRun.py | 26 ++++++++++++++++++++++++--
- regtest/Utils.py | 7 +++++--
+ regtest/TestRun.py | 26 ++++++++++++++++++++++++--
+ regtest/Utils.py | 7 +++++--
regtest/commands/run-tests.py | 29 ++++++++++++++++++++---------
3 files changed, 49 insertions(+), 13 deletions(-)
commit 53be607edc18a861aeb0b6663bac3c05de46c84c
Author: Hib Eris <hib@hiberis.nl>
-Date: Fri Oct 24 11:35:17 2014 +0200
+Date: Fri Oct 24 11:35:17 2014 +0200
Fix warning on unused variable in pdftocairo.cc
@@ -982,7 +1196,7 @@ Date: Fri Oct 24 11:35:17 2014 +0200
pdftocairo.cc:130:14: warning: ‘setupdlg’ defined but not used
[-Wunused-variable]
static GBool setupdlg = gFalse;
- ^
+ ^
https://bugs.freedesktop.org/show_bug.cgi?id=85400
@@ -991,7 +1205,7 @@ Date: Fri Oct 24 11:35:17 2014 +0200
commit f966b8766d40b2c912e69a1e17ef8cc4bd52be95
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Oct 21 16:42:27 2014 +0200
+Date: Tue Oct 21 16:42:27 2014 +0200
fofi: Fix a crash when parsing an invalid font due to a integer
overflow
@@ -1003,23 +1217,23 @@ Date: Tue Oct 21 16:42:27 2014 +0200
commit 4963332ca4db13d8a9186b06d2aa0d59abbc10ee
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Oct 5 21:58:37 2014 +1030
+Date: Sun Oct 5 21:58:37 2014 +1030
pdftocairo: add -printdlg output option for win32
when set the win32 print dialog is displayed before printing
- configure.ac | 2 +-
+ configure.ac | 2 +-
utils/pdftocairo-win32.cc | 303
++++++++++++++++++++++++++++++++++++++++++++--
utils/pdftocairo-win32.h | 14 +--
- utils/pdftocairo.1 | 14 ++-
- utils/pdftocairo.cc | 31 ++++-
+ utils/pdftocairo.1 | 14 ++-
+ utils/pdftocairo.cc | 31 ++++-
5 files changed, 337 insertions(+), 27 deletions(-)
commit d8fe025c36f555a5438677e20df803eee216bb13
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Oct 5 18:11:09 2014 +1030
+Date: Sun Oct 5 18:11:09 2014 +1030
pdftocairo: add a -setupdlg option that will the show printer
properties
@@ -1028,13 +1242,13 @@ Date: Sun Oct 5 18:11:09 2014 +1030
utils/pdftocairo-win32.cc | 22 +++++++++++++++++++---
utils/pdftocairo-win32.h | 3 ++-
- utils/pdftocairo.1 | 5 +++++
- utils/pdftocairo.cc | 24 ++++++++++++++++--------
+ utils/pdftocairo.1 | 5 +++++
+ utils/pdftocairo.cc | 24 ++++++++++++++++--------
4 files changed, 42 insertions(+), 12 deletions(-)
commit c091aa14513859ab76223f5e4e6055d92082433c
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Sep 14 20:43:47 2014 +0930
+Date: Sun Sep 14 20:43:47 2014 +0930
pdftocairo: fix a number of bugs in win32 printing
@@ -1051,57 +1265,57 @@ Date: Sun Sep 14 20:43:47 2014 +0930
utils/pdftocairo-win32.cc | 181
++++++++++++++++++++++++++--------------------
utils/pdftocairo-win32.h | 2 +-
- utils/pdftocairo.1 | 5 +-
- utils/pdftocairo.cc | 49 ++++++-------
+ utils/pdftocairo.1 | 5 +-
+ utils/pdftocairo.cc | 49 ++++++-------
4 files changed, 132 insertions(+), 105 deletions(-)
commit cc3b39d49c656e912a7461212f3bb4e58c6444e7
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri Sep 12 18:17:49 2014 +0930
+Date: Fri Sep 12 18:17:49 2014 +0930
make pdftocairo-win32.cc a standalone .cc file
instead of #including it in pdftocairo.cc
- utils/CMakeLists.txt | 1 +
- utils/Makefile.am | 3 +-
+ utils/CMakeLists.txt | 1 +
+ utils/Makefile.am | 3 +-
utils/pdftocairo-win32.cc | 74
+++++++++++++++++++++++------------------------
utils/pdftocairo-win32.h | 22 ++++++++++++++
- utils/pdftocairo.cc | 24 +++++++++------
+ utils/pdftocairo.cc | 24 +++++++++------
5 files changed, 77 insertions(+), 47 deletions(-)
commit 700205af19ef1ae5f2c713d118ebd5dd4a0afba3
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Sep 7 20:18:36 2014 +0930
+Date: Sun Sep 7 20:18:36 2014 +0930
pdftocairo: Allow an output file for win32 printing to be specified
Can be used for testing win32 print output without wasting paper.
utils/pdftocairo-win32.cc | 12 ++++++++----
- utils/pdftocairo.1 | 4 ++++
- utils/pdftocairo.cc | 13 +++++++------
+ utils/pdftocairo.1 | 4 ++++
+ utils/pdftocairo.cc | 13 +++++++------
3 files changed, 19 insertions(+), 10 deletions(-)
commit 40d3ae87befad489fd8c0b38ff2561a0782cae0b
Author: Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>
-Date: Sat Sep 6 21:04:10 2014 +0930
+Date: Sat Sep 6 21:04:10 2014 +0930
Add support for printing to a Windows printer from pdftocairo
Bug 79936
- configure.ac | 2 +-
+ configure.ac | 2 +-
utils/pdftocairo-win32.cc | 219
++++++++++++++++++++++++++++++++++++++++++++++
- utils/pdftocairo.1 | 23 ++++-
- utils/pdftocairo.cc | 61 ++++++++++---
+ utils/pdftocairo.1 | 23 ++++-
+ utils/pdftocairo.cc | 61 ++++++++++---
4 files changed, 292 insertions(+), 13 deletions(-)
commit ee4a389872d86b619c677888da8f13f1f6c54472
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Mon Oct 20 22:32:30 2014 +1030
+Date: Mon Oct 20 22:32:30 2014 +1030
PDFDoc: fix crash when getPage() returns NULL
@@ -1112,7 +1326,7 @@ Date: Mon Oct 20 22:32:30 2014 +1030
commit 0c3f53e34ec287dab2784e1f3411ad06b62dffc7
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Mon Oct 20 22:17:20 2014 +1030
+Date: Mon Oct 20 22:17:20 2014 +1030
PDFDOC: Check for EOF when reading raw stream
@@ -1123,7 +1337,7 @@ Date: Mon Oct 20 22:17:20 2014 +1030
commit 88dbd4df0998233939b4a51cedbfc65c58a315f9
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Oct 19 22:47:15 2014 +1030
+Date: Sun Oct 19 22:47:15 2014 +1030
pdfdetach: fix crash when getPage() returns null
@@ -1134,7 +1348,7 @@ Date: Sun Oct 19 22:47:15 2014 +1030
commit e0179304cdef615fcf639046410d214fd5b5f276
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Oct 19 21:36:39 2014 +1030
+Date: Sun Oct 19 21:36:39 2014 +1030
cairo: fix crash when no group color space
@@ -1145,7 +1359,7 @@ Date: Sun Oct 19 21:36:39 2014 +1030
commit 745f1241bf903969e50f0e1139641e389a9c331f
Author: Scott West <scott.gregory.west@gmail.com>
-Date: Tue Oct 7 23:54:52 2014 +0200
+Date: Tue Oct 7 23:54:52 2014 +0200
Fix memory leak in Dict.remove.
@@ -1160,21 +1374,21 @@ Date: Tue Oct 7 23:54:52 2014 +0200
commit b8810703ca76f0bbc8185ab87679cf18eb006d52
Author: Luigi Scarso <luigi.scarso@gmail.com>
-Date: Tue Oct 7 22:45:05 2014 +0200
+Date: Tue Oct 7 22:45:05 2014 +0200
Make Attribute::getName() work when UTF-16BE is used
Contains some ideas by me
Bug #84722
- goo/GooString.h | 9 +++++----
+ goo/GooString.h | 9 +++++----
poppler/StructElement.cc | 17 +++++++++++------
poppler/StructElement.h | 7 +++++--
3 files changed, 21 insertions(+), 12 deletions(-)
commit 96a04336c7a6331727724125686a0d6f42f19f46
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Mon Oct 6 10:21:51 2014 +1030
+Date: Mon Oct 6 10:21:51 2014 +1030
cairo: only embed mime data if image decode map is identity
@@ -1186,7 +1400,7 @@ Date: Mon Oct 6 10:21:51 2014 +1030
commit 18541054bebce3f9d4729629785bf140d67d2da0
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Wed Sep 24 21:20:42 2014 +0930
+Date: Wed Sep 24 21:20:42 2014 +0930
cairo: Only embed mime data for gray/rgb/cmyk colorspaces
@@ -1198,7 +1412,7 @@ Date: Wed Sep 24 21:20:42 2014 +0930
commit cbf2652c483d7010fc36191c8b209a57eeec93d8
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu Jan 26 00:37:17 2012 +1030
+Date: Thu Jan 26 00:37:17 2012 +1030
cairo: don't render text when text matrix is not invertable
@@ -1212,7 +1426,7 @@ Date: Thu Jan 26 00:37:17 2012 +1030
commit 4fe17e97a4bd7873caad771c446199b282039697
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Oct 5 11:30:43 2014 +0200
+Date: Sun Oct 5 11:30:43 2014 +0200
glib: Build introspection linking to the uninstalled libraries
@@ -1223,7 +1437,7 @@ Date: Sun Oct 5 11:30:43 2014 +0200
commit a2477da56a4d1c534175940d7c01a9d3db6c72d4
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Oct 1 22:33:11 2014 +0200
+Date: Wed Oct 1 22:33:11 2014 +0200
Fix 303287ebdad0de9fb2655c4d7eab627c0045ea04
@@ -1235,7 +1449,7 @@ Date: Wed Oct 1 22:33:11 2014 +0200
commit ce95ecda450361496aedd5d5cd0bf47fd2c66703
Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 30 19:50:20 2014 +0200
+Date: Tue Sep 30 19:50:20 2014 +0200
Fix assert in 5068.asan.0.6052.pdf
@@ -1244,7 +1458,7 @@ Date: Tue Sep 30 19:50:20 2014 +0200
commit 01723aa17e836e818158dbdc56df642a290be300
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Tue Sep 30 18:48:47 2014 +0200
+Date: Tue Sep 30 18:48:47 2014 +0200
Map Standard/Expert encoding ligatures to AGLFN names
@@ -1254,14 +1468,14 @@ Date: Tue Sep 30 18:48:47 2014 +0200
Bug 80093
poppler/CairoFontEngine.cc | 12 +++++++++---
- poppler/GfxFont.cc | 29 ++++++++++++++++++++++++++++-
- poppler/GfxFont.h | 7 ++++++-
+ poppler/GfxFont.cc | 29 ++++++++++++++++++++++++++++-
+ poppler/GfxFont.h | 7 ++++++-
splash/SplashFTFontFile.cc | 8 ++++++++
4 files changed, 51 insertions(+), 5 deletions(-)
commit 529db4a94607c1ad909764d26f740c601bbe896f
Author: Hib Eris <hib@hiberis.nl>
-Date: Mon Sep 29 22:59:15 2014 +0200
+Date: Mon Sep 29 22:59:15 2014 +0200
Fix build with --disable-utils
@@ -1271,13 +1485,13 @@ Date: Mon Sep 29 22:59:15 2014 +0200
Bug #84448
- Makefile.am | 6 +-----
+ Makefile.am | 6 +-----
utils/Makefile.am | 4 ++++
2 files changed, 5 insertions(+), 5 deletions(-)
commit c54f6aceed983a221d88ce5c21becbf8aab2931b
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Mon Sep 29 21:42:46 2014 +0200
+Date: Mon Sep 29 21:42:46 2014 +0200
use alt colorspace to get CMYK values for an ICC based CMYK colorspace
@@ -1293,7 +1507,7 @@ Date: Mon Sep 29 21:42:46 2014 +0200
commit 21b5fd655ce45b90668d1416d21c526ab7eb3ad6
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Sep 14 11:20:23 2014 +0200
+Date: Sun Sep 14 11:20:23 2014 +0200
Refactor Makefiles to build a noinst library for parsing args
@@ -1341,7 +1555,7 @@ Date: Sun Sep 14 11:20:23 2014 +0200
commit 70a851b0cc58241d1f2f6bc48af2614595326c8f
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Sep 6 21:16:04 2014 +0930
+Date: Sat Sep 6 21:16:04 2014 +0930
Update .gitignore
@@ -1350,7 +1564,7 @@ Date: Sat Sep 6 21:16:04 2014 +0930
commit d44e7e3560bdc79253df98db05385dce3e8ccbb4
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Sep 6 21:53:21 2014 +0930
+Date: Sat Sep 6 21:53:21 2014 +0930
Don't use -fPIC on mingw
@@ -1361,7 +1575,7 @@ Date: Sat Sep 6 21:53:21 2014 +0930
commit 2723371b2e2f7684301ea1c5272ab49851f28c03
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Sep 6 21:19:46 2014 +0930
+Date: Sat Sep 6 21:19:46 2014 +0930
make autogen.sh work with variables with spaces
@@ -1372,7 +1586,7 @@ Date: Sat Sep 6 21:19:46 2014 +0930
commit ebc814a7e31511308bbcd8856d0356f4d7cc74be
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Sep 14 11:45:12 2014 +0200
+Date: Sun Sep 14 11:45:12 2014 +0200
Add compile to .gitignore
@@ -1390,13 +1604,13 @@ Date: Sun Sep 14 11:45:12 2014 +0200
commit 8ce31485faa26994c52f4d032cc5a8355aba23d1
Merge: 4589ce1 303287e
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Sep 26 00:40:43 2014 +0200
+Date: Fri Sep 26 00:40:43 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 303287ebdad0de9fb2655c4d7eab627c0045ea04
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Fri Sep 26 00:25:38 2014 +0200
+Date: Fri Sep 26 00:25:38 2014 +0200
Fix rendering of file with a wrong embedded font
@@ -1407,7 +1621,7 @@ Date: Fri Sep 26 00:25:38 2014 +0200
commit f94ba85a736b4c90c05e7782939f32506472658e
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Sep 12 19:22:20 2014 +0200
+Date: Fri Sep 12 19:22:20 2014 +0200
glib: Fix use of uninitialized members in PopplerInputStream
@@ -1418,7 +1632,7 @@ Date: Fri Sep 12 19:22:20 2014 +0200
commit 4589ce17caf94e7c5fa856906d3a8cc08e999d73
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Sep 12 19:22:20 2014 +0200
+Date: Fri Sep 12 19:22:20 2014 +0200
glib: Fix use of uninitialized members in PopplerInputStream
@@ -1430,37 +1644,37 @@ Date: Fri Sep 12 19:22:20 2014 +0200
commit fe67324d450c356b7c876cf50da705156112513a
Merge: e62e18e f74a596
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Aug 21 21:39:52 2014 +0200
+Date: Thu Aug 21 21:39:52 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit f74a5964078224c01bd5642aabc928d185bb0b69
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Aug 21 20:07:54 2014 +0200
+Date: Thu Aug 21 20:07:54 2014 +0200
0.26.4
CMakeLists.txt | 2 +-
- NEWS | 12 ++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 12 ++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 17 insertions(+), 5 deletions(-)
commit ce92e4ccefc7dad79db7f0af7a792ffa47824849
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Aug 21 20:03:42 2014 +0200
+Date: Thu Aug 21 20:03:42 2014 +0200
Update (C) years
- poppler/Annot.cc | 1 +
+ poppler/Annot.cc | 1 +
poppler/CairoOutputDev.cc | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
commit 42315c28809e62da7872add917e82853cf8c7e33
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Aug 21 19:58:35 2014 +0200
+Date: Thu Aug 21 19:58:35 2014 +0200
Make sure e is always initialized
@@ -1469,63 +1683,63 @@ Date: Thu Aug 21 19:58:35 2014 +0200
commit e62e18e1b318d6fa664d236723de3c06ae43e86b
Author: Jehan Pagès <jehan@zemarmot.net>
-Date: Tue Aug 12 21:05:03 2014 +0200
+Date: Tue Aug 12 21:05:03 2014 +0200
poppler: use poppler-data pkg-config for both cmake and autotools
builds
CMakeLists.txt | 16 ++++++++++++++++
config.h.cmake | 2 +-
- configure.ac | 7 ++++++-
+ configure.ac | 7 ++++++-
3 files changed, 23 insertions(+), 2 deletions(-)
commit 572c60764bbbd2080bfd7a926c646ad20b467aea
Author: Hib Eris <hib@hiberis.nl>
-Date: Tue Aug 12 18:12:45 2014 +0200
+Date: Tue Aug 12 18:12:45 2014 +0200
Makefile.am cleanups
Bug #79411
- configure.ac | 13 +++--
- cpp/Makefile.am | 66 +++++++++++++------------
- cpp/tests/Makefile.am | 13 ++---
- fofi/Makefile.am | 6 +--
- glib/Makefile.am | 29 ++++++-----
- glib/demo/Makefile.am | 18 +++----
- glib/reference/Makefile.am | 3 +-
- goo/Makefile.am | 38 +++++++--------
- poppler/Makefile.am | 118
+ configure.ac | 13 +++--
+ cpp/Makefile.am | 66 +++++++++++++------------
+ cpp/tests/Makefile.am | 13 ++---
+ fofi/Makefile.am | 6 +--
+ glib/Makefile.am | 29 ++++++-----
+ glib/demo/Makefile.am | 18 +++----
+ glib/reference/Makefile.am | 3 +-
+ goo/Makefile.am | 38 +++++++--------
+ poppler/Makefile.am | 118
++++++++++++++++++++++-----------------------
- qt4/demos/Makefile.am | 59 +++++++++++------------
- qt4/src/Makefile.am | 31 ++++++------
- qt4/tests/Makefile.am | 97 +++++++++++++------------------------
- qt5/demos/Makefile.am | 59 +++++++++++------------
- qt5/src/Makefile.am | 27 ++++++-----
- qt5/tests/Makefile.am | 98 ++++++++++++++-----------------------
- splash/Makefile.am | 42 ++++++++--------
- test/Makefile.am | 68 +++++++++-----------------
- utils/Makefile.am | 97 ++++++++++++++++++-------------------
+ qt4/demos/Makefile.am | 59 +++++++++++------------
+ qt4/src/Makefile.am | 31 ++++++------
+ qt4/tests/Makefile.am | 97 +++++++++++++------------------------
+ qt5/demos/Makefile.am | 59 +++++++++++------------
+ qt5/src/Makefile.am | 27 ++++++-----
+ qt5/tests/Makefile.am | 98 ++++++++++++++-----------------------
+ splash/Makefile.am | 42 ++++++++--------
+ test/Makefile.am | 68 +++++++++-----------------
+ utils/Makefile.am | 97 ++++++++++++++++++-------------------
18 files changed, 405 insertions(+), 477 deletions(-)
commit 4a4fe80d85a31b10822c7cd8eb5a0698bf306a52
Author: Hib Eris <hib@hiberis.nl>
-Date: Fri Aug 1 07:16:36 2014 +0200
+Date: Fri Aug 1 07:16:36 2014 +0200
glib-demo: Replace use of deprecated gtk stock items
https://bugs.freedesktop.org/show_bug.cgi?id=82384
- glib/demo/annots.c | 8 ++++----
+ glib/demo/annots.c | 8 ++++----
glib/demo/attachments.c | 4 ++--
- glib/demo/main.c | 6 +++---
- glib/demo/page.c | 6 +++---
- glib/demo/utils.c | 4 ++--
+ glib/demo/main.c | 6 +++---
+ glib/demo/page.c | 6 +++---
+ glib/demo/utils.c | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
commit ec6bad36cf5e9521f35285a3295976c05a69f76a
Author: Hib Eris <hib@hiberis.nl>
-Date: Fri Aug 1 07:51:10 2014 +0200
+Date: Fri Aug 1 07:51:10 2014 +0200
glib-demo: Remove use of deprecated gtk_dialog_get_action_area()
@@ -1537,13 +1751,13 @@ Date: Fri Aug 1 07:51:10 2014 +0200
commit b72a534d6c7d8bc026812b68f9d9ac6bf9a2200a
Merge: f2e4154 ef3f758
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 3 01:06:57 2014 +0200
+Date: Sun Aug 3 01:06:57 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit ef3f7585fac086de0919aa0bb0ef91a5070ac23e
Author: Jiri Slaby <jirislaby@gmail.com>
-Date: Sun Aug 3 01:05:00 2014 +0200
+Date: Sun Aug 3 01:05:00 2014 +0200
Improve non-latin characters in inline notes
@@ -1552,26 +1766,26 @@ Date: Sun Aug 3 01:05:00 2014 +0200
Bug #65956
- poppler/Annot.cc | 1 +
+ poppler/Annot.cc | 1 +
poppler/CharCodeToUnicode.cc | 1 +
2 files changed, 2 insertions(+)
commit 1b9c54286a4cdfaa284795933c20acf3c7e13bfc
Author: Ed Porras <ed@moto-research.com>
-Date: Sun Aug 3 01:01:35 2014 +0200
+Date: Sun Aug 3 01:01:35 2014 +0200
Don't check for inlineImg twice
Bug #82059
- poppler/Annot.cc | 2 +-
+ poppler/Annot.cc | 2 +-
poppler/CharCodeToUnicode.cc | 2 +-
poppler/SplashOutputDev.cc | 9 ++++-----
3 files changed, 6 insertions(+), 7 deletions(-)
commit f2e4154eff52b86e62490a3ccba470824c9cf436
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Sat Jul 26 00:12:37 2014 +0200
+Date: Sat Jul 26 00:12:37 2014 +0200
pdfseparate: additonal handling for annotations
@@ -1584,7 +1798,7 @@ Date: Sat Jul 26 00:12:37 2014 +0200
commit e7825f7cbbe7cc9c324fcb34c2e0dcae75f4172a
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jul 25 15:45:55 2014 +0200
+Date: Fri Jul 25 15:45:55 2014 +0200
glib: Fix a memory leak when getting text layout and attributes
@@ -1593,7 +1807,7 @@ Date: Fri Jul 25 15:45:55 2014 +0200
commit b729bf92ea1522a1eed9579e53e7580215cb9555
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jul 25 15:45:55 2014 +0200
+Date: Fri Jul 25 15:45:55 2014 +0200
glib: Fix a memory leak when getting text layout and attributes
@@ -1602,7 +1816,7 @@ Date: Fri Jul 25 15:45:55 2014 +0200
commit a1ecff0f0ab81fe76f63244250d96e7ef275f402
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jul 25 11:25:42 2014 +0200
+Date: Fri Jul 25 11:25:42 2014 +0200
glib: Return NULL in poppler_annot_get_contents also for empty strings
@@ -1611,7 +1825,7 @@ Date: Fri Jul 25 11:25:42 2014 +0200
commit ab1113d10ef712c7c44cd4b4bb6bc79f9ca3702c
Author: Anuj Khare <khareanuj18@gmail.com>
-Date: Thu Jul 24 19:47:22 2014 +0200
+Date: Thu Jul 24 19:47:22 2014 +0200
annots: Fix a crash when adding annot without contents
@@ -1624,7 +1838,7 @@ Date: Thu Jul 24 19:47:22 2014 +0200
commit f302864ed354b313ec39433f65ca3b107b55789d
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jul 25 11:25:42 2014 +0200
+Date: Fri Jul 25 11:25:42 2014 +0200
glib: Return NULL in poppler_annot_get_contents also for empty strings
@@ -1633,7 +1847,7 @@ Date: Fri Jul 25 11:25:42 2014 +0200
commit 13a5c5f4b61d05f2d18f94ad15e210a47021a576
Author: Anuj Khare <khareanuj18@gmail.com>
-Date: Thu Jul 24 19:47:22 2014 +0200
+Date: Thu Jul 24 19:47:22 2014 +0200
annots: Fix a crash when adding annot without contents
@@ -1646,7 +1860,7 @@ Date: Thu Jul 24 19:47:22 2014 +0200
commit 94ea9d8e1631abfbb8cc078100942d46b1356970
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Jul 24 10:46:17 2014 +0200
+Date: Thu Jul 24 10:46:17 2014 +0200
cairo: Make sure we always push a transparency group in
setSoftMaskFromImageMask()
@@ -1661,7 +1875,7 @@ Date: Thu Jul 24 10:46:17 2014 +0200
commit 02c127b355bb8a98684a5d0af063c60b8bfd09dd
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Jul 24 10:46:17 2014 +0200
+Date: Thu Jul 24 10:46:17 2014 +0200
cairo: Make sure we always push a transparency group in
setSoftMaskFromImageMask()
@@ -1676,7 +1890,7 @@ Date: Thu Jul 24 10:46:17 2014 +0200
commit c841a703c4c1750fd7ac0d04c6c3e7d4af80b8fa
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jul 21 00:29:28 2014 +0200
+Date: Mon Jul 21 00:29:28 2014 +0200
Improve Overprintmode and shadings
@@ -1684,20 +1898,20 @@ Date: Mon Jul 21 00:29:28 2014 +0200
poppler/SplashOutputDev.cc | 6 ++++--
poppler/SplashOutputDev.h | 8 +++++++-
- splash/Splash.cc | 24 ++++++++++++++++++++++--
+ splash/Splash.cc | 24 ++++++++++++++++++++++--
splash/SplashPattern.h | 6 +++++-
4 files changed, 38 insertions(+), 6 deletions(-)
commit ce782112746f629a8e7be6f2daf6ece6ab19917d
Merge: 2c0cb68 26372cf
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 20 20:35:13 2014 +0200
+Date: Sun Jul 20 20:35:13 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 26372cfae029a1124e042855c58bf5b70f281c76
Author: Ed Porras <ed@moto-research.com>
-Date: Sun Jul 20 20:33:48 2014 +0200
+Date: Sun Jul 20 20:33:48 2014 +0200
printf -> error
@@ -1708,20 +1922,20 @@ Date: Sun Jul 20 20:33:48 2014 +0200
commit 87d12c09281e3d12cda0fadcd65ab78928dff283
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 20 18:20:57 2014 +0200
+Date: Sun Jul 20 18:20:57 2014 +0200
0.26.3
CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
commit 69e5b81640c9bb31f0876fa8eb7ba28dbf38923f
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 20 18:18:29 2014 +0200
+Date: Sun Jul 20 18:18:29 2014 +0200
News for 0.26.3
@@ -1730,7 +1944,7 @@ Date: Sun Jul 20 18:18:29 2014 +0200
commit c368c0714d57c089057d974908295d850a1b5108
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 20 18:15:22 2014 +0200
+Date: Sun Jul 20 18:15:22 2014 +0200
Update Thomas' (C)
@@ -1740,7 +1954,7 @@ Date: Sun Jul 20 18:15:22 2014 +0200
commit 639179318c43a907a27e86778b720d33d481a9f9
Author: Pino Toscano <pino@kde.org>
-Date: Thu Jul 17 07:33:10 2014 +0200
+Date: Thu Jul 17 07:33:10 2014 +0200
glib: use C90-style comments in public headers
@@ -1750,13 +1964,13 @@ Date: Thu Jul 17 07:33:10 2014 +0200
commit 2c0cb689910e8579bf428b3999bcac0cb27b0e51
Merge: 0b639cd 1161e72
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jul 12 17:21:07 2014 +0200
+Date: Sat Jul 12 17:21:07 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 1161e728de9ca7c9a5fb0e24c4a5e4a79c65a849
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Sat Jul 12 17:04:42 2014 +0200
+Date: Sat Jul 12 17:04:42 2014 +0200
Error out instead of exiting if allInter grows too much
@@ -1768,7 +1982,7 @@ Date: Sat Jul 12 17:04:42 2014 +0200
commit e82a24a585d251f767725f61700dc1f8fe169a52
Author: Pino Toscano <pino@kde.org>
-Date: Sat Jul 12 08:35:45 2014 +0200
+Date: Sat Jul 12 08:35:45 2014 +0200
cmake: sync poppler-config.h.cmake with poppler-config.h.in
@@ -1778,13 +1992,13 @@ Date: Sat Jul 12 08:35:45 2014 +0200
commit 0b639cd2ac1071f5b741031a78d8e2bc18d2b7d7
Merge: bb16c71 a5ad55b
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 11 00:32:46 2014 +0200
+Date: Fri Jul 11 00:32:46 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit a5ad55b7cb9dc4e62754954291e4ecb8e05b5d67
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 11 00:32:07 2014 +0200
+Date: Fri Jul 11 00:32:07 2014 +0200
Add Hib's (C)
@@ -1793,7 +2007,7 @@ Date: Fri Jul 11 00:32:07 2014 +0200
commit 4f4ee736075d5b1d1bf4911a26c2f80a7122fe04
Author: Aki Koskinen <freedesktop@akikoskinen.info>
-Date: Fri Jul 11 00:30:52 2014 +0200
+Date: Fri Jul 11 00:30:52 2014 +0200
Fix compilation of Qt5 frontend with MinGW
@@ -1802,7 +2016,7 @@ Date: Fri Jul 11 00:30:52 2014 +0200
commit ddd91675792d9d496b06223867e05d2a190b878b
Author: Hib Eris <hib@hiberis.nl>
-Date: Thu May 29 16:58:55 2014 +0200
+Date: Thu May 29 16:58:55 2014 +0200
Include stdio.h from poppler-config.h
@@ -1815,8 +2029,8 @@ Date: Thu May 29 16:58:55 2014 +0200
XRef::XRefTableWriter::writeEntry(Goffset, int, XRefEntryType)':
XRef.cc:1460:94: warning: unknown conversion type character 'l'
in format [-Wformat=]
- outStr->printf("%010lli %05i %c\r\n", (long long)offset, gen,
- (type==xrefEntryFree)?'f':'n');
+ outStr->printf("%010lli %05i %c\r\n", (long long)offset, gen,
+ (type==xrefEntryFree)?'f':'n');
^
XRef.cc:1460:94: warning: format '%i' expects argument of type 'int',
but argument 3 has type 'Goffset {aka long long int}' [-Wformat=]
@@ -1830,7 +2044,7 @@ Date: Thu May 29 16:58:55 2014 +0200
commit bb16c7162c73b871e26f508823c0ee259b7e5420
Author: Hib Eris <hib@hiberis.nl>
-Date: Sat Jun 7 12:00:52 2014 +0200
+Date: Sat Jun 7 12:00:52 2014 +0200
Move automake version check from autogen.sh to configure.ac
@@ -1843,13 +2057,13 @@ Date: Sat Jun 7 12:00:52 2014 +0200
commit 74c72223cf609e7c24594f95cab6f9865ad562ac
Merge: f8f7b3a 47a947f
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 11 00:23:04 2014 +0200
+Date: Fri Jul 11 00:23:04 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 47a947f1dc664793a7037888a46a297a46c79d6c
Author: Hib Eris <hib@hiberis.nl>
-Date: Thu Jun 19 10:11:21 2014 +0200
+Date: Thu Jun 19 10:11:21 2014 +0200
Fix moc-qt5 detection
@@ -1861,13 +2075,13 @@ Date: Thu Jun 19 10:11:21 2014 +0200
commit f8f7b3a61bc7eb1e569c25a630b5e127b5dcae62
Merge: 805ff76 aa6205d
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jul 9 00:23:22 2014 +0200
+Date: Wed Jul 9 00:23:22 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit aa6205d195c56a77e897bad125bf213aba138422
Author: Jason Crain <jason@aquaticape.us>
-Date: Mon Jul 7 23:52:39 2014 -0500
+Date: Mon Jul 7 23:52:39 2014 -0500
Increase required Qt4 version to 4.7.0
@@ -1876,12 +2090,12 @@ Date: Mon Jul 7 23:52:39 2014 -0500
bug #81005
CMakeLists.txt | 2 +-
- configure.ac | 8 ++++----
+ configure.ac | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
commit 805ff76112ebfd57276ea78f1f0891abc61a6c03
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
-Date: Mon Apr 11 16:26:11 2011 -0500
+Date: Mon Apr 11 16:26:11 2011 -0500
Do not dist gir_DATA
@@ -1892,7 +2106,7 @@ Date: Mon Apr 11 16:26:11 2011 -0500
commit e5862155b1c549b6774bb4f25c09c45857ff1734
Author: Hib Eris <hib@hiberis.nl>
-Date: Wed Jun 4 20:58:56 2014 +0200
+Date: Wed Jun 4 20:58:56 2014 +0200
Add Changelog to .gitignore
@@ -1903,7 +2117,7 @@ Date: Wed Jun 4 20:58:56 2014 +0200
commit 5f22649694d64c4170db82847b599576d5377176
Author: Hib Eris <hib@hiberis.nl>
-Date: Wed Jun 4 20:56:23 2014 +0200
+Date: Wed Jun 4 20:56:23 2014 +0200
Add *.gir, *.typelib to glib/.gitignore
@@ -1914,7 +2128,7 @@ Date: Wed Jun 4 20:56:23 2014 +0200
commit b63f57985719c7884b67f46fc4afd4954c44c5ab
Author: Hib Eris <hib@hiberis.nl>
-Date: Wed Jun 4 20:54:30 2014 +0200
+Date: Wed Jun 4 20:54:30 2014 +0200
Add poppler-undeclared.txt to .gitignore
@@ -1925,7 +2139,7 @@ Date: Wed Jun 4 20:54:30 2014 +0200
commit 5e0f4e2516d5a3997ea9c9a9927e24d4f3abe136
Author: Hib Eris <hib@hiberis.nl>
-Date: Wed Jun 4 20:52:15 2014 +0200
+Date: Wed Jun 4 20:52:15 2014 +0200
Add poppler-forms, stress-threads-qt, test-render-to-file to
.gitignore
@@ -1938,7 +2152,7 @@ Date: Wed Jun 4 20:52:15 2014 +0200
commit 4d2400e7bb8ae9208030b9615dda7c53e571be8b
Author: Hib Eris <hib@hiberis.nl>
-Date: Wed Jun 4 10:09:16 2014 +0200
+Date: Wed Jun 4 10:09:16 2014 +0200
Add test-driver to .gitignore
@@ -1949,7 +2163,7 @@ Date: Wed Jun 4 10:09:16 2014 +0200
commit 4c35e0213be26f21b628ff8d9f170252bb0106c9
Author: Hib Eris <hib@hiberis.nl>
-Date: Wed Jun 4 10:06:20 2014 +0200
+Date: Wed Jun 4 10:06:20 2014 +0200
Add poppler-qt5.pc to .gitignore
@@ -1960,7 +2174,7 @@ Date: Wed Jun 4 10:06:20 2014 +0200
commit 2b455b85168d5c9d8641d9a91bfde81ccab18e54
Author: Pino Toscano <pino@kde.org>
-Date: Sun Jul 6 11:13:54 2014 +0200
+Date: Sun Jul 6 11:13:54 2014 +0200
glib: fix typo in apidox
@@ -1969,21 +2183,21 @@ Date: Sun Jul 6 11:13:54 2014 +0200
commit 266a61ab1c9f536a4fb7d68c8f285c854eb2d6e9
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jun 19 20:16:19 2014 +0200
+Date: Thu Jun 19 20:16:19 2014 +0200
0.26.2
CMakeLists.txt | 2 +-
- NEWS | 10 ++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 10 ++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 15 insertions(+), 5 deletions(-)
commit 3381ee20efca2ce27733182d0d6720c1e6936a7f
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jun 19 19:57:31 2014 +0200
+Date: Thu Jun 19 19:57:31 2014 +0200
Update (C)
@@ -1994,13 +2208,13 @@ Date: Thu Jun 19 19:57:31 2014 +0200
commit 8a5e59c6ea7ccd0ecbdb4b37bf3fe4e74e1c0e8e
Merge: 1b70533 310fbee
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 18 00:37:03 2014 +0200
+Date: Wed Jun 18 00:37:03 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 310fbeec692b02d555e3e8dd6c851be11b25e26a
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 18 00:31:48 2014 +0200
+Date: Wed Jun 18 00:31:48 2014 +0200
Make sure we have an xref before using
@@ -2041,7 +2255,7 @@ Date: Wed Jun 18 00:31:48 2014 +0200
commit 1b705331019b155f2138d4b9f5a5bd03ec59193d
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 17:07:15 2014 +0200
+Date: Sun Jun 8 17:07:15 2014 +0200
[glib] doc: Move poppler_date_parse to utility functions section
@@ -2053,7 +2267,7 @@ Date: Sun Jun 8 17:07:15 2014 +0200
commit d661553b0a13855aa5a1240e9c04a0e49dafd910
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 16:11:26 2014 +0200
+Date: Sun Jun 8 16:11:26 2014 +0200
[glib] doc: Document PopplerFindFlags:POPPLER_FIND_DEFAULT
@@ -2071,7 +2285,7 @@ Date: Sun Jun 8 16:11:26 2014 +0200
commit 237a1402ab836d10eb5fdc1aa6ceccabea10a316
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 16:07:14 2014 +0200
+Date: Sun Jun 8 16:07:14 2014 +0200
[glib] doc: Use <emphasis> instead of <em>
@@ -2087,7 +2301,7 @@ Date: Sun Jun 8 16:07:14 2014 +0200
commit 66abf3992228be2559542e9d2753f45f06ae7728
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 16:02:01 2014 +0200
+Date: Sun Jun 8 16:02:01 2014 +0200
[glib] doc: Add PopplerBackend documentation
@@ -2098,7 +2312,7 @@ Date: Sun Jun 8 16:02:01 2014 +0200
commit a30ec8e4abe3875aad068c83265b47f9beea33d1
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 15:05:52 2014 +0200
+Date: Sun Jun 8 15:05:52 2014 +0200
[glib] doc: Add missing POPPLER_TYPE_POINT
@@ -2112,7 +2326,7 @@ Date: Sun Jun 8 15:05:52 2014 +0200
commit 6eb0537ac5163356c8e8f689d2408fa695e99423
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 14:59:15 2014 +0200
+Date: Sun Jun 8 14:59:15 2014 +0200
[glib] doc: Fix typo
@@ -2123,7 +2337,7 @@ Date: Sun Jun 8 14:59:15 2014 +0200
commit 96adcad85d76409cb8ed4266a08ae776b42661e4
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 14:53:42 2014 +0200
+Date: Sun Jun 8 14:53:42 2014 +0200
[glib] doc: Add poppler_annot_set_flags() to documentation
@@ -2134,7 +2348,7 @@ Date: Sun Jun 8 14:53:42 2014 +0200
commit f3519352c70537009cc6bd660c0bd3e727db8b8a
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 14:38:13 2014 +0200
+Date: Sun Jun 8 14:38:13 2014 +0200
[glib] doc: Move PopplerFindFlags to PopplerPage section
@@ -2148,7 +2362,7 @@ Date: Sun Jun 8 14:38:13 2014 +0200
commit 45b0d49330d9d089b2480b91e418924a490c82ce
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 14:22:28 2014 +0200
+Date: Sun Jun 8 14:22:28 2014 +0200
[glib] doc: Move PopplerPrintFlags to PopplerPage section
@@ -2159,7 +2373,7 @@ Date: Sun Jun 8 14:22:28 2014 +0200
commit ce357147d17004a2772ca3b32d106da511bba360
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 13:22:51 2014 +0200
+Date: Sun Jun 8 13:22:51 2014 +0200
[glib] doc: Move poppler_get_{version, backend} documentation to
features section
@@ -2171,27 +2385,27 @@ Date: Sun Jun 8 13:22:51 2014 +0200
commit 1bfd6b69e7e98d4b3e6e891a46b58c9109b8c14c
Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Jun 8 12:57:25 2014 +0200
+Date: Sun Jun 8 12:57:25 2014 +0200
[glib] doc: Move PopplerColor documentation to it's own section
https://bugs.freedesktop.org/show_bug.cgi?id=79798
- glib/poppler-page.cc | 6 ++++++
- glib/reference/poppler-docs.sgml | 1 +
+ glib/poppler-page.cc | 6 ++++++
+ glib/reference/poppler-docs.sgml | 1 +
glib/reference/poppler-sections.txt | 21 +++++++++++++++------
3 files changed, 22 insertions(+), 6 deletions(-)
commit 2dd9b95fd910023a7d9d23f2c2e41dcab91d3c31
Merge: fed71eb b36d27b
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jun 6 21:43:49 2014 +0200
+Date: Fri Jun 6 21:43:49 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit b36d27b42417d15866a5729409e39d6f7c2b0289
Author: Hib Eris <hib@hiberis.nl>
-Date: Fri Jun 6 21:42:10 2014 +0200
+Date: Fri Jun 6 21:42:10 2014 +0200
Fix typo in configure.ac
@@ -2202,7 +2416,7 @@ Date: Fri Jun 6 21:42:10 2014 +0200
commit fed71ebd8e43e24eace9dcebe24bd318ff3d04a6
Author: Hib Eris <hib@hiberis.nl>
-Date: Thu May 29 13:22:05 2014 +0200
+Date: Thu May 29 13:22:05 2014 +0200
Change pagenum arguments in PDFDoc::markAnnotations from Guint to int
@@ -2214,11 +2428,11 @@ Date: Thu May 29 13:22:05 2014 +0200
XRef*, XRef*, Guint, Guint, Guint)':
PDFDoc.cc:1607:40: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
- if (obj2.getRef().num == oldPageNum) {
- ^
+ if (obj2.getRef().num == oldPageNum) {
+ ^
PDFDoc.cc:1617:47: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
- } else if (obj2.getRef().num == newPageNum) {
+ } else if (obj2.getRef().num == newPageNum) {
https://bugs.freedesktop.org/show_bug.cgi?id=79410
@@ -2228,7 +2442,7 @@ Date: Thu May 29 13:22:05 2014 +0200
commit f5e702060a84362bfdf75260531920d4ba8b7333
Author: Pino Toscano <pino@kde.org>
-Date: Sat May 24 15:59:42 2014 +0200
+Date: Sat May 24 15:59:42 2014 +0200
pdftohtml: exit with 0 with -v and -h
@@ -2237,48 +2451,48 @@ Date: Sat May 24 15:59:42 2014 +0200
commit 700bf398ef7b20306f5035e423becfaa3d28fb10
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri May 23 20:05:41 2014 +0200
+Date: Fri May 23 20:05:41 2014 +0200
0.26.1
CMakeLists.txt | 2 +-
- NEWS | 12 ++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ NEWS | 12 ++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 17 insertions(+), 5 deletions(-)
commit 93373cd113d046b65538fe983b46842d689a2112
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 11 18:31:10 2014 +0200
+Date: Sun May 11 18:31:10 2014 +0200
Qt: Add a new page->annotations() call that let's you specify subtypes
This way we don't return annotations you may not be interested in
qt4/src/poppler-annotation-private.h | 4 +--
- qt4/src/poppler-annotation.cc | 48
+ qt4/src/poppler-annotation.cc | 48
++++++++++++++++++++++++++++++++++--
- qt4/src/poppler-page.cc | 7 +++++-
- qt4/src/poppler-qt4.h | 14 +++++++++++
+ qt4/src/poppler-page.cc | 7 +++++-
+ qt4/src/poppler-qt4.h | 14 +++++++++++
qt5/src/poppler-annotation-private.h | 4 +--
- qt5/src/poppler-annotation.cc | 48
+ qt5/src/poppler-annotation.cc | 48
++++++++++++++++++++++++++++++++++--
- qt5/src/poppler-page.cc | 7 +++++-
- qt5/src/poppler-qt5.h | 15 +++++++++++
+ qt5/src/poppler-page.cc | 7 +++++-
+ qt5/src/poppler-qt5.h | 15 +++++++++++
8 files changed, 137 insertions(+), 10 deletions(-)
commit d2892cd893e4379914a08e66682ed5c423743a41
Merge: 0844220 7e9fc61
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 7 22:27:41 2014 +0200
+Date: Wed May 7 22:27:41 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 7e9fc61e287889eefd6b08ef5991d31fed79cafd
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 7 22:25:59 2014 +0200
+Date: Wed May 7 22:25:59 2014 +0200
Fix libopenjpeg 1.5 detection on some systems
@@ -2293,13 +2507,13 @@ Date: Wed May 7 22:25:59 2014 +0200
commit 0844220347f984c3d9b04fe53e690ee0e8c74afe
Merge: 84278d8 0a6c1ff
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 7 21:56:07 2014 +0200
+Date: Wed May 7 21:56:07 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 0a6c1ff777aa23c7a5654b313b639e66600883b9
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Wed May 7 21:54:46 2014 +0200
+Date: Wed May 7 21:54:46 2014 +0200
Only add annotations of the current page when splitting
@@ -2314,13 +2528,13 @@ Date: Wed May 7 21:54:46 2014 +0200
commit 84278d8adbb1f6e9a28588fcb4db30c9ef70adde
Merge: 7b94b11 5b2cdef
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 4 22:21:25 2014 +0200
+Date: Sun May 4 22:21:25 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit 5b2cdef49a8a0a92fd323fbe45841a5098a42ece
Author: Olly Betts <olly@survex.com>
-Date: Sun May 4 22:20:30 2014 +0200
+Date: Sun May 4 22:20:30 2014 +0200
Fix extraction of text in some files
@@ -2332,13 +2546,13 @@ Date: Sun May 4 22:20:30 2014 +0200
commit 7b94b119f07713af7b8b9f1ac3ea3f1d35c1e240
Merge: c859d2b bae836c
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 4 16:21:24 2014 +0200
+Date: Sun May 4 16:21:24 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.26'
commit bae836cd3dd3511ca9cf4745626142334bafd1a6
Author: Marek Kasik <mkasik@redhat.com>
-Date: Sun May 4 16:20:33 2014 +0200
+Date: Sun May 4 16:20:33 2014 +0200
Use field value V for radio buttons
@@ -2353,7 +2567,7 @@ Date: Sun May 4 16:20:33 2014 +0200
commit a748b3a059938e6ae98b51eb82bab7c33a5e23c7
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Apr 30 09:25:31 2014 +0200
+Date: Wed Apr 30 09:25:31 2014 +0200
glib: Fix multiple definition of PopplerTextSpan
@@ -2364,7 +2578,7 @@ Date: Wed Apr 30 09:25:31 2014 +0200
commit c859d2b891a115c79d04db14463791dfb1c46a20
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Apr 30 09:25:31 2014 +0200
+Date: Wed Apr 30 09:25:31 2014 +0200
glib: Fix multiple definition of PopplerTextSpan
@@ -2375,21 +2589,21 @@ Date: Wed Apr 30 09:25:31 2014 +0200
commit 9a68daee2b3c7f8a992ee47c0e9ac78b346d4348
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Apr 25 01:01:08 2014 +0200
+Date: Fri Apr 25 01:01:08 2014 +0200
0.26.0
CMakeLists.txt | 4 ++--
- NEWS | 13 +++++++++++++
- configure.ac | 4 ++--
- cpp/Doxyfile | 2 +-
+ NEWS | 13 +++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
6 files changed, 20 insertions(+), 7 deletions(-)
commit 8073852c84b71257d487aa8a46e441aa82f4b42c
Author: Fabio D'Urso <fabiodurso@hotmail.it>
-Date: Mon Apr 14 23:35:50 2014 +0200
+Date: Mon Apr 14 23:35:50 2014 +0200
qt: Fix missing ! in TextAnnotation::setInplaceIntent
@@ -2401,7 +2615,7 @@ Date: Mon Apr 14 23:35:50 2014 +0200
commit 1fbf98664c0879ac035a63602242a910c0c1d316
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Apr 14 11:53:59 2014 +0200
+Date: Mon Apr 14 11:53:59 2014 +0200
Initialize tmpBufLen
@@ -2417,7 +2631,7 @@ Date: Mon Apr 14 11:53:59 2014 +0200
commit b3e5c582a279b1b8d8309322ac3f4d0e51831f77
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Apr 10 23:38:09 2014 +0200
+Date: Thu Apr 10 23:38:09 2014 +0200
Remove unused member
@@ -2426,19 +2640,19 @@ Date: Thu Apr 10 23:38:09 2014 +0200
commit b86f471c43e387cf873358cf3cbcd27470646713
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Apr 10 22:50:56 2014 +0200
+Date: Thu Apr 10 22:50:56 2014 +0200
0.25.3
- CMakeLists.txt | 2 +-
- NEWS | 19 +++++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
+ CMakeLists.txt | 2 +-
+ NEWS | 19 +++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
poppler/CairoOutputDev.cc | 2 +-
- poppler/GfxFont.cc | 2 +-
- qt4/src/Doxyfile | 2 +-
+ poppler/GfxFont.cc | 2 +-
+ qt4/src/Doxyfile | 2 +-
qt4/src/poppler-optcontent.cc | 2 +-
- qt5/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
qt5/src/poppler-optcontent.cc | 2 +-
qt5/src/poppler-private.cc | 2 +-
qt5/src/poppler-private.h | 2 +-
@@ -2446,7 +2660,7 @@ Date: Thu Apr 10 22:50:56 2014 +0200
commit 80107c72ac03bf4d00b2d71d6f947c139ea84ab5
Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 6 20:17:31 2014 +0200
+Date: Sun Apr 6 20:17:31 2014 +0200
qt5: remove m_fontInfoIterator from Document
@@ -2459,7 +2673,7 @@ Date: Sun Apr 6 20:17:31 2014 +0200
commit b8325316e41fb03eb5fac5c80d6a550fe9ce9695
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 6 16:05:51 2014 +0200
+Date: Sun Apr 6 16:05:51 2014 +0200
Fix memory leak
@@ -2470,7 +2684,7 @@ Date: Sun Apr 6 16:05:51 2014 +0200
commit ca9713118d6ce3fdd245f9ca4f595229a5be19c3
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 6 15:59:43 2014 +0200
+Date: Sun Apr 6 15:59:43 2014 +0200
Don't check twice for the same variable ^_^
@@ -2481,7 +2695,7 @@ Date: Sun Apr 6 15:59:43 2014 +0200
commit 0ef290a7c5a8fa54d3fe0f646abdf098443a7a67
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 6 15:57:38 2014 +0200
+Date: Sun Apr 6 15:57:38 2014 +0200
Fix memory leak
@@ -2492,7 +2706,7 @@ Date: Sun Apr 6 15:57:38 2014 +0200
commit 8810b8917fded340b784873a91ca025b0bb49f3d
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 6 15:49:18 2014 +0200
+Date: Sun Apr 6 15:49:18 2014 +0200
Fix Out-of-bounds read
@@ -2503,7 +2717,7 @@ Date: Sun Apr 6 15:49:18 2014 +0200
commit 9309907673e8557a25021dce79d9b4354640e2d0
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 6 15:35:00 2014 +0200
+Date: Sun Apr 6 15:35:00 2014 +0200
Fix memory leak
@@ -2516,7 +2730,7 @@ Date: Sun Apr 6 15:35:00 2014 +0200
commit a511005584a38217fed582ced6ce2c937526cf96
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 6 15:28:50 2014 +0200
+Date: Sun Apr 6 15:28:50 2014 +0200
Fix Uninitialized pointer read when nFucnsA is 0
@@ -2527,7 +2741,7 @@ Date: Sun Apr 6 15:28:50 2014 +0200
commit 26b961a64030d91c5db2769dcd0ab8dff7b9b6a6
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 6 15:23:35 2014 +0200
+Date: Sun Apr 6 15:23:35 2014 +0200
gfree -> delete since it was new'ed
@@ -2538,7 +2752,7 @@ Date: Sun Apr 6 15:23:35 2014 +0200
commit 814ac2230b594cce3b871588804dd92f4a187e7e
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 6 15:22:13 2014 +0200
+Date: Sun Apr 6 15:22:13 2014 +0200
delete -> gfree since it was gmaloced
@@ -2549,7 +2763,7 @@ Date: Sun Apr 6 15:22:13 2014 +0200
commit b496b6665803247b10b018ae939a2a452fa4a48f
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 6 15:17:50 2014 +0200
+Date: Sun Apr 6 15:17:50 2014 +0200
Fix memory leak
@@ -2560,7 +2774,7 @@ Date: Sun Apr 6 15:17:50 2014 +0200
commit 1b612f355e9f29fa93c15a9de1188049a8e086b6
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 6 15:14:50 2014 +0200
+Date: Sun Apr 6 15:14:50 2014 +0200
Fix memory leak
@@ -2572,13 +2786,13 @@ Date: Sun Apr 6 15:14:50 2014 +0200
commit 07621ebbda8ab85cf4cd76a6092efc67aa14454d
Merge: 8d3a2c9 9fcd46a
Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 15:49:31 2014 +0200
+Date: Sat Apr 5 15:49:31 2014 +0200
Merge remote-tracking branch 'origin/poppler-0.24'
commit 9fcd46ac4a94f138981ec5afaab3875918c6a175
Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 15:48:27 2014 +0200
+Date: Sat Apr 5 15:48:27 2014 +0200
qt4/qt5: remove extra qDebug
@@ -2588,7 +2802,7 @@ Date: Sat Apr 5 15:48:27 2014 +0200
commit 37286ee2923de060ae463ac6b178ffd0e6096b90
Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 15:46:44 2014 +0200
+Date: Sat Apr 5 15:46:44 2014 +0200
qt4/qt5: fix some kinds of OCG models
@@ -2600,19 +2814,19 @@ Date: Sat Apr 5 15:46:44 2014 +0200
commit 8d3a2c9d007052bcb8719200760a1abb6314f804
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
-Date: Sun Mar 30 23:34:23 2014 +0200
+Date: Sun Mar 30 23:34:23 2014 +0200
Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX
- goo/GooMutex.h | 3 +++
- goo/GooTimer.h | 5 ++++-
- goo/gfile.h | 5 ++++-
+ goo/GooMutex.h | 3 +++
+ goo/GooTimer.h | 5 ++++-
+ goo/gfile.h | 5 ++++-
poppler/XpdfPluginAPI.h | 3 +++
4 files changed, 14 insertions(+), 2 deletions(-)
commit 38dcaf96f308265ff6958e4683bcec2be0c254b9
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri Mar 28 20:49:17 2014 +1030
+Date: Fri Mar 28 20:49:17 2014 +1030
cairo: fix segv cause by bad image stream
@@ -2623,7 +2837,7 @@ Date: Fri Mar 28 20:49:17 2014 +1030
commit 07b0a038b194eb0392a1e9a4236064d37247d687
Author: Jakub Wilk <jwilk@jwilk.net>
-Date: Sun Mar 30 16:12:28 2014 +0200
+Date: Sun Mar 30 16:12:28 2014 +0200
pdftohtml: Fix typo in manpage
@@ -2632,7 +2846,7 @@ Date: Sun Mar 30 16:12:28 2014 +0200
commit ac3c8303396a0b8de5e4ad32f480b8da5f3b396e
Author: Thomas Liebetraut <thomas@tommie-lie.de>
-Date: Sun Mar 30 12:25:26 2014 +0200
+Date: Sun Mar 30 12:25:26 2014 +0200
glib: Fix the first coord of the qudrilateral in
create_poppler_quads_from_annot_quads()
@@ -2644,7 +2858,7 @@ Date: Sun Mar 30 12:25:26 2014 +0200
commit 82d69da7c2f67e774c51fb7b146fdf639a6b9616
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Mar 28 15:53:22 2014 +0100
+Date: Fri Mar 28 15:53:22 2014 +0100
Fix error reported by ASAN in 3628.asan.0.3910.pdf
@@ -2652,58 +2866,58 @@ Date: Fri Mar 28 15:53:22 2014 +0100
address 0x60040005c6ef at pc 0x7f8912ca0c90 bp 0x7fff8509ee20 sp
0x7fff8509ee18
READ of size 1 at 0x60040005c6ef thread T0
- #0 0x7f8912ca0c8f in expandRow(unsigned char*, unsigned char*,
- int, int, int) /home/tsdgeos/devel/poppler/splash/Splash.cc:4855
- #1 0x7f8912ca1097 in Splash::scaleImageYuXuBilinear(bool
- (*)(void*, unsigned char*, unsigned char*), void*,
- SplashColorMode, int, bool, int, int, int, int, SplashBitmap*)
- /home/tsdgeos/devel/poppler/splash/Splash.cc:4897
- #2 0x7f8912c9d2b7 in Splash::scaleImage(bool
- (*)(void*, unsigned char*, unsigned char*), void*,
- SplashColorMode, int, bool, int, int, int, int, bool, bool)
- /home/tsdgeos/devel/poppler/splash/Splash.cc:4127
- #3 0x7f8912c98101 in Splash::drawImage(bool
- (*)(void*, unsigned char*, unsigned char*), void*,
- SplashColorMode, bool, int, int, double*, bool, bool)
- /home/tsdgeos/devel/poppler/splash/Splash.cc:3726
- #4 0x7f8912c7056a in
- SplashOutputDev::drawSoftMaskedImage(GfxState*,
- Object*, Stream*, int, int, GfxImageColorMap*,
- bool, Stream*, int, int, GfxImageColorMap*, bool)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3630
- #5 0x7f8912ac7aa7 in Gfx::doImage(Object*, Stream*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4646
- #6 0x7f8912ac4de0 in Gfx::opXObject(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
- #7 0x7f8912a9f33a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #8 0x7f8912a9e50f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #9 0x7f8912a9e163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #10 0x7f8912b80e13 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #11 0x7f8912b8833f in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #13 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #14 0x7f89121a8ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #15 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f8912ca0c8f in expandRow(unsigned char*, unsigned char*,
+ int, int, int) /home/tsdgeos/devel/poppler/splash/Splash.cc:4855
+ #1 0x7f8912ca1097 in Splash::scaleImageYuXuBilinear(bool
+ (*)(void*, unsigned char*, unsigned char*), void*,
+ SplashColorMode, int, bool, int, int, int, int, SplashBitmap*)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:4897
+ #2 0x7f8912c9d2b7 in Splash::scaleImage(bool
+ (*)(void*, unsigned char*, unsigned char*), void*,
+ SplashColorMode, int, bool, int, int, int, int, bool, bool)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:4127
+ #3 0x7f8912c98101 in Splash::drawImage(bool
+ (*)(void*, unsigned char*, unsigned char*), void*,
+ SplashColorMode, bool, int, int, double*, bool, bool)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:3726
+ #4 0x7f8912c7056a in
+ SplashOutputDev::drawSoftMaskedImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*,
+ bool, Stream*, int, int, GfxImageColorMap*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3630
+ #5 0x7f8912ac7aa7 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4646
+ #6 0x7f8912ac4de0 in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #7 0x7f8912a9f33a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #8 0x7f8912a9e50f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #9 0x7f8912a9e163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #10 0x7f8912b80e13 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #11 0x7f8912b8833f in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #13 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #14 0x7f89121a8ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #15 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
splash/Splash.cc | 3 +++
1 file changed, 3 insertions(+)
commit 38ec8cbeeaf69d96b9d7bcd662187c8916cf7903
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Mar 28 11:18:02 2014 +0100
+Date: Fri Mar 28 11:18:02 2014 +0100
Fix error reported by ASAN in 5782.asan.0.7113.pdf
@@ -2711,45 +2925,45 @@ Date: Fri Mar 28 11:18:02 2014 +0100
address 0x6008000e3bcf at pc 0x7f66bae0e117 bp 0x7fffcb54ea70 sp
0x7fffcb54ea68
READ of size 1 at 0x6008000e3bcf thread T0
- #0 0x7f66bae0e116 in GooString::getChar(int)
- /home/tsdgeos/devel/poppler/goo/GooString.h:119
- #1 0x7f66bafb5dca in LinkURI::LinkURI(Object*, GooString*)
- /home/tsdgeos/devel/poppler/poppler/Link.cc:562
- #2 0x7f66bafb2a05 in LinkAction::parseAction(Object*, GooString*)
- /home/tsdgeos/devel/poppler/poppler/Link.cc:98
- #3 0x7f66bae69c0e in AnnotLink::initialize(PDFDoc*, Dict*)
- /home/tsdgeos/devel/poppler/poppler/Annot.cc:2621
- #4 0x7f66bae698d9 in AnnotLink::AnnotLink(PDFDoc*, Dict*, Object*)
- /home/tsdgeos/devel/poppler/poppler/Annot.cc:2596
- #5 0x7f66bae8d998 in Annots::createAnnot(Dict*, Object*)
- /home/tsdgeos/devel/poppler/poppler/Annot.cc:6737
- #6 0x7f66bae8d269 in Annots::Annots(PDFDoc*, int, Object*)
- /home/tsdgeos/devel/poppler/poppler/Annot.cc:6683
- #7 0x7f66bafc750d in Page::getAnnots(XRef*)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:402
- #8 0x7f66bafc8e66 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:595
- #9 0x7f66bafd02fd in PDFDoc::displayPageSlice(OutputDev*, int,
- double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #10 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #11 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #12 0x7f66ba5f0ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #13 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f66bae0e116 in GooString::getChar(int)
+ /home/tsdgeos/devel/poppler/goo/GooString.h:119
+ #1 0x7f66bafb5dca in LinkURI::LinkURI(Object*, GooString*)
+ /home/tsdgeos/devel/poppler/poppler/Link.cc:562
+ #2 0x7f66bafb2a05 in LinkAction::parseAction(Object*, GooString*)
+ /home/tsdgeos/devel/poppler/poppler/Link.cc:98
+ #3 0x7f66bae69c0e in AnnotLink::initialize(PDFDoc*, Dict*)
+ /home/tsdgeos/devel/poppler/poppler/Annot.cc:2621
+ #4 0x7f66bae698d9 in AnnotLink::AnnotLink(PDFDoc*, Dict*, Object*)
+ /home/tsdgeos/devel/poppler/poppler/Annot.cc:2596
+ #5 0x7f66bae8d998 in Annots::createAnnot(Dict*, Object*)
+ /home/tsdgeos/devel/poppler/poppler/Annot.cc:6737
+ #6 0x7f66bae8d269 in Annots::Annots(PDFDoc*, int, Object*)
+ /home/tsdgeos/devel/poppler/poppler/Annot.cc:6683
+ #7 0x7f66bafc750d in Page::getAnnots(XRef*)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:402
+ #8 0x7f66bafc8e66 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:595
+ #9 0x7f66bafd02fd in PDFDoc::displayPageSlice(OutputDev*, int,
+ double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #10 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #11 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #12 0x7f66ba5f0ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #13 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
poppler/Link.cc | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
commit 49b4eb68ee646aefe49b70f9e2831ebf93576053
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Mar 28 11:08:18 2014 +0100
+Date: Fri Mar 28 11:08:18 2014 +0100
Fix error reported by ASAN in 590.asan.0.7288.pdf
@@ -2757,45 +2971,45 @@ Date: Fri Mar 28 11:08:18 2014 +0100
address 0x60ae0007432c at pc 0x7f03483026aa bp 0x7fff6ec0c820 sp
0x7fff6ec0c818
READ of size 4 at 0x60ae0007432c thread T0
- #0 0x7f03483026a9 in SplashFTFont::getGlyphPath(int)
- /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:414
- #1 0x7f034829f681 in SplashOutputDev::drawChar(GfxState*,
- double, double, double, double, double,
- double, unsigned int, int, unsigned int*, int)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2239
- #2 0x7f0348100599 in Gfx::doShowText(GooString*)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
- #3 0x7f03480fddb0 in Gfx::opShowSpaceText(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
- #4 0x7f03480dc33a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #5 0x7f03480db50f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #6 0x7f03480db163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #7 0x7f03481bddd1 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #8 0x7f03481c52fd in PDFDoc::displayPageSlice(OutputDev*, int,
- double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #9 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #10 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #11 0x7f03477e5ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #12 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f03483026a9 in SplashFTFont::getGlyphPath(int)
+ /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:414
+ #1 0x7f034829f681 in SplashOutputDev::drawChar(GfxState*,
+ double, double, double, double, double,
+ double, unsigned int, int, unsigned int*, int)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2239
+ #2 0x7f0348100599 in Gfx::doShowText(GooString*)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
+ #3 0x7f03480fddb0 in Gfx::opShowSpaceText(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
+ #4 0x7f03480dc33a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #5 0x7f03480db50f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #6 0x7f03480db163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #7 0x7f03481bddd1 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #8 0x7f03481c52fd in PDFDoc::displayPageSlice(OutputDev*, int,
+ double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #9 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #10 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #11 0x7f03477e5ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #12 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
splash/SplashFTFont.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 89a64b508e5f8445798c95fcec6c87180f6c9b73
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Mar 28 00:35:17 2014 +0100
+Date: Fri Mar 28 00:35:17 2014 +0100
Fix error reported by ASAN in 2279.asan.0.1904.pdf
@@ -2803,54 +3017,54 @@ Date: Fri Mar 28 00:35:17 2014 +0100
address 0x60420000ff04 at pc 0x7fa1492e8012 bp 0x7fff8406d900 sp
0x7fff8406d8f8
READ of size 4 at 0x60420000ff04 thread T0
- #0 0x7fa1492e8011 in SplashFTFont::makeGlyph(int, int, int,
- SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
- /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:284
- #1 0x7fa1492eda32 in SplashFont::getGlyph(int, int, int,
- SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
- /home/tsdgeos/devel/poppler/splash/SplashFont.cc:168
- #2 0x7fa1492e7c69 in SplashFTFont::getGlyph(int, int, int,
- SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
- /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233
- #3 0x7fa1492b3368 in Splash::fillChar(double, double, int,
- SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714
- #4 0x7fa149286a20 in SplashOutputDev::drawChar(GfxState*,
- double, double, double, double, double,
- double, unsigned int, int, unsigned int*, int)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270
- #5 0x7fa1490e7599 in Gfx::doShowText(GooString*)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
- #6 0x7fa1490e4db0 in Gfx::opShowSpaceText(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
- #7 0x7fa1490c333a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #8 0x7fa1490c250f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #9 0x7fa1490c2163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #10 0x7fa1491a4dd1 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #11 0x7fa1491ac2fd in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #13 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #14 0x7fa1487ccec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #15 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7fa1492e8011 in SplashFTFont::makeGlyph(int, int, int,
+ SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+ /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:284
+ #1 0x7fa1492eda32 in SplashFont::getGlyph(int, int, int,
+ SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+ /home/tsdgeos/devel/poppler/splash/SplashFont.cc:168
+ #2 0x7fa1492e7c69 in SplashFTFont::getGlyph(int, int, int,
+ SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+ /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233
+ #3 0x7fa1492b3368 in Splash::fillChar(double, double, int,
+ SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714
+ #4 0x7fa149286a20 in SplashOutputDev::drawChar(GfxState*,
+ double, double, double, double, double,
+ double, unsigned int, int, unsigned int*, int)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270
+ #5 0x7fa1490e7599 in Gfx::doShowText(GooString*)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
+ #6 0x7fa1490e4db0 in Gfx::opShowSpaceText(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
+ #7 0x7fa1490c333a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #8 0x7fa1490c250f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #9 0x7fa1490c2163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #10 0x7fa1491a4dd1 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #11 0x7fa1491ac2fd in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #13 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #14 0x7fa1487ccec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #15 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
splash/SplashFTFont.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 5055479634dc8d0cd5afb3373de600fb121357fe
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Mar 27 23:54:20 2014 +0100
+Date: Thu Mar 27 23:54:20 2014 +0100
Fix error reported by ASAN in 2010.asan.0.1506.pdf
@@ -2858,52 +3072,52 @@ Date: Thu Mar 27 23:54:20 2014 +0100
0x7f1e4a6beb50 at pc 0x7f1e5557444d bp 0x7fff6af3c340 sp
0x7fff6af3bb00
WRITE of size 442216446 at 0x7f1e4a6beb50 thread T0
- #0 0x7f1e5557444c (/usr/lib/x86_64-linux-gnu/libasan.so.0+0xe44c)
- #1 0x7f1e550e04ff in SplashFont::getGlyph(int, int, int,
- SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
- /home/tsdgeos/devel/poppler/splash/SplashFont.cc:206
- #2 0x7f1e550d9c69 in SplashFTFont::getGlyph(int, int, int,
- SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
- /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233
- #3 0x7f1e550a5368 in Splash::fillChar(double, double, int,
- SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714
- #4 0x7f1e55078a20 in SplashOutputDev::drawChar(GfxState*,
- double, double, double, double, double,
- double, unsigned int, int, unsigned int*, int)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270
- #5 0x7f1e54ed9599 in Gfx::doShowText(GooString*)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
- #6 0x7f1e54ed6db0 in Gfx::opShowSpaceText(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
- #7 0x7f1e54eb533a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #8 0x7f1e54eb450f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #9 0x7f1e54eb4163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #10 0x7f1e54f96dd1 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #11 0x7f1e54f9e2fd in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #13 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #14 0x7f1e545beec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #15 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f1e5557444c (/usr/lib/x86_64-linux-gnu/libasan.so.0+0xe44c)
+ #1 0x7f1e550e04ff in SplashFont::getGlyph(int, int, int,
+ SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+ /home/tsdgeos/devel/poppler/splash/SplashFont.cc:206
+ #2 0x7f1e550d9c69 in SplashFTFont::getGlyph(int, int, int,
+ SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+ /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233
+ #3 0x7f1e550a5368 in Splash::fillChar(double, double, int,
+ SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714
+ #4 0x7f1e55078a20 in SplashOutputDev::drawChar(GfxState*,
+ double, double, double, double, double,
+ double, unsigned int, int, unsigned int*, int)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270
+ #5 0x7f1e54ed9599 in Gfx::doShowText(GooString*)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
+ #6 0x7f1e54ed6db0 in Gfx::opShowSpaceText(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
+ #7 0x7f1e54eb533a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #8 0x7f1e54eb450f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #9 0x7f1e54eb4163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #10 0x7f1e54f96dd1 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #11 0x7f1e54f9e2fd in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #13 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #14 0x7f1e545beec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #15 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
splash/SplashFont.cc | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
commit 3e7779935ec2610410bc4a42e9b0174e41ca9672
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Mar 27 16:49:57 2014 +0100
+Date: Thu Mar 27 16:49:57 2014 +0100
Fix error reported by ASAN in 139.asan.0.581.pdf
@@ -2911,77 +3125,77 @@ Date: Thu Mar 27 16:49:57 2014 +0100
0x605df000f3ee (pc 0x7f1087b3a22e sp 0x7fffec30ff20 bp 0x7fffec30ff80
T0)
AddressSanitizer can not provide additional info.
- #0 0x7f1087b3a22d
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x48f22d)
- #1 0x7f1087b19d92
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x46ed92)
- #2 0x7f1087ae570b
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x43a70b)
- #3 0x7f1087ae4061
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x439061)
- #4 0x7f1087ab9b38
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x40eb38)
- #5 0x7f1087900989
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x255989)
- #6 0x7f10878f733a
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24c33a)
- #7 0x7f10878f650f
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b50f)
- #8 0x7f10878f6163
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b163)
- #9 0x7f10879d8dd1
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x32ddd1)
- #10 0x7f10879e02fd
- (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x3352fd)
- #11 0x40311e
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x40311e)
- #12 0x404416
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x404416)
- #13 0x7f1087000ec4 (/lib/x86_64-linux-gnu/libc-2.19.so+0x21ec4)
- #14 0x401d58
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f1087b3a22d
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x48f22d)
+ #1 0x7f1087b19d92
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x46ed92)
+ #2 0x7f1087ae570b
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x43a70b)
+ #3 0x7f1087ae4061
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x439061)
+ #4 0x7f1087ab9b38
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x40eb38)
+ #5 0x7f1087900989
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x255989)
+ #6 0x7f10878f733a
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24c33a)
+ #7 0x7f10878f650f
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b50f)
+ #8 0x7f10878f6163
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b163)
+ #9 0x7f10879d8dd1
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x32ddd1)
+ #10 0x7f10879e02fd
+ (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x3352fd)
+ #11 0x40311e
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x40311e)
+ #12 0x404416
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x404416)
+ #13 0x7f1087000ec4 (/lib/x86_64-linux-gnu/libc-2.19.so+0x21ec4)
+ #14 0x401d58
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
splash/SplashXPathScanner.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 23ad7fa5253a4fec6543d1435827aa1b59b62ced
Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Mar 27 01:14:05 2014 +0100
+Date: Thu Mar 27 01:14:05 2014 +0100
0.25.2
- CMakeLists.txt | 4 ++--
- NEWS | 48
+ CMakeLists.txt | 4 ++--
+ NEWS | 48
+++++++++++++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- cpp/Doxyfile | 2 +-
- gtk-doc.make | 33 +++++++++++++++++++---------
- m4/gtk-doc.m4 | 47
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ gtk-doc.make | 33 +++++++++++++++++++---------
+ m4/gtk-doc.m4 | 47
+++++++++++++++++++++++++++-------------
- poppler/CairoOutputDev.h | 2 +-
- poppler/Hints.cc | 2 +-
- poppler/Makefile.am | 2 +-
- poppler/PSOutputDev.cc | 3 ++-
- poppler/PSOutputDev.h | 2 +-
- poppler/StructElement.cc | 2 +-
- poppler/StructElement.h | 2 +-
- poppler/StructTreeRoot.cc | 2 +-
- poppler/StructTreeRoot.h | 2 +-
- qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Doxyfile | 2 +-
- qt4/src/Makefile.am | 2 +-
+ poppler/CairoOutputDev.h | 2 +-
+ poppler/Hints.cc | 2 +-
+ poppler/Makefile.am | 2 +-
+ poppler/PSOutputDev.cc | 3 ++-
+ poppler/PSOutputDev.h | 2 +-
+ poppler/StructElement.cc | 2 +-
+ poppler/StructElement.h | 2 +-
+ poppler/StructTreeRoot.cc | 2 +-
+ poppler/StructTreeRoot.h | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
qt4/src/poppler-ps-converter.cc | 1 +
- qt5/src/CMakeLists.txt | 2 +-
- qt5/src/Doxyfile | 2 +-
- qt5/src/Makefile.am | 2 +-
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
qt5/src/poppler-ps-converter.cc | 1 +
- utils/pdftocairo.cc | 2 +-
- utils/pdftops.cc | 1 +
+ utils/pdftocairo.cc | 2 +-
+ utils/pdftops.cc | 1 +
25 files changed, 127 insertions(+), 45 deletions(-)
commit ec2f8bca9f48935d3180dab65ef2ca455a893afd
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 26 18:38:13 2014 +0100
+Date: Wed Mar 26 18:38:13 2014 +0100
Fix overflow malloc
@@ -2990,7 +3204,7 @@ Date: Wed Mar 26 18:38:13 2014 +0100
commit 322e416451b7b33cba8fb3d4702207693c3c7921
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 26 17:58:48 2014 +0100
+Date: Wed Mar 26 17:58:48 2014 +0100
Fix error reported by ASAN in 1195.asan.0.293.pdf
@@ -2998,54 +3212,54 @@ Date: Wed Mar 26 17:58:48 2014 +0100
address 0x60040002a215 at pc 0x7f5614cd96c4 bp 0x7fff54a44050 sp
0x7fff54a44048
READ of size 1 at 0x60040002a215 thread T0
- #0 0x7f5614cd96c3 in JBIG2Stream::readGenericBitmap(bool,
- int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3389
- #1 0x7f5614cce0e7 in JBIG2Stream::readSymbolDictSeg(unsigned
- int, unsigned int, unsigned int*, unsigned int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867
- #2 0x7f5614ccb8fe in JBIG2Stream::readSegments()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408
- #3 0x7f5614cca72e in JBIG2Stream::reset()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
- #4 0x7f5614d1648b in ImageStream::reset()
- /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
- #5 0x7f5614de6578 in SplashOutputDev::drawImage(GfxState*,
- Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
- #6 0x7f5614c41d64 in Gfx::doImage(Object*, Stream*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
- #7 0x7f5614c3ede0 in Gfx::opXObject(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
- #8 0x7f5614c1933a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #9 0x7f5614c1850f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #10 0x7f5614c18163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #11 0x7f5614cfae27 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #12 0x7f5614d02353 in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #14 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #15 0x7f5614322ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #16 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f5614cd96c3 in JBIG2Stream::readGenericBitmap(bool,
+ int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3389
+ #1 0x7f5614cce0e7 in JBIG2Stream::readSymbolDictSeg(unsigned
+ int, unsigned int, unsigned int*, unsigned int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867
+ #2 0x7f5614ccb8fe in JBIG2Stream::readSegments()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408
+ #3 0x7f5614cca72e in JBIG2Stream::reset()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
+ #4 0x7f5614d1648b in ImageStream::reset()
+ /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
+ #5 0x7f5614de6578 in SplashOutputDev::drawImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
+ #6 0x7f5614c41d64 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
+ #7 0x7f5614c3ede0 in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #8 0x7f5614c1933a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #9 0x7f5614c1850f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #10 0x7f5614c18163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #11 0x7f5614cfae27 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #12 0x7f5614d02353 in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #14 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #15 0x7f5614322ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #16 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
poppler/JBIG2Stream.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 225232f6f070d17d8570108ffe39ffd4350fc6e8
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 26 15:00:09 2014 +0100
+Date: Wed Mar 26 15:00:09 2014 +0100
Fix error reported by ASAN in 6609.asan.0.8343.pdf
@@ -3053,54 +3267,54 @@ Date: Wed Mar 26 15:00:09 2014 +0100
address 0x7f3b12f7b5e1 at pc 0x7f3b0f915f5e bp 0x7fff47842de0 sp
0x7fff47842dd8
READ of size 1 at 0x7f3b12f7b5e1 thread T0
- #0 0x7f3b0f915f5d in JBIG2Stream::readGenericBitmap(bool,
- int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3628
- #1 0x7f3b0f910558 in JBIG2Stream::readGenericRegionSeg(unsigned
- int, bool, bool, unsigned int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:2849
- #2 0x7f3b0f906b33 in JBIG2Stream::readSegments()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1443
- #3 0x7f3b0f90572e in JBIG2Stream::reset()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
- #4 0x7f3b0f951459 in ImageStream::reset()
- /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
- #5 0x7f3b0fa21546 in SplashOutputDev::drawImage(GfxState*,
- Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
- #6 0x7f3b0f87cd64 in Gfx::doImage(Object*, Stream*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
- #7 0x7f3b0f879de0 in Gfx::opXObject(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
- #8 0x7f3b0f85433a in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #9 0x7f3b0f85350f in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #10 0x7f3b0f853163 in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #11 0x7f3b0f935df5 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #12 0x7f3b0f93d321 in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #14 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #15 0x7f3b0ef5dec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #16 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f3b0f915f5d in JBIG2Stream::readGenericBitmap(bool,
+ int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3628
+ #1 0x7f3b0f910558 in JBIG2Stream::readGenericRegionSeg(unsigned
+ int, bool, bool, unsigned int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:2849
+ #2 0x7f3b0f906b33 in JBIG2Stream::readSegments()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1443
+ #3 0x7f3b0f90572e in JBIG2Stream::reset()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
+ #4 0x7f3b0f951459 in ImageStream::reset()
+ /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
+ #5 0x7f3b0fa21546 in SplashOutputDev::drawImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
+ #6 0x7f3b0f87cd64 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
+ #7 0x7f3b0f879de0 in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #8 0x7f3b0f85433a in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #9 0x7f3b0f85350f in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #10 0x7f3b0f853163 in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #11 0x7f3b0f935df5 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #12 0x7f3b0f93d321 in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #14 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #15 0x7f3b0ef5dec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #16 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
poppler/JBIG2Stream.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
commit 216890f1f147b25643e0d6e18e361d4d34b6c332
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 26 12:19:42 2014 +0100
+Date: Wed Mar 26 12:19:42 2014 +0100
Fix error reported by ASAN in 6760.asan.0.8568.pdf
@@ -3108,59 +3322,59 @@ Date: Wed Mar 26 12:19:42 2014 +0100
0x7fffbc3e5ea8 (pc 0x7fe1fa858db1 sp 0x7fffc788eb30 bp 0x7fffc788eb40
T0)
AddressSanitizer can not provide additional info.
- #0 0x7fe1fa858db0 in PSStack::index(int)
- /home/tsdgeos/devel/poppler/poppler/Function.cc:1067
- #1 0x7fe1fa856fd6 in PostScriptFunction::exec(PSStack*, int)
- /home/tsdgeos/devel/poppler/poppler/Function.cc:1621
- #2 0x7fe1fa854c10 in PostScriptFunction::transform(double*,
- double*) /home/tsdgeos/devel/poppler/poppler/Function.cc:1266
- #3 0x7fe1fa854097 in
- PostScriptFunction::PostScriptFunction(Object*, Dict*)
- /home/tsdgeos/devel/poppler/poppler/Function.cc:1216
- #4 0x7fe1fa84a0c2 in Function::parse(Object*,
- std::set<int, std::less<int>, std::allocator<int> >*)
- /home/tsdgeos/devel/poppler/poppler/Function.cc:98
- #5 0x7fe1fa849e3c in Function::parse(Object*)
- /home/tsdgeos/devel/poppler/poppler/Function.cc:63
- #6 0x7fe1fa8c1d8c in GfxDeviceNColorSpace::parse(Array*,
- OutputDev*, GfxState*, int)
- /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2978
- #7 0x7fe1fa8a6fb7 in GfxColorSpace::parse(Object*,
- OutputDev*, GfxState*, int)
- /home/tsdgeos/devel/poppler/poppler/GfxState.cc:328
- #8 0x7fe1fa88440f in Gfx::doImage(Object*, Stream*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4403
- #9 0x7fe1fa882d6c in Gfx::opXObject(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
- #10 0x7fe1fa85d2c6 in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #11 0x7fe1fa85c49b in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #12 0x7fe1fa85c0ef in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #13 0x7fe1fa93ed81 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #14 0x7fe1fa9462ad in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #15 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #16 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #17 0x7fe1f9f66ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #18 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7fe1fa858db0 in PSStack::index(int)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:1067
+ #1 0x7fe1fa856fd6 in PostScriptFunction::exec(PSStack*, int)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:1621
+ #2 0x7fe1fa854c10 in PostScriptFunction::transform(double*,
+ double*) /home/tsdgeos/devel/poppler/poppler/Function.cc:1266
+ #3 0x7fe1fa854097 in
+ PostScriptFunction::PostScriptFunction(Object*, Dict*)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:1216
+ #4 0x7fe1fa84a0c2 in Function::parse(Object*,
+ std::set<int, std::less<int>, std::allocator<int> >*)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:98
+ #5 0x7fe1fa849e3c in Function::parse(Object*)
+ /home/tsdgeos/devel/poppler/poppler/Function.cc:63
+ #6 0x7fe1fa8c1d8c in GfxDeviceNColorSpace::parse(Array*,
+ OutputDev*, GfxState*, int)
+ /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2978
+ #7 0x7fe1fa8a6fb7 in GfxColorSpace::parse(Object*,
+ OutputDev*, GfxState*, int)
+ /home/tsdgeos/devel/poppler/poppler/GfxState.cc:328
+ #8 0x7fe1fa88440f in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4403
+ #9 0x7fe1fa882d6c in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #10 0x7fe1fa85d2c6 in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #11 0x7fe1fa85c49b in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #12 0x7fe1fa85c0ef in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #13 0x7fe1fa93ed81 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #14 0x7fe1fa9462ad in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #15 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #16 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #17 0x7fe1f9f66ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #18 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
poppler/Function.cc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
commit fb7d91435c71603697b652c70cfa76dd595ee200
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 26 12:08:52 2014 +0100
+Date: Wed Mar 26 12:08:52 2014 +0100
Fix ASAN in 750.asan.0.9621.pdf
@@ -3168,54 +3382,54 @@ Date: Wed Mar 26 12:08:52 2014 +0100
address 0x60040002a10f at pc 0x7fc396c3c23e bp 0x7ffff1123d20 sp
0x7ffff1123d18
READ of size 1 at 0x60040002a10f thread T0
- #0 0x7fc396c3c23d in JBIG2Stream::readGenericBitmap(bool,
- int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3504
- #1 0x7fc396c30073 in JBIG2Stream::readSymbolDictSeg(unsigned
- int, unsigned int, unsigned int*, unsigned int)
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867
- #2 0x7fc396c2d88a in JBIG2Stream::readSegments()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408
- #3 0x7fc396c2c6ba in JBIG2Stream::reset()
- /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
- #4 0x7fc396c783f7 in ImageStream::reset()
- /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
- #5 0x7fc396d484e4 in SplashOutputDev::drawImage(GfxState*,
- Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
- #6 0x7fc396ba3cf0 in Gfx::doImage(Object*, Stream*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
- #7 0x7fc396ba0d6c in Gfx::opXObject(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
- #8 0x7fc396b7b2c6 in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #9 0x7fc396b7a49b in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #10 0x7fc396b7a0ef in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #11 0x7fc396c5cd93 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #12 0x7fc396c642bf in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #14 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #15 0x7fc396284ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #16 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7fc396c3c23d in JBIG2Stream::readGenericBitmap(bool,
+ int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3504
+ #1 0x7fc396c30073 in JBIG2Stream::readSymbolDictSeg(unsigned
+ int, unsigned int, unsigned int*, unsigned int)
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867
+ #2 0x7fc396c2d88a in JBIG2Stream::readSegments()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408
+ #3 0x7fc396c2c6ba in JBIG2Stream::reset()
+ /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248
+ #4 0x7fc396c783f7 in ImageStream::reset()
+ /home/tsdgeos/devel/poppler/poppler/Stream.cc:484
+ #5 0x7fc396d484e4 in SplashOutputDev::drawImage(GfxState*,
+ Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158
+ #6 0x7fc396ba3cf0 in Gfx::doImage(Object*, Stream*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653
+ #7 0x7fc396ba0d6c in Gfx::opXObject(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+ #8 0x7fc396b7b2c6 in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #9 0x7fc396b7a49b in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #10 0x7fc396b7a0ef in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #11 0x7fc396c5cd93 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #12 0x7fc396c642bf in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #14 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #15 0x7fc396284ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #16 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
poppler/JBIG2Stream.cc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
commit 9002b3b7cbbbc5802abfa8383ded2093a29d1746
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 26 00:48:15 2014 +0100
+Date: Wed Mar 26 00:48:15 2014 +0100
Fix ASAN in 784.asan.0.9671.pdf
@@ -3224,57 +3438,57 @@ Date: Wed Mar 26 00:48:15 2014 +0100
0x603bfffe5804 (pc 0x7f7aa3310c6b sp 0x7fff0e656bd0 bp 0x7fff0e656e90
T0)
AddressSanitizer can not provide additional info.
- #0 0x7f7aa3310c6a in
- GfxIndexedColorSpace::mapColorToBase(GfxColor*, GfxColor*)
- /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2509
- #1 0x7f7aa33110d2 in GfxIndexedColorSpace::getRGB(GfxColor*,
- GfxRGB*) /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2529
- #2 0x7f7aa3466712 in convertGfxColor(unsigned
- char*, SplashColorMode, GfxColorSpace*, GfxColor*)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:117
- #3 0x7f7aa34675a9 in SplashUnivariatePattern::getColor(int,
- int, unsigned char*)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:215
- #4 0x7f7aa348d2a2 in Splash::pipeRun(SplashPipe*)
- /home/tsdgeos/devel/poppler/splash/Splash.cc:363
- #5 0x7f7aa34c9c29 in Splash::drawAALine(SplashPipe*,
- int, int, int, bool, unsigned char)
- /home/tsdgeos/devel/poppler/splash/Splash.cc:1537
- #6 0x7f7aa34c4787 in Splash::shadedFill(SplashPath*, bool,
- SplashPattern*) /home/tsdgeos/devel/poppler/splash/Splash.cc:6388
- #7 0x7f7aa348b65c in
- SplashOutputDev::univariateShadedFill(GfxState*,
- SplashUnivariatePattern*, double, double)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4408
- #8 0x7f7aa348b93d in SplashOutputDev::radialShadedFill(GfxState*,
- GfxRadialShading*, double, double)
- /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4427
- #9 0x7f7aa32c7574 in Gfx::doRadialShFill(GfxRadialShading*)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3058
- #10 0x7f7aa32c188f in Gfx::opShFill(Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:2476
- #11 0x7f7aa32b12c6 in Gfx::execOp(Object*, Object*, int)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
- #12 0x7f7aa32b049b in Gfx::go(bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
- #13 0x7f7aa32b00ef in Gfx::display(Object*, bool)
- /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
- #14 0x7f7aa3392dc9 in Page::displaySlice(OutputDev*, double,
- double, int, bool, bool, int, int, int, int, bool, bool
- (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/Page.cc:585
- #15 0x7f7aa339a2f5 in PDFDoc::displayPageSlice(OutputDev*,
- int, double, double, int, bool, bool, bool, int, int, int, int,
- bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
- /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
- #16 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
- int, int, int, int, int, double, double, char*)
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
- #17 0x404416 in main
- /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
- #18 0x7f7aa29baec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
- #19 0x401d58 in _start
- (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+ #0 0x7f7aa3310c6a in
+ GfxIndexedColorSpace::mapColorToBase(GfxColor*, GfxColor*)
+ /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2509
+ #1 0x7f7aa33110d2 in GfxIndexedColorSpace::getRGB(GfxColor*,
+ GfxRGB*) /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2529
+ #2 0x7f7aa3466712 in convertGfxColor(unsigned
+ char*, SplashColorMode, GfxColorSpace*, GfxColor*)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:117
+ #3 0x7f7aa34675a9 in SplashUnivariatePattern::getColor(int,
+ int, unsigned char*)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:215
+ #4 0x7f7aa348d2a2 in Splash::pipeRun(SplashPipe*)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:363
+ #5 0x7f7aa34c9c29 in Splash::drawAALine(SplashPipe*,
+ int, int, int, bool, unsigned char)
+ /home/tsdgeos/devel/poppler/splash/Splash.cc:1537
+ #6 0x7f7aa34c4787 in Splash::shadedFill(SplashPath*, bool,
+ SplashPattern*) /home/tsdgeos/devel/poppler/splash/Splash.cc:6388
+ #7 0x7f7aa348b65c in
+ SplashOutputDev::univariateShadedFill(GfxState*,
+ SplashUnivariatePattern*, double, double)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4408
+ #8 0x7f7aa348b93d in SplashOutputDev::radialShadedFill(GfxState*,
+ GfxRadialShading*, double, double)
+ /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4427
+ #9 0x7f7aa32c7574 in Gfx::doRadialShFill(GfxRadialShading*)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3058
+ #10 0x7f7aa32c188f in Gfx::opShFill(Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:2476
+ #11 0x7f7aa32b12c6 in Gfx::execOp(Object*, Object*, int)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+ #12 0x7f7aa32b049b in Gfx::go(bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+ #13 0x7f7aa32b00ef in Gfx::display(Object*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+ #14 0x7f7aa3392dc9 in Page::displaySlice(OutputDev*, double,
+ double, int, bool, bool, int, int, int, int, bool, bool
+ (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+ #15 0x7f7aa339a2f5 in PDFDoc::displayPageSlice(OutputDev*,
+ int, double, double, int, bool, bool, bool, int, int, int, int,
+ bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+ /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+ #16 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+ int, int, int, int, int, double, double, char*)
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+ #17 0x404416 in main
+ /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+ #18 0x7f7aa29baec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+ #19 0x401d58 in _start
+ (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
SUMMARY: AddressSanitizer: SEGV
/home/tsdgeos/devel/poppler/poppler/GfxState.cc:2509
GfxIndexedColorSpace::mapColorToBase(GfxColor*, GfxColor*)
@@ -3284,7 +3498,7 @@ Date: Wed Mar 26 00:48:15 2014 +0100
commit 8947c6bc1dcb768b9d9c03a7a5db1573abdc2e87
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 26 00:47:59 2014 +0100
+Date: Wed Mar 26 00:47:59 2014 +0100
Forgot my (C) in the last commit
@@ -3293,7 +3507,7 @@ Date: Wed Mar 26 00:47:59 2014 +0100
commit 1d7095ab7bdf0f14c3bfe99d6d5985bce98abe16
Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Mar 25 22:29:07 2014 +0100
+Date: Tue Mar 25 22:29:07 2014 +0100
Fix Heap-buffer-overflow in TextPage::updateFont
@@ -3304,7 +3518,7 @@ Date: Tue Mar 25 22:29:07 2014 +0100
commit 37ad83d69bd1d10da6ea1eb559c4bd320917ae25
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 22 17:33:55 2014 +0100
+Date: Sat Mar 22 17:33:55 2014 +0100
Reorder the if check condition
@@ -3319,7 +3533,7 @@ Date: Sat Mar 22 17:33:55 2014 +0100
commit 3535d658095ffa49ef8615d69843afa9c5ada061
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 22 17:29:46 2014 +0100
+Date: Sat Mar 22 17:29:46 2014 +0100
Make the test rect go to xMax, yMax not xMax-1,yMax-1
@@ -3331,32 +3545,32 @@ Date: Sat Mar 22 17:29:46 2014 +0100
commit 1e93c3f2d1c86edd40ca283ed422089f64886d04
Author: William Bader <williambader@hotmail.com>
-Date: Sat Mar 15 17:14:21 2014 +0100
+Date: Sat Mar 15 17:14:21 2014 +0100
Fix regression when creating level1 PS
Bug #75241
poppler/PreScanOutputDev.cc | 16 ++++++++++++++--
- poppler/PreScanOutputDev.h | 3 ++-
+ poppler/PreScanOutputDev.h | 3 ++-
2 files changed, 16 insertions(+), 3 deletions(-)
commit 1ea2eb412d12d97eaf49d1e51d7fda7abd8fbf9d
Author: Jason Crain <jason@aquaticape.us>
-Date: Wed Mar 12 00:34:13 2014 +0100
+Date: Wed Mar 12 00:34:13 2014 +0100
Limit numeric parsing of character names
Bug #38456
- poppler/GfxFont.cc | 139
+ poppler/GfxFont.cc | 139
++++++++++++++++++++++++++++++++++--------------
poppler/GlobalParams.cc | 4 +-
2 files changed, 102 insertions(+), 41 deletions(-)
commit e24cbeae22d6c8630e292897bd982a87e6290ca6
Author: Steven Lee <roc.sky@gmail.com>
-Date: Tue Mar 11 21:24:59 2014 +0100
+Date: Tue Mar 11 21:24:59 2014 +0100
Fix TIFF writting in Windows
@@ -3367,7 +3581,7 @@ Date: Tue Mar 11 21:24:59 2014 +0100
commit b984a3b5946ebcd736e0583a10eb614cede3388a
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Wed Mar 5 11:19:48 2014 +0200
+Date: Wed Mar 5 11:19:48 2014 +0200
glib: Use flags argument in poppler_structure_element_get_text()
@@ -3384,12 +3598,12 @@ Date: Wed Mar 5 11:19:48 2014 +0200
glib/poppler-structure-element.cc | 12 +++++++-----
glib/poppler-structure-element.h | 14 +++++++++++++-
- glib/reference/poppler-sections.txt | 3 +++
+ glib/reference/poppler-sections.txt | 3 +++
3 files changed, 23 insertions(+), 6 deletions(-)
commit 94df09de1e07d442895ec1fb5cc23cacd9826552
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Thu Mar 6 10:44:51 2014 +0200
+Date: Thu Mar 6 10:44:51 2014 +0200
glib: Add missing underscore in method name
@@ -3402,7 +3616,7 @@ Date: Thu Mar 6 10:44:51 2014 +0200
commit 7ddd03f9a00dcf505921821c55bebe6817aa3605
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Mar 5 17:48:39 2014 +0100
+Date: Wed Mar 5 17:48:39 2014 +0100
Rename getNumElements, getElement and appendElement as getNumChildren,
getChild and appendChild
@@ -3410,15 +3624,15 @@ Date: Wed Mar 5 17:48:39 2014 +0100
It's more consistent with other internal API and less confusing.
glib/poppler-structure-element.cc | 16 ++++++++--------
- poppler/StructElement.cc | 6 +++---
- poppler/StructElement.h | 8 ++++----
- poppler/StructTreeRoot.cc | 4 ++--
- poppler/StructTreeRoot.h | 8 ++++----
+ poppler/StructElement.cc | 6 +++---
+ poppler/StructElement.h | 8 ++++----
+ poppler/StructTreeRoot.cc | 4 ++--
+ poppler/StructTreeRoot.h | 8 ++++----
5 files changed, 21 insertions(+), 21 deletions(-)
commit 7d6a5b65f8497537248d405177ae141f3765a419
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Mar 5 17:40:14 2014 +0100
+Date: Wed Mar 5 17:40:14 2014 +0100
glib: Update the documentation symbols after the PopplerStructureScope
rename
@@ -3428,7 +3642,7 @@ Date: Wed Mar 5 17:40:14 2014 +0100
commit 9282b5a26e9ce81d81d42c0cbe449543c8366b7c
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Mar 5 17:37:38 2014 +0100
+Date: Wed Mar 5 17:37:38 2014 +0100
glib: Rename PopplerStructureScope as PopplerStructureTableScope
@@ -3440,7 +3654,7 @@ Date: Wed Mar 5 17:37:38 2014 +0100
commit 9888eb65c6fad0eabcf525a7e88941dec2a27e92
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Thu Sep 26 19:36:12 2013 +0300
+Date: Thu Sep 26 19:36:12 2013 +0300
glib: Implement accessors for element attributes
@@ -3452,25 +3666,25 @@ Date: Thu Sep 26 19:36:12 2013 +0300
glib/poppler-structure-element.cc | 1279
++++++++++++++++++++++++++++++++++-
- glib/poppler-structure-element.h | 252 ++++++-
- glib/reference/poppler-sections.txt | 84 +++
+ glib/poppler-structure-element.h | 252 ++++++-
+ glib/reference/poppler-sections.txt | 84 +++
3 files changed, 1597 insertions(+), 18 deletions(-)
commit b346df59ef0775f5bd74a9f7379b5f430ccd7b79
Author: Adam Reichold <adamreichold@myopera.com>
-Date: Tue Mar 4 23:40:59 2014 +0100
+Date: Tue Mar 4 23:40:59 2014 +0100
Qt: Expose document-supplied text direction
qt4/src/poppler-document.cc | 17 +++++++++++++++++
- qt4/src/poppler-qt4.h | 10 +++++++++-
+ qt4/src/poppler-qt4.h | 10 +++++++++-
qt5/src/poppler-document.cc | 17 +++++++++++++++++
- qt5/src/poppler-qt5.h | 10 +++++++++-
+ qt5/src/poppler-qt5.h | 10 +++++++++-
4 files changed, 52 insertions(+), 2 deletions(-)
commit 2fc38c1866243598e22be07f0177e7d9385542d5
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Fri Feb 28 19:14:36 2014 +0200
+Date: Fri Feb 28 19:14:36 2014 +0200
glib: Fixes in the API reference documentation
@@ -3490,7 +3704,7 @@ Date: Fri Feb 28 19:14:36 2014 +0200
commit cfe47a655ec5e280168e000da85bbf13f5f5f8b8
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Fri Feb 28 19:17:45 2014 +0200
+Date: Fri Feb 28 19:17:45 2014 +0200
glib: Remove poppler_text_span_is_link() in header
@@ -3504,7 +3718,7 @@ Date: Fri Feb 28 19:17:45 2014 +0200
commit 7a2db63b5f7cae4bc215baa0859c4d4f8a660951
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Wed Feb 26 20:16:29 2014 +0200
+Date: Wed Feb 26 20:16:29 2014 +0200
glib: Remove unneeded POPPLER_STRUCTURE_ELEMENT_UNKNOWN
@@ -3522,7 +3736,7 @@ Date: Wed Feb 26 20:16:29 2014 +0200
commit db909c2a14f962234a813ba9853535b9692cfd5a
Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 26 22:09:44 2014 +0100
+Date: Wed Feb 26 22:09:44 2014 +0100
Try harder to open broken files
@@ -3534,7 +3748,7 @@ Date: Wed Feb 26 22:09:44 2014 +0100
commit b2394eee5384edf4128d598030989e66d64714ef
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Mon Feb 10 20:29:35 2014 +0200
+Date: Mon Feb 10 20:29:35 2014 +0200
Tagged-PDF: Fix parsing of attached element attributes
@@ -3553,7 +3767,7 @@ Date: Mon Feb 10 20:29:35 2014 +0200
commit c549b5e9ce2dcc8beb2511ee315bfff2fdfdf6e8
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Sun Feb 9 18:31:22 2014 +0200
+Date: Sun Feb 9 18:31:22 2014 +0200
glib: Add poppler_structure_element_is_grouping()
@@ -3563,13 +3777,13 @@ Date: Sun Feb 9 18:31:22 2014 +0200
https://bugs.freedesktop.org/show_bug.cgi?id=74753
glib/poppler-structure-element.cc | 20 ++++++++++++++++++++
- glib/poppler-structure-element.h | 1 +
- glib/reference/poppler-sections.txt | 1 +
+ glib/poppler-structure-element.h | 1 +
+ glib/reference/poppler-sections.txt | 1 +
3 files changed, 22 insertions(+)
commit 6fbd6cb85bdd32dc5a3d4c3c719556269a4488ac
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Fri Feb 21 15:02:44 2014 +0200
+Date: Fri Feb 21 15:02:44 2014 +0200
glib: Handle missing structure element types
@@ -3587,11 +3801,11 @@ Date: Fri Feb 21 15:02:44 2014 +0200
commit 63e9c0b67fa2e64ca20258d873a849386c7eb295
Author: Fabio D'Urso <fabiodurso@hotmail.it>
-Date: Mon Feb 17 23:58:09 2014 +0100
+Date: Mon Feb 17 23:58:09 2014 +0100
Some error() usage fixes
- poppler/Hints.cc | 3 ++-
+ poppler/Hints.cc | 3 ++-
poppler/JBIG2Stream.cc | 4 ++--
poppler/PSOutputDev.cc | 4 ++--
poppler/SecurityHandler.cc | 3 ++-
@@ -3603,21 +3817,21 @@ Date: Mon Feb 17 23:58:09 2014 +0100
commit 8f2d847f1d0224a297e642944f8da9c1409732b6
Author: Fabio D'Urso <fabiodurso@hotmail.it>
-Date: Mon Feb 17 23:56:49 2014 +0100
+Date: Mon Feb 17 23:56:49 2014 +0100
Clang++ plugin that checks for usage errors in GooString::format-style
calls
- goo/GooString.h | 12 +-
- poppler/Error.h | 4 +-
- test/goostring-format-checker/README | 16 +
- .../goostring-format-checker.cc | 369
+ goo/GooString.h | 12 +-
+ poppler/Error.h | 4 +-
+ test/goostring-format-checker/README | 16 +
+ .../goostring-format-checker.cc | 369
+++++++++++++++++++++
4 files changed, 397 insertions(+), 4 deletions(-)
commit d7d61dcda91910f7eb2548b19e8380d7c3232dd3
Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Wed Feb 12 21:50:38 2014 +0100
+Date: Wed Feb 12 21:50:38 2014 +0100
blend usage in PDF with spot colors casue random output
@@ -3634,19 +3848,19 @@ Date: Wed Feb 12 21:50:38 2014 +0100
commit b2905a0d299cc09fcd219afe49cb370f6db61c5a
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Feb 10 20:19:07 2014 +0100
+Date: Mon Feb 10 20:19:07 2014 +0100
increase gtk3 dependency
gtk_tree_view_set_activate_on_single_click was introduced in 3.8
cmake/modules/FindGTK.cmake | 2 +-
- configure.ac | 4 ++--
+ configure.ac | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
commit 71d4041b061c109a965e72230640cf8ee616dac3
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Feb 10 20:16:46 2014 +0100
+Date: Mon Feb 10 20:16:46 2014 +0100
Make sure number of least objects in hints table is valid
@@ -3657,17 +3871,17 @@ Date: Mon Feb 10 20:16:46 2014 +0100
commit a865f13def88153fdbe8a0a054d2005e3e2bb737
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 9 23:22:07 2014 +0100
+Date: Sun Feb 9 23:22:07 2014 +0100
Fix cmake build
- glib/CMakeLists.txt | 2 ++
+ glib/CMakeLists.txt | 2 ++
glib/demo/CMakeLists.txt | 1 +
2 files changed, 3 insertions(+)
commit d6fde0fac0120b1622942d8344d5153d9abf3e1e
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Wed May 29 23:44:03 2013 +0300
+Date: Wed May 29 23:44:03 2013 +0300
glib-demo: Pane showing the document structure
@@ -3676,8 +3890,8 @@ Date: Wed May 29 23:44:03 2013 +0300
documents. It also serves as an example on how to to use the API for
PopplerStructure and PopplerStructureElement.
- glib/demo/Makefile.am | 2 +
- glib/demo/main.c | 2 +
+ glib/demo/Makefile.am | 2 +
+ glib/demo/main.c | 2 +
glib/demo/taggedstruct.c | 232
+++++++++++++++++++++++++++++++++++++++++++++++
glib/demo/taggedstruct.h | 31 +++++++
@@ -3685,7 +3899,7 @@ Date: Wed May 29 23:44:03 2013 +0300
commit 0f9fa775c469c03d1613b955ee7b06b823e6e080
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Thu Sep 26 17:50:51 2013 +0300
+Date: Thu Sep 26 17:50:51 2013 +0300
glib: Expose inline attributes of structure elements
@@ -3704,14 +3918,14 @@ Date: Thu Sep 26 17:50:51 2013 +0300
glib/poppler-structure-element.cc | 269
++++++++++++++++++++++++++++++++++++
- glib/poppler-structure-element.h | 16 ++-
- glib/poppler.h | 1 +
- glib/reference/poppler-sections.txt | 12 ++
+ glib/poppler-structure-element.h | 16 ++-
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 12 ++
4 files changed, 297 insertions(+), 1 deletion(-)
commit 8072d4b0e3ea10b4308f8172891f769f30466133
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Thu May 9 12:01:59 2013 +0300
+Date: Thu May 9 12:01:59 2013 +0300
glib: Expose the document structure tree
@@ -3725,20 +3939,20 @@ Date: Thu May 9 12:01:59 2013 +0300
https://bugs.freedesktop.org/show_bug.cgi?id=64821
- glib/Makefile.am | 2 +
- glib/poppler-private.h | 10 +
+ glib/Makefile.am | 2 +
+ glib/poppler-private.h | 10 +
glib/poppler-structure-element.cc | 663
++++++++++++++++++++++++++++++++++++
glib/poppler-structure-element.h | 112 ++++++
- glib/poppler.h | 3 +
- glib/reference/poppler-docs.sgml | 2 +
- glib/reference/poppler-sections.txt | 37 ++
- glib/reference/poppler.types | 2 +
+ glib/poppler.h | 3 +
+ glib/reference/poppler-docs.sgml | 2 +
+ glib/reference/poppler-sections.txt | 37 ++
+ glib/reference/poppler.types | 2 +
8 files changed, 831 insertions(+)
commit 46b7470ae9846d7e6dbb72bbb3ff831acd954168
Author: Germán Poo-Caamaño <gpoo@gnome.org>
-Date: Thu Jan 30 14:42:51 2014 -0800
+Date: Thu Jan 30 14:42:51 2014 -0800
glib-demo: Fix performance in text markup annotations
@@ -3749,7 +3963,7 @@ Date: Thu Jan 30 14:42:51 2014 -0800
commit 8a84b45674aed8c27a1d172b07eb0531c0ec14f1
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Feb 8 09:17:02 2014 +0100
+Date: Sat Feb 8 09:17:02 2014 +0100
glib: Fix gobject-introspection warnings
@@ -3758,7 +3972,7 @@ Date: Sat Feb 8 09:17:02 2014 +0100
commit 899799df78c00fc2ca6d2d0e612536b87a871817
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Tue Feb 4 19:26:53 2014 +0200
+Date: Tue Feb 4 19:26:53 2014 +0200
Allow properly identifying grouping elements
@@ -3779,7 +3993,7 @@ Date: Tue Feb 4 19:26:53 2014 +0200
commit 27cd9a00bfebf0602e7ed29a8ee8e16ffff67bde
Author: Adrian Perez de Castro <aperez@igalia.com>
-Date: Tue Feb 4 19:35:58 2014 +0200
+Date: Tue Feb 4 19:35:58 2014 +0200
Report LBody elements in Tagged-PDF structure as block elements
@@ -3796,7 +4010,7 @@ Date: Tue Feb 4 19:35:58 2014 +0200
commit 4cda839cb489fe5cd4726109cb9ab8b0ba2fa563
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Tue Jan 28 06:06:09 2014 +1030
+Date: Tue Jan 28 06:06:09 2014 +1030
pdftops: ensure there is always a page size in the output
@@ -3807,7 +4021,7 @@ Date: Tue Jan 28 06:06:09 2014 +1030
commit 45a87afdf1372911aa1ba840557e61627cdc7b4f
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Dec 29 15:16:37 2013 +1030
+Date: Sun Dec 29 15:16:37 2013 +1030
cairo: clip to crop box
@@ -3820,7 +4034,7 @@ Date: Sun Dec 29 15:16:37 2013 +1030
commit 6d39a1d7b348329dd057a8e7c77bfd47921fc495
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Mon Dec 30 17:59:09 2013 +1030
+Date: Mon Dec 30 17:59:09 2013 +1030
pdftocairo: ensure page size and crop box works the same as pdftops
@@ -3832,7 +4046,7 @@ Date: Mon Dec 30 17:59:09 2013 +1030
commit b1da7e20dcef78ef6036418b37a47ba3f8818453
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu Dec 19 22:18:26 2013 +1030
+Date: Thu Dec 19 22:18:26 2013 +1030
pdftops: Only change paper size when different to previous size
@@ -3848,7 +4062,7 @@ Date: Thu Dec 19 22:18:26 2013 +1030
commit 7ac7d3bad4b868950ee96fd9c5ece88632f8827c
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri Dec 20 07:19:21 2013 +1030
+Date: Fri Dec 20 07:19:21 2013 +1030
pdftops: Remove origpagesizes mode and make -origpagesizes an alias
for -paper match
@@ -3856,14 +4070,14 @@ Date: Fri Dec 20 07:19:21 2013 +1030
Bug 72312
poppler/PSOutputDev.cc | 9 ++-------
- poppler/PSOutputDev.h | 4 ++--
- utils/pdftops.1 | 30 ++++++++++--------------------
- utils/pdftops.cc | 23 ++++++++++++++---------
+ poppler/PSOutputDev.h | 4 ++--
+ utils/pdftops.1 | 30 ++++++++++--------------------
+ utils/pdftops.cc | 23 ++++++++++++++---------
4 files changed, 28 insertions(+), 38 deletions(-)
commit 31fc5181bc491ff2e4aee0ae05c0f611a36e585c
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri Dec 20 07:16:37 2013 +1030
+Date: Fri Dec 20 07:16:37 2013 +1030
pdftops: Use crop box as page size
@@ -3878,23 +4092,23 @@ Date: Fri Dec 20 07:16:37 2013 +1030
commit bf2049b17ac4706f472c59e50266f4eaf0ffaa32
Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Dec 15 18:00:41 2013 +1030
+Date: Sun Dec 15 18:00:41 2013 +1030
pdftps: fix DocumentMedia/Page/Media/PageBBox DSC comments
Bug 72312
- poppler/PSOutputDev.cc | 167
+ poppler/PSOutputDev.cc | 167
++++++++++++++++++++++++++--------------
- poppler/PSOutputDev.h | 6 +-
+ poppler/PSOutputDev.h | 6 +-
qt4/src/poppler-ps-converter.cc | 1 +
qt5/src/poppler-ps-converter.cc | 1 +
- utils/pdftops.cc | 1 +
+ utils/pdftops.cc | 1 +
5 files changed, 119 insertions(+), 57 deletions(-)
commit fe49033c9bd2103c13d4eb59983e06fdcdd33a8d
Author: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Sat Dec 14 16:05:09 2013 +1030
+Date: Sat Dec 14 16:05:09 2013 +1030
pdftops: ensure paper size takes into account rotation
@@ -3906,28 +4120,28 @@ Date: Sat Dec 14 16:05:09 2013 +1030
commit 31edf585e62f4e91b7b64295cc8b978ac466ce58
Author: Bogdan Cristea <cristeab@gmail.com>
-Date: Mon Jan 27 20:06:11 2014 +0100
+Date: Mon Jan 27 20:06:11 2014 +0100
[qt] Improve compilation under Win 8 with Visual Studio 2012
Bug #73111
- goo/GooMutex.h | 3 ++-
- goo/GooTimer.h | 2 ++
- goo/gfile.h | 2 ++
- poppler/PDFDoc.cc | 4 +---
- poppler/XpdfPluginAPI.h | 2 ++
+ goo/GooMutex.h | 3 ++-
+ goo/GooTimer.h | 2 ++
+ goo/gfile.h | 2 ++
+ poppler/PDFDoc.cc | 4 +---
+ poppler/XpdfPluginAPI.h | 2 ++
poppler/poppler-config.h.cmake | 18 ++++++++++++++++--
- poppler/poppler-config.h.in | 18 ++++++++++++++++--
+ poppler/poppler-config.h.in | 18 ++++++++++++++++--
qt4/tests/stress-threads-qt4.cpp | 5 +++++
- qt5/src/poppler-private.h | 6 ++++--
+ qt5/src/poppler-private.h | 6 ++++--
qt5/tests/stress-threads-qt5.cpp | 5 +++++
- test/perf-test.cc | 1 -
+ test/perf-test.cc | 1 -
11 files changed, 55 insertions(+), 11 deletions(-)
commit 834cd18e3ddfda44a11316290f7eee98cd871305
Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 26 16:10:20 2014 +0100
+Date: Sun Jan 26 16:10:20 2014 +0100
Use c99 for the c compiler
@@ -3936,7 +4150,7 @@ Date: Sun Jan 26 16:10:20 2014 +0100
commit 03674a141a96806e5e1a134dc3dec2ee61b68713
Author: Pino Toscano <pino@kde.org>
-Date: Sun Jan 26 12:43:13 2014 +0100
+Date: Sun Jan 26 12:43:13 2014 +0100
qt4/qt5: add GCC visibility export attributes
@@ -3950,7 +4164,7 @@ Date: Sun Jan 26 12:43:13 2014 +0100
commit 52b46d05219cf9898ee4adae7c8c2702adb1ba23
Author: Pino Toscano <pino@kde.org>
-Date: Sun Jan 26 12:38:03 2014 +0100
+Date: Sun Jan 26 12:38:03 2014 +0100
qt4/qt5: improve naming of internal export/import macros
@@ -3962,7 +4176,7 @@ Date: Sun Jan 26 12:38:03 2014 +0100
commit 7a8bcea11ad71fccbbba2787fc442f6ba4bf7100
Author: Pino Toscano <pino@kde.org>
-Date: Thu Jan 23 22:34:07 2014 +0100
+Date: Thu Jan 23 22:34:07 2014 +0100
cmake: install JpegWriter.h depending on libjpeg
@@ -3973,7 +4187,7 @@ Date: Thu Jan 23 22:34:07 2014 +0100
commit 57f34f525fa2c2e62ebc7383ceba48ebc80ebba6
Author: Andres Gomez <agomez@igalia.com>
-Date: Wed Jan 8 12:26:14 2014 +0200
+Date: Wed Jan 8 12:26:14 2014 +0200
glib-demo: Fix conding style issue in render.c
@@ -3982,7 +4196,7 @@ Date: Wed Jan 8 12:26:14 2014 +0200
commit 3fac919eeb1ca1abfdbb4f9923a454e532256f5c
Author: Andres Gomez <agomez@igalia.com>
-Date: Wed Jan 8 12:25:52 2014 +0200
+Date: Wed Jan 8 12:25:52 2014 +0200
glib-demo: Fix trailing whitespaces in render.c
@@ -3991,7 +4205,7 @@ Date: Wed Jan 8 12:25:52 2014 +0200
commit 92ea15642a6d3fe65d66d5c59fb6bed54e060e5d
Author: Christian Persch <chpe@gnome.org>
-Date: Fri Jan 3 23:31:56 2014 +0100
+Date: Fri Jan 3 23:31:56 2014 +0100
glib: Install error callback
@@ -4006,7 +4220,7 @@ Date: Fri Jan 3 23:31:56 2014 +0100
commit f99128e38bbff43623d5cd1c1bc27fd789d0bc0c
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Jan 19 16:03:35 2014 +0100
+Date: Sun Jan 19 16:03:35 2014 +0100
glib: Make vertices a constructor parameter of line annotations
@@ -4019,7 +4233,7 @@ Date: Sun Jan 19 16:03:35 2014 +0100
commit 587a40f90e4ac5a1b6ab9044495a1ae403bc8c58
Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Jan 19 15:58:43 2014 +0100
+Date: Sun Jan 19 15:58:43 2014 +0100
annots: Fix memory leak when setting AnnotTextMarkup quads twice
@@ -4028,7 +4242,7 @@ Date: Sun Jan 19 15:58:43 2014 +0100
commit 69e73da1fbab9bf3365b40dced1008b0283ac931
Author: Germán Poo-Caamaño <gpoo@gnome.org>
-Date: Wed Nov 20 11:53:30 2013 -0800
+Date: Wed Nov 20 11:53:30 2013 -0800
glib-demo: Add support for PopplerTextAnnotMarkup
@@ -4044,7 +4258,7 @@ Date: Wed Nov 20 11:53:30 2013 -0800
commit 9a7699ebe3e644ba845ef75d9295c88d321cb934
Author: Germán Poo-Caamaño <gpoo@gnome.org>
-Date: Mon Nov 18 16:42:08 2013 -0800
+Date: Mon Nov 18 16:42:08 2013 -0800
glib: Add PopplerAnnotTextMarkup class and subtypes
@@ -4054,33 +4268,33 @@ Date: Mon Nov 18 16:42:08 2013 -0800
https://bugs.freedesktop.org/show_bug.cgi?id=51487
- glib/poppler-annot.cc | 264
+ glib/poppler-annot.cc | 264
++++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h | 23 ++++
- glib/poppler-page.cc | 6 +
- glib/poppler-private.h | 1 +
- glib/poppler.h | 1 +
- glib/reference/poppler-sections.txt | 11 ++
+ glib/poppler-annot.h | 23 ++++
+ glib/poppler-page.cc | 6 +
+ glib/poppler-private.h | 1 +
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 11 ++
6 files changed, 306 insertions(+)
commit 40040b41216a3dcc833fc224f1c6f15517a88aed
Author: Germán Poo-Caamaño <gpoo@gnome.org>
-Date: Mon Nov 18 16:26:27 2013 -0800
+Date: Mon Nov 18 16:26:27 2013 -0800
glib: Add PopplerQuadrilateral boxed type
https://bugs.freedesktop.org/show_bug.cgi?id=51487
- glib/poppler-page.cc | 53
+ glib/poppler-page.cc | 53
+++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h | 33 +++++++++++++++++++++++
- glib/poppler.h | 1 +
- glib/reference/poppler-sections.txt | 6 +++++
+ glib/poppler-page.h | 33 +++++++++++++++++++++++
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 6 +++++
4 files changed, 93 insertions(+)
commit c8a845cf7c7752d3b7dad06013d3154812c66c92
Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jan 14 20:26:59 2014 +0100
+Date: Tue Jan 14 20:26:59 2014 +0100
Do not define -ansi
@@ -4089,12 +4303,12 @@ Date: Tue Jan 14 20:26:59 2014 +0100
not make any sense. Bug #72499
cmake/modules/PopplerMacros.cmake | 5 -----
- configure.ac | 15 ---------------
+ configure.ac | 15 ---------------
2 files changed, 20 deletions(-)
commit f0c13ee72e8a7df17bdf847f5e922c01acee1f0d
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jan 6 21:55:07 2014 +0100
+Date: Mon Jan 6 21:55:07 2014 +0100
C for last commit
@@ -4103,7 +4317,7 @@ Date: Mon Jan 6 21:55:07 2014 +0100
commit 1e1b9991a911fb610e74119979b20b179f3f2a67
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jan 6 21:51:25 2014 +0100
+Date: Mon Jan 6 21:51:25 2014 +0100
Fix rendering of pdf file from KDE bug 329600
@@ -4118,17 +4332,17 @@ Date: Mon Jan 6 21:51:25 2014 +0100
commit 4cd5c349cfbc745688c0c38fc50d364092bc3718
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jan 6 21:48:25 2014 +0100
+Date: Mon Jan 6 21:48:25 2014 +0100
Update popplers (C)
poppler/poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
+ poppler/poppler-config.h.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 7ca2f42b06757587dfd9521fb1c6c7d657545553
Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jan 6 15:48:22 2014 +0100
+Date: Mon Jan 6 15:48:22 2014 +0100
Learn about automake 1.14
@@ -4137,20 +4351,20 @@ Date: Mon Jan 6 15:48:22 2014 +0100
commit de9643b6f76774ebe131c4787df82dd213181c71
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jan 3 00:53:37 2014 +0100
+Date: Fri Jan 3 00:53:37 2014 +0100
0.25.1
CMakeLists.txt | 2 +-
- NEWS | 19 +++++++++++++++++++
- cpp/Doxyfile | 2 +-
+ NEWS | 19 +++++++++++++++++++
+ cpp/Doxyfile | 2 +-
qt4/src/Doxyfile | 2 +-
qt5/src/Doxyfile | 2 +-
5 files changed, 23 insertions(+), 4 deletions(-)
commit e238c1f83fd5f667336bfbb0e9a59569ff638ecc
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jan 3 00:29:28 2014 +0100
+Date: Fri Jan 3 00:29:28 2014 +0100
Fix qt5 moc detection fix
@@ -4160,7 +4374,7 @@ Date: Fri Jan 3 00:29:28 2014 +0100
commit 381ae2877acace4e8908b07ee5fb442bc19bf814
Merge: 64100e7 a2f0e4b
Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jan 3 00:04:29 2014 +0100
+Date: Fri Jan 3 00:04:29 2014 +0100
Merge remote-tracking branch 'origin/poppler-0.24'
diff --git a/Build/source/libs/poppler/poppler-0.32.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.33.0/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.33.0/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.32.0/INSTALL b/Build/source/libs/poppler/poppler-0.33.0/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.33.0/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.32.0/Makefile.am b/Build/source/libs/poppler/poppler-0.33.0/Makefile.am
index 691512f4e3a..691512f4e3a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.33.0/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.32.0/NEWS b/Build/source/libs/poppler/poppler-0.33.0/NEWS
index e83112497f0..48f97fd14fe 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/NEWS
+++ b/Build/source/libs/poppler/poppler-0.33.0/NEWS
@@ -1,3 +1,28 @@
+Release 0.33.0
+ core:
+ * Fix regression in pdftops parameter passing. Bug #89827
+ * Combine base characters and diacritical marks. Bug #87215
+ * Use width from W array for WMode positioning. Bug #89621
+ * Fixed adding annotation of Subtype Popup to pdf page. Bug #89136
+ * CairoOutputDev: Fix memory leak in CairoFreeTypeFont::create
+ * SplashOutputDev: memset on error to have reproducible outputs
+
+ qt4:
+ * Fix PDF Text String -> QString conversion. KDE Bug #344849
+
+ qt5:
+ * Fix PDF Text String -> QString conversion. KDE Bug #344849
+
+ glib:
+ * Add poppler_annot_markup_set_popup_rectangle()
+ * Fix segfault when creating PopplerAction. Bug #90093
+
+ utils:
+ * pdftohtml: Set exit status adecuately. Bug #83609
+
+ build system:
+ * configure: Fix invalid shell comparaison in libtiff test
+
Release 0.32.0
core:
* Annotations: Fix rendering of empty BG/BC arrays
diff --git a/Build/source/libs/poppler/poppler-0.32.0/README b/Build/source/libs/poppler/poppler-0.33.0/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/README
+++ b/Build/source/libs/poppler/poppler-0.33.0/README
diff --git a/Build/source/libs/poppler/poppler-0.32.0/README-XPDF b/Build/source/libs/poppler/poppler-0.33.0/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.33.0/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.32.0/TODO b/Build/source/libs/poppler/poppler-0.33.0/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/TODO
+++ b/Build/source/libs/poppler/poppler-0.33.0/TODO
diff --git a/Build/source/libs/poppler/poppler-0.32.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.33.0/config.h.cmake
index 8ed1c92248e..8ed1c92248e 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.33.0/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.32.0/config.h.in b/Build/source/libs/poppler/poppler-0.33.0/config.h.in
index c47d66d3e52..c47d66d3e52 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/configure.ac b/Build/source/libs/poppler/poppler-0.33.0/configure.ac
index 56a972e456b..67599c0971f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.33.0/configure.ac
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[32])
+m4_define([poppler_version_minor],[33])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
@@ -231,7 +231,7 @@ CPPFLAGS="$CPPFLAGS $LIBTIFF_CFLAGS"
CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS"
LIBS="$LIBS $LIBTIFF_LIBS"
if test x$enable_libtiff = xyes; then
- if test x"$LIBTIFF_LIBS" != ; then
+ if test x"$LIBTIFF_LIBS" != x; then
AC_CHECK_FUNC([TIFFOpen],,
AC_MSG_ERROR("*** libtiff library not found ***"))
else
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiTrueType.cc
index 11699dd6119..11699dd6119 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1.cc
index 827ebc7d7c3..827ebc7d7c3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.33.0/fofi/Makefile.am
index 4deb7d5e063..4deb7d5e063 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.33.0/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.33.0/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.33.0/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.33.0/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.33.0/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.33.0/goo/GooMutex.h
index b2714b048c7..b2714b048c7 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/GooString.cc
index 3f22f368560..3f22f368560 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.33.0/goo/GooString.h
index 0176d873646..0176d873646 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.33.0/goo/GooTimer.h
index ac64f6b4868..ac64f6b4868 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.33.0/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.33.0/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.33.0/goo/Makefile.am
index 370e85021be..370e85021be 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.33.0/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.33.0/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/TiffWriter.cc
index 316008778b1..316008778b1 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.33.0/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/gfile.cc
index 3528bb357d8..3528bb357d8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.33.0/goo/gfile.h
index 1365a9cf2ab..1365a9cf2ab 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.33.0/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/grandom.h b/Build/source/libs/poppler/poppler-0.33.0/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.33.0/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.33.0/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.33.0/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.33.0/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.33.0/gtk-doc.make
index e7916563d75..e7916563d75 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.33.0/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.33.0/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.33.0/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.33.0/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.33.0/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Annot.cc
index d7769a0f627..dd99eee8aaa 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Annot.cc
@@ -33,6 +33,7 @@
// Copyright (C) 2014 Jiri Slaby <jirislaby@gmail.com>
// Copyright (C) 2014 Anuj Khare <khareanuj18@gmail.com>
// Copyright (C) 2015 Petr Gajdos <pgajdos@suse.cz>
+// Copyright (C) 2015 Philipp Reinkemeier <philipp.reinkemeier@offis.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -2089,6 +2090,16 @@ void AnnotMarkup::setLabel(GooString *new_label) {
}
void AnnotMarkup::setPopup(AnnotPopup *new_popup) {
+ // If there exists an old popup annotation that is already
+ // associated with a page, then we need to remove that
+ // popup annotation from the page. Otherwise we would have
+ // dangling references to it.
+ if (popup != NULL && popup->getPageNum() != 0) {
+ Page *pageobj = doc->getPage(popup->getPageNum());
+ if (pageobj) {
+ pageobj->removeAnnot(popup);
+ }
+ }
delete popup;
if (new_popup) {
@@ -2100,6 +2111,15 @@ void AnnotMarkup::setPopup(AnnotPopup *new_popup) {
new_popup->setParent(this);
popup = new_popup;
+
+ // If this annotation is already added to a page, then we
+ // add the new popup annotation to the same page.
+ if (page != 0) {
+ Page *pageobj = doc->getPage(page);
+ assert(pageobj != NULL); // pageobj should exist in doc (see setPage())
+
+ pageobj->addAnnot(popup);
+ }
} else {
popup = NULL;
}
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Annot.h
index 8fde6a6736b..1e64f59bc76 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Annot.h
@@ -15,7 +15,7 @@
//
// Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
// Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2007-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007-2011, 2013, 2015 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
@@ -697,7 +697,7 @@ public:
~AnnotPopup();
Object *getParent(Object *obj) { return parent.fetch (xref, obj); }
- Object *getParentNF(Object *obj) { return &parent; }
+ Object *getParentNF() { return &parent; }
void setParent(Object *parentA);
void setParent(Annot *parentA);
GBool getOpen() const { return open; }
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/CMap.cc
index 6731ab5a1fa..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoFontEngine.cc
index a5a3023208a..1d611b59d3c 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoFontEngine.cc
@@ -27,6 +27,7 @@
// Copyright (C) 2010 Jan Kümmel <jan+freedesktop@snorc.org>
// Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2015 Jason Crain <jason@aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -256,12 +257,16 @@ _ft_done_face (void *closure)
else
_ft_open_faces = data->next;
+ if (data->fd != -1) {
#if defined(__SUNPRO_CC) && defined(__sun) && defined(__SVR4)
- munmap ((char*)data->bytes, data->size);
+ munmap ((char*)data->bytes, data->size);
#else
- munmap (data->bytes, data->size);
+ munmap (data->bytes, data->size);
#endif
- close (data->fd);
+ close (data->fd);
+ } else {
+ gfree (data->bytes);
+ }
FT_Done_Face (data->face);
gfree (data);
@@ -318,6 +323,8 @@ _ft_new_face (FT_Library lib,
munmap (tmpl.bytes, tmpl.size);
#endif
close (tmpl.fd);
+ } else {
+ gfree (tmpl.bytes);
}
*face_out = l->face;
*font_face_out = cairo_font_face_reference (l->font_face);
@@ -533,8 +540,6 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
}
if (! _ft_new_face (lib, fileNameC, font_data, font_data_len, &face, &font_face)) {
- gfree(codeToGID);
- codeToGID = NULL;
error(errSyntaxError, -1, "could not create cid face\n");
goto err2;
}
@@ -555,6 +560,8 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
err2:
/* hmm? */
delete fontLoc;
+ gfree (codeToGID);
+ gfree (font_data);
fprintf (stderr, "some font thing failed\n");
return NULL;
}
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoOutputDev.cc
index a86ec120f20..a86ec120f20 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoOutputDev.h
index 33dde0c570a..33dde0c570a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Catalog.cc
index f75f4e106f3..f75f4e106f3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/CharCodeToUnicode.cc
index 59b7c93e66f..59b7c93e66f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Dict.cc
index c2a94f4a1fa..c2a94f4a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Error.h
index 9e11733d803..9e11733d803 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Form.cc
index 661ed8972df..661ed8972df 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Function.cc
index 67283dffe9f..67283dffe9f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Gfx.cc
index 07d95b355a8..07d95b355a8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Gfx.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxFont.cc
index 3e9b7db4248..81f59037f7f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxFont.cc
@@ -30,7 +30,7 @@
// Copyright (C) 2012 Yi Yang <ahyangyi@gmail.com>
// Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
-// Copyright (C) 2013, 2014 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2013-2015 Jason Crain <jason@aquaticape.us>
// Copyright (C) 2014 Olly Betts <olly@survex.com>
//
// To see a description of the changes please see the Changelog file that
@@ -2207,30 +2207,14 @@ int GfxCIDFont::getNextChar(char *s, int len, CharCode *code,
// horizontal
if (cMap->getWMode() == 0) {
- w = widths.defWidth;
+ w = getWidth(cid);
h = vx = vy = 0;
- if (widths.nExceps > 0 && cid >= widths.exceps[0].first) {
- a = 0;
- b = widths.nExceps;
- // invariant: widths.exceps[a].first <= cid < widths.exceps[b].first
- while (b - a > 1) {
- m = (a + b) / 2;
- if (widths.exceps[m].first <= cid) {
- a = m;
- } else {
- b = m;
- }
- }
- if (cid <= widths.exceps[a].last) {
- w = widths.exceps[a].width;
- }
- }
// vertical
} else {
w = 0;
h = widths.defHeight;
- vx = widths.defWidth / 2;
+ vx = getWidth(cid) / 2;
vy = widths.defVY;
if (widths.nExcepsV > 0 && cid >= widths.excepsV[0].first) {
a = 0;
@@ -2534,13 +2518,9 @@ int *GfxCIDFont::getCodeToGIDMap(FoFiTrueType *ff, int *mapsizep) {
return codeToGID;
}
-double GfxCIDFont::getWidth (char* s, int len) {
- int nUsed;
+double GfxCIDFont::getWidth(CID cid) {
double w;
int a, b, m;
- CharCode c;
-
- CID cid = cMap->getCID(s, len, &c, &nUsed);
w = widths.defWidth;
if (widths.nExceps > 0 && cid >= widths.exceps[0].first) {
@@ -2562,6 +2542,14 @@ double GfxCIDFont::getWidth (char* s, int len) {
return w;
}
+double GfxCIDFont::getWidth (char* s, int len) {
+ int nUsed;
+ CharCode c;
+
+ CID cid = cMap->getCID(s, len, &c, &nUsed);
+ return getWidth(cid);
+}
+
//------------------------------------------------------------------------
// GfxFontDict
//------------------------------------------------------------------------
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxFont.h
index 1f01cc7571c..febb902922d 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxFont.h
@@ -21,6 +21,7 @@
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
// Copyright (C) 2011 Axel Strübing <axel.struebing@freenet.de>
// Copyright (C) 2011, 2012, 2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2015 Jason Crain <jason@aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -401,6 +402,7 @@ private:
int mapCodeToGID(FoFiTrueType *ff, int cmapi,
Unicode unicode, GBool wmode);
+ double getWidth(CID cid); // Get width of a character.
GooString *collection; // collection name
CMap *cMap; // char code --> CID
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState.cc
index 3e9cac41534..3e9cac41534 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState.h
index f018e93dd34..f018e93dd34 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParams.cc
index 7e110d05b15..7e110d05b15 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParams.h
index 16d615ae6d9..16d615ae6d9 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Hints.cc
index bdd0d322612..bdd0d322612 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/JBIG2Stream.cc
index 66c1d2505e8..66c1d2505e8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/JBIG2Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/JBIG2Stream.h
index 1e14c5cf783..1e14c5cf783 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/JPEG2000Stream.cc
index 35e98b86ebc..35e98b86ebc 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/JPEG2000Stream.h
index 73b6bdd97b8..73b6bdd97b8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Lexer.cc
index 952967a998a..952967a998a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Link.cc
index 4ab5f52ceda..4ab5f52ceda 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.33.0/poppler/Makefile.am
index 43faa7e39b3..fd75d1ada49 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 51:0:0 \
+ -version-info 52:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Object.h
index 15bea159857..15bea159857 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDoc.cc
index 71a1efe269d..71a1efe269d 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDoc.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDoc.h
index 6c40f7b0c0c..6c40f7b0c0c 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/PSOutputDev.cc
index 2502f5fc286..5dc89bea25e 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PSOutputDev.cc
@@ -1073,7 +1073,7 @@ static void outputToFile(void *stream, const char *data, int len) {
}
PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
- char *psTitle,
+ char *psTitleA,
const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA, int paperHeightA,
GBool noCropA, GBool duplexA,
@@ -1105,6 +1105,7 @@ PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
haveTextClip = gFalse;
t3String = NULL;
forceRasterize = forceRasterizeA;
+ psTitle = NULL;
// open file or pipe
if (!strcmp(fileName, "-")) {
@@ -1135,14 +1136,14 @@ PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
}
}
- init(outputToFile, f, fileTypeA, psTitle,
+ init(outputToFile, f, fileTypeA, psTitleA,
doc, pages, modeA,
imgLLXA, imgLLYA, imgURXA, imgURYA, manualCtrlA,
paperWidthA, paperHeightA, noCropA, duplexA);
}
PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
- char *psTitle,
+ char *psTitleA,
PDFDoc *doc,
const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA, int paperHeightA,
@@ -1172,8 +1173,9 @@ PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
haveTextClip = gFalse;
t3String = NULL;
forceRasterize = forceRasterizeA;
+ psTitle = NULL;
- init(outputFuncA, outputStreamA, psGeneric, psTitle,
+ init(outputFuncA, outputStreamA, psGeneric, psTitleA,
doc, pages, modeA,
imgLLXA, imgLLYA, imgURXA, imgURYA, manualCtrlA,
paperWidthA, paperHeightA, noCropA, duplexA);
@@ -1212,17 +1214,16 @@ static bool pageDimensionEqual(int a, int b) {
return (abs (a - b) < 5);
}
+// Shared initialization of PSOutputDev members.
+// Store the values but do not process them so the function that
+// created the PSOutputDev can use the various setters to change defaults.
+
void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
- PSFileType fileTypeA, char *pstitle, PDFDoc *docA,
+ PSFileType fileTypeA, char *psTitleA, PDFDoc *docA,
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) {
- Catalog *catalog;
- PDFRectangle *box;
- PSOutPaperSize *size;
- GooList *names;
- int w, h, i;
if (pagesA.empty()) {
ok = gFalse;
@@ -1230,6 +1231,7 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
}
// initialize
+ postInitDone = gFalse;
embedType1 = gTrue;
embedTrueType = gTrue;
embedCIDPostScript = gTrue;
@@ -1249,18 +1251,64 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
outputFunc = outputFuncA;
outputStream = outputStreamA;
fileType = fileTypeA;
+ psTitle = (psTitleA? strdup(psTitleA): NULL);
doc = docA;
- xref = doc->getXRef();
- catalog = doc->getCatalog();
level = globalParams->getPSLevel();
+ pages = pagesA;
mode = modeA;
paperWidth = paperWidthA;
paperHeight = paperHeightA;
noCrop = noCropA;
+ duplex = duplexA;
imgLLX = imgLLXA;
imgLLY = imgLLYA;
imgURX = imgURXA;
imgURY = imgURYA;
+ manualCtrl = manualCtrlA;
+
+ xref = NULL;
+
+ processColors = 0;
+ inType3Char = gFalse;
+ inUncoloredPattern = gFalse;
+ t3FillColorOnly = gFalse;
+
+#if OPI_SUPPORT
+ // initialize OPI nesting levels
+ opi13Nest = 0;
+ opi20Nest = 0;
+#endif
+
+ tx0 = ty0 = -1;
+ xScale0 = yScale0 = 0;
+ rotate0 = -1;
+ clipLLX0 = clipLLY0 = 0;
+ clipURX0 = clipURY0 = -1;
+
+ // initialize sequential page number
+ seqPage = 1;
+}
+
+// Complete the initialization after the function that created the PSOutputDev
+// has had a chance to modify default values with the various setters.
+
+void PSOutputDev::postInit()
+{
+ Catalog *catalog;
+ PDFRectangle *box;
+ PSOutPaperSize *size;
+ GooList *names;
+ int w, h, i;
+
+ if (postInitDone || !ok) {
+ return;
+ }
+
+ postInitDone = gTrue;
+
+ xref = doc->getXRef();
+ catalog = doc->getCatalog();
+
if (paperWidth < 0 || paperHeight < 0) {
paperMatch = gTrue;
} else {
@@ -1268,8 +1316,8 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
}
Page *page;
paperSizes = new GooList();
- for (size_t pgi = 0; pgi < pagesA.size(); ++pgi) {
- const int pg = pagesA[pgi];
+ for (size_t pgi = 0; pgi < pages.size(); ++pgi) {
+ const int pg = pages[pgi];
page = catalog->getPage(pg);
if (page == NULL)
paperMatch = gFalse;
@@ -1283,7 +1331,7 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
w = 595;
h = 842;
}
- } else if (noCropA) {
+ } else if (noCrop) {
w = (int)ceil(page->getMediaWidth());
h = (int)ceil(page->getMediaHeight());
} else {
@@ -1329,29 +1377,12 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
imgURX = paperWidth;
imgURY = paperHeight;
}
- manualCtrl = manualCtrlA;
- std::vector<int> pages;
+ std::vector<int> pageList;
if (mode == psModeForm) {
- pages.push_back(pagesA[0]);
+ pageList.push_back(pages[0]);
} else {
- pages = pagesA;
+ pageList = pages;
}
- processColors = 0;
- inType3Char = gFalse;
- inUncoloredPattern = gFalse;
- t3FillColorOnly = gFalse;
-
-#if OPI_SUPPORT
- // initialize OPI nesting levels
- opi13Nest = 0;
- opi20Nest = 0;
-#endif
-
- tx0 = ty0 = -1;
- xScale0 = yScale0 = 0;
- rotate0 = -1;
- clipLLX0 = clipLLY0 = 0;
- clipURX0 = clipURY0 = -1;
// initialize fontIDs, fontFileIDs, and fontFileNames lists
fontIDSize = 64;
@@ -1387,16 +1418,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(pages[0]))) {
- writeHeader(pages,
+ if ((page = doc->getPage(pageList[0]))) {
+ writeHeader(pageList,
page->getMediaBox(),
page->getCropBox(),
page->getRotate(),
- pstitle);
+ psTitle);
} else {
- error(errSyntaxError, -1, "Invalid page {0:d}", pages[0]);
+ error(errSyntaxError, -1, "Invalid page {0:d}", pageList[0]);
box = new PDFRectangle(0, 0, 1, 1);
- writeHeader(pages, box, box, 0, pstitle);
+ writeHeader(pageList, box, box, 0, psTitle);
delete box;
}
if (mode != psModeForm) {
@@ -1407,14 +1438,11 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
writePS("%%EndProlog\n");
writePS("%%BeginSetup\n");
}
- writeDocSetup(doc, catalog, pages, duplexA);
+ writeDocSetup(doc, catalog, pageList, duplex);
if (mode != psModeForm) {
writePS("%%EndSetup\n");
}
}
-
- // initialize sequential page number
- seqPage = 1;
}
PSOutputDev::~PSOutputDev() {
@@ -1422,6 +1450,9 @@ PSOutputDev::~PSOutputDev() {
int i;
if (ok) {
+ if (!postInitDone) {
+ postInit();
+ }
if (!manualCtrl) {
writePS("%%Trailer\n");
writeTrailer();
@@ -1481,6 +1512,7 @@ PSOutputDev::~PSOutputDev() {
customColors = cc->next;
delete cc;
}
+ gfree(psTitle);
}
void PSOutputDev::writeHeader(const std::vector<int> &pages,
@@ -1511,14 +1543,14 @@ void PSOutputDev::writeHeader(const std::vector<int> &pages,
obj1.free();
info.free();
if(psTitle) {
- char *sanitizedTile = strdup(psTitle);
- for (Guint i = 0; i < strlen(sanitizedTile); ++i) {
- if (sanitizedTile[i] == '\n' || sanitizedTile[i] == '\r') {
- sanitizedTile[i] = ' ';
+ char *sanitizedTitle = strdup(psTitle);
+ for (Guint i = 0; i < strlen(sanitizedTitle); ++i) {
+ if (sanitizedTitle[i] == '\n' || sanitizedTitle[i] == '\r') {
+ sanitizedTitle[i] = ' ';
}
}
- writePSFmt("%%Title: {0:s}\n", sanitizedTile);
- free(sanitizedTile);
+ writePSFmt("%%Title: {0:s}\n", sanitizedTitle);
+ free(sanitizedTitle);
}
writePSFmt("%%LanguageLevel: {0:d}\n",
(level == psLevel1 || level == psLevel1Sep) ? 1 :
@@ -3174,6 +3206,9 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
Guchar digit;
GBool isGray;
+ if (!postInitDone) {
+ postInit();
+ }
if (forceRasterize) {
rasterize = gTrue;
} else {
@@ -3596,6 +3631,9 @@ void PSOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
GooString *s;
PSOutPaperSize *paperSize;
+ if (!postInitDone) {
+ postInit();
+ }
xref = xrefA;
if (mode == psModePS) {
GooString pageLabel;
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PSOutputDev.h
index 6c14cef7bb6..7318cafdf2a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PSOutputDev.h
@@ -96,7 +96,7 @@ 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,
+ char *psTitleA,
const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA = -1, int paperHeightA = -1,
GBool noCrop = gFalse,
@@ -111,7 +111,7 @@ public:
// 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,
+ char *psTitleA,
PDFDoc *docA,
const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA = -1, int paperHeightA = -1,
@@ -334,11 +334,12 @@ public:
private:
void init(PSOutputFunc outputFuncA, void *outputStreamA,
- PSFileType fileTypeA, char *pstitle, PDFDoc *doc,
+ PSFileType fileTypeA, char *psTitleA, PDFDoc *doc,
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);
+ void postInit();
void setupResources(Dict *resDict);
void setupFonts(Dict *resDict);
void setupFont(GfxFont *font, Dict *parentResDict);
@@ -434,6 +435,10 @@ private:
int imgLLX, imgLLY, // imageable area, in pts
imgURX, imgURY;
GBool noCrop;
+ GBool duplex;
+ std::vector<int> pages;
+ char *psTitle;
+ GBool postInitDone; // true if postInit() was called
PSOutputFunc outputFunc;
void *outputStream;
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Page.cc
index 98c13c14ff8..a4af3405b92 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Page.cc
@@ -19,7 +19,7 @@
// Copyright (C) 2006-2008 Pino Toscano <pino@kde.org>
// Copyright (C) 2006 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
// Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
-// Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006-2011, 2015 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2008 Iñigo Martínez <inigomartinez@gmail.com>
// Copyright (C) 2008 Brad Hards <bradh@kde.org>
@@ -28,6 +28,7 @@
// Copyright (C) 2013, 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2015 Philipp Reinkemeier <philipp.reinkemeier@offis.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -442,8 +443,21 @@ void Page::addAnnot(Annot *annot) {
obj1.free();
}
- annots->appendAnnot(annot);
+ // Popup annots are already handled by markup annots,
+ // so add to the list only Popup annots without a
+ // markup annotation associated.
+ if (annot->getType() != Annot::typePopup ||
+ static_cast<AnnotPopup*>(annot)->getParentNF()->isNull()) {
+ annots->appendAnnot(annot);
+ }
annot->setPage(num, gTrue);
+
+ AnnotMarkup *annotMarkup = dynamic_cast<AnnotMarkup*>(annot);
+ if (annotMarkup) {
+ AnnotPopup *annotPopup = annotMarkup->getPopup();
+ if (annotPopup)
+ addAnnot(annotPopup);
+ }
}
void Page::removeAnnot(Annot *annot) {
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo_p.h
index 6cd5220d372..6cd5220d372 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Parser.cc
index 28a54607f5c..28a54607f5c 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/PreScanOutputDev.cc
index b2af18d86b8..b2af18d86b8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/PreScanOutputDev.h
index 50fcbf22f73..50fcbf22f73 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/SecurityHandler.cc
index 63d8b4e1287..63d8b4e1287 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/SplashOutputDev.cc
index 455c2be62cd..a7cc6bc1bcd 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/SplashOutputDev.cc
@@ -2835,6 +2835,18 @@ GBool SplashOutputDev::imageSrc(void *data, SplashColorPtr colorLine,
return gFalse;
}
if (!(p = imgData->imgStr->getLine())) {
+ int destComps = 1;
+ if (imgData->colorMode == splashModeRGB8 || imgData->colorMode == splashModeBGR8)
+ destComps = 3;
+ else if (imgData->colorMode == splashModeXBGR8)
+ destComps = 4;
+#if SPLASH_CMYK
+ else if (imgData->colorMode == splashModeCMYK8)
+ destComps = 4;
+ else if (imgData->colorMode == splashModeDeviceN8)
+ destComps = SPOT_NCOMPS + 4;
+#endif
+ memset(colorLine, 0, imgData->width * destComps);
return gFalse;
}
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/SplashOutputDev.h
index ae20faccb51..ae20faccb51 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream.cc
index d2dd761c729..d2dd761c729 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/StructElement.cc
index b1aaca8a58b..b1aaca8a58b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/StructElement.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/StructElement.h
index cd89a970ddb..cd89a970ddb 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/StructElement.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/StructTreeRoot.cc
index e46e3e28388..e46e3e28388 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/StructTreeRoot.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/StructTreeRoot.h
index 3b1f3c84421..3b1f3c84421 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/StructTreeRoot.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/TextOutputDev.cc
index 150d4449603..16f099f291a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.33.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, 2014 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2012, 2013-2015 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>
@@ -173,6 +173,11 @@
// Max distance between edge of text and edge of link border
#define hyperlinkSlack 2
+// Max distance between characters when combining a base character and
+// combining character
+#define combMaxMidDelta 0.3
+#define combMaxBaseDelta 0.4
+
//------------------------------------------------------------------------
// TextUnderline
//------------------------------------------------------------------------
@@ -236,6 +241,18 @@ GBool TextFontInfo::matches(TextFontInfo *fontInfo) {
return gfxFont == fontInfo->gfxFont;
}
+double TextFontInfo::getAscent() {
+ return gfxFont ? gfxFont->getAscent() : 0.95;
+}
+
+double TextFontInfo::getDescent() {
+ return gfxFont ? gfxFont->getDescent() : -0.35;
+}
+
+int TextFontInfo::getWMode() {
+ return gfxFont ? gfxFont->getWMode() : 0;
+}
+
//------------------------------------------------------------------------
// TextWord
//------------------------------------------------------------------------
@@ -282,19 +299,7 @@ TextWord::~TextWord() {
void TextWord::addChar(GfxState *state, TextFontInfo *fontA, double x, double y,
double dx, double dy, int charPosA, int charLen,
CharCode c, Unicode u, Matrix textMatA) {
- GfxFont *gfxFont;
- double ascent, descent;
- ascent = descent = 0; // make gcc happy
-
- if (len == size) {
- size += 16;
- text = (Unicode *)greallocn(text, size, sizeof(Unicode));
- charcode = (Unicode *)greallocn(charcode, size, sizeof(CharCode));
- edge = (double *)greallocn(edge, (size + 1), sizeof(double));
- charPos = (int *)greallocn(charPos, size + 1, sizeof(int));
- font = (TextFontInfo **)greallocn(font, size, sizeof(TextFontInfo *));
- textMat = (Matrix *)greallocn(textMat, size, sizeof(Matrix));
- }
+ ensureCapacity(len+1);
text[len] = u;
charcode[len] = c;
charPos[len] = charPosA;
@@ -302,61 +307,26 @@ void TextWord::addChar(GfxState *state, TextFontInfo *fontA, double x, double y,
font[len] = fontA;
textMat[len] = textMatA;
- if (len == 0) {
- if ((gfxFont = fontA->gfxFont)) {
- ascent = gfxFont->getAscent() * fontSize;
- descent = gfxFont->getDescent() * fontSize;
- wMode = gfxFont->getWMode();
- } else {
- // this means that the PDF file draws text without a current font,
- // which should never happen
- ascent = 0.95 * fontSize;
- descent = -0.35 * fontSize;
- wMode = 0;
- }
- }
+ if (len == 0)
+ setInitialBounds(fontA, x, y);
if (wMode) { // vertical writing mode
// NB: the rotation value has been incremented by 1 (in
// TextPage::beginWord()) for vertical writing mode
switch (rot) {
case 0:
- if (len == 0) {
- xMin = x - fontSize;
- yMin = y - fontSize;
- yMax = y;
- base = y;
- }
edge[len] = x - fontSize;
xMax = edge[len+1] = x;
break;
case 1:
- if (len == 0) {
- xMin = x;
- yMin = y - fontSize;
- xMax = x + fontSize;
- base = x;
- }
edge[len] = y - fontSize;
yMax = edge[len+1] = y;
break;
case 2:
- if (len == 0) {
- yMin = y;
- xMax = x + fontSize;
- yMax = y + fontSize;
- base = y;
- }
edge[len] = x + fontSize;
xMin = edge[len+1] = x;
break;
case 3:
- if (len == 0) {
- xMin = x - fontSize;
- xMax = x;
- yMax = y + fontSize;
- base = x;
- }
edge[len] = y + fontSize;
yMin = edge[len+1] = y;
break;
@@ -364,66 +334,18 @@ void TextWord::addChar(GfxState *state, TextFontInfo *fontA, double x, double y,
} else { // horizontal writing mode
switch (rot) {
case 0:
- if (len == 0) {
- xMin = x;
- yMin = y - ascent;
- yMax = y - descent;
- if (yMin == yMax) {
- // this is a sanity check for a case that shouldn't happen -- but
- // if it does happen, we want to avoid dividing by zero later
- yMin = y;
- yMax = y + 1;
- }
- base = y;
- }
edge[len] = x;
xMax = edge[len+1] = x + dx;
break;
case 1:
- if (len == 0) {
- xMin = x + descent;
- yMin = y;
- xMax = x + ascent;
- if (xMin == xMax) {
- // this is a sanity check for a case that shouldn't happen -- but
- // if it does happen, we want to avoid dividing by zero later
- xMin = x;
- xMax = x + 1;
- }
- base = x;
- }
edge[len] = y;
yMax = edge[len+1] = y + dy;
break;
case 2:
- if (len == 0) {
- yMin = y + descent;
- xMax = x;
- yMax = y + ascent;
- if (yMin == yMax) {
- // this is a sanity check for a case that shouldn't happen -- but
- // if it does happen, we want to avoid dividing by zero later
- yMin = y;
- yMax = y + 1;
- }
- base = y;
- }
edge[len] = x;
xMin = edge[len+1] = x + dx;
break;
case 3:
- if (len == 0) {
- xMin = x - ascent;
- xMax = x - descent;
- yMax = y;
- if (xMin == xMax) {
- // this is a sanity check for a case that shouldn't happen -- but
- // if it does happen, we want to avoid dividing by zero later
- xMin = x;
- xMax = x + 1;
- }
- base = x;
- }
edge[len] = y;
yMin = edge[len+1] = y + dy;
break;
@@ -432,6 +354,269 @@ void TextWord::addChar(GfxState *state, TextFontInfo *fontA, double x, double y,
++len;
}
+void TextWord::setInitialBounds(TextFontInfo *fontA, double x, double y) {
+ double ascent = fontA->getAscent() * fontSize;
+ double descent = fontA->getDescent() * fontSize;
+ wMode = fontA->getWMode();
+
+ if (wMode) { // vertical writing mode
+ // NB: the rotation value has been incremented by 1 (in
+ // TextPage::beginWord()) for vertical writing mode
+ switch (rot) {
+ case 0:
+ xMin = x - fontSize;
+ yMin = y - fontSize;
+ yMax = y;
+ base = y;
+ break;
+ case 1:
+ xMin = x;
+ yMin = y - fontSize;
+ xMax = x + fontSize;
+ base = x;
+ break;
+ case 2:
+ yMin = y;
+ xMax = x + fontSize;
+ yMax = y + fontSize;
+ base = y;
+ break;
+ case 3:
+ xMin = x - fontSize;
+ xMax = x;
+ yMax = y + fontSize;
+ base = x;
+ break;
+ }
+ } else { // horizontal writing mode
+ switch (rot) {
+ case 0:
+ xMin = x;
+ yMin = y - ascent;
+ yMax = y - descent;
+ if (yMin == yMax) {
+ // this is a sanity check for a case that shouldn't happen -- but
+ // if it does happen, we want to avoid dividing by zero later
+ yMin = y;
+ yMax = y + 1;
+ }
+ base = y;
+ break;
+ case 1:
+ xMin = x + descent;
+ yMin = y;
+ xMax = x + ascent;
+ if (xMin == xMax) {
+ // this is a sanity check for a case that shouldn't happen -- but
+ // if it does happen, we want to avoid dividing by zero later
+ xMin = x;
+ xMax = x + 1;
+ }
+ base = x;
+ break;
+ case 2:
+ yMin = y + descent;
+ xMax = x;
+ yMax = y + ascent;
+ if (yMin == yMax) {
+ // this is a sanity check for a case that shouldn't happen -- but
+ // if it does happen, we want to avoid dividing by zero later
+ yMin = y;
+ yMax = y + 1;
+ }
+ base = y;
+ break;
+ case 3:
+ xMin = x - ascent;
+ xMax = x - descent;
+ yMax = y;
+ if (xMin == xMax) {
+ // this is a sanity check for a case that shouldn't happen -- but
+ // if it does happen, we want to avoid dividing by zero later
+ xMin = x;
+ xMax = x + 1;
+ }
+ base = x;
+ break;
+ }
+ }
+}
+
+void TextWord::ensureCapacity(int capacity) {
+ if (capacity > size) {
+ size = std::max(size + 16, capacity);
+ text = (Unicode *)greallocn(text, size, sizeof(Unicode));
+ charcode = (CharCode *)greallocn(charcode, (size + 1), sizeof(CharCode));
+ edge = (double *)greallocn(edge, (size + 1), sizeof(double));
+ charPos = (int *)greallocn(charPos, size + 1, sizeof(int));
+ font = (TextFontInfo **)greallocn(font, size, sizeof(TextFontInfo *));
+ textMat = (Matrix *)greallocn(textMat, size, sizeof(Matrix));
+ }
+}
+
+struct CombiningTable {
+ Unicode base;
+ Unicode comb;
+};
+
+static struct CombiningTable combiningTable[] = {
+ {0x0060, 0x0300}, // grave
+ {0x00a8, 0x0308}, // dieresis
+ {0x00af, 0x0304}, // macron
+ {0x00b4, 0x0301}, // acute
+ {0x00b8, 0x0327}, // cedilla
+ {0x02c6, 0x0302}, // circumflex
+ {0x02c7, 0x030c}, // caron
+ {0x02d8, 0x0306}, // breve
+ {0x02d9, 0x0307}, // dotaccent
+ {0x02da, 0x030a}, // ring
+ {0x02dc, 0x0303}, // tilde
+ {0x02dd, 0x030b} // hungarumlaut (double acute accent)
+};
+
+// returning combining versions of characters
+Unicode getCombiningChar(Unicode u) {
+ int len = sizeof(combiningTable) / sizeof(combiningTable[0]);
+ for (int i = 0; i < len; ++i) {
+ if (u == combiningTable[i].base)
+ return combiningTable[i].comb;
+ }
+ return 0;
+}
+
+GBool TextWord::addCombining(GfxState *state, TextFontInfo *fontA, double fontSizeA, double x, double y,
+ double dx, double dy, int charPosA, int charLen,
+ CharCode c, Unicode u, Matrix textMatA) {
+ if (len == 0 || wMode != 0 || fontA->getWMode() != 0)
+ return gFalse;
+
+ Unicode cCurrent = getCombiningChar(u);
+ Unicode cPrev = getCombiningChar(text[len-1]);
+ double edgeMid = (edge[len-1] + edge[len]) / 2;
+ double charMid, maxScaledMidDelta, charBase, maxScaledBaseDelta;
+
+ if (cCurrent != 0 && unicodeTypeAlphaNum(text[len-1])) {
+ // Current is a combining character, previous is base character
+ maxScaledMidDelta = fabs(edge[len] - edge[len-1]) * combMaxMidDelta;
+ charMid = charBase = maxScaledBaseDelta = 0;
+
+ // Test if characters overlap
+ if (rot == 0 || rot == 2) {
+ charMid = x + (dx / 2);
+ charBase = y;
+ maxScaledBaseDelta = (yMax - yMin) * combMaxBaseDelta;
+ } else {
+ charMid = y + (dy / 2);
+ charBase = x;
+ maxScaledBaseDelta = (xMax - xMin) * combMaxBaseDelta;
+ }
+
+ if (fabs(charMid - edgeMid) >= maxScaledMidDelta ||
+ fabs(charBase - base) >= maxScaledBaseDelta)
+ return gFalse;
+
+ // Add character, but don't adjust edge / bounding box because
+ // combining character's positioning could be odd.
+ ensureCapacity(len+1);
+ text[len] = cCurrent;
+ charcode[len] = c;
+ charPos[len] = charPosA;
+ charPos[len+1] = charPosA + charLen;
+ font[len] = fontA;
+ textMat[len] = textMatA;
+ edge[len+1] = edge[len];
+ edge[len] = (edge[len+1] + edge[len-1]) / 2;
+ ++len;
+ return gTrue;
+ }
+
+ if (cPrev != 0 && unicodeTypeAlphaNum(u)) {
+ // Previous is a combining character, current is base character
+ maxScaledBaseDelta = (fontA->getAscent() - fontA->getDescent()) * fontSizeA * combMaxBaseDelta;
+ charMid = charBase = maxScaledMidDelta = 0;
+
+ // Test if characters overlap
+ if (rot == 0 || rot == 2) {
+ charMid = x + (dx / 2);
+ charBase = y;
+ maxScaledMidDelta = fabs(dx * combMaxMidDelta);
+ } else {
+ charMid = y + (dy / 2);
+ charBase = x;
+ maxScaledMidDelta = fabs(dy * combMaxMidDelta);
+ }
+
+ if (fabs(charMid - edgeMid) >= maxScaledMidDelta ||
+ fabs(charBase - base) >= maxScaledBaseDelta)
+ return gFalse;
+
+ // move combining character to after base character
+ ensureCapacity(len+1);
+ fontSize = fontSizeA;
+ text[len] = cPrev;
+ charcode[len] = charcode[len-1];
+ charPos[len] = charPosA;
+ charPos[len+1] = charPosA + charLen;
+ font[len] = font[len-1];
+ textMat[len] = textMat[len-1];
+
+ text[len-1] = u;
+ charcode[len-1] = c;
+ font[len-1] = fontA;
+ textMat[len-1] = textMatA;
+
+ if (len == 1)
+ setInitialBounds(fontA, x, y);
+
+ // Updated edges / bounding box because we changed the base
+ // character.
+ if (wMode) {
+ switch (rot) {
+ case 0:
+ edge[len-1] = x - fontSize;
+ xMax = edge[len+1] = x;
+ break;
+ case 1:
+ edge[len-1] = y - fontSize;
+ yMax = edge[len+1] = y;
+ break;
+ case 2:
+ edge[len-1] = x + fontSize;
+ xMin = edge[len+1] = x;
+ break;
+ case 3:
+ edge[len-1] = y + fontSize;
+ yMin = edge[len+1] = y;
+ break;
+ }
+ } else {
+ switch (rot) {
+ case 0:
+ edge[len-1] = x;
+ xMax = edge[len+1] = x + dx;
+ break;
+ case 1:
+ edge[len-1] = y;
+ yMax = edge[len+1] = y + dy;
+ break;
+ case 2:
+ edge[len-1] = x;
+ xMin = edge[len+1] = x + dx;
+ break;
+ case 3:
+ edge[len-1] = y;
+ yMin = edge[len+1] = y + dy;
+ break;
+ }
+ }
+
+ edge[len] = (edge[len+1] + edge[len-1]) / 2;
+ ++len;
+ return gTrue;
+ }
+ return gFalse;
+}
+
void TextWord::merge(TextWord *word) {
int i;
@@ -447,15 +632,7 @@ void TextWord::merge(TextWord *word) {
if (word->yMax > yMax) {
yMax = word->yMax;
}
- if (len + word->len > size) {
- size = len + word->len;
- text = (Unicode *)greallocn(text, size, sizeof(Unicode));
- charcode = (CharCode *)greallocn(charcode, (size + 1), sizeof(CharCode));
- edge = (double *)greallocn(edge, (size + 1), sizeof(double));
- charPos = (int *)greallocn(charPos, size + 1, sizeof(int));
- font = (TextFontInfo **)greallocn(font, size, sizeof(TextFontInfo *));
- textMat = (Matrix *)greallocn(textMat, size, sizeof(Matrix));
- }
+ ensureCapacity(len + word->len);
for (i = 0; i < word->len; ++i) {
text[len + i] = word->text[i];
charcode[len + i] = word->charcode[i];
@@ -2070,6 +2247,7 @@ TextPage::TextPage(GBool rawOrderA) {
haveLastFind = gFalse;
underlines = new GooList();
links = new GooList();
+ mergeCombining = gTrue;
}
TextPage::~TextPage() {
@@ -2320,6 +2498,17 @@ void TextPage::addChar(GfxState *state, double x, double y,
return;
}
+ state->getFontTransMat(&mat.m[0], &mat.m[1], &mat.m[2], &mat.m[3]);
+ mat.m[4] = x1;
+ mat.m[5] = y1;
+
+ if (mergeCombining && curWord && uLen == 1 &&
+ curWord->addCombining(state, curFont, curFontSize, x1, y1, w1, h1, charPos, nBytes, c,
+ u[0], mat)) {
+ charPos += nBytes;
+ return;
+ }
+
// start a new word if:
// (1) this character doesn't fall in the right place relative to
// the end of the previous word (this places upper and lower
@@ -2356,7 +2545,7 @@ void TextPage::addChar(GfxState *state, double x, double y,
}
overlap = fabs(delta) < dupMaxPriDelta * curWord->fontSize &&
fabs(base - curWord->base) < dupMaxSecDelta * curWord->fontSize;
- wMode = curFont->gfxFont ? curFont->gfxFont->getWMode() : 0;
+ wMode = curFont->getWMode();
if (overlap || lastCharOverlap ||
sp < -minDupBreakOverlap * curWord->fontSize ||
sp > minWordBreakSpace * curWord->fontSize ||
@@ -2376,10 +2565,6 @@ void TextPage::addChar(GfxState *state, double x, double y,
beginWord(state);
}
- state->getFontTransMat(&mat.m[0], &mat.m[1], &mat.m[2], &mat.m[3]);
- mat.m[4] = x1;
- mat.m[5] = y1;
-
// page rotation and/or transform matrices can cause text to be
// drawn in reverse order -- in this case, swap the begin/end
// coordinates and break text into individual chars
@@ -5043,6 +5228,10 @@ void TextPage::dump(void *outputStream, TextOutputFunc outputFunc,
uMap->decRefCnt();
}
+void TextPage::setMergeCombining(GBool merge) {
+ mergeCombining = merge;
+}
+
void TextPage::assignColumns(TextLineFrag *frags, int nFrags, GBool oneRot) {
TextLineFrag *frag0, *frag1;
int rot, col1, col2, i, j, k;
@@ -5610,6 +5799,10 @@ GBool TextOutputDev::findCharRange(int pos, int length,
return text->findCharRange(pos, length, xMin, yMin, xMax, yMax);
}
+void TextOutputDev::setMergeCombining(GBool merge) {
+ text->setMergeCombining(merge);
+}
+
#if TEXTOUT_WORD_LIST
TextWordList *TextOutputDev::makeWordList() {
return text->makeWordList(physLayout);
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/TextOutputDev.h
index 23fb3b726a9..a0aa6f8a991 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/TextOutputDev.h
@@ -19,7 +19,7 @@
// Copyright (C) 2007 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2010 Brian Ewins <brian.ewins@gmail.com>
-// Copyright (C) 2012, 2013 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2012, 2013, 2015 Jason Crain <jason@aquaticape.us>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
//
// To see a description of the changes please see the Changelog file that
@@ -82,6 +82,15 @@ public:
GBool matches(GfxState *state);
GBool matches(TextFontInfo *fontInfo);
+ // Get the font ascent, or a default value if the font is not set
+ double getAscent();
+
+ // Get the font descent, or a default value if the font is not set
+ double getDescent();
+
+ // Get the writing mode (0 or 1), or 0 if the font is not set
+ int getWMode();
+
#if TEXTOUT_WORD_LIST
// Get the font name (which may be NULL).
GooString *getFontName() { return fontName; }
@@ -125,6 +134,14 @@ public:
double dx, double dy, int charPosA, int charLen,
CharCode c, Unicode u, Matrix textMatA);
+ // Attempt to add a character to the word as a combining character.
+ // Either character u or the last character in the word must be an
+ // acute, dieresis, or other combining character. Returns true if
+ // the character was added.
+ GBool addCombining(GfxState *state, TextFontInfo *fontA, double fontSizeA, double x, double y,
+ double dx, double dy, int charPosA, int charLen,
+ CharCode c, Unicode u, Matrix textMatA);
+
// Merge <word> onto the end of <this>.
void merge(TextWord *word);
@@ -172,6 +189,8 @@ public:
GBool hasSpaceAfter () { return spaceAfter; }
TextWord* nextWord () { return next; };
private:
+ void ensureCapacity(int capacity);
+ void setInitialBounds(TextFontInfo *fontA, double x, double y);
int rot; // rotation, multiple of 90 degrees
// (0, 1, 2, or 3)
@@ -601,6 +620,10 @@ public:
// Get the head of the linked list of TextFlows.
TextFlow *getFlows() { return flows; }
+ // If true, will combine characters when a base and combining
+ // character are drawn on eachother.
+ void setMergeCombining(GBool merge);
+
#if TEXTOUT_WORD_LIST
// Build a flat word list, in content stream order (if
// this->rawOrder is true), physical layout order (if <physLayout>
@@ -619,6 +642,8 @@ private:
int dumpFragment(Unicode *text, int len, UnicodeMap *uMap, GooString *s);
GBool rawOrder; // keep text in content stream order
+ GBool mergeCombining; // merge when combining and base characters
+ // are drawn on top of each other
double pageWidth, pageHeight; // width and height of current page
TextWord *curWord; // currently active string
@@ -814,6 +839,10 @@ public:
GooString *getSelectionText(PDFRectangle *selection,
SelectionStyle style);
+ // If true, will combine characters when a base and combining
+ // character are drawn on eachother.
+ void setMergeCombining(GBool merge);
+
#if TEXTOUT_WORD_LIST
// Build a flat word list, in content stream order (if
// this->rawOrder is true), physical layout order (if
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/XRef.cc
index 1bbbdc51c25..1bbbdc51c25 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.33.0/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.33.0/poppler/XpdfPluginAPI.h
index 6ed890a8f1f..6ed890a8f1f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.33.0/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.33.0/poppler/poppler-config.h.cmake
index b087a693f92..b087a693f92 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.33.0/poppler/poppler-config.h.in
index f73d0f66ee9..f73d0f66ee9 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.32.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.33.0/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.33.0/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.33.0/splash/Makefile.am
index 5c265d6360c..5c265d6360c 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/Splash.cc
index d8ee6409605..d8ee6409605 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/Splash.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/Splash.h b/Build/source/libs/poppler/poppler-0.33.0/splash/Splash.h
index cf98e6c6824..cf98e6c6824 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/Splash.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashBitmap.cc
index e886683fd41..e886683fd41 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashBitmap.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashBitmap.h
index 70509abcfaa..70509abcfaa 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFont.cc
index b785826d66b..b785826d66b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontFile.cc
index f0dcf50384b..f0dcf50384b 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFont.cc
index 3d6d6b2343e..3d6d6b2343e 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontEngine.cc
index 968e8207362..968e8207362 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPattern.h
index e678c9e20e6..e678c9e20e6 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashState.cc
index fd2789d02f9..fd2789d02f9 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashState.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashState.h
index 2c603531cfd..2c603531cfd 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashState.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPathScanner.cc
index ac47881cb4f..ac47881cb4f 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPathScanner.cc
diff --git a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPathScanner.h
index cc295cb68fe..cc295cb68fe 100644
--- a/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index 20359d39c41..2be18a5ae09 100644
--- a/Build/source/libs/poppler/version.ac
+++ b/Build/source/libs/poppler/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.32.0])
+m4_define([poppler_version], [0.33.0])