From 4e5efbb798293e6b8926a8c01e00ba99bb8ef885 Mon Sep 17 00:00:00 2001
From: Luigi Scarso <luigi.scarso@gmail.com>
Date: Mon, 12 Oct 2015 08:08:01 +0000
Subject: [PATCH] sinc with TL rev. 38618.
---
source/build-aux/texinfo.tex | 32 ++-
source/libs/README | 6 +-
source/libs/poppler/ChangeLog | 5 +
source/libs/poppler/Makefile.in | 4 +-
source/libs/poppler/configure | 30 +--
.../ChangeLog | 7 +
.../TL-Changes | 2 +-
.../patch-02-LLONG_MAX | 6 +-
.../patch-03-Object-functions | 6 +-
.../AUTHORS | 0
.../CMakeLists.txt | 4 +-
.../COPYING | 0
.../ChangeLog | 186 ++++++++++++++++++
.../ConfigureChecks.cmake | 0
.../INSTALL | 0
.../Makefile.am | 0
.../{poppler-0.36.0 => poppler-0.37.0}/NEWS | 18 +-
.../{poppler-0.36.0 => poppler-0.37.0}/README | 0
.../README-XPDF | 0
.../{poppler-0.36.0 => poppler-0.37.0}/TODO | 0
.../config.h.cmake | 0
.../config.h.in | 0
.../configure.ac | 6 +-
.../fofi/FoFiBase.cc | 0
.../fofi/FoFiBase.h | 0
.../fofi/FoFiEncodings.cc | 0
.../fofi/FoFiEncodings.h | 0
.../fofi/FoFiIdentifier.cc | 0
.../fofi/FoFiIdentifier.h | 0
.../fofi/FoFiTrueType.cc | 0
.../fofi/FoFiTrueType.h | 0
.../fofi/FoFiType1.cc | 0
.../fofi/FoFiType1.h | 0
.../fofi/FoFiType1C.cc | 0
.../fofi/FoFiType1C.h | 0
.../fofi/Makefile.am | 0
.../goo/FixedPoint.cc | 0
.../goo/FixedPoint.h | 0
.../goo/GooHash.cc | 0
.../goo/GooHash.h | 0
.../goo/GooLikely.h | 0
.../goo/GooList.cc | 0
.../goo/GooList.h | 0
.../goo/GooMutex.h | 0
.../goo/GooString.cc | 0
.../goo/GooString.h | 0
.../goo/GooTimer.cc | 0
.../goo/GooTimer.h | 0
.../goo/ImgWriter.cc | 0
.../goo/ImgWriter.h | 0
.../goo/JpegWriter.cc | 0
.../goo/JpegWriter.h | 0
.../goo/Makefile.am | 0
.../goo/NetPBMWriter.cc | 0
.../goo/NetPBMWriter.h | 0
.../goo/PNGWriter.cc | 0
.../goo/PNGWriter.h | 0
.../goo/TiffWriter.cc | 0
.../goo/TiffWriter.h | 0
.../goo/gfile.cc | 0
.../goo/gfile.h | 0
.../goo/gmem.cc | 0
.../goo/gmem.h | 0
.../goo/gmempp.cc | 0
.../goo/grandom.cc | 0
.../goo/grandom.h | 0
.../goo/gstrtod.cc | 0
.../goo/gstrtod.h | 0
.../goo/gtypes.h | 0
.../goo/gtypes_p.h | 0
.../gtk-doc.make | 20 +-
.../poppler-cairo-uninstalled.pc.in | 0
.../poppler-cairo.pc.cmake | 0
.../poppler-cairo.pc.in | 0
.../poppler-cpp-uninstalled.pc.in | 0
.../poppler-cpp.pc.cmake | 0
.../poppler-cpp.pc.in | 0
.../poppler-glib-uninstalled.pc.in | 0
.../poppler-glib.pc.cmake | 0
.../poppler-glib.pc.in | 0
.../poppler-qt4-uninstalled.pc.in | 0
.../poppler-qt4.pc.cmake | 0
.../poppler-qt4.pc.in | 0
.../poppler-qt5-uninstalled.pc.in | 0
.../poppler-qt5.pc.cmake | 0
.../poppler-qt5.pc.in | 0
.../poppler-splash-uninstalled.pc.in | 0
.../poppler-splash.pc.cmake | 0
.../poppler-splash.pc.in | 0
.../poppler-uninstalled.pc.in | 0
.../poppler.pc.cmake | 0
.../poppler.pc.in | 0
.../poppler/Annot.cc | 7 +-
.../poppler/Annot.h | 0
.../poppler/Array.cc | 0
.../poppler/Array.h | 0
.../poppler/BuiltinFont.cc | 0
.../poppler/BuiltinFont.h | 0
.../poppler/BuiltinFontTables.cc | 0
.../poppler/BuiltinFontTables.h | 0
.../poppler/CMap.cc | 0
.../poppler/CMap.h | 0
.../poppler/CachedFile.cc | 0
.../poppler/CachedFile.h | 0
.../poppler/CairoFontEngine.cc | 0
.../poppler/CairoFontEngine.h | 0
.../poppler/CairoOutputDev.cc | 10 +-
.../poppler/CairoOutputDev.h | 0
.../poppler/CairoRescaleBox.cc | 0
.../poppler/CairoRescaleBox.h | 0
.../poppler/Catalog.cc | 24 ++-
.../poppler/Catalog.h | 0
.../poppler/CharCodeToUnicode.cc | 0
.../poppler/CharCodeToUnicode.h | 0
.../poppler/CharTypes.h | 0
.../poppler/CompactFontTables.h | 0
.../poppler/CurlCachedFile.cc | 0
.../poppler/CurlCachedFile.h | 0
.../poppler/CurlPDFDocBuilder.cc | 0
.../poppler/CurlPDFDocBuilder.h | 0
.../poppler/DCTStream.cc | 0
.../poppler/DCTStream.h | 0
.../poppler/DateInfo.cc | 0
.../poppler/DateInfo.h | 0
.../poppler/Decrypt.cc | 0
.../poppler/Decrypt.h | 0
.../poppler/Dict.cc | 0
.../poppler/Dict.h | 0
.../poppler/Error.cc | 0
.../poppler/Error.h | 0
.../poppler/ErrorCodes.h | 0
.../poppler/FileSpec.cc | 0
.../poppler/FileSpec.h | 0
.../poppler/FlateStream.cc | 0
.../poppler/FlateStream.h | 0
.../poppler/FontEncodingTables.cc | 0
.../poppler/FontEncodingTables.h | 0
.../poppler/FontInfo.cc | 0
.../poppler/FontInfo.h | 0
.../poppler/Form.cc | 0
.../poppler/Form.h | 0
.../poppler/Function.cc | 0
.../poppler/Function.h | 0
.../poppler/Gfx.cc | 0
.../poppler/Gfx.h | 0
.../poppler/GfxFont.cc | 0
.../poppler/GfxFont.h | 11 ++
.../poppler/GfxState.cc | 26 ++-
.../poppler/GfxState.h | 0
.../poppler/GfxState_helpers.h | 0
.../poppler/GlobalParams.cc | 0
.../poppler/GlobalParams.h | 0
.../poppler/GlobalParamsWin.cc | 0
.../poppler/Hints.cc | 0
.../poppler/Hints.h | 0
.../poppler/JArithmeticDecoder.cc | 0
.../poppler/JArithmeticDecoder.h | 0
.../poppler/JBIG2Stream.cc | 11 +-
.../poppler/JBIG2Stream.h | 0
.../poppler/JPEG2000Stream.cc | 0
.../poppler/JPEG2000Stream.h | 0
.../poppler/JPXStream.cc | 0
.../poppler/JPXStream.h | 0
.../poppler/Lexer.cc | 0
.../poppler/Lexer.h | 0
.../poppler/Linearization.cc | 0
.../poppler/Linearization.h | 0
.../poppler/Link.cc | 0
.../poppler/Link.h | 0
.../poppler/LocalPDFDocBuilder.cc | 0
.../poppler/LocalPDFDocBuilder.h | 0
.../poppler/Makefile.am | 2 +-
.../poppler/MarkedContentOutputDev.cc | 0
.../poppler/MarkedContentOutputDev.h | 0
.../poppler/Movie.cc | 0
.../poppler/Movie.h | 0
.../poppler/NameToCharCode.cc | 0
.../poppler/NameToCharCode.h | 0
.../poppler/NameToUnicodeTable.h | 0
.../poppler/Object.cc | 0
.../poppler/Object.h | 0
.../poppler/OptionalContent.cc | 0
.../poppler/OptionalContent.h | 0
.../poppler/Outline.cc | 0
.../poppler/Outline.h | 0
.../poppler/OutputDev.cc | 0
.../poppler/OutputDev.h | 0
.../poppler/PDFDoc.cc | 0
.../poppler/PDFDoc.h | 0
.../poppler/PDFDocBuilder.h | 0
.../poppler/PDFDocEncoding.cc | 0
.../poppler/PDFDocEncoding.h | 0
.../poppler/PDFDocFactory.cc | 0
.../poppler/PDFDocFactory.h | 0
.../poppler/PSOutputDev.cc | 0
.../poppler/PSOutputDev.h | 0
.../poppler/PSTokenizer.cc | 0
.../poppler/PSTokenizer.h | 0
.../poppler/Page.cc | 0
.../poppler/Page.h | 0
.../poppler/PageLabelInfo.cc | 0
.../poppler/PageLabelInfo.h | 0
.../poppler/PageLabelInfo_p.h | 0
.../poppler/PageTransition.cc | 5 +-
.../poppler/PageTransition.h | 5 +-
.../poppler/Parser.cc | 0
.../poppler/Parser.h | 0
.../poppler/PopplerCache.cc | 0
.../poppler/PopplerCache.h | 0
.../poppler/PreScanOutputDev.cc | 0
.../poppler/PreScanOutputDev.h | 0
.../poppler/ProfileData.cc | 0
.../poppler/ProfileData.h | 0
.../poppler/Rendition.cc | 0
.../poppler/Rendition.h | 0
.../poppler/SecurityHandler.cc | 0
.../poppler/SecurityHandler.h | 0
.../poppler/Sound.cc | 0
.../poppler/Sound.h | 0
.../poppler/SplashOutputDev.cc | 32 ++-
.../poppler/SplashOutputDev.h | 0
.../poppler/StdinCachedFile.cc | 0
.../poppler/StdinCachedFile.h | 0
.../poppler/StdinPDFDocBuilder.cc | 0
.../poppler/StdinPDFDocBuilder.h | 0
.../poppler/Stream-CCITT.h | 0
.../poppler/Stream.cc | 0
.../poppler/Stream.h | 0
.../poppler/StructElement.cc | 0
.../poppler/StructElement.h | 0
.../poppler/StructTreeRoot.cc | 0
.../poppler/StructTreeRoot.h | 0
.../poppler/TextOutputDev.cc | 0
.../poppler/TextOutputDev.h | 0
.../poppler/UTF.cc | 0
.../poppler/UTF.h | 0
.../poppler/UTF8.h | 0
.../poppler/UnicodeCClassTables.h | 0
.../poppler/UnicodeCompTables.h | 0
.../poppler/UnicodeDecompTables.h | 0
.../poppler/UnicodeMap.cc | 0
.../poppler/UnicodeMap.h | 0
.../poppler/UnicodeMapTables.h | 0
.../poppler/UnicodeTypeTable.cc | 0
.../poppler/UnicodeTypeTable.h | 0
.../poppler/ViewerPreferences.cc | 0
.../poppler/ViewerPreferences.h | 0
.../poppler/XRef.cc | 0
.../poppler/XRef.h | 0
.../poppler/XpdfPluginAPI.cc | 0
.../poppler/XpdfPluginAPI.h | 0
.../poppler/gen-unicode-tables.py | 0
.../poppler/poppler-config.h.cmake | 0
.../poppler/poppler-config.h.in | 0
.../poppler/strtok_r.cpp | 0
.../splash/Makefile.am | 0
.../splash/Splash.cc | 0
.../splash/Splash.h | 0
.../splash/SplashBitmap.cc | 0
.../splash/SplashBitmap.h | 0
.../splash/SplashClip.cc | 0
.../splash/SplashClip.h | 0
.../splash/SplashErrorCodes.h | 0
.../splash/SplashFTFont.cc | 0
.../splash/SplashFTFont.h | 0
.../splash/SplashFTFontEngine.cc | 0
.../splash/SplashFTFontEngine.h | 0
.../splash/SplashFTFontFile.cc | 0
.../splash/SplashFTFontFile.h | 0
.../splash/SplashFont.cc | 0
.../splash/SplashFont.h | 0
.../splash/SplashFontEngine.cc | 0
.../splash/SplashFontEngine.h | 0
.../splash/SplashFontFile.cc | 0
.../splash/SplashFontFile.h | 0
.../splash/SplashFontFileID.cc | 0
.../splash/SplashFontFileID.h | 0
.../splash/SplashGlyphBitmap.h | 0
.../splash/SplashMath.h | 0
.../splash/SplashPath.cc | 0
.../splash/SplashPath.h | 0
.../splash/SplashPattern.cc | 0
.../splash/SplashPattern.h | 0
.../splash/SplashScreen.cc | 0
.../splash/SplashScreen.h | 0
.../splash/SplashState.cc | 0
.../splash/SplashState.h | 0
.../splash/SplashT1Font.cc | 0
.../splash/SplashT1Font.h | 0
.../splash/SplashT1FontEngine.cc | 0
.../splash/SplashT1FontEngine.h | 0
.../splash/SplashT1FontFile.cc | 0
.../splash/SplashT1FontFile.h | 0
.../splash/SplashTypes.h | 0
.../splash/SplashXPath.cc | 0
.../splash/SplashXPath.h | 0
.../splash/SplashXPathScanner.cc | 0
.../splash/SplashXPathScanner.h | 0
source/libs/poppler/version.ac | 2 +-
source/texk/README | 4 +-
source/texk/web2c/luatexdir/ChangeLog | 5 +
.../web2c/luatexdir/luafontloader/ChangeLog | 8 +
.../fontforge/fontforge/splinefont.h | 2 +-
.../fontforge/fontforge/splinesaveafm.c | 2 +-
.../luatexdir/luafontloader/src/luafflib.c | 12 +-
305 files changed, 416 insertions(+), 84 deletions(-)
rename source/libs/poppler/{poppler-0.36.0-PATCHES => poppler-0.37.0-PATCHES}/ChangeLog (97%)
rename source/libs/poppler/{poppler-0.36.0-PATCHES => poppler-0.37.0-PATCHES}/TL-Changes (83%)
rename source/libs/poppler/{poppler-0.36.0-PATCHES => poppler-0.37.0-PATCHES}/patch-02-LLONG_MAX (76%)
rename source/libs/poppler/{poppler-0.36.0-PATCHES => poppler-0.37.0-PATCHES}/patch-03-Object-functions (87%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/AUTHORS (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/CMakeLists.txt (99%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/COPYING (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/ChangeLog (99%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/ConfigureChecks.cmake (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/INSTALL (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/Makefile.am (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/NEWS (99%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/README (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/README-XPDF (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/TODO (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/config.h.cmake (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/config.h.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/configure.ac (99%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiBase.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiBase.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiEncodings.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiEncodings.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiIdentifier.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiIdentifier.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiTrueType.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiTrueType.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiType1.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiType1.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiType1C.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/FoFiType1C.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/fofi/Makefile.am (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/FixedPoint.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/FixedPoint.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/GooHash.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/GooHash.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/GooLikely.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/GooList.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/GooList.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/GooMutex.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/GooString.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/GooString.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/GooTimer.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/GooTimer.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/ImgWriter.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/ImgWriter.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/JpegWriter.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/JpegWriter.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/Makefile.am (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/NetPBMWriter.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/NetPBMWriter.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/PNGWriter.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/PNGWriter.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/TiffWriter.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/TiffWriter.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/gfile.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/gfile.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/gmem.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/gmem.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/gmempp.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/grandom.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/grandom.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/gstrtod.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/gstrtod.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/gtypes.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/goo/gtypes_p.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/gtk-doc.make (95%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-cairo-uninstalled.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-cairo.pc.cmake (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-cairo.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-cpp-uninstalled.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-cpp.pc.cmake (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-cpp.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-glib-uninstalled.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-glib.pc.cmake (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-glib.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-qt4-uninstalled.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-qt4.pc.cmake (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-qt4.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-qt5-uninstalled.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-qt5.pc.cmake (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-qt5.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-splash-uninstalled.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-splash.pc.cmake (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-splash.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler-uninstalled.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler.pc.cmake (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler.pc.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Annot.cc (99%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Annot.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Array.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Array.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/BuiltinFont.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/BuiltinFont.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/BuiltinFontTables.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/BuiltinFontTables.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CMap.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CMap.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CachedFile.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CachedFile.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CairoFontEngine.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CairoFontEngine.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CairoOutputDev.cc (99%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CairoOutputDev.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CairoRescaleBox.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CairoRescaleBox.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Catalog.cc (97%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Catalog.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CharCodeToUnicode.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CharCodeToUnicode.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CharTypes.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CompactFontTables.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CurlCachedFile.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CurlCachedFile.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CurlPDFDocBuilder.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/CurlPDFDocBuilder.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/DCTStream.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/DCTStream.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/DateInfo.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/DateInfo.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Decrypt.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Decrypt.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Dict.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Dict.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Error.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Error.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/ErrorCodes.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/FileSpec.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/FileSpec.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/FlateStream.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/FlateStream.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/FontEncodingTables.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/FontEncodingTables.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/FontInfo.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/FontInfo.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Form.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Form.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Function.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Function.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Gfx.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Gfx.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/GfxFont.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/GfxFont.h (97%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/GfxState.cc (99%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/GfxState.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/GfxState_helpers.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/GlobalParams.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/GlobalParams.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/GlobalParamsWin.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Hints.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Hints.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/JArithmeticDecoder.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/JArithmeticDecoder.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/JBIG2Stream.cc (99%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/JBIG2Stream.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/JPEG2000Stream.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/JPEG2000Stream.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/JPXStream.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/JPXStream.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Lexer.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Lexer.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Linearization.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Linearization.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Link.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Link.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/LocalPDFDocBuilder.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/LocalPDFDocBuilder.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Makefile.am (99%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/MarkedContentOutputDev.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/MarkedContentOutputDev.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Movie.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Movie.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/NameToCharCode.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/NameToCharCode.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/NameToUnicodeTable.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Object.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Object.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/OptionalContent.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/OptionalContent.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Outline.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Outline.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/OutputDev.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/OutputDev.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PDFDoc.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PDFDoc.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PDFDocBuilder.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PDFDocEncoding.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PDFDocEncoding.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PDFDocFactory.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PDFDocFactory.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PSOutputDev.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PSOutputDev.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PSTokenizer.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PSTokenizer.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Page.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Page.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PageLabelInfo.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PageLabelInfo.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PageLabelInfo_p.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PageTransition.cc (96%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PageTransition.h (94%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Parser.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Parser.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PopplerCache.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PopplerCache.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PreScanOutputDev.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/PreScanOutputDev.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/ProfileData.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/ProfileData.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Rendition.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Rendition.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/SecurityHandler.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/SecurityHandler.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Sound.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Sound.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/SplashOutputDev.cc (99%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/SplashOutputDev.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/StdinCachedFile.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/StdinCachedFile.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/StdinPDFDocBuilder.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/StdinPDFDocBuilder.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Stream-CCITT.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Stream.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/Stream.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/StructElement.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/StructElement.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/StructTreeRoot.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/StructTreeRoot.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/TextOutputDev.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/TextOutputDev.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UTF.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UTF.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UTF8.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UnicodeCClassTables.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UnicodeCompTables.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UnicodeDecompTables.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UnicodeMap.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UnicodeMap.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UnicodeMapTables.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UnicodeTypeTable.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/UnicodeTypeTable.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/ViewerPreferences.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/ViewerPreferences.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/XRef.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/XRef.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/XpdfPluginAPI.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/XpdfPluginAPI.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/gen-unicode-tables.py (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/poppler-config.h.cmake (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/poppler-config.h.in (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/poppler/strtok_r.cpp (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/Makefile.am (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/Splash.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/Splash.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashBitmap.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashBitmap.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashClip.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashClip.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashErrorCodes.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFTFont.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFTFont.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFTFontEngine.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFTFontEngine.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFTFontFile.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFTFontFile.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFont.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFont.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFontEngine.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFontEngine.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFontFile.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFontFile.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFontFileID.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashFontFileID.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashGlyphBitmap.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashMath.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashPath.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashPath.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashPattern.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashPattern.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashScreen.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashScreen.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashState.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashState.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashT1Font.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashT1Font.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashT1FontEngine.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashT1FontEngine.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashT1FontFile.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashT1FontFile.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashTypes.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashXPath.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashXPath.h (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashXPathScanner.cc (100%)
rename source/libs/poppler/{poppler-0.36.0 => poppler-0.37.0}/splash/SplashXPathScanner.h (100%)
diff --git a/source/build-aux/texinfo.tex b/source/build-aux/texinfo.tex
index 6a81594bd..46a9d1535 100644
--- a/source/build-aux/texinfo.tex
+++ b/source/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2015-10-06.21}
+\def\texinfoversion{2015-10-09.18}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -530,14 +530,13 @@
%
\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
+
+% \parseargdef - define a command taking an argument on the line
+%
% \parseargdef\foo{...}
% is roughly equivalent to
% \def\foo{\parsearg\Xfoo}
% \def\Xfoo#1{...}
-%
-% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my
-% favourite TeX trick. --kasal, 16nov03
-
\def\parseargdef#1{%
\expandafter \doparseargdef \csname\string#1\endcsname #1%
}
@@ -9349,7 +9348,8 @@ directory should work if nowhere else does.}
% @documentencoding sets the definition of non-ASCII characters
% according to the specified encoding.
%
-\parseargdef\documentencoding{%
+\def\documentencoding{\parseargusing\filenamecatcodes\documentencodingzzz}
+\def\documentencodingzzz#1{%
% Encoding being declared for the document.
\def\declaredencoding{\csname #1.enc\endcsname}%
%
@@ -10076,6 +10076,9 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{02DB}{\ogonek{ }}
+ % Greek letters
+ \DeclareUnicodeCharacter{03C0}{\ensuremath\pi}
+
\DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
\DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
\DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
@@ -10203,6 +10206,7 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{1EF8}{\~Y}
\DeclareUnicodeCharacter{1EF9}{\~y}
+ % Punctuation
\DeclareUnicodeCharacter{2013}{--}
\DeclareUnicodeCharacter{2014}{---}
\DeclareUnicodeCharacter{2018}{\quoteleft}
@@ -10214,18 +10218,34 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{2020}{\ensuremath\dagger}
\DeclareUnicodeCharacter{2021}{\ensuremath\ddagger}
\DeclareUnicodeCharacter{2022}{\bullet}
+ \DeclareUnicodeCharacter{202F}{\thinspace}
\DeclareUnicodeCharacter{2026}{\dots}
\DeclareUnicodeCharacter{2039}{\guilsinglleft}
\DeclareUnicodeCharacter{203A}{\guilsinglright}
+
\DeclareUnicodeCharacter{20AC}{\euro}
\DeclareUnicodeCharacter{2192}{\expansion}
\DeclareUnicodeCharacter{21D2}{\result}
+ % Mathematical symbols
+ \DeclareUnicodeCharacter{2200}{\ensuremath\forall}
+ \DeclareUnicodeCharacter{2203}{\ensuremath\exists}
+ \DeclareUnicodeCharacter{2208}{\ensuremath\in}
\DeclareUnicodeCharacter{2212}{\minus}
\DeclareUnicodeCharacter{2217}{\point}
+ \DeclareUnicodeCharacter{221E}{\ensuremath\infty}
\DeclareUnicodeCharacter{2225}{\ensuremath\parallel}
+ \DeclareUnicodeCharacter{2227}{\ensuremath\wedge}
+ \DeclareUnicodeCharacter{2229}{\ensuremath\cap}
\DeclareUnicodeCharacter{2261}{\equiv}
+ \DeclareUnicodeCharacter{2264}{\ensuremath\leq}
+ \DeclareUnicodeCharacter{2265}{\ensuremath\geq}
+ \DeclareUnicodeCharacter{2282}{\ensuremath\subset}
+ \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq}
+
+ \global\mathchardef\checkmark="1370 % actually the square root sign
+ \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark}
}% end of \utfeightchardefs
% US-ASCII character definitions.
diff --git a/source/libs/README b/source/libs/README
index 4f5cd44e1..f7a530bf7 100644
--- a/source/libs/README
+++ b/source/libs/README
@@ -1,4 +1,4 @@
-$Id: README 38545 2015-10-04 13:05:32Z peter $
+$Id: README 38609 2015-10-10 09:55:58Z peter $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -27,7 +27,7 @@ graphite2 1.3.3 - checked 27sep15
harfbuzz 1.0.4 - checked 1oct15
http://www.freedesktop.org/software/harfbuzz/release/
-icu 56.1 (rc) - checked 27sep15
+icu 56.1 (release) - checked 8oct15
http://download.icu-project.org/files/icu4c/
libpaper 1.1.24+nmu2 - checked 24oct13
@@ -49,7 +49,7 @@ mpfr 3.1.3 - checked 20jun15
pixman 0.32.8 - checked 27sep15
http://cairographics.org/releases/
-poppler 0.36.0 - checked 10sep15
+poppler 0.37.0 - checked 10oct15
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.12 - checked 27mar15
diff --git a/source/libs/poppler/ChangeLog b/source/libs/poppler/ChangeLog
index ac836d001..ebb76cea7 100644
--- a/source/libs/poppler/ChangeLog
+++ b/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.37.0.
+ * version.ac: Adjust.
+
2015-09-10 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.36.0.
diff --git a/source/libs/poppler/Makefile.in b/source/libs/poppler/Makefile.in
index bc38c7974..a84f23a01 100644
--- a/source/libs/poppler/Makefile.in
+++ b/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.36.0/poppler/poppler-config.h.in \
+ $(top_srcdir)/poppler-0.37.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.36.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.37.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/source/libs/poppler/configure b/source/libs/poppler/configure
index d8934ab54..8ae39948f 100755
--- a/source/libs/poppler/configure
+++ b/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.36.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.37.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.36.0'
-PACKAGE_STRING='poppler (TeX Live) 0.36.0'
+PACKAGE_VERSION='0.37.0'
+PACKAGE_STRING='poppler (TeX Live) 0.37.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.36.0/poppler/Array.cc"
+ac_unique_file="poppler-0.37.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.36.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.37.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.36.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.37.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.36.0
+poppler (TeX Live) configure 0.37.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.36.0, which was
+It was created by poppler (TeX Live) $as_me 0.37.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.36.0'
+ VERSION='0.37.0'
# Some tools Automake needs.
@@ -6573,12 +6573,12 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.36.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.37.0/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.36.0"
+#define POPPLER_VERSION "0.37.0"
_ACEOF
@@ -6712,7 +6712,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.36.0
+POPPLER_TREE=poppler-0.37.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.36.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.37.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.36.0
+poppler (TeX Live) config.status 0.37.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.36.0/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.37.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/source/libs/poppler/poppler-0.36.0-PATCHES/ChangeLog b/source/libs/poppler/poppler-0.37.0-PATCHES/ChangeLog
similarity index 97%
rename from source/libs/poppler/poppler-0.36.0-PATCHES/ChangeLog
rename to source/libs/poppler/poppler-0.37.0-PATCHES/ChangeLog
index 8f51405dd..ce2c6d5ff 100644
--- a/source/libs/poppler/poppler-0.36.0-PATCHES/ChangeLog
+++ b/source/libs/poppler/poppler-0.37.0-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.37.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
2015-09-10 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported poppler-0.36.0 source tree from:
diff --git a/source/libs/poppler/poppler-0.36.0-PATCHES/TL-Changes b/source/libs/poppler/poppler-0.37.0-PATCHES/TL-Changes
similarity index 83%
rename from source/libs/poppler/poppler-0.36.0-PATCHES/TL-Changes
rename to source/libs/poppler/poppler-0.37.0-PATCHES/TL-Changes
index 3882f0cbf..0e0ed2e9e 100644
--- a/source/libs/poppler/poppler-0.36.0-PATCHES/TL-Changes
+++ b/source/libs/poppler/poppler-0.37.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.36.0 tree as obtained from:
+Changes applied to the poppler-0.37.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
diff --git a/source/libs/poppler/poppler-0.36.0-PATCHES/patch-02-LLONG_MAX b/source/libs/poppler/poppler-0.37.0-PATCHES/patch-02-LLONG_MAX
similarity index 76%
rename from source/libs/poppler/poppler-0.36.0-PATCHES/patch-02-LLONG_MAX
rename to source/libs/poppler/poppler-0.37.0-PATCHES/patch-02-LLONG_MAX
index f0dee49b3..a9eb70511 100644
--- a/source/libs/poppler/poppler-0.36.0-PATCHES/patch-02-LLONG_MAX
+++ b/source/libs/poppler/poppler-0.37.0-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.36.0.orig/goo/GooString.h poppler-0.36.0/goo/GooString.h
---- poppler-0.36.0.orig/goo/GooString.h 2015-07-12 17:05:10.000000000 +0200
-+++ poppler-0.36.0/goo/GooString.h 2015-08-10 09:38:59.000000000 +0200
+diff -ur poppler-0.37.0.orig/goo/GooString.h poppler-0.37.0/goo/GooString.h
+--- poppler-0.37.0.orig/goo/GooString.h 2015-07-12 17:05:10.000000000 +0200
++++ poppler-0.37.0/goo/GooString.h 2015-08-10 09:38:59.000000000 +0200
@@ -35,6 +35,21 @@
#endif
diff --git a/source/libs/poppler/poppler-0.36.0-PATCHES/patch-03-Object-functions b/source/libs/poppler/poppler-0.37.0-PATCHES/patch-03-Object-functions
similarity index 87%
rename from source/libs/poppler/poppler-0.36.0-PATCHES/patch-03-Object-functions
rename to source/libs/poppler/poppler-0.37.0-PATCHES/patch-03-Object-functions
index 4eeab4f4d..b78dc76ce 100644
--- a/source/libs/poppler/poppler-0.36.0-PATCHES/patch-03-Object-functions
+++ b/source/libs/poppler/poppler-0.37.0-PATCHES/patch-03-Object-functions
@@ -1,6 +1,6 @@
-diff -ur poppler-0.36.0.orig/poppler/Object.h poppler-0.36.0/poppler/Object.h
---- poppler-0.36.0.orig/poppler/Object.h 2015-08-17 19:47:55.000000000 +0200
-+++ poppler-0.36.0/poppler/Object.h 2015-09-10 08:15:10.000000000 +0200
+diff -ur poppler-0.37.0.orig/poppler/Object.h poppler-0.37.0/poppler/Object.h
+--- poppler-0.37.0.orig/poppler/Object.h 2015-08-17 19:47:55.000000000 +0200
++++ poppler-0.37.0/poppler/Object.h 2015-09-10 08:15:10.000000000 +0200
@@ -140,7 +140,7 @@
Object *initStream(Stream *streamA);
Object *initRef(int numA, int genA)
diff --git a/source/libs/poppler/poppler-0.36.0/AUTHORS b/source/libs/poppler/poppler-0.37.0/AUTHORS
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/AUTHORS
rename to source/libs/poppler/poppler-0.37.0/AUTHORS
diff --git a/source/libs/poppler/poppler-0.36.0/CMakeLists.txt b/source/libs/poppler/poppler-0.37.0/CMakeLists.txt
similarity index 99%
rename from source/libs/poppler/poppler-0.36.0/CMakeLists.txt
rename to source/libs/poppler/poppler-0.37.0/CMakeLists.txt
index ac3d090c2..ff81531a7 100644
--- a/source/libs/poppler/poppler-0.36.0/CMakeLists.txt
+++ b/source/libs/poppler/poppler-0.37.0/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ECM_FOUND)
endif()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "36")
+set(POPPLER_MINOR_VERSION "37")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -478,7 +478,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 55.0.0 SOVERSION 55)
+set_target_properties(poppler PROPERTIES VERSION 56.0.0 SOVERSION 56)
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/source/libs/poppler/poppler-0.36.0/COPYING b/source/libs/poppler/poppler-0.37.0/COPYING
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/COPYING
rename to source/libs/poppler/poppler-0.37.0/COPYING
diff --git a/source/libs/poppler/poppler-0.36.0/ChangeLog b/source/libs/poppler/poppler-0.37.0/ChangeLog
similarity index 99%
rename from source/libs/poppler/poppler-0.36.0/ChangeLog
rename to source/libs/poppler/poppler-0.37.0/ChangeLog
index c74b0fda5..effd216f3 100644
--- a/source/libs/poppler/poppler-0.36.0/ChangeLog
+++ b/source/libs/poppler/poppler-0.37.0/ChangeLog
@@ -1,3 +1,189 @@
+commit e8cb16bff48dbe2d9efd988ddb09608406d2633b
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Sep 27 15:34:12 2015 +0930
+
+ configure: fix openjpeg detection
+
+ - configure was failing when enable_libopenjpeg="auto" and openjpeg
+ not found
+ - fix header check for pre 1.4 versions
+
+ Bug 92135
+
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit a82e338b4f9639aced3201bf7639bbdf1a7974e2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 27 15:41:27 2015 +0200
+
+ Fix memory leak on font reload
+
+ poppler/SplashOutputDev.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+commit 8639b20da3d9be62f47462ad1cdaa5c65d117dfb
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Sun Sep 27 15:37:51 2015 +0200
+
+ Try to use an external font if the internal one is invalid
+
+ poppler/GfxFont.h | 11 +++++++++++
+ poppler/SplashOutputDev.cc | 8 ++++++++
+ 2 files changed, 19 insertions(+)
+
+commit e3225a0543d1e6fbc269094ca192879816296993
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 25 01:14:41 2015 +0200
+
+ Fix crash in GfxGouraudTriangleShading for malformed files
+
+ poppler/GfxState.cc | 26 ++++++++++++++++----------
+ 1 file changed, 16 insertions(+), 10 deletions(-)
+
+commit 0a33e3a740a1dbe57023d0a51077689d29d79def
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 25 01:00:32 2015 +0200
+
+ Fix the fix of the fix for SplashOutputDev::beginTransparencyGroup
+ and malformed files
+
+ poppler/SplashOutputDev.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit b723e4f90c78ac972bf30d7006283042930374d7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 25 00:53:10 2015 +0200
+
+ Fix crash in malformed document in SplashOutputDev::drawMaskedImage
+
+ And improved the one i just did for
+ SplashOutputDev::beginTransparencyGroup
+
+ poppler/SplashOutputDev.cc | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+commit fd49b3d4ecdbe04c4f51e6ab77687dc25bbc3f49
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 25 00:45:55 2015 +0200
+
+ Fix crash on Annot::layoutText for malformed documents
+
+ poppler/Annot.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit a88be71fee8a4fd8e9a5a1d9d955addc0f3076ea
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 25 00:42:14 2015 +0200
+
+ Fix crash in SplashOutputDev::beginTransparencyGroup in malformed file
+
+ poppler/SplashOutputDev.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit 0fa5c17ea409c3fdfe1e3a97ff5e4bae96da1cae
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 25 00:36:33 2015 +0200
+
+ Fix crash on JBIG2Stream::readHalftoneRegionSeg for malformed
+ documents
+
+ poppler/JBIG2Stream.cc | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+commit 942adfc25e7a00ac3cf032ced2d8949e99099f70
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 25 00:30:58 2015 +0200
+
+ Fix crash on AnnotInk::draw for malformed documents
+
+ poppler/Annot.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 9aa19159bff4db02889cba48b9b31e40247e5314
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: Fri Sep 11 13:56:05 2015 +0200
+
+ Catalog::cachePageTree(): recover from out of memory condition
+
+ poppler/Catalog.cc | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+commit 8dc9187690de10f1538764972799a39660272d1f
+Author: Even Rouault <even.rouault@spatialys.com>
+Date: Fri Sep 11 13:30:32 2015 +0200
+
+ Catalog::getNumPages(): validate page count
+
+ poppler/Catalog.cc | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit 7028f835a603e12dd73452a39f56ac0b633207b2
+Author: Arseniy Lartsev <arseniy@alumni.chalmers.se>
+Date: Sun Sep 20 18:32:36 2015 +0200
+
+ PageTransition D is a number not an int
+
+ See bug #92040
+
+ poppler/PageTransition.cc | 5 +++--
+ poppler/PageTransition.h | 5 +++--
+ qt4/src/poppler-page-transition.cc | 6 ++++++
+ qt4/src/poppler-page-transition.h | 14 ++++++++++++--
+ qt5/src/poppler-page-transition.cc | 6 ++++++
+ qt5/src/poppler-page-transition.h | 14 ++++++++++++--
+ 6 files changed, 42 insertions(+), 8 deletions(-)
+
+commit a98f99e90aac703e648697da5c897c49645eda10
+Author: Kenji Uno <ku@digitaldolphins.jp>
+Date: Wed Sep 16 22:08:59 2015 +0200
+
+ SplashOuputDev: Protect calls to set/getAA with the proper #if guards
+
+ Bug #92006
+
+ poppler/SplashOutputDev.cc | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+commit 2a48cab5e66a69ed1bf3e792efc109ddcad8d5ee
+Author: Jason Crain <jason@aquaticape.us>
+Date: Tue Sep 15 14:43:21 2015 -0500
+
+ cairo: Use mask for even-odd fill
+
+ Bug #84527
+
+ poppler/CairoOutputDev.cc | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+commit b14d4b0968f7b0ad783c3fa56ad863d7fda235fe
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 10 00:33:15 2015 +0200
+
+ Post release fixlets for the NEWS file
+
+ NEWS | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+commit de1ece5c929c3f46c04be76b4b72f6371911fd1a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 10 00:26:02 2015 +0200
+
+ Poppler 0.36
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 36 ++++++++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
+ 11 files changed, 47 insertions(+), 11 deletions(-)
+
commit d490c21fe4a60cff26f34c619d3078dcb575bf44
Author: Albert Astals Cid <aacid@kde.org>
Date: Wed Sep 9 23:55:57 2015 +0200
diff --git a/source/libs/poppler/poppler-0.36.0/ConfigureChecks.cmake b/source/libs/poppler/poppler-0.37.0/ConfigureChecks.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/ConfigureChecks.cmake
rename to source/libs/poppler/poppler-0.37.0/ConfigureChecks.cmake
diff --git a/source/libs/poppler/poppler-0.36.0/INSTALL b/source/libs/poppler/poppler-0.37.0/INSTALL
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/INSTALL
rename to source/libs/poppler/poppler-0.37.0/INSTALL
diff --git a/source/libs/poppler/poppler-0.36.0/Makefile.am b/source/libs/poppler/poppler-0.37.0/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/Makefile.am
rename to source/libs/poppler/poppler-0.37.0/Makefile.am
diff --git a/source/libs/poppler/poppler-0.36.0/NEWS b/source/libs/poppler/poppler-0.37.0/NEWS
similarity index 99%
rename from source/libs/poppler/poppler-0.36.0/NEWS
rename to source/libs/poppler/poppler-0.37.0/NEWS
index 5326eed5f..949f81791 100644
--- a/source/libs/poppler/poppler-0.36.0/NEWS
+++ b/source/libs/poppler/poppler-0.37.0/NEWS
@@ -1,3 +1,16 @@
+Release 0.37.0
+ core:
+ * CairoOutputDev: Use mask for even-odd fill. Bug #84527
+ * SplashOuputDev: Protect calls to set/getAA with the proper #if guards. Bug #92006
+ * SplashOuputDev: Try to use an external font if the internal one is invalid
+ * PageTransition D is a number not an int. Bug #92040
+ * Catalog::getNumPages(): validate page count
+ * Catalog::cachePageTree(): recover from out of memory condition
+ * Fix crashes in malformed documents
+
+ build system:
+ * configure: fix openjpeg detection
+
Release 0.36.0
core:
* Patch to support RichMedia annotations
@@ -18,7 +31,7 @@ Release 0.36.0
qt5:
* Basic support for RichMedia annotations
* Change default image format
- * Minor optimizationsHEADmaster
+ * Minor optimizations
cpp:
* Fix utf8/utf16 conversion. Bug #91644
@@ -27,9 +40,6 @@ Release 0.36.0
* Do not hardcode -fPIC in Makefile.am
* cmake: Allow configuring SHARE_INSTALL_DIR. Bug #90293
- glib:
- *
-
utils:
* pdfunite: Insert embedded files in result pdf. Bug #90066
* pdftotext: Add -bbox-layout option. Bug #89941
diff --git a/source/libs/poppler/poppler-0.36.0/README b/source/libs/poppler/poppler-0.37.0/README
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/README
rename to source/libs/poppler/poppler-0.37.0/README
diff --git a/source/libs/poppler/poppler-0.36.0/README-XPDF b/source/libs/poppler/poppler-0.37.0/README-XPDF
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/README-XPDF
rename to source/libs/poppler/poppler-0.37.0/README-XPDF
diff --git a/source/libs/poppler/poppler-0.36.0/TODO b/source/libs/poppler/poppler-0.37.0/TODO
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/TODO
rename to source/libs/poppler/poppler-0.37.0/TODO
diff --git a/source/libs/poppler/poppler-0.36.0/config.h.cmake b/source/libs/poppler/poppler-0.37.0/config.h.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/config.h.cmake
rename to source/libs/poppler/poppler-0.37.0/config.h.cmake
diff --git a/source/libs/poppler/poppler-0.36.0/config.h.in b/source/libs/poppler/poppler-0.37.0/config.h.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/config.h.in
rename to source/libs/poppler/poppler-0.37.0/config.h.in
diff --git a/source/libs/poppler/poppler-0.36.0/configure.ac b/source/libs/poppler/poppler-0.37.0/configure.ac
similarity index 99%
rename from source/libs/poppler/poppler-0.36.0/configure.ac
rename to source/libs/poppler/poppler-0.37.0/configure.ac
index 4bc1524e4..e826adf62 100644
--- a/source/libs/poppler/poppler-0.36.0/configure.ac
+++ b/source/libs/poppler/poppler-0.37.0/configure.ac
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[36])
+m4_define([poppler_version_minor],[37])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
@@ -219,14 +219,14 @@ if test x$enable_libopenjpeg = xopenjpeg1 || test x$enable_libopenjpeg = xauto;
[openjpeg1="yes"
LIBOPENJPEG_LIBS="-lopenjpeg"],[openjpeg_header=no])
AC_CHECK_HEADERS([openjpeg.h],,
- [openjpeg="no"])])
+ [openjpeg_header="no"])])
fi
dnl test for libopenjpeg2
if test x$openjpeg1 = xno; then
if test x$enable_libopenjpeg = xopenjpeg2 || test x$enable_libopenjpeg = xauto; then
PKG_CHECK_MODULES(LIBOPENJPEG, libopenjp2,
- [openjpeg2=yes],[])
+ [openjpeg2=yes],[openjpeg2=no])
fi
fi
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiBase.cc b/source/libs/poppler/poppler-0.37.0/fofi/FoFiBase.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiBase.cc
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiBase.cc
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiBase.h b/source/libs/poppler/poppler-0.37.0/fofi/FoFiBase.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiBase.h
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiBase.h
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiEncodings.cc b/source/libs/poppler/poppler-0.37.0/fofi/FoFiEncodings.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiEncodings.cc
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiEncodings.cc
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiEncodings.h b/source/libs/poppler/poppler-0.37.0/fofi/FoFiEncodings.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiEncodings.h
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiEncodings.h
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiIdentifier.cc b/source/libs/poppler/poppler-0.37.0/fofi/FoFiIdentifier.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiIdentifier.cc
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiIdentifier.cc
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiIdentifier.h b/source/libs/poppler/poppler-0.37.0/fofi/FoFiIdentifier.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiIdentifier.h
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiIdentifier.h
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiTrueType.cc b/source/libs/poppler/poppler-0.37.0/fofi/FoFiTrueType.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiTrueType.cc
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiTrueType.cc
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiTrueType.h b/source/libs/poppler/poppler-0.37.0/fofi/FoFiTrueType.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiTrueType.h
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiTrueType.h
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1.cc b/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiType1.cc
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiType1.cc
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1.h b/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiType1.h
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiType1.h
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1C.cc b/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1C.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiType1C.cc
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiType1C.cc
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/FoFiType1C.h b/source/libs/poppler/poppler-0.37.0/fofi/FoFiType1C.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/FoFiType1C.h
rename to source/libs/poppler/poppler-0.37.0/fofi/FoFiType1C.h
diff --git a/source/libs/poppler/poppler-0.36.0/fofi/Makefile.am b/source/libs/poppler/poppler-0.37.0/fofi/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/fofi/Makefile.am
rename to source/libs/poppler/poppler-0.37.0/fofi/Makefile.am
diff --git a/source/libs/poppler/poppler-0.36.0/goo/FixedPoint.cc b/source/libs/poppler/poppler-0.37.0/goo/FixedPoint.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/FixedPoint.cc
rename to source/libs/poppler/poppler-0.37.0/goo/FixedPoint.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/FixedPoint.h b/source/libs/poppler/poppler-0.37.0/goo/FixedPoint.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/FixedPoint.h
rename to source/libs/poppler/poppler-0.37.0/goo/FixedPoint.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/GooHash.cc b/source/libs/poppler/poppler-0.37.0/goo/GooHash.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/GooHash.cc
rename to source/libs/poppler/poppler-0.37.0/goo/GooHash.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/GooHash.h b/source/libs/poppler/poppler-0.37.0/goo/GooHash.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/GooHash.h
rename to source/libs/poppler/poppler-0.37.0/goo/GooHash.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/GooLikely.h b/source/libs/poppler/poppler-0.37.0/goo/GooLikely.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/GooLikely.h
rename to source/libs/poppler/poppler-0.37.0/goo/GooLikely.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/GooList.cc b/source/libs/poppler/poppler-0.37.0/goo/GooList.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/GooList.cc
rename to source/libs/poppler/poppler-0.37.0/goo/GooList.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/GooList.h b/source/libs/poppler/poppler-0.37.0/goo/GooList.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/GooList.h
rename to source/libs/poppler/poppler-0.37.0/goo/GooList.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/GooMutex.h b/source/libs/poppler/poppler-0.37.0/goo/GooMutex.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/GooMutex.h
rename to source/libs/poppler/poppler-0.37.0/goo/GooMutex.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/GooString.cc b/source/libs/poppler/poppler-0.37.0/goo/GooString.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/GooString.cc
rename to source/libs/poppler/poppler-0.37.0/goo/GooString.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/GooString.h b/source/libs/poppler/poppler-0.37.0/goo/GooString.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/GooString.h
rename to source/libs/poppler/poppler-0.37.0/goo/GooString.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/GooTimer.cc b/source/libs/poppler/poppler-0.37.0/goo/GooTimer.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/GooTimer.cc
rename to source/libs/poppler/poppler-0.37.0/goo/GooTimer.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/GooTimer.h b/source/libs/poppler/poppler-0.37.0/goo/GooTimer.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/GooTimer.h
rename to source/libs/poppler/poppler-0.37.0/goo/GooTimer.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/ImgWriter.cc b/source/libs/poppler/poppler-0.37.0/goo/ImgWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/ImgWriter.cc
rename to source/libs/poppler/poppler-0.37.0/goo/ImgWriter.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/ImgWriter.h b/source/libs/poppler/poppler-0.37.0/goo/ImgWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/ImgWriter.h
rename to source/libs/poppler/poppler-0.37.0/goo/ImgWriter.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/JpegWriter.cc b/source/libs/poppler/poppler-0.37.0/goo/JpegWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/JpegWriter.cc
rename to source/libs/poppler/poppler-0.37.0/goo/JpegWriter.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/JpegWriter.h b/source/libs/poppler/poppler-0.37.0/goo/JpegWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/JpegWriter.h
rename to source/libs/poppler/poppler-0.37.0/goo/JpegWriter.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/Makefile.am b/source/libs/poppler/poppler-0.37.0/goo/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/Makefile.am
rename to source/libs/poppler/poppler-0.37.0/goo/Makefile.am
diff --git a/source/libs/poppler/poppler-0.36.0/goo/NetPBMWriter.cc b/source/libs/poppler/poppler-0.37.0/goo/NetPBMWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/NetPBMWriter.cc
rename to source/libs/poppler/poppler-0.37.0/goo/NetPBMWriter.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/NetPBMWriter.h b/source/libs/poppler/poppler-0.37.0/goo/NetPBMWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/NetPBMWriter.h
rename to source/libs/poppler/poppler-0.37.0/goo/NetPBMWriter.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/PNGWriter.cc b/source/libs/poppler/poppler-0.37.0/goo/PNGWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/PNGWriter.cc
rename to source/libs/poppler/poppler-0.37.0/goo/PNGWriter.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/PNGWriter.h b/source/libs/poppler/poppler-0.37.0/goo/PNGWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/PNGWriter.h
rename to source/libs/poppler/poppler-0.37.0/goo/PNGWriter.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/TiffWriter.cc b/source/libs/poppler/poppler-0.37.0/goo/TiffWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/TiffWriter.cc
rename to source/libs/poppler/poppler-0.37.0/goo/TiffWriter.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/TiffWriter.h b/source/libs/poppler/poppler-0.37.0/goo/TiffWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/TiffWriter.h
rename to source/libs/poppler/poppler-0.37.0/goo/TiffWriter.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/gfile.cc b/source/libs/poppler/poppler-0.37.0/goo/gfile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/gfile.cc
rename to source/libs/poppler/poppler-0.37.0/goo/gfile.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/gfile.h b/source/libs/poppler/poppler-0.37.0/goo/gfile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/gfile.h
rename to source/libs/poppler/poppler-0.37.0/goo/gfile.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/gmem.cc b/source/libs/poppler/poppler-0.37.0/goo/gmem.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/gmem.cc
rename to source/libs/poppler/poppler-0.37.0/goo/gmem.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/gmem.h b/source/libs/poppler/poppler-0.37.0/goo/gmem.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/gmem.h
rename to source/libs/poppler/poppler-0.37.0/goo/gmem.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/gmempp.cc b/source/libs/poppler/poppler-0.37.0/goo/gmempp.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/gmempp.cc
rename to source/libs/poppler/poppler-0.37.0/goo/gmempp.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/grandom.cc b/source/libs/poppler/poppler-0.37.0/goo/grandom.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/grandom.cc
rename to source/libs/poppler/poppler-0.37.0/goo/grandom.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/grandom.h b/source/libs/poppler/poppler-0.37.0/goo/grandom.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/grandom.h
rename to source/libs/poppler/poppler-0.37.0/goo/grandom.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/gstrtod.cc b/source/libs/poppler/poppler-0.37.0/goo/gstrtod.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/gstrtod.cc
rename to source/libs/poppler/poppler-0.37.0/goo/gstrtod.cc
diff --git a/source/libs/poppler/poppler-0.36.0/goo/gstrtod.h b/source/libs/poppler/poppler-0.37.0/goo/gstrtod.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/gstrtod.h
rename to source/libs/poppler/poppler-0.37.0/goo/gstrtod.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/gtypes.h b/source/libs/poppler/poppler-0.37.0/goo/gtypes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/gtypes.h
rename to source/libs/poppler/poppler-0.37.0/goo/gtypes.h
diff --git a/source/libs/poppler/poppler-0.36.0/goo/gtypes_p.h b/source/libs/poppler/poppler-0.37.0/goo/gtypes_p.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/goo/gtypes_p.h
rename to source/libs/poppler/poppler-0.37.0/goo/gtypes_p.h
diff --git a/source/libs/poppler/poppler-0.36.0/gtk-doc.make b/source/libs/poppler/poppler-0.37.0/gtk-doc.make
similarity index 95%
rename from source/libs/poppler/poppler-0.36.0/gtk-doc.make
rename to source/libs/poppler/poppler-0.37.0/gtk-doc.make
index e7916563d..9ccd0b04b 100644
--- a/source/libs/poppler/poppler-0.36.0/gtk-doc.make
+++ b/source/libs/poppler/poppler-0.37.0/gtk-doc.make
@@ -25,6 +25,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
SETUP_FILES = \
$(content_files) \
+ $(expand_content_files) \
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
@@ -86,7 +87,7 @@ GTK_DOC_V_SETUP_0=@echo " DOC Preparing build";
setup-build.stamp:
-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+ files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
if test "x$$files" != "x" ; then \
for file in $$files ; do \
destdir=`dirname $(abs_builddir)/$$file`; \
@@ -118,7 +119,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
scanobj_options=""; \
gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$(?)" = "0"; then \
+ if test "$$?" = "0"; then \
if test "x$(V)" = "x1"; then \
scanobj_options="--verbose"; \
fi; \
@@ -162,17 +163,17 @@ GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references";
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
mkhtml_options=""; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$(?)" = "0"; then \
+ if test "$$?" = "0"; then \
if test "x$(V)" = "x1"; then \
mkhtml_options="$$mkhtml_options --verbose"; \
fi; \
fi; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$(?)" = "0"; then \
+ if test "$$?" = "0"; then \
mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
fi; \
cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -194,11 +195,11 @@ GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
GTK_DOC_V_PDF_0=@echo " DOC Building PDF";
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
mkpdf_options=""; \
gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$(?)" = "0"; then \
+ if test "$$?" = "0"; then \
if test "x$(V)" = "x1"; then \
mkpdf_options="$$mkpdf_options --verbose"; \
fi; \
@@ -223,12 +224,15 @@ clean-local:
@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
rm -f $(DOC_MODULE).types; \
fi
+ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+ rm -f $(DOC_MODULE)-sections.txt; \
+ fi
distclean-local:
@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
$(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+ rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
fi
maintainer-clean-local:
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-cairo-uninstalled.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-cairo-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-cairo-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-cairo-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-cairo.pc.cmake b/source/libs/poppler/poppler-0.37.0/poppler-cairo.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-cairo.pc.cmake
rename to source/libs/poppler/poppler-0.37.0/poppler-cairo.pc.cmake
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-cairo.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-cairo.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-cairo.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-cairo.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-cpp-uninstalled.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-cpp-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-cpp-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-cpp-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-cpp.pc.cmake b/source/libs/poppler/poppler-0.37.0/poppler-cpp.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-cpp.pc.cmake
rename to source/libs/poppler/poppler-0.37.0/poppler-cpp.pc.cmake
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-cpp.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-cpp.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-cpp.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-cpp.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-glib-uninstalled.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-glib-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-glib-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-glib-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-glib.pc.cmake b/source/libs/poppler/poppler-0.37.0/poppler-glib.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-glib.pc.cmake
rename to source/libs/poppler/poppler-0.37.0/poppler-glib.pc.cmake
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-glib.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-glib.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-glib.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-glib.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-qt4-uninstalled.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-qt4-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-qt4-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-qt4-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-qt4.pc.cmake b/source/libs/poppler/poppler-0.37.0/poppler-qt4.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-qt4.pc.cmake
rename to source/libs/poppler/poppler-0.37.0/poppler-qt4.pc.cmake
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-qt4.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-qt4.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-qt4.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-qt4.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-qt5-uninstalled.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-qt5-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-qt5-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-qt5-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-qt5.pc.cmake b/source/libs/poppler/poppler-0.37.0/poppler-qt5.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-qt5.pc.cmake
rename to source/libs/poppler/poppler-0.37.0/poppler-qt5.pc.cmake
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-qt5.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-qt5.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-qt5.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-qt5.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-splash-uninstalled.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-splash-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-splash-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-splash-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-splash.pc.cmake b/source/libs/poppler/poppler-0.37.0/poppler-splash.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-splash.pc.cmake
rename to source/libs/poppler/poppler-0.37.0/poppler-splash.pc.cmake
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-splash.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-splash.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-splash.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-splash.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler-uninstalled.pc.in b/source/libs/poppler/poppler-0.37.0/poppler-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler.pc.cmake b/source/libs/poppler/poppler-0.37.0/poppler.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler.pc.cmake
rename to source/libs/poppler/poppler-0.37.0/poppler.pc.cmake
diff --git a/source/libs/poppler/poppler-0.36.0/poppler.pc.in b/source/libs/poppler/poppler-0.37.0/poppler.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler.pc.in
rename to source/libs/poppler/poppler-0.37.0/poppler.pc.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Annot.cc b/source/libs/poppler/poppler-0.37.0/poppler/Annot.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.36.0/poppler/Annot.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Annot.cc
index 85a8ac4a7..f3f479ce0 100644
--- a/source/libs/poppler/poppler-0.36.0/poppler/Annot.cc
+++ b/source/libs/poppler/poppler-0.37.0/poppler/Annot.cc
@@ -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-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2013, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007-2013 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
// Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
@@ -4052,6 +4052,9 @@ void Annot::layoutText(GooString *text, GooString *outBuf, int *i,
double w = 0.0;
int uLen, n;
double dx, dy, ox, oy;
+ if (!text) {
+ return;
+ }
GBool unicode = text->hasUnicodeMarker();
GBool spacePrev; // previous character was a space
@@ -6151,7 +6154,7 @@ void AnnotInk::draw(Gfx *gfx, GBool printing) {
for (int i = 0; i < inkListLength; ++i) {
const AnnotPath * path = inkList[i];
- if (path->getCoordsLength() != 0) {
+ if (path && path->getCoordsLength() != 0) {
appearBuf->appendf ("{0:.2f} {1:.2f} m\n", path->getX(0) - rect->x1, path->getY(0) - rect->y1);
appearBBox->extendTo (path->getX(0) - rect->x1, path->getY(0) - rect->y1);
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Annot.h b/source/libs/poppler/poppler-0.37.0/poppler/Annot.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Annot.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Annot.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Array.cc b/source/libs/poppler/poppler-0.37.0/poppler/Array.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Array.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Array.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Array.h b/source/libs/poppler/poppler-0.37.0/poppler/Array.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Array.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Array.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFont.cc b/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/BuiltinFont.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/BuiltinFont.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFont.h b/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFont.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/BuiltinFont.h
rename to source/libs/poppler/poppler-0.37.0/poppler/BuiltinFont.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFontTables.cc b/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFontTables.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/BuiltinFontTables.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/BuiltinFontTables.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/BuiltinFontTables.h b/source/libs/poppler/poppler-0.37.0/poppler/BuiltinFontTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/BuiltinFontTables.h
rename to source/libs/poppler/poppler-0.37.0/poppler/BuiltinFontTables.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CMap.cc b/source/libs/poppler/poppler-0.37.0/poppler/CMap.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CMap.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/CMap.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CMap.h b/source/libs/poppler/poppler-0.37.0/poppler/CMap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CMap.h
rename to source/libs/poppler/poppler-0.37.0/poppler/CMap.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CachedFile.cc b/source/libs/poppler/poppler-0.37.0/poppler/CachedFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CachedFile.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/CachedFile.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CachedFile.h b/source/libs/poppler/poppler-0.37.0/poppler/CachedFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CachedFile.h
rename to source/libs/poppler/poppler-0.37.0/poppler/CachedFile.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CairoFontEngine.cc b/source/libs/poppler/poppler-0.37.0/poppler/CairoFontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CairoFontEngine.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/CairoFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CairoFontEngine.h b/source/libs/poppler/poppler-0.37.0/poppler/CairoFontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CairoFontEngine.h
rename to source/libs/poppler/poppler-0.37.0/poppler/CairoFontEngine.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.cc b/source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.cc
index 1e201d38e..3916485c5 100644
--- a/source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.cc
+++ b/source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.cc
@@ -823,8 +823,16 @@ void CairoOutputDev::eoFill(GfxState *state) {
cairo_set_fill_rule (cairo, CAIRO_FILL_RULE_EVEN_ODD);
cairo_set_source (cairo, fill_pattern);
LOG(printf ("fill-eo\n"));
- cairo_fill (cairo);
+ if (mask) {
+ cairo_save (cairo);
+ cairo_clip (cairo);
+ cairo_set_matrix (cairo, &mask_matrix);
+ cairo_mask (cairo, mask);
+ cairo_restore (cairo);
+ } else {
+ cairo_fill (cairo);
+ }
if (cairo_shape) {
cairo_set_fill_rule (cairo_shape, CAIRO_FILL_RULE_EVEN_ODD);
doPath (cairo_shape, state, state->getPath());
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.h b/source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CairoOutputDev.h
rename to source/libs/poppler/poppler-0.37.0/poppler/CairoOutputDev.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CairoRescaleBox.cc b/source/libs/poppler/poppler-0.37.0/poppler/CairoRescaleBox.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CairoRescaleBox.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/CairoRescaleBox.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CairoRescaleBox.h b/source/libs/poppler/poppler-0.37.0/poppler/CairoRescaleBox.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CairoRescaleBox.h
rename to source/libs/poppler/poppler-0.37.0/poppler/CairoRescaleBox.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Catalog.cc b/source/libs/poppler/poppler-0.37.0/poppler/Catalog.cc
similarity index 97%
rename from source/libs/poppler/poppler-0.36.0/poppler/Catalog.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Catalog.cc
index 04caa1c1f..a8c96ac47 100644
--- a/source/libs/poppler/poppler-0.36.0/poppler/Catalog.cc
+++ b/source/libs/poppler/poppler-0.37.0/poppler/Catalog.cc
@@ -31,6 +31,7 @@
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2013 José Aliste <jaliste@src.gnome.org>
// Copyright (C) 2014 Ed Porras <ed@moto-research.com>
+// Copyright (C) 2015 Even Rouault <even.rouault@spatialys.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -171,8 +172,8 @@ Catalog::~Catalog() {
}
}
gfree(pages);
- gfree(pageRefs);
}
+ gfree(pageRefs);
names.free();
dests.free();
delete destNameTree;
@@ -305,8 +306,14 @@ GBool Catalog::cachePageTree(int page)
}
pagesSize = getNumPages();
- pages = (Page **)gmallocn(pagesSize, sizeof(Page *));
- pageRefs = (Ref *)gmallocn(pagesSize, sizeof(Ref));
+ pages = (Page **)gmallocn_checkoverflow(pagesSize, sizeof(Page *));
+ pageRefs = (Ref *)gmallocn_checkoverflow(pagesSize, sizeof(Ref));
+ if (pages == NULL || pageRefs == NULL ) {
+ error(errSyntaxError, -1, "Cannot allocate page cache");
+ pagesDict->decRef();
+ pagesSize = 0;
+ return gFalse;
+ }
for (int i = 0; i < pagesSize; ++i) {
pages[i] = NULL;
pageRefs[i].num = -1;
@@ -856,6 +863,17 @@ int Catalog::getNumPages()
}
} else {
numPages = (int)obj.getNum();
+ if (numPages <= 0) {
+ error(errSyntaxError, -1,
+ "Invalid page count {0:d}", numPages);
+ numPages = 0;
+ } else if (numPages > xref->getNumObjects()) {
+ error(errSyntaxError, -1,
+ "Page count ({0:d}) larger than number of objects ({1:d})",
+ numPages, xref->getNumObjects());
+ numPages = 0;
+ }
+
}
catDict.free();
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Catalog.h b/source/libs/poppler/poppler-0.37.0/poppler/Catalog.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Catalog.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Catalog.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CharCodeToUnicode.cc b/source/libs/poppler/poppler-0.37.0/poppler/CharCodeToUnicode.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CharCodeToUnicode.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/CharCodeToUnicode.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CharCodeToUnicode.h b/source/libs/poppler/poppler-0.37.0/poppler/CharCodeToUnicode.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CharCodeToUnicode.h
rename to source/libs/poppler/poppler-0.37.0/poppler/CharCodeToUnicode.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CharTypes.h b/source/libs/poppler/poppler-0.37.0/poppler/CharTypes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CharTypes.h
rename to source/libs/poppler/poppler-0.37.0/poppler/CharTypes.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CompactFontTables.h b/source/libs/poppler/poppler-0.37.0/poppler/CompactFontTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CompactFontTables.h
rename to source/libs/poppler/poppler-0.37.0/poppler/CompactFontTables.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CurlCachedFile.cc b/source/libs/poppler/poppler-0.37.0/poppler/CurlCachedFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CurlCachedFile.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/CurlCachedFile.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CurlCachedFile.h b/source/libs/poppler/poppler-0.37.0/poppler/CurlCachedFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CurlCachedFile.h
rename to source/libs/poppler/poppler-0.37.0/poppler/CurlCachedFile.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CurlPDFDocBuilder.cc b/source/libs/poppler/poppler-0.37.0/poppler/CurlPDFDocBuilder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CurlPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/CurlPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/CurlPDFDocBuilder.h b/source/libs/poppler/poppler-0.37.0/poppler/CurlPDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/CurlPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.37.0/poppler/CurlPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/DCTStream.cc b/source/libs/poppler/poppler-0.37.0/poppler/DCTStream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/DCTStream.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/DCTStream.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/DCTStream.h b/source/libs/poppler/poppler-0.37.0/poppler/DCTStream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/DCTStream.h
rename to source/libs/poppler/poppler-0.37.0/poppler/DCTStream.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/DateInfo.cc b/source/libs/poppler/poppler-0.37.0/poppler/DateInfo.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/DateInfo.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/DateInfo.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/DateInfo.h b/source/libs/poppler/poppler-0.37.0/poppler/DateInfo.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/DateInfo.h
rename to source/libs/poppler/poppler-0.37.0/poppler/DateInfo.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Decrypt.cc b/source/libs/poppler/poppler-0.37.0/poppler/Decrypt.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Decrypt.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Decrypt.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Decrypt.h b/source/libs/poppler/poppler-0.37.0/poppler/Decrypt.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Decrypt.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Decrypt.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Dict.cc b/source/libs/poppler/poppler-0.37.0/poppler/Dict.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Dict.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Dict.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Dict.h b/source/libs/poppler/poppler-0.37.0/poppler/Dict.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Dict.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Dict.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Error.cc b/source/libs/poppler/poppler-0.37.0/poppler/Error.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Error.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Error.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Error.h b/source/libs/poppler/poppler-0.37.0/poppler/Error.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Error.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Error.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/ErrorCodes.h b/source/libs/poppler/poppler-0.37.0/poppler/ErrorCodes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/ErrorCodes.h
rename to source/libs/poppler/poppler-0.37.0/poppler/ErrorCodes.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/FileSpec.cc b/source/libs/poppler/poppler-0.37.0/poppler/FileSpec.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/FileSpec.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/FileSpec.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/FileSpec.h b/source/libs/poppler/poppler-0.37.0/poppler/FileSpec.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/FileSpec.h
rename to source/libs/poppler/poppler-0.37.0/poppler/FileSpec.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/FlateStream.cc b/source/libs/poppler/poppler-0.37.0/poppler/FlateStream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/FlateStream.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/FlateStream.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/FlateStream.h b/source/libs/poppler/poppler-0.37.0/poppler/FlateStream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/FlateStream.h
rename to source/libs/poppler/poppler-0.37.0/poppler/FlateStream.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/FontEncodingTables.cc b/source/libs/poppler/poppler-0.37.0/poppler/FontEncodingTables.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/FontEncodingTables.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/FontEncodingTables.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/FontEncodingTables.h b/source/libs/poppler/poppler-0.37.0/poppler/FontEncodingTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/FontEncodingTables.h
rename to source/libs/poppler/poppler-0.37.0/poppler/FontEncodingTables.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/FontInfo.cc b/source/libs/poppler/poppler-0.37.0/poppler/FontInfo.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/FontInfo.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/FontInfo.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/FontInfo.h b/source/libs/poppler/poppler-0.37.0/poppler/FontInfo.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/FontInfo.h
rename to source/libs/poppler/poppler-0.37.0/poppler/FontInfo.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Form.cc b/source/libs/poppler/poppler-0.37.0/poppler/Form.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Form.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Form.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Form.h b/source/libs/poppler/poppler-0.37.0/poppler/Form.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Form.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Form.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Function.cc b/source/libs/poppler/poppler-0.37.0/poppler/Function.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Function.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Function.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Function.h b/source/libs/poppler/poppler-0.37.0/poppler/Function.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Function.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Function.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Gfx.cc b/source/libs/poppler/poppler-0.37.0/poppler/Gfx.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Gfx.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Gfx.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Gfx.h b/source/libs/poppler/poppler-0.37.0/poppler/Gfx.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Gfx.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Gfx.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/GfxFont.cc b/source/libs/poppler/poppler-0.37.0/poppler/GfxFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/GfxFont.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/GfxFont.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/GfxFont.h b/source/libs/poppler/poppler-0.37.0/poppler/GfxFont.h
similarity index 97%
rename from source/libs/poppler/poppler-0.36.0/poppler/GfxFont.h
rename to source/libs/poppler/poppler-0.37.0/poppler/GfxFont.h
index febb90292..85bdea137 100644
--- a/source/libs/poppler/poppler-0.36.0/poppler/GfxFont.h
+++ b/source/libs/poppler/poppler-0.37.0/poppler/GfxFont.h
@@ -22,6 +22,7 @@
// 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>
+// Copyright (C) 2015 Thomas Freitag <Thomas.Freitag@alfa.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -211,6 +212,16 @@ public:
GBool getEmbeddedFontID(Ref *embID)
{ *embID = embFontID; return embFontID.num >= 0; }
+ // Invalidate an embedded font
+ // Returns false if there is no embedded font.
+ GBool invalidateEmbeddedFont() {
+ if (embFontID.num >= 0) {
+ embFontID.num = -1;
+ return gTrue;
+ }
+ return gFalse;
+ }
+
// Get the PostScript font name for the embedded font. Returns
// NULL if there is no embedded font.
GooString *getEmbeddedFontName() { return embFontName; }
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/GfxState.cc b/source/libs/poppler/poppler-0.37.0/poppler/GfxState.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.36.0/poppler/GfxState.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/GfxState.cc
index cacccad30..ab796f731 100644
--- a/source/libs/poppler/poppler-0.36.0/poppler/GfxState.cc
+++ b/source/libs/poppler/poppler-0.37.0/poppler/GfxState.cc
@@ -5027,7 +5027,7 @@ GfxGouraudTriangleShading *GfxGouraudTriangleShading::parse(GfxResources *res, i
}
}
delete bitBuf;
- if (typeA == 5) {
+ if (typeA == 5 && nVerticesA > 0) {
nRows = nVerticesA / vertsPerRow;
nTrianglesA = (nRows - 1) * 2 * (vertsPerRow - 1);
trianglesA = (int (*)[3])gmallocn(nTrianglesA * 3, sizeof(int));
@@ -5140,17 +5140,23 @@ void GfxGouraudTriangleShading::getTriangle(int i,
assert(isParameterized());
v = triangles[i][0];
- *x0 = vertices[v].x;
- *y0 = vertices[v].y;
- *color0 = colToDbl(vertices[v].color.c[0]);
+ if (likely(v >= 0 && v < nVertices)) {
+ *x0 = vertices[v].x;
+ *y0 = vertices[v].y;
+ *color0 = colToDbl(vertices[v].color.c[0]);
+ }
v = triangles[i][1];
- *x1 = vertices[v].x;
- *y1 = vertices[v].y;
- *color1 = colToDbl(vertices[v].color.c[0]);
+ if (likely(v >= 0 && v < nVertices)) {
+ *x1 = vertices[v].x;
+ *y1 = vertices[v].y;
+ *color1 = colToDbl(vertices[v].color.c[0]);
+ }
v = triangles[i][2];
- *x2 = vertices[v].x;
- *y2 = vertices[v].y;
- *color2 = colToDbl(vertices[v].color.c[0]);
+ if (likely(v >= 0 && v < nVertices)) {
+ *x2 = vertices[v].x;
+ *y2 = vertices[v].y;
+ *color2 = colToDbl(vertices[v].color.c[0]);
+ }
}
//------------------------------------------------------------------------
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/GfxState.h b/source/libs/poppler/poppler-0.37.0/poppler/GfxState.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/GfxState.h
rename to source/libs/poppler/poppler-0.37.0/poppler/GfxState.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/GfxState_helpers.h b/source/libs/poppler/poppler-0.37.0/poppler/GfxState_helpers.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/GfxState_helpers.h
rename to source/libs/poppler/poppler-0.37.0/poppler/GfxState_helpers.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/GlobalParams.cc b/source/libs/poppler/poppler-0.37.0/poppler/GlobalParams.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/GlobalParams.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/GlobalParams.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/GlobalParams.h b/source/libs/poppler/poppler-0.37.0/poppler/GlobalParams.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/GlobalParams.h
rename to source/libs/poppler/poppler-0.37.0/poppler/GlobalParams.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/GlobalParamsWin.cc b/source/libs/poppler/poppler-0.37.0/poppler/GlobalParamsWin.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/GlobalParamsWin.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/GlobalParamsWin.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Hints.cc b/source/libs/poppler/poppler-0.37.0/poppler/Hints.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Hints.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Hints.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Hints.h b/source/libs/poppler/poppler-0.37.0/poppler/Hints.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Hints.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Hints.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/JArithmeticDecoder.cc b/source/libs/poppler/poppler-0.37.0/poppler/JArithmeticDecoder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/JArithmeticDecoder.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/JArithmeticDecoder.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/JArithmeticDecoder.h b/source/libs/poppler/poppler-0.37.0/poppler/JArithmeticDecoder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/JArithmeticDecoder.h
rename to source/libs/poppler/poppler-0.37.0/poppler/JArithmeticDecoder.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.cc b/source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.cc
index 66c1d2505..a20c22081 100644
--- a/source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.cc
+++ b/source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.cc
@@ -15,7 +15,7 @@
//
// Copyright (C) 2006 Raj Kumar <rkumar@archive.org>
// Copyright (C) 2006 Paul Walmsley <paul@booyaka.com>
-// Copyright (C) 2006-2010, 2012, 2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2010, 2012, 2014, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 David Benjamin <davidben@mit.edu>
// Copyright (C) 2011 Edward Jiang <ejiang@google.com>
// Copyright (C) 2012 William Bader <williambader@hotmail.com>
@@ -2701,8 +2701,13 @@ void JBIG2Stream::readHalftoneRegionSeg(Guint segNum, GBool imm,
i >>= 1;
}
}
- patW = patternDict->getBitmap(0)->getWidth();
- patH = patternDict->getBitmap(0)->getHeight();
+ patternBitmap = patternDict->getBitmap(0);
+ if (unlikely(patternBitmap == NULL)) {
+ error(errSyntaxError, curStr->getPos(), "Bad pattern bitmap");
+ return;
+ }
+ patW = patternBitmap->getWidth();
+ patH = patternBitmap->getHeight();
// set up the arithmetic decoder
if (!mmr) {
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.h b/source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/JBIG2Stream.h
rename to source/libs/poppler/poppler-0.37.0/poppler/JBIG2Stream.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/JPEG2000Stream.cc b/source/libs/poppler/poppler-0.37.0/poppler/JPEG2000Stream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/JPEG2000Stream.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/JPEG2000Stream.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/JPEG2000Stream.h b/source/libs/poppler/poppler-0.37.0/poppler/JPEG2000Stream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/JPEG2000Stream.h
rename to source/libs/poppler/poppler-0.37.0/poppler/JPEG2000Stream.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/JPXStream.cc b/source/libs/poppler/poppler-0.37.0/poppler/JPXStream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/JPXStream.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/JPXStream.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/JPXStream.h b/source/libs/poppler/poppler-0.37.0/poppler/JPXStream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/JPXStream.h
rename to source/libs/poppler/poppler-0.37.0/poppler/JPXStream.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Lexer.cc b/source/libs/poppler/poppler-0.37.0/poppler/Lexer.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Lexer.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Lexer.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Lexer.h b/source/libs/poppler/poppler-0.37.0/poppler/Lexer.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Lexer.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Lexer.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Linearization.cc b/source/libs/poppler/poppler-0.37.0/poppler/Linearization.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Linearization.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Linearization.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Linearization.h b/source/libs/poppler/poppler-0.37.0/poppler/Linearization.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Linearization.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Linearization.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Link.cc b/source/libs/poppler/poppler-0.37.0/poppler/Link.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Link.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Link.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Link.h b/source/libs/poppler/poppler-0.37.0/poppler/Link.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Link.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Link.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/LocalPDFDocBuilder.cc b/source/libs/poppler/poppler-0.37.0/poppler/LocalPDFDocBuilder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/LocalPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/LocalPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/LocalPDFDocBuilder.h b/source/libs/poppler/poppler-0.37.0/poppler/LocalPDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/LocalPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.37.0/poppler/LocalPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Makefile.am b/source/libs/poppler/poppler-0.37.0/poppler/Makefile.am
similarity index 99%
rename from source/libs/poppler/poppler-0.36.0/poppler/Makefile.am
rename to source/libs/poppler/poppler-0.37.0/poppler/Makefile.am
index 9a5d02674..85ee13b03 100644
--- a/source/libs/poppler/poppler-0.36.0/poppler/Makefile.am
+++ b/source/libs/poppler/poppler-0.37.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 55:0:0 \
+ -version-info 56:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/MarkedContentOutputDev.cc b/source/libs/poppler/poppler-0.37.0/poppler/MarkedContentOutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/MarkedContentOutputDev.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/MarkedContentOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/MarkedContentOutputDev.h b/source/libs/poppler/poppler-0.37.0/poppler/MarkedContentOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/MarkedContentOutputDev.h
rename to source/libs/poppler/poppler-0.37.0/poppler/MarkedContentOutputDev.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Movie.cc b/source/libs/poppler/poppler-0.37.0/poppler/Movie.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Movie.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Movie.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Movie.h b/source/libs/poppler/poppler-0.37.0/poppler/Movie.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Movie.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Movie.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/NameToCharCode.cc b/source/libs/poppler/poppler-0.37.0/poppler/NameToCharCode.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/NameToCharCode.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/NameToCharCode.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/NameToCharCode.h b/source/libs/poppler/poppler-0.37.0/poppler/NameToCharCode.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/NameToCharCode.h
rename to source/libs/poppler/poppler-0.37.0/poppler/NameToCharCode.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/NameToUnicodeTable.h b/source/libs/poppler/poppler-0.37.0/poppler/NameToUnicodeTable.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/NameToUnicodeTable.h
rename to source/libs/poppler/poppler-0.37.0/poppler/NameToUnicodeTable.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Object.cc b/source/libs/poppler/poppler-0.37.0/poppler/Object.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Object.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Object.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Object.h b/source/libs/poppler/poppler-0.37.0/poppler/Object.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Object.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Object.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/OptionalContent.cc b/source/libs/poppler/poppler-0.37.0/poppler/OptionalContent.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/OptionalContent.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/OptionalContent.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/OptionalContent.h b/source/libs/poppler/poppler-0.37.0/poppler/OptionalContent.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/OptionalContent.h
rename to source/libs/poppler/poppler-0.37.0/poppler/OptionalContent.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Outline.cc b/source/libs/poppler/poppler-0.37.0/poppler/Outline.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Outline.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Outline.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Outline.h b/source/libs/poppler/poppler-0.37.0/poppler/Outline.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Outline.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Outline.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/OutputDev.cc b/source/libs/poppler/poppler-0.37.0/poppler/OutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/OutputDev.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/OutputDev.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/OutputDev.h b/source/libs/poppler/poppler-0.37.0/poppler/OutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/OutputDev.h
rename to source/libs/poppler/poppler-0.37.0/poppler/OutputDev.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PDFDoc.cc b/source/libs/poppler/poppler-0.37.0/poppler/PDFDoc.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PDFDoc.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/PDFDoc.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PDFDoc.h b/source/libs/poppler/poppler-0.37.0/poppler/PDFDoc.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PDFDoc.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PDFDoc.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PDFDocBuilder.h b/source/libs/poppler/poppler-0.37.0/poppler/PDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PDFDocBuilder.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PDFDocEncoding.cc b/source/libs/poppler/poppler-0.37.0/poppler/PDFDocEncoding.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PDFDocEncoding.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/PDFDocEncoding.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PDFDocEncoding.h b/source/libs/poppler/poppler-0.37.0/poppler/PDFDocEncoding.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PDFDocEncoding.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PDFDocEncoding.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PDFDocFactory.cc b/source/libs/poppler/poppler-0.37.0/poppler/PDFDocFactory.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PDFDocFactory.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/PDFDocFactory.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PDFDocFactory.h b/source/libs/poppler/poppler-0.37.0/poppler/PDFDocFactory.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PDFDocFactory.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PDFDocFactory.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PSOutputDev.cc b/source/libs/poppler/poppler-0.37.0/poppler/PSOutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PSOutputDev.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/PSOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PSOutputDev.h b/source/libs/poppler/poppler-0.37.0/poppler/PSOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PSOutputDev.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PSOutputDev.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PSTokenizer.cc b/source/libs/poppler/poppler-0.37.0/poppler/PSTokenizer.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PSTokenizer.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/PSTokenizer.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PSTokenizer.h b/source/libs/poppler/poppler-0.37.0/poppler/PSTokenizer.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PSTokenizer.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PSTokenizer.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Page.cc b/source/libs/poppler/poppler-0.37.0/poppler/Page.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Page.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Page.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Page.h b/source/libs/poppler/poppler-0.37.0/poppler/Page.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Page.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Page.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo.cc b/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo.h b/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo_p.h b/source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo_p.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PageLabelInfo_p.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PageLabelInfo_p.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PageTransition.cc b/source/libs/poppler/poppler-0.37.0/poppler/PageTransition.cc
similarity index 96%
rename from source/libs/poppler/poppler-0.36.0/poppler/PageTransition.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/PageTransition.cc
index 441634c03..d5a84f89a 100644
--- a/source/libs/poppler/poppler-0.36.0/poppler/PageTransition.cc
+++ b/source/libs/poppler/poppler-0.37.0/poppler/PageTransition.cc
@@ -2,6 +2,7 @@
* Copyright (C) 2005, Net Integration Technologies, Inc.
* Copyright (C) 2010, Albert Astals Cid <aacid@kde.org>
* Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+ * Copyright (C) 2015, Arseniy Lartsev <arseniy@alumni.chalmers.se>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -80,8 +81,8 @@ PageTransition::PageTransition (Object *trans) {
obj.free();
// get duration
- if (dict->lookup("D", &obj)->isInt()) {
- duration = obj.getInt();
+ if (dict->lookup("D", &obj)->isNum()) {
+ duration = obj.getNum();
}
obj.free();
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PageTransition.h b/source/libs/poppler/poppler-0.37.0/poppler/PageTransition.h
similarity index 94%
rename from source/libs/poppler/poppler-0.36.0/poppler/PageTransition.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PageTransition.h
index e892c6c50..82f080f41 100644
--- a/source/libs/poppler/poppler-0.36.0/poppler/PageTransition.h
+++ b/source/libs/poppler/poppler-0.37.0/poppler/PageTransition.h
@@ -1,5 +1,6 @@
/* PageTransition.cc
* Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2015, Arseniy Lartsev <arseniy@alumni.chalmers.se>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -72,7 +73,7 @@ public:
PageTransitionType getType() { return type; }
// Get duration
- int getDuration() { return duration;}
+ double getDuration() { return duration; }
// Get alignment
PageTransitionAlignment getAlignment() { return alignment; }
@@ -92,7 +93,7 @@ public:
private:
PageTransitionType type; // transition style
- int duration; // duration of the effect in seconds
+ double duration; // duration of the effect in seconds
PageTransitionAlignment alignment; // dimension of the effect
PageTransitionDirection direction; // direction of motion
int angle; // direction in degrees
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Parser.cc b/source/libs/poppler/poppler-0.37.0/poppler/Parser.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Parser.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Parser.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Parser.h b/source/libs/poppler/poppler-0.37.0/poppler/Parser.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Parser.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Parser.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PopplerCache.cc b/source/libs/poppler/poppler-0.37.0/poppler/PopplerCache.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PopplerCache.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/PopplerCache.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PopplerCache.h b/source/libs/poppler/poppler-0.37.0/poppler/PopplerCache.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PopplerCache.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PopplerCache.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PreScanOutputDev.cc b/source/libs/poppler/poppler-0.37.0/poppler/PreScanOutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PreScanOutputDev.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/PreScanOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/PreScanOutputDev.h b/source/libs/poppler/poppler-0.37.0/poppler/PreScanOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/PreScanOutputDev.h
rename to source/libs/poppler/poppler-0.37.0/poppler/PreScanOutputDev.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/ProfileData.cc b/source/libs/poppler/poppler-0.37.0/poppler/ProfileData.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/ProfileData.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/ProfileData.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/ProfileData.h b/source/libs/poppler/poppler-0.37.0/poppler/ProfileData.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/ProfileData.h
rename to source/libs/poppler/poppler-0.37.0/poppler/ProfileData.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Rendition.cc b/source/libs/poppler/poppler-0.37.0/poppler/Rendition.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Rendition.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Rendition.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Rendition.h b/source/libs/poppler/poppler-0.37.0/poppler/Rendition.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Rendition.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Rendition.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/SecurityHandler.cc b/source/libs/poppler/poppler-0.37.0/poppler/SecurityHandler.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/SecurityHandler.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/SecurityHandler.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/SecurityHandler.h b/source/libs/poppler/poppler-0.37.0/poppler/SecurityHandler.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/SecurityHandler.h
rename to source/libs/poppler/poppler-0.37.0/poppler/SecurityHandler.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Sound.cc b/source/libs/poppler/poppler-0.37.0/poppler/Sound.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Sound.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Sound.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Sound.h b/source/libs/poppler/poppler-0.37.0/poppler/Sound.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Sound.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Sound.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.cc b/source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.cc
index d9d5699a0..6d4161687 100644
--- a/source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.cc
+++ b/source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.cc
@@ -35,6 +35,7 @@
// Copyright (C) 2014 Ed Porras <ed@moto-research.com>
// Copyright (C) 2014 Richard PALO <richard@netbsd.org>
// Copyright (C) 2015 Tamas Szekeres <szekerest@gmail.com>
+// Copyright (C) 2015 Kenji Uno <ku@digitaldolphins.jp>
//
// 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
@@ -1906,7 +1907,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
GfxFont *gfxFont;
GfxFontLoc *fontLoc;
GfxFontType fontType;
- SplashOutFontFileID *id;
+ SplashOutFontFileID *id = NULL;
SplashFontFile *fontFile;
SplashFontSrc *fontsrc = NULL;
FoFiTrueType *ff;
@@ -1945,6 +1946,12 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
}
// check the font file cache
+reload:
+ delete id;
+ delete fontLoc;
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
+
id = new SplashOutFontFileID(gfxFont->getID());
if ((fontFile = fontEngine->getFontFile(id))) {
delete id;
@@ -1988,6 +1995,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString()
: "(unnamed)");
+ if (gfxFont->invalidateEmbeddedFont()) goto reload;
goto err2;
}
break;
@@ -1999,6 +2007,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString()
: "(unnamed)");
+ if (gfxFont->invalidateEmbeddedFont()) goto reload;
goto err2;
}
break;
@@ -2010,6 +2019,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString()
: "(unnamed)");
+ if (gfxFont->invalidateEmbeddedFont()) goto reload;
goto err2;
}
break;
@@ -2045,6 +2055,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString()
: "(unnamed)");
+ if (gfxFont->invalidateEmbeddedFont()) goto reload;
goto err2;
}
break;
@@ -2056,6 +2067,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString()
: "(unnamed)");
+ if (gfxFont->invalidateEmbeddedFont()) goto reload;
goto err2;
}
break;
@@ -2076,6 +2088,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString()
: "(unnamed)");
+ if (gfxFont->invalidateEmbeddedFont()) goto reload;
goto err2;
}
break;
@@ -2112,6 +2125,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString()
: "(unnamed)");
+ if (gfxFont->invalidateEmbeddedFont()) goto reload;
goto err2;
}
break;
@@ -3683,6 +3697,11 @@ void SplashOutputDev::drawMaskedImage(GfxState *state, Object *ref,
imgMaskData.height = maskHeight;
imgMaskData.y = 0;
maskBitmap = new SplashBitmap(width, height, 1, splashModeMono1, gFalse);
+ if (!maskBitmap->getDataPtr()) {
+ delete maskBitmap;
+ width = height = 1;
+ maskBitmap = new SplashBitmap(width, height, 1, splashModeMono1, gFalse);
+ }
maskSplash = new Splash(maskBitmap, gFalse);
maskColor[0] = 0;
maskSplash->clear(maskColor);
@@ -4058,7 +4077,9 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
// save state
transpGroup->origBitmap = bitmap;
transpGroup->origSplash = splash;
+#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
transpGroup->fontAA = fontEngine->getAA();
+#endif
//~ this handles the blendingColorSpace arg for soft masks, but
//~ not yet for transparency groups
@@ -4088,10 +4109,17 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
// create the temporary bitmap
bitmap = new SplashBitmap(w, h, bitmapRowPad, colorMode, gTrue,
bitmapTopDown, bitmap->getSeparationList());
+ if (!bitmap->getDataPtr()) {
+ delete bitmap;
+ w = h = 1;
+ bitmap = new SplashBitmap(w, h, bitmapRowPad, colorMode, gTrue, bitmapTopDown);
+ }
splash = new Splash(bitmap, vectorAntialias,
transpGroup->origSplash->getScreen());
if (transpGroup->next != NULL && transpGroup->next->knockout) {
+#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
fontEngine->setAA(gFalse);
+#endif
}
splash->setThinLineMode(transpGroup->origSplash->getThinLineMode());
splash->setMinLineWidth(globalParams->getMinLineWidth());
@@ -4155,7 +4183,9 @@ void SplashOutputDev::paintTransparencyGroup(GfxState *state, double *bbox) {
splash->composite(tBitmap, 0, 0, tx, ty,
tBitmap->getWidth(), tBitmap->getHeight(),
gFalse, !isolated, transpGroupStack->next != NULL && transpGroupStack->next->knockout, knockoutOpacity);
+#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
fontEngine->setAA(transpGroupStack->fontAA);
+#endif
if (transpGroupStack->next != NULL && transpGroupStack->next->shape != NULL) {
transpGroupStack->next->knockout = gTrue;
}
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.h b/source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/SplashOutputDev.h
rename to source/libs/poppler/poppler-0.37.0/poppler/SplashOutputDev.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/StdinCachedFile.cc b/source/libs/poppler/poppler-0.37.0/poppler/StdinCachedFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/StdinCachedFile.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/StdinCachedFile.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/StdinCachedFile.h b/source/libs/poppler/poppler-0.37.0/poppler/StdinCachedFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/StdinCachedFile.h
rename to source/libs/poppler/poppler-0.37.0/poppler/StdinCachedFile.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/StdinPDFDocBuilder.cc b/source/libs/poppler/poppler-0.37.0/poppler/StdinPDFDocBuilder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/StdinPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/StdinPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/StdinPDFDocBuilder.h b/source/libs/poppler/poppler-0.37.0/poppler/StdinPDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/StdinPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.37.0/poppler/StdinPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Stream-CCITT.h b/source/libs/poppler/poppler-0.37.0/poppler/Stream-CCITT.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Stream-CCITT.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Stream-CCITT.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Stream.cc b/source/libs/poppler/poppler-0.37.0/poppler/Stream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Stream.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/Stream.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/Stream.h b/source/libs/poppler/poppler-0.37.0/poppler/Stream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/Stream.h
rename to source/libs/poppler/poppler-0.37.0/poppler/Stream.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/StructElement.cc b/source/libs/poppler/poppler-0.37.0/poppler/StructElement.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/StructElement.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/StructElement.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/StructElement.h b/source/libs/poppler/poppler-0.37.0/poppler/StructElement.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/StructElement.h
rename to source/libs/poppler/poppler-0.37.0/poppler/StructElement.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/StructTreeRoot.cc b/source/libs/poppler/poppler-0.37.0/poppler/StructTreeRoot.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/StructTreeRoot.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/StructTreeRoot.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/StructTreeRoot.h b/source/libs/poppler/poppler-0.37.0/poppler/StructTreeRoot.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/StructTreeRoot.h
rename to source/libs/poppler/poppler-0.37.0/poppler/StructTreeRoot.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/TextOutputDev.cc b/source/libs/poppler/poppler-0.37.0/poppler/TextOutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/TextOutputDev.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/TextOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/TextOutputDev.h b/source/libs/poppler/poppler-0.37.0/poppler/TextOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/TextOutputDev.h
rename to source/libs/poppler/poppler-0.37.0/poppler/TextOutputDev.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UTF.cc b/source/libs/poppler/poppler-0.37.0/poppler/UTF.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UTF.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/UTF.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UTF.h b/source/libs/poppler/poppler-0.37.0/poppler/UTF.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UTF.h
rename to source/libs/poppler/poppler-0.37.0/poppler/UTF.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UTF8.h b/source/libs/poppler/poppler-0.37.0/poppler/UTF8.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UTF8.h
rename to source/libs/poppler/poppler-0.37.0/poppler/UTF8.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UnicodeCClassTables.h b/source/libs/poppler/poppler-0.37.0/poppler/UnicodeCClassTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UnicodeCClassTables.h
rename to source/libs/poppler/poppler-0.37.0/poppler/UnicodeCClassTables.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UnicodeCompTables.h b/source/libs/poppler/poppler-0.37.0/poppler/UnicodeCompTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UnicodeCompTables.h
rename to source/libs/poppler/poppler-0.37.0/poppler/UnicodeCompTables.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UnicodeDecompTables.h b/source/libs/poppler/poppler-0.37.0/poppler/UnicodeDecompTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UnicodeDecompTables.h
rename to source/libs/poppler/poppler-0.37.0/poppler/UnicodeDecompTables.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMap.cc b/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMap.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UnicodeMap.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/UnicodeMap.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMap.h b/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UnicodeMap.h
rename to source/libs/poppler/poppler-0.37.0/poppler/UnicodeMap.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UnicodeMapTables.h b/source/libs/poppler/poppler-0.37.0/poppler/UnicodeMapTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UnicodeMapTables.h
rename to source/libs/poppler/poppler-0.37.0/poppler/UnicodeMapTables.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UnicodeTypeTable.cc b/source/libs/poppler/poppler-0.37.0/poppler/UnicodeTypeTable.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UnicodeTypeTable.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/UnicodeTypeTable.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/UnicodeTypeTable.h b/source/libs/poppler/poppler-0.37.0/poppler/UnicodeTypeTable.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/UnicodeTypeTable.h
rename to source/libs/poppler/poppler-0.37.0/poppler/UnicodeTypeTable.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/ViewerPreferences.cc b/source/libs/poppler/poppler-0.37.0/poppler/ViewerPreferences.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/ViewerPreferences.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/ViewerPreferences.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/ViewerPreferences.h b/source/libs/poppler/poppler-0.37.0/poppler/ViewerPreferences.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/ViewerPreferences.h
rename to source/libs/poppler/poppler-0.37.0/poppler/ViewerPreferences.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/XRef.cc b/source/libs/poppler/poppler-0.37.0/poppler/XRef.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/XRef.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/XRef.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/XRef.h b/source/libs/poppler/poppler-0.37.0/poppler/XRef.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/XRef.h
rename to source/libs/poppler/poppler-0.37.0/poppler/XRef.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/XpdfPluginAPI.cc b/source/libs/poppler/poppler-0.37.0/poppler/XpdfPluginAPI.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/XpdfPluginAPI.cc
rename to source/libs/poppler/poppler-0.37.0/poppler/XpdfPluginAPI.cc
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/XpdfPluginAPI.h b/source/libs/poppler/poppler-0.37.0/poppler/XpdfPluginAPI.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/XpdfPluginAPI.h
rename to source/libs/poppler/poppler-0.37.0/poppler/XpdfPluginAPI.h
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/gen-unicode-tables.py b/source/libs/poppler/poppler-0.37.0/poppler/gen-unicode-tables.py
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/gen-unicode-tables.py
rename to source/libs/poppler/poppler-0.37.0/poppler/gen-unicode-tables.py
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/poppler-config.h.cmake b/source/libs/poppler/poppler-0.37.0/poppler/poppler-config.h.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/poppler-config.h.cmake
rename to source/libs/poppler/poppler-0.37.0/poppler/poppler-config.h.cmake
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/poppler-config.h.in b/source/libs/poppler/poppler-0.37.0/poppler/poppler-config.h.in
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/poppler-config.h.in
rename to source/libs/poppler/poppler-0.37.0/poppler/poppler-config.h.in
diff --git a/source/libs/poppler/poppler-0.36.0/poppler/strtok_r.cpp b/source/libs/poppler/poppler-0.37.0/poppler/strtok_r.cpp
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/poppler/strtok_r.cpp
rename to source/libs/poppler/poppler-0.37.0/poppler/strtok_r.cpp
diff --git a/source/libs/poppler/poppler-0.36.0/splash/Makefile.am b/source/libs/poppler/poppler-0.37.0/splash/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/Makefile.am
rename to source/libs/poppler/poppler-0.37.0/splash/Makefile.am
diff --git a/source/libs/poppler/poppler-0.36.0/splash/Splash.cc b/source/libs/poppler/poppler-0.37.0/splash/Splash.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/Splash.cc
rename to source/libs/poppler/poppler-0.37.0/splash/Splash.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/Splash.h b/source/libs/poppler/poppler-0.37.0/splash/Splash.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/Splash.h
rename to source/libs/poppler/poppler-0.37.0/splash/Splash.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashBitmap.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashBitmap.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashBitmap.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashBitmap.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashBitmap.h b/source/libs/poppler/poppler-0.37.0/splash/SplashBitmap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashBitmap.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashBitmap.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashClip.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashClip.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashClip.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashClip.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashClip.h b/source/libs/poppler/poppler-0.37.0/splash/SplashClip.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashClip.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashClip.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashErrorCodes.h b/source/libs/poppler/poppler-0.37.0/splash/SplashErrorCodes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashErrorCodes.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashErrorCodes.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFTFont.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashFTFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFTFont.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFTFont.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFTFont.h b/source/libs/poppler/poppler-0.37.0/splash/SplashFTFont.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFTFont.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFTFont.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontEngine.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFTFontEngine.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFTFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontEngine.h b/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFTFontEngine.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFTFontEngine.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontFile.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFTFontFile.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFTFontFile.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFTFontFile.h b/source/libs/poppler/poppler-0.37.0/splash/SplashFTFontFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFTFontFile.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFTFontFile.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFont.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFont.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFont.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFont.h b/source/libs/poppler/poppler-0.37.0/splash/SplashFont.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFont.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFont.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFontEngine.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashFontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFontEngine.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFontEngine.h b/source/libs/poppler/poppler-0.37.0/splash/SplashFontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFontEngine.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFontEngine.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFontFile.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashFontFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFontFile.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFontFile.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFontFile.h b/source/libs/poppler/poppler-0.37.0/splash/SplashFontFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFontFile.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFontFile.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFontFileID.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashFontFileID.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFontFileID.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFontFileID.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashFontFileID.h b/source/libs/poppler/poppler-0.37.0/splash/SplashFontFileID.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashFontFileID.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashFontFileID.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashGlyphBitmap.h b/source/libs/poppler/poppler-0.37.0/splash/SplashGlyphBitmap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashGlyphBitmap.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashGlyphBitmap.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashMath.h b/source/libs/poppler/poppler-0.37.0/splash/SplashMath.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashMath.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashMath.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashPath.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashPath.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashPath.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashPath.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashPath.h b/source/libs/poppler/poppler-0.37.0/splash/SplashPath.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashPath.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashPath.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashPattern.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashPattern.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashPattern.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashPattern.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashPattern.h b/source/libs/poppler/poppler-0.37.0/splash/SplashPattern.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashPattern.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashPattern.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashScreen.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashScreen.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashScreen.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashScreen.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashScreen.h b/source/libs/poppler/poppler-0.37.0/splash/SplashScreen.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashScreen.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashScreen.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashState.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashState.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashState.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashState.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashState.h b/source/libs/poppler/poppler-0.37.0/splash/SplashState.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashState.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashState.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashT1Font.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashT1Font.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashT1Font.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashT1Font.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashT1Font.h b/source/libs/poppler/poppler-0.37.0/splash/SplashT1Font.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashT1Font.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashT1Font.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontEngine.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashT1FontEngine.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashT1FontEngine.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontEngine.h b/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashT1FontEngine.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashT1FontEngine.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontFile.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashT1FontFile.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashT1FontFile.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashT1FontFile.h b/source/libs/poppler/poppler-0.37.0/splash/SplashT1FontFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashT1FontFile.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashT1FontFile.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashTypes.h b/source/libs/poppler/poppler-0.37.0/splash/SplashTypes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashTypes.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashTypes.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashXPath.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashXPath.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashXPath.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashXPath.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashXPath.h b/source/libs/poppler/poppler-0.37.0/splash/SplashXPath.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashXPath.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashXPath.h
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashXPathScanner.cc b/source/libs/poppler/poppler-0.37.0/splash/SplashXPathScanner.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashXPathScanner.cc
rename to source/libs/poppler/poppler-0.37.0/splash/SplashXPathScanner.cc
diff --git a/source/libs/poppler/poppler-0.36.0/splash/SplashXPathScanner.h b/source/libs/poppler/poppler-0.37.0/splash/SplashXPathScanner.h
similarity index 100%
rename from source/libs/poppler/poppler-0.36.0/splash/SplashXPathScanner.h
rename to source/libs/poppler/poppler-0.37.0/splash/SplashXPathScanner.h
diff --git a/source/libs/poppler/version.ac b/source/libs/poppler/version.ac
index 686a3c38e..be7fdc2be 100644
--- a/source/libs/poppler/version.ac
+++ b/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.36.0])
+m4_define([poppler_version], [0.37.0])
diff --git a/source/texk/README b/source/texk/README
index c5fad1a86..0a6e6aaa6 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,4 +1,4 @@
-$Id: README 38494 2015-09-29 07:38:47Z peter $
+$Id: README 38597 2015-10-09 08:32:06Z peter $
Copyright 2006-2015 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -62,7 +62,7 @@ dvipsk - maintained here, by us
dvisvgm 1.11 - checked 29sep15
http://dvisvgm.bplaced.net/Downloads
-gregorio 4.0.0-beta2
+gregorio 4.0.0-rc1 - checked 9oct15
https://github.com/gregorio-project/gregorio/releases/
gsftopk - from Paul Vojta's xdvi?
diff --git a/source/texk/web2c/luatexdir/ChangeLog b/source/texk/web2c/luatexdir/ChangeLog
index 01ad1c2a2..4998e8413 100644
--- a/source/texk/web2c/luatexdir/ChangeLog
+++ b/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * luatex.c: Sync with the upstream.
+ * font/luatexfont.h, font/writetype2.w: Sync with the upstream.
+
2015-10-08 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* lua/lepdflib.cc, tex/texnodes.h, tex/texnodes.w, NEWS:
diff --git a/source/texk/web2c/luatexdir/luafontloader/ChangeLog b/source/texk/web2c/luatexdir/luafontloader/ChangeLog
index 59837dcef..7b9b0c48c 100644
--- a/source/texk/web2c/luatexdir/luafontloader/ChangeLog
+++ b/source/texk/web2c/luatexdir/luafontloader/ChangeLog
@@ -1,3 +1,11 @@
+2015-10-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * fontforge/fontforge/splinefont.h.
+ fontforge/fontforge/splinesaveafm.c:
+ Declare arg2 of CheckAfmOfPostscript() as const.
+ * src/luafflib.c: Temporarily copy const strings instead of
+ casting them from 'const char *' to 'char *'.
+
2015-10-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* src/ffdummies.h (new): Declare functions and variables.
diff --git a/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/splinefont.h b/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/splinefont.h
index ccee275e0..5c432cb7d 100644
--- a/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/splinefont.h
+++ b/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/splinefont.h
@@ -1764,7 +1764,7 @@ extern char *strconcat3(const char *str, const char *str2, const char *str3);
extern char *XUIDFromFD(int xuid[20]);
extern SplineFont *SplineFontFromPSFont(struct fontdict *fd);
-extern int CheckAfmOfPostscript(SplineFont *sf,char *psname,EncMap *map);
+extern int CheckAfmOfPostscript(SplineFont *sf, const char *psname,EncMap *map);
extern int LoadKerningDataFromAmfm(SplineFont *sf, char *filename, EncMap *map);
extern int LoadKerningDataFromAfm(SplineFont *sf, char *filename, EncMap *map);
extern int LoadKerningDataFromTfm(SplineFont *sf, char *filename, EncMap *map);
diff --git a/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c b/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c
index 4607ee388..781e9e26f 100644
--- a/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c
+++ b/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c
@@ -228,7 +228,7 @@ return( 0 );
return( true );
}
-int CheckAfmOfPostscript(SplineFont *sf,char *psname, EncMap *map) {
+int CheckAfmOfPostscript(SplineFont *sf, const char *psname, EncMap *map) {
char *new, *pt;
int ret;
int wasuc=false;
diff --git a/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c b/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
index 61a2e7934..f932c3d99 100644
--- a/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
+++ b/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
@@ -301,8 +301,9 @@ static int ff_apply_featurefile(lua_State * L)
SplineFont **sf;
char *fname;
sf = check_isfont(L, 1);
- fname = (char *) luaL_checkstring(L, 2);
+ fname = xstrdup(luaL_checkstring(L, 2));
SFApplyFeatureFilename(*sf, fname);
+ free(fname);
if (gww_error_count > 0) {
int i;
lua_newtable(L);
@@ -320,9 +321,9 @@ static int ff_apply_featurefile(lua_State * L)
static int ff_apply_afmfile(lua_State * L)
{
SplineFont **sf;
- char *fname;
+ const char *fname;
sf = check_isfont(L, 1);
- fname = (char *) luaL_checkstring(L, 2);
+ fname = luaL_checkstring(L, 2);
CheckAfmOfPostscript(*sf, fname, (*sf)->map);
if (gww_error_count > 0) {
int i;
@@ -3227,6 +3228,7 @@ static int ff_info(lua_State * L)
FILE *l;
int i;
const char *fontname;
+ char *fontnamecopy;
int openflags = 1;
fontname = luaL_checkstring(L, 1);
if (!strlen(fontname)) {
@@ -3247,7 +3249,9 @@ static int ff_info(lua_State * L)
}
gww_error_count = 0;
- sf = ReadSplineFontInfo((char *) fontname, openflags);
+ fontnamecopy = xstrdup(fontname);
+ sf = ReadSplineFontInfo(fontnamecopy, openflags);
+ free(fontnamecopy);
if (gww_error_count > 0)
gwwv_errors_free();
--
GitLab