summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/libs/README2
-rwxr-xr-xBuild/source/libs/gd/configure22
-rw-r--r--Build/source/libs/gd/configure.ac15
-rw-r--r--Build/source/libs/poppler/ChangeLog9
-rw-r--r--Build/source/libs/poppler/Makefile.am6
-rw-r--r--Build/source/libs/poppler/Makefile.in132
-rwxr-xr-xBuild/source/libs/poppler/configure35
-rw-r--r--Build/source/libs/poppler/configure.ac5
-rw-r--r--Build/source/libs/poppler/fofi/Makefile.in2
-rw-r--r--Build/source/libs/poppler/goo/Makefile.in2
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY154
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-02-warnings22
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-03-POPPLER_VERSION13
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/ChangeLog24069
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/aclocal.m41159
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/goo/GooVector.h113
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/goo/PNGWriter.h43
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/goo/gtypes.h29
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/gtk-doc.make196
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/poppler-config.h.cmake90
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/poppler/ABWOutputDev.cc1179
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/poppler/ABWOutputDev.h141
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/poppler/Catalog.cc739
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/poppler/FileSpec.h24
-rw-r--r--Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDoc.cc914
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0-PATCHES/ChangeLog (renamed from Build/source/libs/poppler/poppler-0.12.4-PATCHES/ChangeLog)6
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0-PATCHES/TL-Changes (renamed from Build/source/libs/poppler/poppler-0.12.4-PATCHES/TL-Changes)5
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY89
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-02-warnings86
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-03-POPPLER_VERSION13
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/AUTHORS (renamed from Build/source/libs/poppler/poppler-0.12.4/AUTHORS)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/CMakeLists.txt (renamed from Build/source/libs/poppler/poppler-0.12.4/CMakeLists.txt)257
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/COPYING (renamed from Build/source/libs/poppler/poppler-0.12.4/COPYING)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/ChangeLog37227
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/ConfigureChecks.cmake (renamed from Build/source/libs/poppler/poppler-0.12.4/ConfigureChecks.cmake)9
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/INSTALL (renamed from Build/source/libs/poppler/poppler-0.12.4/INSTALL)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.12.4/Makefile.am)58
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/Makefile.in (renamed from Build/source/libs/poppler/poppler-0.12.4/Makefile.in)190
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/NEWS (renamed from Build/source/libs/poppler/poppler-0.12.4/NEWS)582
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/README (renamed from Build/source/libs/poppler/poppler-0.12.4/README)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/README-XPDF (renamed from Build/source/libs/poppler/poppler-0.12.4/README-XPDF)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/TODO (renamed from Build/source/libs/poppler/poppler-0.12.4/TODO)2
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/aclocal.m42161
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/config.h.cmake (renamed from Build/source/libs/poppler/poppler-0.12.4/config.h.cmake)82
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/config.h.in (renamed from Build/source/libs/poppler/poppler-0.12.4/config.h.in)55
-rwxr-xr-xBuild/source/libs/poppler/poppler-0.18.0/configure (renamed from Build/source/libs/poppler/poppler-0.12.4/configure)10033
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/configure.ac (renamed from Build/source/libs/poppler/poppler-0.12.4/configure.ac)374
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiBase.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiBase.cc)6
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiBase.h (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiBase.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiEncodings.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiEncodings.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiEncodings.h (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiEncodings.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiTrueType.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiTrueType.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiTrueType.h (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiTrueType.h)2
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1.cc)13
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1.h (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1C.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1C.cc)12
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1C.h (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1C.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/Makefile.am)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/fofi/Makefile.in (renamed from Build/source/libs/poppler/poppler-0.12.4/fofi/Makefile.in)40
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/FixedPoint.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/FixedPoint.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/FixedPoint.h (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/FixedPoint.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/GooHash.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/GooHash.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/GooHash.h (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/GooHash.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/GooLikely.h22
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/GooList.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/GooList.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/GooList.h (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/GooList.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/GooMutex.h (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/GooMutex.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/GooString.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/GooString.cc)14
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/GooString.h (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/GooString.h)21
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/GooTimer.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/GooTimer.cc)7
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/GooTimer.h (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/GooTimer.h)7
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.cc15
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.h33
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.cc145
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.h56
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/Makefile.am)16
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/Makefile.in (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/Makefile.in)79
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/PNGWriter.cc)79
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.h63
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.cc202
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.h54
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/gfile.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/gfile.cc)6
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/gfile.h (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/gfile.h)3
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/gmem.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/gmem.cc)64
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/gmem.h (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/gmem.h)38
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/gmempp.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/gmempp.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/gstrtod.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/gstrtod.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/gstrtod.h (renamed from Build/source/libs/poppler/poppler-0.12.4/goo/gstrtod.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/gtypes.h48
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/goo/gtypes_p.h30
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/gtk-doc.make240
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-cairo-uninstalled.pc.in6
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-cairo.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler-cairo.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-cairo.pc.in (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler-cairo.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-cpp-uninstalled.pc.in7
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-cpp.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler-qt.pc.cmake)8
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-cpp.pc.in (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler-qt.pc.in)8
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-glib-uninstalled.pc.in7
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-glib.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler-glib.pc.cmake)2
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-glib.pc.in (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler-glib.pc.in)2
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-qt4-uninstalled.pc.in7
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-qt4.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler-qt4.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-qt4.pc.in (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler-qt4.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-splash-uninstalled.pc.in7
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-splash.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler-splash.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-splash.pc.in (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler-splash.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler-uninstalled.pc.in6
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler.pc.cmake (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler.pc.cmake)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler.pc.in (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler.pc.in)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Annot.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Annot.cc)2708
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Annot.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Annot.h)206
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Array.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Array.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Array.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Array.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/ArthurOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/ArthurOutputDev.cc)185
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/ArthurOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/ArthurOutputDev.h)22
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFont.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFont.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFont.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFont.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFontTables.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFontTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFontTables.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFontTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CMap.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/CMap.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CMap.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/CMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.cc256
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.h146
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CairoFontEngine.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/CairoFontEngine.cc)174
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CairoFontEngine.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/CairoFontEngine.h)13
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CairoOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/CairoOutputDev.cc)968
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CairoOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/CairoOutputDev.h)72
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.cc351
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.h12
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.cc965
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Catalog.h)127
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CharCodeToUnicode.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/CharCodeToUnicode.cc)29
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CharCodeToUnicode.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/CharCodeToUnicode.h)4
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CharTypes.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/CharTypes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CompactFontTables.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/CompactFontTables.h)16
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.cc99
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.h40
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.cc47
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.h33
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/DCTStream.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/DCTStream.cc)118
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/DCTStream.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/DCTStream.h)20
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/DateInfo.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/DateInfo.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/DateInfo.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/DateInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Decrypt.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Decrypt.cc)8
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Decrypt.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Decrypt.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Dict.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Dict.cc)106
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Dict.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Dict.h)9
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Error.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Error.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Error.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Error.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/ErrorCodes.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/ErrorCodes.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/FileSpec.cc)128
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.h73
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/FlateStream.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/FlateStream.cc)9
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/FlateStream.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/FlateStream.h)12
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/FontEncodingTables.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/FontEncodingTables.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/FontEncodingTables.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/FontEncodingTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/FontInfo.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/FontInfo.cc)95
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/FontInfo.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/FontInfo.h)15
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Form.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Form.cc)1194
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Form.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Form.h)177
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Function.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Function.cc)169
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Function.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Function.h)11
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Gfx.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Gfx.cc)699
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Gfx.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Gfx.h)34
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/GfxFont.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/GfxFont.cc)70
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/GfxFont.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/GfxFont.h)6
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/GfxState.cc)1201
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/GfxState.h)259
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState_helpers.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/GfxState_helpers.h)4
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.cc)269
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.h)21
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParamsWin.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParamsWin.cc)7
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.cc442
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.h95
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/JArithmeticDecoder.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/JArithmeticDecoder.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/JArithmeticDecoder.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/JArithmeticDecoder.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/JBIG2Stream.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/JBIG2Stream.cc)31
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/JBIG2Stream.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/JBIG2Stream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/JPEG2000Stream.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/JPEG2000Stream.cc)104
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/JPEG2000Stream.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/JPEG2000Stream.h)26
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/JPXStream.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/JPXStream.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/JPXStream.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/JPXStream.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Lexer.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Lexer.cc)35
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Lexer.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Lexer.h)8
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.cc222
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.h45
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Link.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Link.cc)282
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Link.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Link.h)93
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.cc46
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.h33
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Makefile.am (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Makefile.am)75
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Makefile.in (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Makefile.in)325
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.cc285
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.h110
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/NameToCharCode.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/NameToCharCode.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/NameToCharCode.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/NameToCharCode.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/NameToUnicodeTable.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/NameToUnicodeTable.h)18
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Object.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Object.cc)9
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Object.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Object.h)36
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/OptionalContent.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/OptionalContent.cc)20
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/OptionalContent.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/OptionalContent.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Outline.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Outline.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Outline.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Outline.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/OutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/OutputDev.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/OutputDev.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/OutputDev.h)31
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.cc1523
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDoc.h)78
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocBuilder.h42
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocEncoding.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDocEncoding.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocEncoding.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDocEncoding.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.cc72
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.h55
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PSOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PSOutputDev.cc)836
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PSOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PSOutputDev.h)50
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PSTokenizer.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PSTokenizer.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PSTokenizer.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PSTokenizer.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Page.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Page.cc)87
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Page.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Page.h)13
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PageLabelInfo.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PageLabelInfo.cc)7
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PageLabelInfo.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PageLabelInfo.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PageTransition.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PageTransition.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PageTransition.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PageTransition.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Parser.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Parser.cc)29
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Parser.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Parser.h)10
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PopplerCache.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PopplerCache.cc)63
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PopplerCache.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PopplerCache.h)19
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PreScanOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PreScanOutputDev.cc)46
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/PreScanOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/PreScanOutputDev.h)28
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/ProfileData.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/ProfileData.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/ProfileData.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/ProfileData.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Rendition.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Movie.cc)301
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Rendition.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Movie.h)88
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/SecurityHandler.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/SecurityHandler.cc)22
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/SecurityHandler.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/SecurityHandler.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Sound.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Sound.cc)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Sound.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Sound.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/SplashOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/SplashOutputDev.cc)1112
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/SplashOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/SplashOutputDev.h)178
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.cc47
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.h27
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.cc43
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.h33
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Stream-CCITT.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Stream-CCITT.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Stream.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Stream.cc)249
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/Stream.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/Stream.h)216
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/TextOutputDev.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/TextOutputDev.cc)1105
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/TextOutputDev.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/TextOutputDev.h)34
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/UTF8.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/UTF8.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeCClassTables.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeCClassTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeCompTables.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeCompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeDecompTables.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeDecompTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMap.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeMap.cc)21
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMap.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeMap.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMapTables.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeMapTables.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeTypeTable.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeTypeTable.cc)3
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeTypeTable.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeTypeTable.h)3
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.cc117
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.h76
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/XRef.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/XRef.cc)548
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/XRef.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/XRef.h)43
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/XpdfPluginAPI.cc (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/XpdfPluginAPI.cc)3
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/XpdfPluginAPI.h (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/XpdfPluginAPI.h)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/gen-unicode-tables.py (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/gen-unicode-tables.py)0
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.cmake178
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.in (renamed from Build/source/libs/poppler/poppler-0.12.4/poppler/poppler-config.h.in)104
-rw-r--r--Build/source/libs/poppler/poppler-0.18.0/poppler/strtok_r.cpp77
-rw-r--r--Build/source/libs/poppler/poppler/Makefile.in8
-rw-r--r--Build/source/libs/poppler/version.ac11
-rwxr-xr-xBuild/source/libs/teckit/configure7
-rw-r--r--Build/source/libs/teckit/configure.ac8
-rwxr-xr-xBuild/source/texk/dvipdfmx/configure7
-rw-r--r--Build/source/texk/dvipdfmx/configure.ac5
272 files changed, 64663 insertions, 38246 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 29c7a1e2c55..1e0eb45089f 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -32,7 +32,7 @@ libpng 1.5.5 - checked 5oct11
obsdcompat - used by pdftex and luatex
-poppler 0.12.4 - checked => 0.16.7
+poppler 0.18.0 - checked 8oct11
http://poppler.freedesktop.org/ - used by luatex and xetex
t1lib 5.1.2 - checked 25apr11
diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure
index f5e960eb599..b568df6980b 100755
--- a/Build/source/libs/gd/configure
+++ b/Build/source/libs/gd/configure
@@ -13413,7 +13413,6 @@ kpse_save_LIBS=$LIBS
eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\"
eval LIBS=\"$ZLIB_LIBS \$LIBS\"
-
ac_fn_c_check_func "$LINENO" "deflate" "ac_cv_func_deflate"
if test "x$ac_cv_func_deflate" = xyes; then :
@@ -13436,13 +13435,9 @@ fi
done
-$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
-
-
eval CPPFLAGS=\"$LIBPNG_INCLUDES \$CPPFLAGS\"
eval LIBS=\"$LIBPNG_LIBS \$LIBS\"
-
ac_fn_c_check_func "$LINENO" "png_create_read_struct" "ac_cv_func_png_create_read_struct"
if test "x$ac_cv_func_png_create_read_struct" = xyes; then :
@@ -13465,13 +13460,9 @@ fi
done
-$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
-
-
eval CPPFLAGS=\"$FREETYPE2_INCLUDES \$CPPFLAGS\"
eval LIBS=\"$FREETYPE2_LIBS \$LIBS\"
-
ac_fn_c_check_func "$LINENO" "FT_Init_FreeType" "ac_cv_func_FT_Init_FreeType"
if test "x$ac_cv_func_FT_Init_FreeType" = xyes; then :
@@ -13494,9 +13485,6 @@ fi
done
-$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
-
-
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
@@ -13504,6 +13492,16 @@ LIBS=$kpse_save_LIBS
echo timestamp >config.force
fi
+
+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
+
+
GD_TREE=gd-2.0.35
diff --git a/Build/source/libs/gd/configure.ac b/Build/source/libs/gd/configure.ac
index fb51f497881..6d6226f4484 100644
--- a/Build/source/libs/gd/configure.ac
+++ b/Build/source/libs/gd/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -46,30 +46,27 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno])
if test "x$enable_build" != xno || test -f config.force; then
KPSE_ADD_FLAGS([zlib])
-
AC_CHECK_FUNC([deflate], , [AC_ERROR([zlib not found])])
AC_CHECK_HEADERS([zlib.h], , [AC_ERROR([zlib not found])])
-AC_DEFINE([HAVE_LIBZ], 1, [Define if you have zlib.])
KPSE_ADD_FLAGS([libpng])
-
AC_CHECK_FUNC([png_create_read_struct], , [AC_ERROR([libpng not found])])
AC_CHECK_HEADERS([png.h], , [AC_ERROR([libpng not found])])
-AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have the png library.])
KPSE_ADD_FLAGS([freetype2])
-
AC_CHECK_FUNC([FT_Init_FreeType], , [AC_ERROR([libfreetype2 not found])])
AC_CHECK_HEADERS([ft2build.h], , [AC_ERROR([libfreetype2 not found])])
-AC_DEFINE([HAVE_LIBFREETYPE], 1, [ Define if you have the freetype library.])
KPSE_RESTORE_FLAGS
echo timestamp >config.force
fi
-GD_TREE=gd-[]gd_version
-AC_SUBST([GD_TREE])
+AC_DEFINE([HAVE_LIBZ], 1, [Define if you have zlib.])
+AC_DEFINE([HAVE_LIBPNG], 1, [Define if you have the png library.])
+AC_DEFINE([HAVE_LIBFREETYPE], 1, [ Define if you have the freetype library.])
+
+AC_SUBST([GD_TREE], [gd-]gd_version)
AC_CONFIG_FILES([Makefile include/Makefile])
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index f1168ff8f7d..4bb4f21f302 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler 0.18.0.
+ * version.ac: New file defining the poppler version.
+ * Makefile.am (poppler_libpoppler_a_sources): Add CachedFile.cc,
+ Hints.cc, Linearization.cc, Rendition.cc, strtok_r.cpp, and
+ ViewerPreferences.cc.
+ * configure.ac: Adapt.
+
2011-04-23 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (goo_libGoo_a_sources): Omit PNGWriter.cc.
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am
index 6cb693975e9..fad9ccd569b 100644
--- a/Build/source/libs/poppler/Makefile.am
+++ b/Build/source/libs/poppler/Makefile.am
@@ -66,6 +66,7 @@ poppler_libpoppler_a_sources = \
$(POPPLER_SRC)/BuiltinFont.cc \
$(POPPLER_SRC)/BuiltinFontTables.cc \
$(POPPLER_SRC)/CMap.cc \
+ $(POPPLER_SRC)/CachedFile.cc \
$(POPPLER_SRC)/Catalog.cc \
$(POPPLER_SRC)/CharCodeToUnicode.cc \
$(POPPLER_SRC)/DateInfo.cc \
@@ -82,9 +83,11 @@ poppler_libpoppler_a_sources = \
$(POPPLER_SRC)/GfxFont.cc \
$(POPPLER_SRC)/GfxState.cc \
$(POPPLER_SRC)/GlobalParams.cc \
+ $(POPPLER_SRC)/Hints.cc \
$(POPPLER_SRC)/JArithmeticDecoder.cc \
$(POPPLER_SRC)/JBIG2Stream.cc \
$(POPPLER_SRC)/JPXStream.cc \
+ $(POPPLER_SRC)/Linearization.cc \
$(POPPLER_SRC)/Lexer.cc \
$(POPPLER_SRC)/Link.cc \
$(POPPLER_SRC)/Movie.cc \
@@ -104,11 +107,14 @@ poppler_libpoppler_a_sources = \
$(POPPLER_SRC)/PopplerCache.cc \
$(POPPLER_SRC)/PreScanOutputDev.cc \
$(POPPLER_SRC)/ProfileData.cc \
+ $(POPPLER_SRC)/Rendition.cc \
$(POPPLER_SRC)/SecurityHandler.cc \
$(POPPLER_SRC)/Sound.cc \
$(POPPLER_SRC)/Stream.cc \
+ $(POPPLER_SRC)/strtok_r.cpp \
$(POPPLER_SRC)/UnicodeMap.cc \
$(POPPLER_SRC)/UnicodeTypeTable.cc \
+ $(POPPLER_SRC)/ViewerPreferences.cc \
$(POPPLER_SRC)/XRef.cc \
$(POPPLER_SRC)/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 43406459036..800a32289a2 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -46,7 +46,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -67,25 +67,27 @@ am__objects_2 = FoFiBase.$(OBJEXT) FoFiEncodings.$(OBJEXT) \
FoFiTrueType.$(OBJEXT) FoFiType1.$(OBJEXT) \
FoFiType1C.$(OBJEXT)
am__objects_3 = Annot.$(OBJEXT) Array.$(OBJEXT) BuiltinFont.$(OBJEXT) \
- BuiltinFontTables.$(OBJEXT) CMap.$(OBJEXT) Catalog.$(OBJEXT) \
+ BuiltinFontTables.$(OBJEXT) CMap.$(OBJEXT) \
+ CachedFile.$(OBJEXT) Catalog.$(OBJEXT) \
CharCodeToUnicode.$(OBJEXT) DateInfo.$(OBJEXT) \
Decrypt.$(OBJEXT) Dict.$(OBJEXT) Error.$(OBJEXT) \
FileSpec.$(OBJEXT) FlateStream.$(OBJEXT) \
FontEncodingTables.$(OBJEXT) FontInfo.$(OBJEXT) Form.$(OBJEXT) \
Function.$(OBJEXT) Gfx.$(OBJEXT) GfxFont.$(OBJEXT) \
- GfxState.$(OBJEXT) GlobalParams.$(OBJEXT) \
+ GfxState.$(OBJEXT) GlobalParams.$(OBJEXT) Hints.$(OBJEXT) \
JArithmeticDecoder.$(OBJEXT) JBIG2Stream.$(OBJEXT) \
- JPXStream.$(OBJEXT) Lexer.$(OBJEXT) Link.$(OBJEXT) \
- Movie.$(OBJEXT) NameToCharCode.$(OBJEXT) Object.$(OBJEXT) \
- OptionalContent.$(OBJEXT) Outline.$(OBJEXT) \
+ JPXStream.$(OBJEXT) Linearization.$(OBJEXT) Lexer.$(OBJEXT) \
+ Link.$(OBJEXT) Movie.$(OBJEXT) NameToCharCode.$(OBJEXT) \
+ Object.$(OBJEXT) OptionalContent.$(OBJEXT) Outline.$(OBJEXT) \
OutputDev.$(OBJEXT) PDFDoc.$(OBJEXT) PDFDocEncoding.$(OBJEXT) \
PSOutputDev.$(OBJEXT) PSTokenizer.$(OBJEXT) Page.$(OBJEXT) \
PageLabelInfo.$(OBJEXT) PageTransition.$(OBJEXT) \
Parser.$(OBJEXT) PopplerCache.$(OBJEXT) \
PreScanOutputDev.$(OBJEXT) ProfileData.$(OBJEXT) \
- SecurityHandler.$(OBJEXT) Sound.$(OBJEXT) Stream.$(OBJEXT) \
- UnicodeMap.$(OBJEXT) UnicodeTypeTable.$(OBJEXT) XRef.$(OBJEXT) \
- XpdfPluginAPI.$(OBJEXT)
+ Rendition.$(OBJEXT) SecurityHandler.$(OBJEXT) Sound.$(OBJEXT) \
+ Stream.$(OBJEXT) strtok_r.$(OBJEXT) UnicodeMap.$(OBJEXT) \
+ UnicodeTypeTable.$(OBJEXT) ViewerPreferences.$(OBJEXT) \
+ XRef.$(OBJEXT) XpdfPluginAPI.$(OBJEXT)
nodist_libpoppler_a_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3)
libpoppler_a_OBJECTS = $(nodist_libpoppler_a_OBJECTS)
@@ -291,6 +293,7 @@ poppler_libpoppler_a_sources = \
$(POPPLER_SRC)/BuiltinFont.cc \
$(POPPLER_SRC)/BuiltinFontTables.cc \
$(POPPLER_SRC)/CMap.cc \
+ $(POPPLER_SRC)/CachedFile.cc \
$(POPPLER_SRC)/Catalog.cc \
$(POPPLER_SRC)/CharCodeToUnicode.cc \
$(POPPLER_SRC)/DateInfo.cc \
@@ -307,9 +310,11 @@ poppler_libpoppler_a_sources = \
$(POPPLER_SRC)/GfxFont.cc \
$(POPPLER_SRC)/GfxState.cc \
$(POPPLER_SRC)/GlobalParams.cc \
+ $(POPPLER_SRC)/Hints.cc \
$(POPPLER_SRC)/JArithmeticDecoder.cc \
$(POPPLER_SRC)/JBIG2Stream.cc \
$(POPPLER_SRC)/JPXStream.cc \
+ $(POPPLER_SRC)/Linearization.cc \
$(POPPLER_SRC)/Lexer.cc \
$(POPPLER_SRC)/Link.cc \
$(POPPLER_SRC)/Movie.cc \
@@ -329,11 +334,14 @@ poppler_libpoppler_a_sources = \
$(POPPLER_SRC)/PopplerCache.cc \
$(POPPLER_SRC)/PreScanOutputDev.cc \
$(POPPLER_SRC)/ProfileData.cc \
+ $(POPPLER_SRC)/Rendition.cc \
$(POPPLER_SRC)/SecurityHandler.cc \
$(POPPLER_SRC)/Sound.cc \
$(POPPLER_SRC)/Stream.cc \
+ $(POPPLER_SRC)/strtok_r.cpp \
$(POPPLER_SRC)/UnicodeMap.cc \
$(POPPLER_SRC)/UnicodeTypeTable.cc \
+ $(POPPLER_SRC)/ViewerPreferences.cc \
$(POPPLER_SRC)/XRef.cc \
$(POPPLER_SRC)/XpdfPluginAPI.cc
@@ -342,7 +350,7 @@ all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .cc .o .obj
+.SUFFIXES: .cc .cpp .o .obj
am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@@ -413,6 +421,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BuiltinFont.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BuiltinFontTables.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CMap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CachedFile.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Catalog.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CharCodeToUnicode.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DateInfo.Po@am__quote@
@@ -439,10 +448,12 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GooList.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GooString.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GooTimer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Hints.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JArithmeticDecoder.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JBIG2Stream.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPXStream.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Lexer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Linearization.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Link.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Movie.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NameToCharCode.Po@am__quote@
@@ -461,17 +472,20 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PopplerCache.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PreScanOutputDev.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ProfileData.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Rendition.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SecurityHandler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sound.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Stream.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnicodeMap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnicodeTypeTable.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ViewerPreferences.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XRef.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XpdfPluginAPI.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmem.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmempp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstrtod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtok_r.Po@am__quote@
.cc.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -753,6 +767,20 @@ CMap.obj: $(POPPLER_SRC)/CMap.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CMap.obj `if test -f '$(POPPLER_SRC)/CMap.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/CMap.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/CMap.cc'; fi`
+CachedFile.o: $(POPPLER_SRC)/CachedFile.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CachedFile.o -MD -MP -MF $(DEPDIR)/CachedFile.Tpo -c -o CachedFile.o `test -f '$(POPPLER_SRC)/CachedFile.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/CachedFile.cc
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/CachedFile.Tpo $(DEPDIR)/CachedFile.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/CachedFile.cc' object='CachedFile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CachedFile.o `test -f '$(POPPLER_SRC)/CachedFile.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/CachedFile.cc
+
+CachedFile.obj: $(POPPLER_SRC)/CachedFile.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CachedFile.obj -MD -MP -MF $(DEPDIR)/CachedFile.Tpo -c -o CachedFile.obj `if test -f '$(POPPLER_SRC)/CachedFile.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/CachedFile.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/CachedFile.cc'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/CachedFile.Tpo $(DEPDIR)/CachedFile.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/CachedFile.cc' object='CachedFile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CachedFile.obj `if test -f '$(POPPLER_SRC)/CachedFile.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/CachedFile.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/CachedFile.cc'; fi`
+
Catalog.o: $(POPPLER_SRC)/Catalog.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Catalog.o -MD -MP -MF $(DEPDIR)/Catalog.Tpo -c -o Catalog.o `test -f '$(POPPLER_SRC)/Catalog.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/Catalog.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Catalog.Tpo $(DEPDIR)/Catalog.Po
@@ -977,6 +1005,20 @@ GlobalParams.obj: $(POPPLER_SRC)/GlobalParams.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GlobalParams.obj `if test -f '$(POPPLER_SRC)/GlobalParams.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/GlobalParams.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/GlobalParams.cc'; fi`
+Hints.o: $(POPPLER_SRC)/Hints.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hints.o -MD -MP -MF $(DEPDIR)/Hints.Tpo -c -o Hints.o `test -f '$(POPPLER_SRC)/Hints.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/Hints.cc
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Hints.Tpo $(DEPDIR)/Hints.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/Hints.cc' object='Hints.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hints.o `test -f '$(POPPLER_SRC)/Hints.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/Hints.cc
+
+Hints.obj: $(POPPLER_SRC)/Hints.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Hints.obj -MD -MP -MF $(DEPDIR)/Hints.Tpo -c -o Hints.obj `if test -f '$(POPPLER_SRC)/Hints.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/Hints.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/Hints.cc'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Hints.Tpo $(DEPDIR)/Hints.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/Hints.cc' object='Hints.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Hints.obj `if test -f '$(POPPLER_SRC)/Hints.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/Hints.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/Hints.cc'; fi`
+
JArithmeticDecoder.o: $(POPPLER_SRC)/JArithmeticDecoder.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT JArithmeticDecoder.o -MD -MP -MF $(DEPDIR)/JArithmeticDecoder.Tpo -c -o JArithmeticDecoder.o `test -f '$(POPPLER_SRC)/JArithmeticDecoder.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/JArithmeticDecoder.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/JArithmeticDecoder.Tpo $(DEPDIR)/JArithmeticDecoder.Po
@@ -1019,6 +1061,20 @@ JPXStream.obj: $(POPPLER_SRC)/JPXStream.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o JPXStream.obj `if test -f '$(POPPLER_SRC)/JPXStream.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/JPXStream.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/JPXStream.cc'; fi`
+Linearization.o: $(POPPLER_SRC)/Linearization.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Linearization.o -MD -MP -MF $(DEPDIR)/Linearization.Tpo -c -o Linearization.o `test -f '$(POPPLER_SRC)/Linearization.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/Linearization.cc
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Linearization.Tpo $(DEPDIR)/Linearization.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/Linearization.cc' object='Linearization.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Linearization.o `test -f '$(POPPLER_SRC)/Linearization.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/Linearization.cc
+
+Linearization.obj: $(POPPLER_SRC)/Linearization.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Linearization.obj -MD -MP -MF $(DEPDIR)/Linearization.Tpo -c -o Linearization.obj `if test -f '$(POPPLER_SRC)/Linearization.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/Linearization.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/Linearization.cc'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Linearization.Tpo $(DEPDIR)/Linearization.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/Linearization.cc' object='Linearization.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Linearization.obj `if test -f '$(POPPLER_SRC)/Linearization.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/Linearization.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/Linearization.cc'; fi`
+
Lexer.o: $(POPPLER_SRC)/Lexer.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Lexer.o -MD -MP -MF $(DEPDIR)/Lexer.Tpo -c -o Lexer.o `test -f '$(POPPLER_SRC)/Lexer.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/Lexer.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Lexer.Tpo $(DEPDIR)/Lexer.Po
@@ -1285,6 +1341,20 @@ ProfileData.obj: $(POPPLER_SRC)/ProfileData.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ProfileData.obj `if test -f '$(POPPLER_SRC)/ProfileData.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/ProfileData.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/ProfileData.cc'; fi`
+Rendition.o: $(POPPLER_SRC)/Rendition.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Rendition.o -MD -MP -MF $(DEPDIR)/Rendition.Tpo -c -o Rendition.o `test -f '$(POPPLER_SRC)/Rendition.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/Rendition.cc
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Rendition.Tpo $(DEPDIR)/Rendition.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/Rendition.cc' object='Rendition.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Rendition.o `test -f '$(POPPLER_SRC)/Rendition.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/Rendition.cc
+
+Rendition.obj: $(POPPLER_SRC)/Rendition.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Rendition.obj -MD -MP -MF $(DEPDIR)/Rendition.Tpo -c -o Rendition.obj `if test -f '$(POPPLER_SRC)/Rendition.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/Rendition.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/Rendition.cc'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/Rendition.Tpo $(DEPDIR)/Rendition.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/Rendition.cc' object='Rendition.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Rendition.obj `if test -f '$(POPPLER_SRC)/Rendition.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/Rendition.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/Rendition.cc'; fi`
+
SecurityHandler.o: $(POPPLER_SRC)/SecurityHandler.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SecurityHandler.o -MD -MP -MF $(DEPDIR)/SecurityHandler.Tpo -c -o SecurityHandler.o `test -f '$(POPPLER_SRC)/SecurityHandler.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/SecurityHandler.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/SecurityHandler.Tpo $(DEPDIR)/SecurityHandler.Po
@@ -1327,6 +1397,20 @@ Stream.obj: $(POPPLER_SRC)/Stream.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Stream.obj `if test -f '$(POPPLER_SRC)/Stream.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/Stream.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/Stream.cc'; fi`
+strtok_r.o: $(POPPLER_SRC)/strtok_r.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT strtok_r.o -MD -MP -MF $(DEPDIR)/strtok_r.Tpo -c -o strtok_r.o `test -f '$(POPPLER_SRC)/strtok_r.cpp' || echo '$(srcdir)/'`$(POPPLER_SRC)/strtok_r.cpp
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/strtok_r.Tpo $(DEPDIR)/strtok_r.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/strtok_r.cpp' object='strtok_r.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o strtok_r.o `test -f '$(POPPLER_SRC)/strtok_r.cpp' || echo '$(srcdir)/'`$(POPPLER_SRC)/strtok_r.cpp
+
+strtok_r.obj: $(POPPLER_SRC)/strtok_r.cpp
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT strtok_r.obj -MD -MP -MF $(DEPDIR)/strtok_r.Tpo -c -o strtok_r.obj `if test -f '$(POPPLER_SRC)/strtok_r.cpp'; then $(CYGPATH_W) '$(POPPLER_SRC)/strtok_r.cpp'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/strtok_r.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/strtok_r.Tpo $(DEPDIR)/strtok_r.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/strtok_r.cpp' object='strtok_r.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o strtok_r.obj `if test -f '$(POPPLER_SRC)/strtok_r.cpp'; then $(CYGPATH_W) '$(POPPLER_SRC)/strtok_r.cpp'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/strtok_r.cpp'; fi`
+
UnicodeMap.o: $(POPPLER_SRC)/UnicodeMap.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UnicodeMap.o -MD -MP -MF $(DEPDIR)/UnicodeMap.Tpo -c -o UnicodeMap.o `test -f '$(POPPLER_SRC)/UnicodeMap.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/UnicodeMap.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/UnicodeMap.Tpo $(DEPDIR)/UnicodeMap.Po
@@ -1355,6 +1439,20 @@ UnicodeTypeTable.obj: $(POPPLER_SRC)/UnicodeTypeTable.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UnicodeTypeTable.obj `if test -f '$(POPPLER_SRC)/UnicodeTypeTable.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/UnicodeTypeTable.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/UnicodeTypeTable.cc'; fi`
+ViewerPreferences.o: $(POPPLER_SRC)/ViewerPreferences.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ViewerPreferences.o -MD -MP -MF $(DEPDIR)/ViewerPreferences.Tpo -c -o ViewerPreferences.o `test -f '$(POPPLER_SRC)/ViewerPreferences.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/ViewerPreferences.cc
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/ViewerPreferences.Tpo $(DEPDIR)/ViewerPreferences.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/ViewerPreferences.cc' object='ViewerPreferences.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ViewerPreferences.o `test -f '$(POPPLER_SRC)/ViewerPreferences.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/ViewerPreferences.cc
+
+ViewerPreferences.obj: $(POPPLER_SRC)/ViewerPreferences.cc
+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ViewerPreferences.obj -MD -MP -MF $(DEPDIR)/ViewerPreferences.Tpo -c -o ViewerPreferences.obj `if test -f '$(POPPLER_SRC)/ViewerPreferences.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/ViewerPreferences.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/ViewerPreferences.cc'; fi`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/ViewerPreferences.Tpo $(DEPDIR)/ViewerPreferences.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(POPPLER_SRC)/ViewerPreferences.cc' object='ViewerPreferences.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ViewerPreferences.obj `if test -f '$(POPPLER_SRC)/ViewerPreferences.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/ViewerPreferences.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/ViewerPreferences.cc'; fi`
+
XRef.o: $(POPPLER_SRC)/XRef.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT XRef.o -MD -MP -MF $(DEPDIR)/XRef.Tpo -c -o XRef.o `test -f '$(POPPLER_SRC)/XRef.cc' || echo '$(srcdir)/'`$(POPPLER_SRC)/XRef.cc
@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/XRef.Tpo $(DEPDIR)/XRef.Po
@@ -1383,6 +1481,20 @@ XpdfPluginAPI.obj: $(POPPLER_SRC)/XpdfPluginAPI.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o XpdfPluginAPI.obj `if test -f '$(POPPLER_SRC)/XpdfPluginAPI.cc'; then $(CYGPATH_W) '$(POPPLER_SRC)/XpdfPluginAPI.cc'; else $(CYGPATH_W) '$(srcdir)/$(POPPLER_SRC)/XpdfPluginAPI.cc'; fi`
+.cpp.o:
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index 7dfcf974cde..580b27db235 100755
--- a/Build/source/libs/poppler/configure
+++ b/Build/source/libs/poppler/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for poppler for TeX Live 0.12.4.
+# Generated by GNU Autoconf 2.68 for poppler for TeX Live 0.18.0.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -560,12 +560,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='poppler for TeX Live'
PACKAGE_TARNAME='poppler-for-tex-live'
-PACKAGE_VERSION='0.12.4'
-PACKAGE_STRING='poppler for TeX Live 0.12.4'
+PACKAGE_VERSION='0.18.0'
+PACKAGE_STRING='poppler for TeX Live 0.18.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.12.4/poppler/Array.cc"
+ac_unique_file="poppler-0.18.0/poppler/Array.cc"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1276,7 +1276,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poppler for TeX Live 0.12.4 to adapt to many kinds of systems.
+\`configure' configures poppler for TeX Live 0.18.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1343,7 +1343,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler for TeX Live 0.12.4:";;
+ short | recursive ) echo "Configuration of poppler for TeX Live 0.18.0:";;
esac
cat <<\_ACEOF
@@ -1451,7 +1451,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler for TeX Live configure 0.12.4
+poppler for TeX Live configure 0.18.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1858,7 +1858,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poppler for TeX Live $as_me 0.12.4, which was
+It was created by poppler for TeX Live $as_me 0.18.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2677,7 +2677,7 @@ fi
# Define the identity of the package.
PACKAGE='poppler-for-tex-live'
- VERSION='0.12.4'
+ VERSION='0.18.0'
# Some tools Automake needs.
@@ -5208,7 +5208,7 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers poppler/poppler-config.h:poppler-0.12.4/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler/poppler-config.h:poppler-0.18.0/poppler/poppler-config.h.in"
## _KPSE_INIT: Initialize TL infrastructure
@@ -5294,9 +5294,6 @@ fi
done
-
-$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
@@ -5304,7 +5301,11 @@ LIBS=$kpse_save_LIBS
echo timestamp >config.force
fi
-POPPLER_TREE=poppler-0.12.4
+
+$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
+
+
+POPPLER_TREE=poppler-0.18.0
ac_config_files="$ac_config_files Makefile poppler/Makefile goo/Makefile fofi/Makefile"
@@ -5856,7 +5857,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poppler for TeX Live $as_me 0.12.4, which was
+This file was extended by poppler for TeX Live $as_me 0.18.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5922,7 +5923,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poppler for TeX Live config.status 0.12.4
+poppler for TeX Live config.status 0.18.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -6053,7 +6054,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "poppler/poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler/poppler-config.h:poppler-0.12.4/poppler/poppler-config.h.in" ;;
+ "poppler/poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler/poppler-config.h:poppler-0.18.0/poppler/poppler-config.h.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"poppler/Makefile") CONFIG_FILES="$CONFIG_FILES poppler/Makefile" ;;
"goo/Makefile") CONFIG_FILES="$CONFIG_FILES goo/Makefile" ;;
diff --git a/Build/source/libs/poppler/configure.ac b/Build/source/libs/poppler/configure.ac
index ef9b9b2f4ff..6f03d45a63f 100644
--- a/Build/source/libs/poppler/configure.ac
+++ b/Build/source/libs/poppler/configure.ac
@@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-m4_define([poppler_version], [0.12.4])[]dnl using unmodified poppler source tree
+m4_include([version.ac])[] dnl define poppler_version
AC_INIT([poppler for TeX Live], poppler_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([poppler-]poppler_version[/poppler/Array.cc])
@@ -85,12 +85,13 @@ if test "x$enable_build" != xno || test -f config.force; then
KPSE_ADD_FLAGS([zlib])
AC_CHECK_FUNC([inflate], , [AC_ERROR([zlib not found])])
AC_CHECK_HEADERS([zlib.h], , [AC_ERROR([zlib not found])])
-AC_DEFINE([ENABLE_ZLIB], 1, [Use zlib instead of builtin zlib decoder.])
KPSE_RESTORE_FLAGS
echo timestamp >config.force
fi
+AC_DEFINE([ENABLE_ZLIB], 1, [Use zlib instead of builtin zlib decoder.])
+
AC_SUBST([POPPLER_TREE], [poppler-]poppler_version)
AC_CONFIG_FILES([Makefile poppler/Makefile goo/Makefile fofi/Makefile])
diff --git a/Build/source/libs/poppler/fofi/Makefile.in b/Build/source/libs/poppler/fofi/Makefile.in
index aa868da467c..2d1189d9a40 100644
--- a/Build/source/libs/poppler/fofi/Makefile.in
+++ b/Build/source/libs/poppler/fofi/Makefile.in
@@ -38,7 +38,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/libs/poppler/goo/Makefile.in b/Build/source/libs/poppler/goo/Makefile.in
index 8c7ebb55f6b..128559beb57 100644
--- a/Build/source/libs/poppler/goo/Makefile.in
+++ b/Build/source/libs/poppler/goo/Makefile.in
@@ -38,7 +38,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff --git a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY
deleted file mode 100644
index d321a6561a8..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-01-PDF_PARSER_ONLY
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -ur poppler-0.12.4.orig/poppler/GlobalParams.cc poppler-0.12.4/poppler/GlobalParams.cc
---- poppler-0.12.4.orig/poppler/GlobalParams.cc 2010-01-17 01:06:58.000000000 +0100
-+++ poppler-0.12.4/poppler/GlobalParams.cc 2011-04-14 10:34:35.000000000 +0200
-@@ -140,6 +140,7 @@
- }
- }
-
-+#ifndef PDF_PARSER_ONLY
- #ifdef _WIN32
-
- //------------------------------------------------------------------------
-@@ -384,6 +385,7 @@
- }
-
- #endif // _WIN32
-+#endif // PDF_PARSER_ONLY
-
- //------------------------------------------------------------------------
- // PSFontParam
-@@ -557,7 +559,7 @@
- UnicodeMap *map;
- int i;
-
--#ifndef _MSC_VER
-+#if !defined(PDF_PARSER_ONLY) && !defined(_MSC_VER)
- FcInit();
- FCcfg = FcConfigGetCurrent();
- #endif
-@@ -641,10 +643,12 @@
- unicodeMapCache = new UnicodeMapCache();
- cMapCache = new CMapCache();
-
-+#ifndef PDF_PARSER_ONLY
- #ifdef _WIN32
- baseFontsInitialized = gFalse;
- winFontList = NULL;
- #endif
-+#endif
-
- #ifdef ENABLE_PLUGINS
- plugins = new GooList();
-@@ -806,9 +810,11 @@
- deleteGooHash(unicodeMaps, GooString);
- deleteGooList(toUnicodeDirs, GooString);
- deleteGooHash(displayFonts, DisplayFontParam);
-+#ifndef PDF_PARSER_ONLY
- #ifdef _WIN32
- delete winFontList;
- #endif
-+#endif
- deleteGooHash(psFonts, PSFontParam);
- deleteGooList(psNamedFonts16, PSFontParam);
- deleteGooList(psFonts16, PSFontParam);
-@@ -944,6 +950,7 @@
- return NULL;
- }
-
-+#if !defined(PDF_PARSER_ONLY) && !defined(_MSC_VER)
- static GBool findModifier(const char *name, const char *modifier, const char **start)
- {
- const char *match;
-@@ -962,7 +969,6 @@
- }
- }
-
--#ifndef _MSC_VER
- static FcPattern *buildFcPattern(GfxFont *font)
- {
- int weight = -1,
-@@ -1110,7 +1116,11 @@
- /* if you can't or don't want to use Fontconfig, you need to implement
- this function for your platform. For Windows, it's in GlobalParamsWin.cc
- */
--#ifndef _MSC_VER
-+#ifdef PDF_PARSER_ONLY
-+DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
-+ return NULL;
-+}
-+#elif !defined(_MSC_VER)
- DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
- DisplayFontParam *dfp;
- FcPattern *p=0;
-diff -ur poppler-0.12.4.orig/poppler/GlobalParams.h poppler-0.12.4/poppler/GlobalParams.h
---- poppler-0.12.4.orig/poppler/GlobalParams.h 2010-01-17 01:06:58.000000000 +0100
-+++ poppler-0.12.4/poppler/GlobalParams.h 2011-04-14 10:32:41.000000000 +0200
-@@ -37,7 +37,7 @@
- #include <assert.h>
- #include "poppler-config.h"
- #include <stdio.h>
--#ifndef _MSC_VER
-+#if !defined(PDF_PARSER_ONLY) && !defined(_MSC_VER)
- #include <fontconfig/fontconfig.h>
- #endif
- #include "goo/gtypes.h"
-@@ -61,9 +61,11 @@
- class GlobalParams;
- class GfxFont;
- class Stream;
-+#ifndef PDF_PARSER_ONLY
- #ifdef _WIN32
- class WinFontList;
- #endif
-+#endif
-
- //------------------------------------------------------------------------
-
-@@ -169,7 +171,7 @@
-
- void setBaseDir(char *dir);
-
--#ifdef _MSC_VER
-+#if !defined(PDF_PARSER_ONLY) && !defined(_MSC_VER)
- void setupBaseFonts(char *dir);
- #endif
-
-@@ -303,10 +305,12 @@
- GooList *toUnicodeDirs; // list of ToUnicode CMap dirs [GooString]
- GooHash *displayFonts; // display font info, indexed by font name
- // [DisplayFontParam]
-+#ifndef PDF_PARSER_ONLY
- #ifdef _WIN32
- GBool baseFontsInitialized;
- WinFontList *winFontList; // system TrueType fonts
- #endif
-+#endif
- GBool psExpandSmaller; // expand smaller pages to fill paper
- GBool psShrinkLarger; // shrink larger pages to fit paper
- GBool psCenter; // center pages on the paper
-@@ -352,7 +356,7 @@
- UnicodeMapCache *unicodeMapCache;
- CMapCache *cMapCache;
-
--#ifndef _MSC_VER
-+#if !defined (PDF_PARSER_ONLY) && !defined(_MSC_VER)
- FcConfig *FCcfg;
- #endif
-
-diff -ur poppler-0.12.4.orig/poppler/Page.cc poppler-0.12.4/poppler/Page.cc
---- poppler-0.12.4.orig/poppler/Page.cc 2010-01-17 01:06:57.000000000 +0100
-+++ poppler-0.12.4/poppler/Page.cc 2011-04-12 16:17:47.000000000 +0200
-@@ -45,13 +45,11 @@
- #include "XRef.h"
- #include "Link.h"
- #include "OutputDev.h"
--#ifndef PDF_PARSER_ONLY
- #include "Gfx.h"
- #include "GfxState.h"
- #include "Annot.h"
- #include "TextOutputDev.h"
- #include "Form.h"
--#endif
- #include "Error.h"
- #include "Page.h"
- #include "Catalog.h"
diff --git a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-02-warnings b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-02-warnings
deleted file mode 100644
index 008e9c09e2b..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-02-warnings
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur poppler-0.12.4.orig/goo/PNGWriter.h poppler-0.12.4/goo/PNGWriter.h
---- poppler-0.12.4.orig/goo/PNGWriter.h 2010-01-17 01:06:58.000000000 +0100
-+++ poppler-0.12.4/goo/PNGWriter.h 2011-04-12 22:16:31.489535918 +0200
-@@ -40,4 +40,4 @@
-
- #endif
-
--#endif
-\ No newline at end of file
-+#endif
-diff -ur poppler-0.12.4.orig/poppler/Movie.cc poppler-0.12.4/poppler/Movie.cc
---- poppler-0.12.4.orig/poppler/Movie.cc 2010-01-17 01:06:57.000000000 +0100
-+++ poppler-0.12.4/poppler/Movie.cc 2011-04-12 22:19:34.797833201 +0200
-@@ -227,7 +227,7 @@
- if (tmp.dictLookup("S", &oname)->isName()) {
- char* name = oname.getName();
- if (!strcmp(name, "F"))
-- duration.units = -1; // infinity
-+ duration.units = (Gulong)(-1); // infinity
- else if (!strcmp(name, "T")) {
- if (tmp.dictLookup("T", &ddict)->isDict()) {
- if (ddict.dictLookup("V", &tmp2)->isNum()) {
diff --git a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-03-POPPLER_VERSION b/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-03-POPPLER_VERSION
deleted file mode 100644
index 759b8340198..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/patch-03-POPPLER_VERSION
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur poppler-0.12.4.orig/poppler/poppler-config.h.in poppler-0.12.4/poppler/poppler-config.h.in
---- poppler-0.12.4.orig/poppler/poppler-config.h.in 2010-02-17 23:08:16.000000000 +0100
-+++ poppler-0.12.4/poppler/poppler-config.h.in 2011-04-14 11:17:43.000000000 +0200
-@@ -50,6 +50,9 @@
- #define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org"
- #define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
-
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
- //------------------------------------------------------------------------
- // popen
- //------------------------------------------------------------------------
diff --git a/Build/source/libs/poppler/poppler-0.12.4/ChangeLog b/Build/source/libs/poppler/poppler-0.12.4/ChangeLog
deleted file mode 100644
index 7258b8059bf..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/ChangeLog
+++ /dev/null
@@ -1,24069 +0,0 @@
-commit dfc43459df669a757faca07b2b44bde59766468e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 17 21:54:31 2010 +0000
-
- if malloc failed return false
-
- splash/SplashFTFont.cc | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-commit ef7339eb26d76714250ed25bd826d737283cc1a4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Feb 16 23:31:05 2010 +0000
-
- Only assume the OC is not visible if it exists and is set to no
-
- Fixes bug 26532 and a small line that was not drawn in 15899
-
- poppler/OptionalContent.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit b60a5d415e74ff69a6356e3f864f44d3a9b0895b
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 10 23:16:27 2010 +0100
-
- [CMake] fix typo: "MULTITHREAD" -> "MULTITHREADED"
-
- CMakeLists.txt | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 6203d1d98ad44f0fac55198504a959d494ac5a0c
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jan 26 20:49:17 2010 +0100
-
- [cairo] Use the right matrix for the mask in drawMaskedImage()
-
- Fixes bug #16906.
-
- poppler/CairoOutputDev.cc | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-commit e25e4fd2e76619dd42715a1e9d78088850d8fe7e
-Author: mpsuzuki <mpsuzuki@hiroshima-u.ac.jp>
-Date: Sun Jan 24 13:34:41 2010 +0100
-
- [cairo] Fix memory leak
-
- poppler/CairoFontEngine.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 941ec1ca4f7110765f4c48409c0e6c3f6625cf5c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Dec 24 12:20:25 2009 +0100
-
- 0.12.3
-
- CMakeLists.txt | 2 +-
- NEWS | 16 ++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 22 insertions(+), 6 deletions(-)
-
-commit b526edc439a19970aa5efb47993ebddc80af0f05
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 20 21:59:05 2010 +0000
-
- Fix GfxRadialShading::GfxRadialShading
-
- Fixes crash in KDE bug 223359
-
- poppler/GfxState.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 44833844c6208039a3dd3c427aa97e47dc3d497a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 14 08:43:11 2010 +0000
-
- Fix Uncover and Fade to return correct values
-
- Bug 26034
-
- poppler/PageTransition.cc | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-commit 2bd99c5a48782bcd85be8801221446038ec35c2d
-Author: Hib Eris <hib@hiberis.nl>
-Date: Thu Dec 31 17:52:33 2009 +0100
-
- [glib] Use PDFDoc(wchar_t *, ...) on Windows
-
- Fixes bug #25032
-
- glib/poppler-document.cc | 22 +++++++++++++++++++---
- 1 files changed, 19 insertions(+), 3 deletions(-)
-
-commit 42359d6f75ca33f1d04a9f129b61725958686879
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jan 4 18:36:01 2010 +0000
-
- Require Qt 4.4
-
- This updates the requirement to real requirement
-
- CMakeLists.txt | 2 +-
- configure.ac | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-commit ec36133e2d3693a05836aadb96a722262d48fd39
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Dec 12 17:22:08 2009 +0100
-
- Initialize profileCommands in Gfx constructor
-
- poppler/Gfx.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 36abc88231e3d62b12a98afcb0a3c4ed5f07a1e6
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Dec 9 19:45:40 2009 +0100
-
- [cairo] Update font of TextPage in CairoOutputDev::updateAll()
-
- Fixes a crash with some documents, see Evince bug
- https://bugzilla.gnome.org/show_bug.cgi?id=603934
-
- poppler/CairoOutputDev.cc | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit c9ee556ab8b9bab3107a5cb3489354b3d6187a8b
-Author: Axel Struebing <axel.struebing@freenet.de>
-Date: Sat Dec 5 22:31:29 2009 +0000
-
- Add a empty space after null
-
- Fixes bug 25465
-
- poppler/PDFDoc.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit a6cdeb7be296b14d74cf1d2f22729dc7d0b9e31c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 4 14:59:41 2009 +0100
-
- Make the code a bit more resilient
-
- By checking the GooString we are going to use really exists
-
- poppler/PSOutputDev.cc | 24 ++++++++++++++++--------
- 1 files changed, 16 insertions(+), 8 deletions(-)
-
-commit 4eaf44cdf4e6006b70712c055a97ab152c41d26f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 4 14:57:10 2009 +0100
-
- Accept Fontname if FontName is not present
-
- Fixes KDE bug 217013
-
- poppler/GfxFont.cc | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-commit 59853762c541539ca99bdab610c7649a2d3d6c3c
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Nov 27 15:23:11 2009 +0100
-
- [cairo] Revert commit 119071cb9a6144b6268a7ff9b6341ad0cc75d9ae
-
- And fix bug #24575 jut by checking pointer is not null before using it.
-
- poppler/CairoOutputDev.cc | 12 +++++-------
- 1 files changed, 5 insertions(+), 7 deletions(-)
-
-commit e0bdffb6ab9e313f7b2c9155c0f1d4059d7bcc61
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Nov 22 20:26:40 2009 +0100
-
- Update copyrights
-
- poppler/CairoFontEngine.cc | 2 +-
- poppler/CairoOutputDev.cc | 4 ++--
- poppler/CairoOutputDev.h | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 119071cb9a6144b6268a7ff9b6341ad0cc75d9ae
-Author: David Benjamin <davidben@mit.edu>
-Date: Sun Nov 22 20:19:29 2009 +0100
-
- Do not crash on malformed files
-
- bug 24575
-
- poppler/CairoOutputDev.cc | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit ac1e46da77e03ca193af75ca03d5e0a05c16200e
-Author: Ilya Gorenbein <igorenbein@finjan.com>
-Date: Sun Nov 22 19:51:54 2009 +0100
-
- Improve the reconstruction of the XRef
-
- Makes load a file Ilya can't share
-
- poppler/XRef.cc | 165 +++++++++++++++++++++++++++++++-----------------------
- 1 files changed, 95 insertions(+), 70 deletions(-)
-
-commit 8ffd9753eaebdb2b738f80ee25584dacdeccb28b
-Author: Ilya Gorenbein <igorenbein@finjan.com>
-Date: Sun Nov 22 15:16:02 2009 +0100
-
- Correctly initialize fileName
-
- Bug 25221
-
- poppler/Link.cc | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 74353b77ec6fe258ac493dc0a10f6956b3dd5300
-Author: David Benjamin <davidben@mit.edu>
-Date: Sat Nov 21 02:43:21 2009 +0100
-
- Be more lenient with /Decode key on images
-
- The spec requires the field be [1 0] or [0 1]. Adobe accepts floating point
- values as well. This fixes bug #17439.
-
- poppler/Gfx.cc | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-commit 26f58fea334fd975e23cfda0b2d00e14940f0358
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Nov 20 22:09:44 2009 +0100
-
- Check for openjpeg in the C++ part as it uses bool in the header
-
- Bug 25103
-
- configure.ac | 61 ++++++++++++++++++++++++++++-----------------------------
- 1 files changed, 30 insertions(+), 31 deletions(-)
-
-commit 524ebbd9f5b3e1cf992cee779055ec1716685a51
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 18 22:06:39 2009 +0100
-
- poppler 0.12.2
-
- CMakeLists.txt | 2 +-
- NEWS | 18 ++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 24 insertions(+), 6 deletions(-)
-
-commit 781e1bfb5eeb6b41b0bcb0eea5e595f02c66b035
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Nov 17 20:45:42 2009 +0100
-
- i didn't want to commit this
-
- configure.ac | 60 ++++++++++++++++++++++++-----------------------
- splash/SplashMath.h | 5 +--
- splash/SplashScreen.cc | 21 +---------------
- splash/SplashScreen.h | 3 --
- utils/pdftoppm.cc | 8 ------
- 5 files changed, 35 insertions(+), 62 deletions(-)
-
-commit 3e59f5666c0521db85b3a8a6f05ecb07e45c1b87
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Nov 17 20:34:24 2009 +0100
-
- do not use setAttribute with doubles
-
- it is evil and locale dependant, we do NOT want that so use QString::number
-
- configure.ac | 60 ++++++++++++++---------------
- qt4/src/poppler-annotation.cc | 82 ++++++++++++++++++++--------------------
- splash/SplashMath.h | 5 +-
- splash/SplashScreen.cc | 21 +++++++++-
- splash/SplashScreen.h | 2 +
- utils/pdftoppm.cc | 8 ++++
- 6 files changed, 102 insertions(+), 76 deletions(-)
-
-commit f385ca47a2e6da332e7c216db439296993361556
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Nov 13 00:55:37 2009 +0100
-
- jpeg_start_decompress can fail, check it
-
- Fixes KDE bug #214317
-
- poppler/DCTStream.cc | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-commit 701af67b5988b6cff800f123ced7570ecbadf668
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Nov 9 11:25:24 2009 +0100
-
- Transitions dictionary can be a Ref too
-
- poppler/Page.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit c00e4f10cd214c105813448415630fec68e094ef
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue Aug 11 19:17:52 2009 +0100
-
- [cairo] Mark images dirty
-
- After directly manipulating the pixel values we need to mark the surface
- as dirty. This means that cairo will refresh any caches it may have taken
- of the surface will the new data.
- (cherry picked from commit 32ea667ec8f18311539123c7b80c7ab4767070cb)
-
- poppler/CairoOutputDev.cc | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-commit af6a212234e20252c78fd615a8906d529b1821e6
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Oct 29 18:38:22 2009 +0100
-
- [cairo] Don't render patterns when using CairoImageOutputDev
-
- poppler/CairoOutputDev.h | 15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
-
-commit 2b1ccee4be6cfe2eeaad6ee200506b0722037da6
-Author: Ilya Gorenbein <igorenbein@finjan.com>
-Date: Wed Oct 28 19:20:41 2009 +0100
-
- There are some pdf where Aspect values are reals, use getNum
-
- Fixes bug 24733
-
- poppler/Annot.cc | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-commit 726c7b8c112460f1762de4fe0b986e979f362771
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 25 21:55:55 2009 +0100
-
- do not accept negative interval lengths in the page labels tree
-
- See bug 24721
-
- poppler/PageLabelInfo.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit cb19a40f1507a87a53b60134d09b42fad686f692
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Oct 23 21:57:42 2009 +0200
-
- Move the iccColorSpaceCache from a static in GfxState to a member of Gfx
-
- Fixes the problem that the keys are per document but we had a static
- that lived as much as the library. Now the cache only lives the rendering
- of a page so it's a bit slower but at least it's correct. Fixes bug 24686
-
- poppler/Gfx.cc | 49 +++++++++++++++++---------
- poppler/Gfx.h | 13 ++++++-
- poppler/GfxState.cc | 94 +++++++++++++++++++++++++--------------------------
- poppler/GfxState.h | 33 +++++++++---------
- poppler/Page.cc | 4 +-
- 5 files changed, 107 insertions(+), 86 deletions(-)
-
-commit c53e611cfbb2b027d2cbddb6d8fce8d84319566a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Oct 22 21:26:29 2009 +0200
-
- initialize len at 0 when reading the font fails
-
- See bug 24525 for more info
-
- poppler/GfxFont.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 7313dd1018a9028f40e0e511a4e34d793a0ae605
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Oct 20 10:09:13 2009 +0200
-
- [glib] Fix CVE-2009-3607
-
- glib/poppler-page.cc | 20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-commit 4fb3e9c090bd973c7d9123f8c258c7925166f078
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Oct 19 23:33:58 2009 +0200
-
- fix memory leak
-
- poppler/PSOutputDev.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 57982aaec95f0def1d30dce5f77492b0d88d851d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 18 01:50:02 2009 +0200
-
- poppler 0.12.1
-
- CMakeLists.txt | 2 +-
- NEWS | 27 +++++++++++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 33 insertions(+), 6 deletions(-)
-
-commit d9fd61976dd6b85fdfa7b2cb7ec1979afbd272dd
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 18 01:22:16 2009 +0200
-
- This include is needed as this file uses Ref
-
- poppler/OutputDev.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 55e7692501646aab5075974b8a49b51fb248cac1
-Author: Michael Jansen <kde@michael-jansen.biz>
-Date: Sat Oct 17 01:30:40 2009 +0200
-
- CMake: add the possibility to pass LIB_SUFFIX.
-
- This allows to tune the installation libdir by adding a suffix for it
- (making it eg lib, lib32, or lib64)
-
- CMakeLists.txt | 16 +++++++++-------
- glib/CMakeLists.txt | 2 +-
- poppler-cairo.pc.cmake | 2 +-
- poppler-glib.pc.cmake | 2 +-
- poppler-qt.pc.cmake | 2 +-
- poppler-qt4.pc.cmake | 2 +-
- poppler-splash.pc.cmake | 2 +-
- poppler.pc.cmake | 2 +-
- qt/CMakeLists.txt | 2 +-
- qt4/src/CMakeLists.txt | 2 +-
- 10 files changed, 18 insertions(+), 16 deletions(-)
-
-commit f530bc721bd23a2461b0cb765a8a6dad88ed3459
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Oct 17 00:48:58 2009 +0200
-
- check the document is not locked when printing
-
- qt4/src/poppler-ps-converter.cc | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 65cb34b7c77b95f036306460bcea6681e386afaf
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Oct 17 00:48:27 2009 +0200
-
- fix file name comment
-
- qt4/src/poppler-ps-converter.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit dbd5ba680d846d6a57e3fb7618a64202441c6e76
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Oct 17 00:47:34 2009 +0200
-
- Add a way for converters to return more exact errors they had when converting
-
- qt4/src/poppler-base-converter.cc | 8 +++++++-
- qt4/src/poppler-converter-private.h | 3 ++-
- qt4/src/poppler-pdf-converter.cc | 11 ++++++++++-
- qt4/src/poppler-ps-converter.cc | 6 +++++-
- qt4/src/poppler-qt4.h | 14 ++++++++++++++
- 5 files changed, 38 insertions(+), 4 deletions(-)
-
-commit bb21f825fcaa49e149cc7a7eb9c68f15f11fff1d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Oct 16 23:17:22 2009 +0200
-
- Some "security" fixes based on newly released Xpdf 3.02pl4
-
- poppler/Stream.cc | 4 ++++
- poppler/XRef.cc | 19 +++++++++++++++----
- splash/Splash.cc | 7 +++++++
- splash/SplashBitmap.cc | 37 ++++++++++++++++++++++++++++++-------
- splash/SplashErrorCodes.h | 4 +++-
- 5 files changed, 59 insertions(+), 12 deletions(-)
-
-commit 910c1c6f52b095be6ff0835519ad061c32201e80
-Author: Glenn Ganz <glenn.ganz@uptime.ch>
-Date: Fri Oct 16 20:54:32 2009 +0200
-
- fix constructor of DCTStream
-
- poppler/Stream.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 0f317ac8d7271354c90f0341eb432cafb0d5f27f
-Author: Patrick Spendrin <ps_ml@gmx.de>
-Date: Fri Oct 9 16:09:46 2009 +0200
-
- MSVC: add _CRT_SECURE_NO_WARNINGS to the define's
-
- CMakeLists.txt | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit a90248a81cb0f3fdd8405a441b94dce448208d3f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Oct 6 00:52:10 2009 +0200
-
- Forgot to update the year here
-
- qt4/src/poppler-private.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 8db50841a28f58551c91716530bc07f862af0be0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Oct 6 00:42:52 2009 +0200
-
- Add the possibility of enabling hinting
-
- qt4/src/poppler-document.cc | 2 +-
- qt4/src/poppler-private.h | 1 +
- qt4/src/poppler-qt4.h | 3 ++-
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
-commit 8b478281f20637b52c109decae13c6a29ec33ad4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Oct 6 00:41:57 2009 +0200
-
- rework how hinting is used in the splash backend
-
- Basically we default to no hinting now with the possibility to enable it
-
- poppler/ArthurOutputDev.cc | 2 +-
- poppler/GlobalParams.cc | 19 ------------
- poppler/GlobalParams.h | 3 --
- poppler/SplashOutputDev.cc | 8 ++++-
- poppler/SplashOutputDev.h | 3 ++
- splash/SplashFTFont.cc | 64 +++++++++--------------------------------
- splash/SplashFTFont.h | 4 +-
- splash/SplashFTFontEngine.cc | 8 ++--
- splash/SplashFTFontEngine.h | 7 ++--
- splash/SplashFontEngine.cc | 5 ++-
- splash/SplashFontEngine.h | 3 +-
- 11 files changed, 40 insertions(+), 86 deletions(-)
-
-commit df5b37cfb38c86111d6393cc5401719c3b510734
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Oct 5 00:55:55 2009 +0200
-
- Fix includes for those using internal headers
-
- goo/FixedPoint.h | 2 +-
- goo/gmem.h | 2 +-
- poppler/OutputDev.h | 2 +-
- poppler/PSOutputDev.h | 2 +-
- poppler/PageLabelInfo.h | 2 +-
- utils/ImageOutputDev.h | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-commit a6d61f68f13bb4a90f09479ccca01fa979e36d05
-Author: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Mon Oct 5 00:39:36 2009 +0200
-
- Use _WIN32 instead of WIN32
-
- More info at http://bugs.freedesktop.org/show_bug.cgi?id=24259
-
- goo/GooMutex.h | 16 +++++++++++++++-
- goo/gfile.cc | 33 +++++++++++++++++----------------
- goo/gfile.h | 5 +++--
- msvc/poppler/poppler-config.h | 2 +-
- poppler-config.h.cmake | 2 +-
- poppler/ABWOutputDev.h | 3 ++-
- poppler/FileSpec.cc | 7 ++++---
- poppler/GlobalParams.cc | 37 +++++++++++++++++++------------------
- poppler/GlobalParams.h | 4 ++--
- poppler/Link.cc | 3 ++-
- poppler/PDFDoc.cc | 4 ++--
- poppler/PDFDoc.h | 3 ++-
- poppler/PSOutputDev.cc | 5 +++--
- poppler/TextOutputDev.cc | 5 +++--
- poppler/XpdfPluginAPI.cc | 13 ++++++++++++-
- poppler/poppler-config.h.in | 2 +-
- splash/SplashFontEngine.cc | 9 +++++----
- test/perf-test.cc | 24 ++++++++++++------------
- utils/HtmlOutputDev.h | 3 ++-
- 19 files changed, 108 insertions(+), 72 deletions(-)
-
-commit 60ccf3170ca8ee531cd7bb223757b16286cf5de6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Oct 5 00:21:15 2009 +0200
-
- Remove spurious ;
-
- Found by -Wextra i think we should add more warnings to our default flags
-
- qt4/src/poppler-annotation.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0137b0f0dc0dac6f92b076c0aa9210f842991bd5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Oct 2 22:04:46 2009 +0200
-
- Strings can have 0 inside so use the length
-
- Fixes saving some files
-
- poppler/PDFDoc.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 05be1252cd551ad6e9bad0cebe27c40b48f9e45f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Oct 2 22:04:03 2009 +0200
-
- Increase decimals from 5 to 10, a double has that precision
-
- Makes saving more faithful for some files
-
- poppler/PDFDoc.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 456020775e7c322abd2bcc6c9fd3ec6e594afc93
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Oct 2 22:03:40 2009 +0200
-
- If the stream was wrongly formed save the correct length
-
- Fixes saving of some files
-
- poppler/PDFDoc.cc | 12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-commit 8bcac03940cb401df98649f52835043da8a8d4c2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Oct 2 22:02:13 2009 +0200
-
- Return the save status as program status
-
- test/pdf-fullrewrite.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit a9db687d598e75f0046b9b27f9b0c4718f25b248
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Oct 2 22:01:45 2009 +0200
-
- If the Length entry of the stream is wrong, fix it
-
- Fixes saving some files
-
- poppler/Parser.cc | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 0712c2e37066813805d321d78c3ac5facbe2a092
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Oct 2 22:00:12 2009 +0200
-
- increase the range of characters we sanitize
-
- Fixes saving of some files
-
- goo/GooString.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 119c1ec73644ac7b90ba404b93e94bf673d18888
-Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
-Date: Sun Sep 27 17:17:32 2009 +0200
-
- Fix the linking not to use the .so directly but the lib
-
- Fixes check on cygwin
-
- m4/qt.m4 | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 25a54786f553e92a534e778575f32b6ec4bb6774
-Author: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Sat Sep 26 19:26:19 2009 +0200
-
- Do not crash when saving files that come from a stream without name
-
- Bug 24090
-
- poppler/PDFDoc.cc | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-commit 871564f39f98b863fef8155d00f68eda58949821
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 26 18:30:41 2009 +0200
-
- Write the Info into the trailer dict if there is one
-
- Bug 24091
-
- poppler/PDFDoc.cc | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 57fad0a254d363d6003f7376a46a8111489d4ad1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 26 18:28:40 2009 +0200
-
- Plug leak
-
- test/pdf-fullrewrite.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 7255a49b2adebdd33ca08a3be7e259c1b1d02555
-Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
-Date: Sat Sep 26 15:01:35 2009 +0200
-
- Patch to make poppler work on Cygwin
-
- Bug 4195
-
- configure.ac | 3 +++
- qt/Makefile.am | 2 +-
- qt4/src/Makefile.am | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-commit 17368c4933a51d6155683ab37f7d425e40ac8b18
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 26 14:56:38 2009 +0200
-
- Improve realibility for Streams with broken Length
-
- Fixes bug 6841
-
- poppler/Parser.cc | 17 +++++++++++++----
- 1 files changed, 13 insertions(+), 4 deletions(-)
-
-commit 5e9d056f184c4637cb1dc949a17e5ad4ddd3ade5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 21 21:58:26 2009 +0200
-
- Print with a . and not with a , in all locales
-
- This is a regression after the removal of setting LC_NUMERIC
-
- poppler/PDFDoc.cc | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-commit 5df1e583a2349868a0060138d3a184a9a6eb1b58
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Sep 20 17:21:13 2009 +0200
-
- CharCodeToUnicode is not mandatory in fonts, don't crash one fonts that do not have it
-
- Fixes bug #24036
-
- poppler/Annot.cc | 33 ++++++++++++++++++++-------------
- 1 files changed, 20 insertions(+), 13 deletions(-)
-
-commit 4b22a958339619cb0f54e9d82e08d9fc6b3a3fbf
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Sep 17 20:12:20 2009 +0200
-
- Windows32/MSVC: initialize the font list once per GlobalParams, instead of once at all
-
- this fixes the font list being empty at the second (and following) GlobalParams creation
- thanks for Christian Ehrlicher for reporting the bug and testing its fix
-
- poppler/GlobalParams.cc | 1 +
- poppler/GlobalParams.h | 1 +
- poppler/GlobalParamsWin.cc | 1 -
- 3 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 3083720d3e9f628c1fb963ee83c17a0ff7e80117
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 9 23:24:22 2009 +0200
-
- uint -> Guint
-
- some compilers don't know about uint
-
- poppler/Gfx.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 943a13c9354dec18cb023642aebbe5d3bb920ed7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 9 20:04:06 2009 +0200
-
- poppler 0.12.0
-
- CMakeLists.txt | 4 ++--
- NEWS | 18 ++++++++++++++++++
- configure.ac | 4 ++--
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 26 insertions(+), 8 deletions(-)
-
-commit e8ed7210346cb18f6e4588ad557f993c6d42f4a3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 9 19:21:21 2009 +0200
-
- increase library to 3.2.0
-
- qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit e950107006a3b1889646d3705323c1b3d41eaa49
-Author: David Benjamin <davidben@mit.edu>
-Date: Wed Sep 9 01:19:38 2009 +0200
-
- Fix infinite loop in JBIG2Decoder
-
- Bug 23025
- Also fixes problems in bug-poppler6881-2.pdf and bug-poppler6500.pdf
-
- poppler/JBIG2Stream.cc | 13 ++++++++-----
- 1 files changed, 8 insertions(+), 5 deletions(-)
-
-commit 1cb25a4adaaf3e2da50724312a3db6928991f425
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Sep 6 10:45:56 2009 +0200
-
- [glib] Ignore attachments with an invalid embedded file
-
- Fixes bug #10386
-
- glib/poppler-document.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 842e00f3114666609ef4dec6fa613d46f330a40c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 5 15:20:35 2009 +0200
-
- Add EmbeddedFile::isValid
-
- Also do not crash if data() is called on an invalid file
-
- qt4/src/poppler-embeddedfile.cc | 10 +++++++++-
- qt4/src/poppler-qt4.h | 9 ++++++++-
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
-commit 9d40b268f5a9a9a0fb79da0e1627dd8eebc4db6a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 5 15:19:27 2009 +0200
-
- Add EmbFile::isOk
-
- At the moment returns false if the object stream is not really a stream
-
- poppler/Catalog.h | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 642650b6f70425c8fff2df978ae71249a5ae07f3
-Author: David Benjamin <davidben@mit.edu>
-Date: Sat Sep 5 01:12:49 2009 +0200
-
- Better fallback when there's a type mismatch
-
- Bug #17252
-
- poppler/GfxFont.cc | 38 ++++++++++++++++++++++++++++++++------
- 1 files changed, 32 insertions(+), 6 deletions(-)
-
-commit bf5811f5331292ccf30f1b0f089fe43d351d96be
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Aug 26 00:43:46 2009 +0200
-
- Improve shading color rendering
-
- Shading is not necessarily lineal so require another bisection to
- assume all the area in between have the same color. Fixes bug #20238
-
- poppler/Gfx.cc | 17 ++++++++++++++++-
- 1 files changed, 16 insertions(+), 1 deletions(-)
-
-commit e94430b790fde6ce7b7cb163c2e0adf2d071c81d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Aug 26 00:42:49 2009 +0200
-
- Make code a bit more readable
-
- poppler/Gfx.cc | 23 +++++++++++------------
- 1 files changed, 11 insertions(+), 12 deletions(-)
-
-commit 465212780557705fd939dfe54f96913505bfc96e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Aug 25 21:55:45 2009 +0200
-
- forgot to update my copyright
-
- poppler/JPEG2000Stream.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 4f6016d01ced32002bef22b9b5d5426a74e55842
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Aug 25 21:10:07 2009 +0200
-
- Fix format security warnings
-
- Don't just directly print strings of unknown content; use "%s".
-
- poppler/JPEG2000Stream.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 4616b23382b5d155f8b2f1942733037cf5730844
-Author: Christian Persch <chpe@gnome.org>
-Date: Tue Aug 25 21:09:40 2009 +0200
-
- Fix format security warnings
-
- Don't just directly print strings of unknown content; use "%s".
-
- poppler/GfxState.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 6c5c8d008456d1e4f3d60bc182209747c2a175dc
-Author: Christian Persch <chpe@gnome.org>
-Date: Tue Aug 25 21:03:16 2009 +0200
-
- Support AM_SILENT_RULES
-
- When using automake 1.11, should support silent build rules.
-
- Makefile.am | 2 +-
- configure.ac | 1 +
- glib/Makefile.am | 4 ++--
- qt4/demos/Makefile.am | 2 +-
- qt4/src/Makefile.am | 2 +-
- qt4/tests/Makefile.am | 2 +-
- 6 files changed, 7 insertions(+), 6 deletions(-)
-
-commit e7dd1c47b01d8f31599ee686eafbe7c54d7c023a
-Author: Christian Persch <chpe@gnome.org>
-Date: Tue Aug 25 21:01:13 2009 +0200
-
- Fix automake check, and add automake 1.11 support
-
- Fix the automake checks to take the *newest* version available, not the
- oldest one. Add support for automake 1.11. FDO#23473.
-
- autogen.sh | 13 +++++++------
- 1 files changed, 7 insertions(+), 6 deletions(-)
-
-commit 493d2c5aa78a3241e70108c5d7eccba9ac72f834
-Author: Rex Dieter <rdieter@math.unl.edu>
-Date: Mon Aug 24 20:08:46 2009 +0200
-
- Use Requires.private if available
-
- The following patch minimizes pkg-config deps similar to how the
- glib-related pkg-config deps are done.
-
- poppler-qt.pc.cmake | 3 ++-
- poppler-qt.pc.in | 3 ++-
- poppler-qt4.pc.cmake | 3 ++-
- poppler-qt4.pc.in | 3 ++-
- 4 files changed, 8 insertions(+), 4 deletions(-)
-
-commit 341cd3ecd08a39cd146c1c57f356b50a2881c03f
-Author: Jakub Wilk <ubanus@users.sf.net>
-Date: Mon Aug 24 19:51:34 2009 +0200
-
- common options for pdftoabw
-
- The attached patch fixes command line handling for pdftoabw and implements some
- common options (e.g., --help) that are already found in other pdftosomething
- utilities.
-
- utils/pdftoabw.cc | 39 ++++++++++++++++++++++++++++++++-------
- 1 files changed, 32 insertions(+), 7 deletions(-)
-
-commit 365683d5faea6e0a7570b139d1f3366c22271f8e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Aug 18 21:18:13 2009 +0200
-
- 0.11.3
-
- CMakeLists.txt | 2 +-
- NEWS | 22 ++++++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 28 insertions(+), 6 deletions(-)
-
-commit cb28bc8a637d300664b3c7569263445275333878
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Aug 17 14:14:03 2009 +0200
-
- [glib] Add FORMAT_MAJOR/MINOR properties to get the PDF version
-
- See bug #23076.
-
- glib/poppler-document.cc | 26 ++++++++++++++++++++++++++
- 1 files changed, 26 insertions(+), 0 deletions(-)
-
-commit 1b5612841b0c663f6d391d4581f65f68a2975db0
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Aug 17 01:04:04 2009 +0200
-
- [Qt] add Document::getPdfVersion(int *major, int *minor) for the document PDF version numbers
-
- This new function reads the version of the PDF specification of the document, putting major and minor numbers in own variables.
-
- qt/poppler-document.cc | 8 ++++++++
- qt/poppler-qt.h | 12 ++++++++++++
- 2 files changed, 20 insertions(+), 0 deletions(-)
-
-commit aef8ecda1e80b921228f415a53c9c5a52df87d94
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Aug 17 00:57:08 2009 +0200
-
- [Qt4] deprecate Document::pdfVersion()
-
- ... in favour of getPdfVersion()
-
- qt4/src/poppler-qt4.h | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-commit 830140f70e48e8033ad4411b6bd405d5ad7358a3
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Aug 17 00:51:13 2009 +0200
-
- [Qt4] add Document::getPdfVersion(int *major, int *minor) for the document PDF version numbers
-
- This new function reads the version of the PDF specification of the document, putting major and minor numbers in own variables.
- Add them to the relative unit test.
-
- qt4/src/poppler-document.cc | 8 ++++++++
- qt4/src/poppler-qt4.h | 13 +++++++++++++
- qt4/tests/check_metadata.cpp | 4 ++++
- 3 files changed, 25 insertions(+), 0 deletions(-)
-
-commit 5491d16dfbd73f0256c62e49d02622dc3185012e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 17 00:24:41 2009 +0200
-
- Move poppler core away from using a double as PDF file version
-
- Frontends are yet to come
-
- glib/poppler-document.cc | 2 +-
- poppler/PDFDoc.cc | 7 ++++---
- poppler/PDFDoc.h | 8 +++++---
- qt/poppler-document.cc | 4 ++--
- qt4/src/poppler-document.cc | 4 ++--
- utils/pdfinfo.cc | 4 ++--
- 6 files changed, 16 insertions(+), 13 deletions(-)
-
-commit efd5dd63a5b08249529d9a9f5906aefe806fb3aa
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 17 00:21:22 2009 +0200
-
- Forgot to update copyright info
-
- fofi/FoFiType1C.cc | 14 ++++++++++++++
- poppler/PDFDoc.cc | 2 +-
- utils/parseargs.c | 2 +-
- 3 files changed, 16 insertions(+), 2 deletions(-)
-
-commit 25ff4be0b4521cc3d2de386cdeb589beb245d435
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 17 00:15:10 2009 +0200
-
- No need to change the locale since we use gatof that does the right thing
-
- poppler/PDFDoc.cc | 6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-commit a6f698b4edc42c0414dd4690e1e037088321db2c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 17 00:14:35 2009 +0200
-
- Use gatof instead of atof
-
- fofi/FoFiType1C.cc | 3 ++-
- poppler/Annot.cc | 5 +++--
- poppler/Function.cc | 3 ++-
- poppler/PDFDoc.cc | 3 ++-
- utils/parseargs.c | 4 +++-
- 5 files changed, 12 insertions(+), 6 deletions(-)
-
-commit 807b121cae45832d2e5832bad19c31e77420bfec
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 17 00:10:30 2009 +0200
-
- Add a custom strtod that comes from libspectre
-
- Works over C locale integers without changing locale settings
-
- CMakeLists.txt | 2 +
- goo/Makefile.am | 6 ++-
- goo/gstrtod.cc | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- goo/gstrtod.h | 43 ++++++++++++++++
- 4 files changed, 196 insertions(+), 2 deletions(-)
-
-commit 914bf7677a14494b69857b1d8070092a9999fe79
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 16 20:50:02 2009 +0200
-
- When writing the cm matrix write 4 significant digits not 4 decimals
-
- This fixes bug 23332
- Maybe we want to make this the default behaviour of 'g' instead of
- a new 'gs' case, but i prefer to be on the safe side for the moment
-
- goo/GooString.cc | 27 +++++++++++++++++++++++++--
- goo/GooString.h | 4 +++-
- poppler/PSOutputDev.cc | 4 ++--
- 3 files changed, 30 insertions(+), 5 deletions(-)
-
-commit b7dfca1aa52b825eb3b8f1cc0470398c31615b30
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Aug 16 19:28:37 2009 +0200
-
- [cairo] CairoImageOutputDev doesn't implement patterns
-
- poppler/CairoOutputDev.h | 13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-commit d20d65111aee2ee4b8cdea2962ed1bb149122ba9
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Aug 16 17:36:14 2009 +0200
-
- [cairo] Implement tiling patterns in cairo backend
-
- Fixes bug #13518 for the cairo backend.
-
- poppler/CairoOutputDev.cc | 56 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h | 10 ++++++++
- 2 files changed, 66 insertions(+), 0 deletions(-)
-
-commit e965d0686d979c775b64a93f8e2f775f81885417
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Aug 13 14:48:10 2009 +0200
-
- Change OutputDev::tilingPatternFill to return a GBool
-
- It allows outputdevs to decide whether render the pattern or not depending
- on the parameters, like shaded patterns currently do.
-
- poppler/Gfx.cc | 37 +++++++++++++++++++------------------
- poppler/OutputDev.h | 11 ++++++-----
- poppler/PSOutputDev.cc | 12 +++++++-----
- poppler/PSOutputDev.h | 10 +++++-----
- 4 files changed, 37 insertions(+), 33 deletions(-)
-
-commit ce70ef7d6afc800e24031dae43da301e9e542f0e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 15 17:45:57 2009 +0200
-
- Fix backwards search
-
- qt4/src/poppler-page.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 5b7b1cdc5c3b8652d3ae583b4d7b8b6de625adc2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 15 17:45:05 2009 +0200
-
- Add an autotest showing previousresult fails
-
- qt4/tests/check_search.cpp | 51 ++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 51 insertions(+), 0 deletions(-)
-
-commit 2484b0dcb8eb62f8e2c147498c58871ec04630b5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 14 11:47:11 2009 +0200
-
- Implement the alpha path
-
- I wonder if this is the correct fix why it was not implemented
- but if fixes rendering of files in KDE bug 145868, KDE bug 193657,
- poppler bug 17473.pdf, poppler bug 21651, poppler bug 22143 and
- poppler bug 22152 and causes no regression in all the other files
- i have in my test dir so i'm commiting it
-
- poppler/SplashOutputDev.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 03970d8b6d7624444664320470baa6d1b1299622
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Aug 11 12:01:07 2009 +0200
-
- [build] Fix build with autotools
-
- utils/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 15752b7cd5c94620e3ad3b6afd9c70ccc754c9b3
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Aug 10 20:02:13 2009 +0200
-
- [cairo] Add empty updateBlendMode to CairoImageOutputDev
-
- Fixes a crash when using CairoImageOutputDev with a document with blend
- modes.
-
- poppler/CairoOutputDev.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 45dae4e66b2b833f95656850b5f1b0ffd1d96f1d
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Aug 10 20:00:04 2009 +0200
-
- [cairo] Use current fill_opacity when drawing images
-
- Fixes launchpad bug #342282 (page 2 of the attached document)
-
- poppler/CairoOutputDev.cc | 16 +++++++++++++---
- 1 files changed, 13 insertions(+), 3 deletions(-)
-
-commit b1cd54546844f2f7cd6bf7cc14b7584c84c3fc14
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Aug 10 19:55:44 2009 +0200
-
- [cairo] Do not save the font file twice for FreeType fonts
-
- Fixes bug #20491.
-
- poppler/CairoFontEngine.cc | 19 ++-----------------
- 1 files changed, 2 insertions(+), 17 deletions(-)
-
-commit 4181a0ff11195eb7a56d76be23994b843e20b483
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 10 19:58:09 2009 +0200
-
- this branch is unlikely to happen
-
- poppler/Lexer.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 2a3025f32951ce7b7343aeef111902615d71595e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 10 19:55:40 2009 +0200
-
- fix overflow calculation not to depend on the variable overflowing
-
- poppler/Lexer.cc | 12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-commit a38001f724f78231c2fdadd28e647a35b41bab74
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 9 23:26:02 2009 +0200
-
- Check for overflow when parsing integers
-
- Fixes bug 23078
-
- poppler/Lexer.cc | 28 ++++++++++++++++++++++------
- 1 files changed, 22 insertions(+), 6 deletions(-)
-
-commit 4c4c0e44452d07bea88d98b7df0c01fadd7693cc
-Author: Jakub Wilk <ubanus@users.sf.net>
-Date: Sat Aug 8 17:26:14 2009 +0200
-
- Silence some warnings when using internal headers and not compiling with -Wno-write-strings
-
- People should not be using internal headers but it's just two lines
-
- poppler/Object.h | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-commit e2c319ba18ab473fd969db9519a9231be67538c3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 8 00:48:18 2009 +0200
-
- Also implement mono so that -mono in pdftoppm -png works
-
- Totally not optimized
-
- splash/SplashBitmap.cc | 23 ++++++++++++++++++++++-
- 1 files changed, 22 insertions(+), 1 deletions(-)
-
-commit c669e7f3ca421265e78161cc3fdecd2a0c7510c9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 8 00:38:50 2009 +0200
-
- Support splashModeMono8 in writePNGFile
-
- Works though is non optimal
-
- splash/SplashBitmap.cc | 55 ++++++++++++++++++++++++++++++++++--------------
- 1 files changed, 39 insertions(+), 16 deletions(-)
-
-commit 92744b72df9084fd2d69ba78406898378884aed8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 8 00:20:52 2009 +0200
-
- Add the -png flag to pdftoppm to output to PNG
-
- Based on a patch by Shen Liang <shenzhuxi@gmail.com>
- Also factored common PNG code from HtmlOutputDev to PNGWriter
-
- CMakeLists.txt | 5 ++
- goo/Makefile.am | 9 +++-
- goo/PNGWriter.cc | 110 +++++++++++++++++++++++++++++++++++++++++++++
- goo/PNGWriter.h | 43 +++++++++++++++++
- poppler/Makefile.am | 8 +++
- splash/SplashBitmap.cc | 70 ++++++++++++++++++++++++++++
- splash/SplashBitmap.h | 5 ++
- splash/SplashErrorCodes.h | 4 +-
- utils/CMakeLists.txt | 4 --
- utils/HtmlOutputDev.cc | 66 +++++----------------------
- utils/Makefile.am | 4 --
- utils/pdftoppm.1 | 3 +
- utils/pdftoppm.cc | 21 +++++++--
- 13 files changed, 283 insertions(+), 69 deletions(-)
-
-commit e4439ff527bb202d0239f78e647452983b733411
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Aug 7 15:23:57 2009 +0200
-
- [cairo] Don't apply masks when fill color space mode is csPattern
-
- In that case the mask is used for clipping when drawing images. Fixes
- bug #22216.
-
- poppler/CairoOutputDev.cc | 59 +++++++++++++++++++++++++++++----------------
- 1 files changed, 38 insertions(+), 21 deletions(-)
-
-commit 7194f59a18e4f6997ae560af3db1bd101d6f726e
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu Aug 6 11:24:22 2009 +0100
-
- [cairo] Use FT_New_Memory_Face() for mmapped fonts
-
- If we hold a mapping for the font, then we can pass that memory to
- FreeType for it to use as well. This saves on FreeType having to read the
- file into a fresh block of memory.
-
- poppler/CairoFontEngine.cc | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-commit 7e2bbcf6f85111d1006b0d5bc1503cadaba83c9f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Aug 4 00:10:58 2009 +0200
-
- Set KDAB via gamaral copyright
-
- poppler/Form.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit ed5918e16dafebc9ecf6db8ce0186f407ecbf7d5
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 1 20:00:22 2009 +0200
-
- [Qt4 apidox] make example for FontIterator... not leak ;)
-
- qt4/src/poppler-qt4.h | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit f3b36d9c992491e614e88dbf1a84b5433a7647f4
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 1 19:54:52 2009 +0200
-
- [Qt4] Add color management API.
-
- Add few wrapper functions to get/set color profiles.
- Add a function to know whether the color management functions actually do anything (ie support compiled or not).
- Add few basic API docs for the new functions.
- Based on an initial patch by Hal V. Engel <hvengel@astound.net>, heavily reindented, polished and massaged in its API by me.
-
- qt4/src/poppler-document.cc | 52 +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 50 +++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 102 insertions(+), 0 deletions(-)
-
-commit 78a1969d040018c0c2bb74c94f5507f786e4666e
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 1 18:00:06 2009 +0200
-
- [Qt] add unhandled cases and remove unused code
-
- qt/poppler-page.cc | 12 ++----------
- 1 files changed, 2 insertions(+), 10 deletions(-)
-
-commit bddebec0712e92e13b57d3d05d652673fe737866
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 1 17:12:22 2009 +0200
-
- 0.11.2
-
- CMakeLists.txt | 2 +-
- NEWS | 30 ++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 36 insertions(+), 6 deletions(-)
-
-commit 87e2af3454348f5568d155c15af5d85268e47f1b
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Aug 1 15:48:02 2009 +0200
-
- [glib-demo] Add cast to make sure the comparison is always valid
-
- glib/demo/attachments.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 464e95ef451103daddc9a30cd26b986291f02176
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Aug 1 15:47:25 2009 +0200
-
- [glib-demo] Add missing return
-
- glib/demo/attachments.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 7f48369e4d29b2a71abffa9e1966e3a2252de895
-Author: Guillermo Antonio Amaral Bastidas <gamaral@amaral.com.mx>
-Date: Sat Aug 1 15:41:34 2009 +0200
-
- Call fillChildrenSiblingsID in fillChildrenSiblingsID instaed of loadChildrenDefaults
-
- poppler/Form.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit e21a3e40bf6f4365064cea751ae186580d8f81f5
-Author: William Bader <williambader@hotmail.com>
-Date: Sat Aug 1 15:23:03 2009 +0200
-
- Add the possibility of disabling font substitution in pdftops
-
- Bug #23030
-
- poppler/GlobalParams.cc | 17 +++++++++++++
- poppler/GlobalParams.h | 4 +++
- poppler/PSOutputDev.cc | 59 ++++++++++++++++++++++++++--------------------
- poppler/PSOutputDev.h | 2 +
- utils/pdftops.1 | 8 +++++-
- utils/pdftops.cc | 7 +++++
- 6 files changed, 70 insertions(+), 27 deletions(-)
-
-commit bd68c90338cbf16f468e5db59722610300a629e1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 1 15:19:48 2009 +0200
-
- Forgot to add my copyright
-
- poppler/GfxState.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 173451730948c320f16a0f5924a58302603eca0b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 1 15:13:35 2009 +0200
-
- Try to workaround some incorrect PDF
-
- Fixes rendering of PDF where forms/patterns have more q than Q. Fixes
- rendering in splash of pdf in bugs #22835, #21899 and #16402
-
- poppler/Gfx.cc | 13 +++++++++++++
- poppler/GfxState.h | 1 +
- 2 files changed, 14 insertions(+), 0 deletions(-)
-
-commit 35c408ca49be08144bcf14aa112505fd556725d2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 31 23:27:02 2009 +0200
-
- add the overloaded virtual warning also the autotools based build
-
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 1c32bd2d101e5dfb37e28276ecad699f121b27b7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 31 23:22:25 2009 +0200
-
- Add my copyright to files i just edited
-
- poppler/OutputDev.cc | 1 +
- poppler/OutputDev.h | 1 +
- utils/HtmlOutputDev.h | 2 +-
- 3 files changed, 3 insertions(+), 1 deletions(-)
-
-commit 10717a48c85f1dbeff1c6bcd094006a9ecc92efc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 31 23:22:10 2009 +0200
-
- Add -Woverloaded-virtual as default CXX flag
-
- cmake/modules/PopplerMacros.cmake | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit db5f736655f01575ac5d7c524cbf131924ae91fa
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 31 23:12:00 2009 +0200
-
- rename the function
-
- That way the name is different from the OutputDev function and does
- not seem like a wrong overload
-
- utils/HtmlOutputDev.cc | 4 ++--
- utils/HtmlOutputDev.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 4be87f87509b93c4fe4025f9bd788e9412416663
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 31 23:11:32 2009 +0200
-
- Remove Outputdev::beginMarkedContent as noone uses it
-
- poppler/Gfx.cc | 2 --
- poppler/OutputDev.cc | 3 ---
- poppler/OutputDev.h | 1 -
- 3 files changed, 0 insertions(+), 6 deletions(-)
-
-commit 6ab2ec8a89519d2bd1576c8d62f8aec51b04479a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 31 23:10:56 2009 +0200
-
- Warning--
-
- poppler/PSOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 53c3d636ad645a350b576160e1498726238a7bd1
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jul 31 18:23:57 2009 +0200
-
- [cairo] Implement radialShadedFill in cairo backend using cairo gradients
-
- Fixes bugs #10942, #14160
-
- poppler/CairoOutputDev.cc | 28 +++++++++
- poppler/CairoOutputDev.h | 2 +
- poppler/Gfx.cc | 141 +++++++++++++++++++++++++++------------------
- poppler/OutputDev.h | 2 +-
- poppler/PSOutputDev.cc | 3 +-
- poppler/PSOutputDev.h | 2 +-
- 6 files changed, 117 insertions(+), 61 deletions(-)
-
-commit 2ba937545d1a2b9fa798f04fee755ccdf0e74ec7
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jul 31 17:49:18 2009 +0200
-
- [cairo] Use cairo_pattern_set_extend for linear gradients
-
- poppler/CairoOutputDev.cc | 9 +++++++++
- poppler/CairoOutputDev.h | 1 +
- poppler/Gfx.cc | 34 ++++++++++++++++++++++++++++------
- poppler/OutputDev.h | 4 ++++
- 4 files changed, 42 insertions(+), 6 deletions(-)
-
-commit b054756113f0df6b59935823882f412486e96db5
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jun 17 11:10:15 2009 +0200
-
- [cairo] Implement blend mdoes in cairo backend
-
- It requires cairo from git master to work at the moment. Fixes bugs
- #22384, #12979, #13603, #17919, #22255
-
- configure.ac | 27 ++++++++++++++++++++
- poppler/CairoOutputDev.cc | 59 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h | 1 +
- 3 files changed, 87 insertions(+), 0 deletions(-)
-
-commit bf8964726c9311e7e82b1faf49cc2272e5c1e339
-Author: William Bader <williambader@hotmail.com>
-Date: Thu Jul 30 22:08:43 2009 +0200
-
- Fix some double to int warnings by explicit casting
-
- poppler/Gfx.cc | 7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-commit fdbd0c548e963461b2bc4bdf1beaa1577cafcea7
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Jul 30 21:05:18 2009 +0200
-
- Update gtk-doc build files
-
- gtk-doc.make | 102 ++++++++++++++++++++++++++++++++++++++------------------
- m4/gtk-doc.m4 | 74 +++++++++++++++++++++++------------------
- 2 files changed, 110 insertions(+), 66 deletions(-)
-
-commit ae84dce5cea4d249526a6ed5b2feb2d3f241da1b
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Jul 30 20:45:39 2009 +0200
-
- Revert "Remove unneeded files from repo"
-
- This reverts commit 4cc9dee35e03d7b295a476f937ec0f2c43bb6592.
-
- See bug #22697.
-
- configure.ac | 2 +-
- glib/reference/Makefile.am | 4 +-
- gtk-doc.make | 155 ++++++++++++++++++++++++++++++++++++++++++++
- m4/gtk-doc.m4 | 53 +++++++++++++++
- 4 files changed, 211 insertions(+), 3 deletions(-)
-
-commit 7e14516a78b16453c747eb92b08665632e5f6844
-Author: Sanjoy Mahajan <sanjoy@mit.edu>
-Date: Mon Jul 27 23:20:50 2009 +0200
-
- Fix displayPages call
-
- Parameters are outputdev, first, last, dpi, dpi, rotate, usemediabox, crop, printing
- and we were doing
- usemediabox = !noCrop
- crop = gFasle
- the correct is
- usemediabox = noCrop
- crop = !noCrop
-
- utils/pdftops.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 3d53a0eb14420d54c0ebf8590e34c018b8da105d
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Jul 19 16:02:33 2009 +0200
-
- Copy byte_lookup in copy constructor
-
- poppler/GfxState.cc | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 8f7271acf17c46e663cd48d90c382b04a834fba2
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Jul 19 15:53:49 2009 +0200
-
- Don't use byte_lookup table when color space doesn't support getLine methods
-
- For color spaces that don't implement getRGBLine or getGrayLine methods,
- getRGB or getGray are called for every pixel, however we were allocating
- the byte_lookup table and converting colors in those cases too. Instead
- of falling back to generic methods in the base class, the new methods
- useGetRGBLine and useGetGrayLine have been added to he base class, so that
- when they are not suopported in the current color space byte_lookup table is
- not used at all.
-
- Fixes bug #11027.
-
- poppler/GfxState.cc | 125 ++++++++++++++++++++++++++++++---------------------
- poppler/GfxState.h | 21 +++++++-
- 2 files changed, 91 insertions(+), 55 deletions(-)
-
-commit 1bc737796bef1c65289a101b2d4c367267b9c974
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Jul 19 15:51:43 2009 +0200
-
- Remove unused variable
-
- poppler/GfxState.h | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit 512b2c654fd80c83b82e7adc828a478a18de17ab
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Jul 26 19:35:06 2009 +0200
-
- [cairo] Use CAIRO_EXTEND_PAD in drawImageMaskPrescaled too
-
- poppler/CairoOutputDev.cc | 32 +++++++++++++++-----------------
- 1 files changed, 15 insertions(+), 17 deletions(-)
-
-commit ad26e34bede53cb6300bc463cbdcc2b5adf101c2
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Jul 26 18:36:06 2009 +0200
-
- [cairo] Use rectangle + clip instead of invert + tranform
-
- This is just for consistency of drawImage methods
-
- poppler/CairoOutputDev.cc | 30 ++++++++++++++----------------
- 1 files changed, 14 insertions(+), 16 deletions(-)
-
-commit ee6b761a55baef4c3bbe4614b0c3b3d761a3111f
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun Jul 26 16:19:15 2009 +0200
-
- [cairo] Apply a clip for masked drawImage
-
- In order to use EXTEND_PAD with a mask, we need to apply a clip (to
- constrain the image to the appropriate region). The complicating factor for
- drawSoftImage() is that mask size is independent of the image size, so we
- need to compute the intersection of the mask with in the image in userspace.
-
- poppler/CairoOutputDev.cc | 21 ++++++++++++++-------
- 1 files changed, 14 insertions(+), 7 deletions(-)
-
-commit 499c6c972bac14936b5370276da723a6e98861b3
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Jul 26 11:30:08 2009 +0200
-
- [cairo] Use CAIRO_EXTEND_PAD when drawing images
-
- poppler/CairoOutputDev.cc | 306 +++++++++++++++++++++------------------------
- 1 files changed, 140 insertions(+), 166 deletions(-)
-
-commit f91eb7d01cef0897727c63267db309bc92297d37
-Author: Koji Otani <sho@bbr.jp>
-Date: Sat Jul 25 16:34:12 2009 +0200
-
- Fix generation of ps for some files
-
- For example fixes second pdf in bug 18908
-
- poppler/PSOutputDev.cc | 68 ++++++++++++++++++++++++++++++++++++------------
- 1 files changed, 51 insertions(+), 17 deletions(-)
-
-commit f93f5e17d8f23f3e2862f3411f43a95b334e6c91
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Jul 20 17:10:37 2009 +0200
-
- [cairo] Improve performance when rendering one-channel images
-
- It implements the same idea already used in SplashOutputDev, for
- one-channel (monochrome/gray/separation) images we build a lookup table
- so that we won't need to call colorMap->getRGBLine when filling the
- image buffer. Fixes bug #18017.
-
- poppler/CairoOutputDev.cc | 36 ++++++++++++++++++++++++++++++++++--
- 1 files changed, 34 insertions(+), 2 deletions(-)
-
-commit e7475062b6ae5c495fa72faaf8fb3d97391f8544
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jul 14 17:22:52 2009 +0200
-
- [cairo] Handle fontType1COT fonts in CairoFontEngine
-
- poppler/CairoFontEngine.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit d42b9425fb2f98fa79e7a60e4f71ef14f5bacfe9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 12 19:55:14 2009 +0200
-
- glade is not used anymore
-
- cmake/modules/FindGTK.cmake | 9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
-
-commit 454f7468c6a6a442a5064b5daa24d65ebf4fc6b6
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu Jul 9 10:43:00 2009 +0100
-
- [cairo] Fix drawImage() for non-1x1 images
-
- Carlos noticed a nasty bug with converting drawImage() to use PAD + fill,
- instead of NONE + paint. That is the image was being padded out far beyond
- the correct output extents. The cause is that the caller pre-scales the
- context for the image, so the output rectangle was many times the true
- image size - obliterating large amounts of the page. The temporary fix is
- to counter-act the scaling on the context. Longer term, after fixing all
- painters to use PAD correctly, we need to review the callers to remove
- unnecessary pre-scaling.
-
- poppler/CairoOutputDev.cc | 16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
-
-commit f8d93eae3c7b9388feabac71f2380d0b42a855e7
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jul 8 20:14:35 2009 +0200
-
- Lookup UF and F entries before Unix, MAC and DOS in getFileSpec
-
- poppler/FileSpec.cc | 24 ++++++++++++------------
- 1 files changed, 12 insertions(+), 12 deletions(-)
-
-commit 767c534f5fdf6ccbccfd85a0086d72c215c278f1
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jul 8 19:13:54 2009 +0200
-
- Use UF entry when present in dict in getFileSpecName() too
-
- poppler/FileSpec.cc | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 569627ac4d56ddd58e109ce2a37179a85e042030
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jul 8 13:02:16 2009 +0200
-
- Implement axialShadedFill in cairo backend using cairo gradients
-
- See bug #10942.
-
- poppler/CairoOutputDev.cc | 29 +++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h | 10 ++++++++++
- poppler/Gfx.cc | 29 ++++++++++++++++++++---------
- poppler/OutputDev.h | 6 +++++-
- poppler/PSOutputDev.cc | 2 +-
- poppler/PSOutputDev.h | 2 +-
- 6 files changed, 66 insertions(+), 12 deletions(-)
-
-commit 6ae0a6c0044713affa23eb1ee6a070785ed6c2f3
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed Jul 8 16:48:26 2009 +0100
-
- [cairo] premultiply image mask
-
- Cairo uses a premultiplied colour-space, so when creating the image mask
- in drawImage() we need to remember to multiply by the alpha. In this case
- it just requires zeroing out the masked pixels.
-
- poppler/CairoOutputDev.cc | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-commit 646e5884e748ecce7094c673400484aa1d902bdd
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed Jul 8 17:00:34 2009 +0100
-
- [cairo] maskColors is an array of ints, no scaling required
-
- drawImage() was erroneously scaling the maskColors from what it believed
- to be [0:1] to [0:255]. However maskColors is already an integer array,
- [0:255].
-
- poppler/CairoOutputDev.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit d75feb1ee84385a9f94308cf47a43f4583092ddf
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed Jul 8 16:37:19 2009 +0100
-
- [cairo] cleanse DrawImage()
-
- Just a small bit of code rearrangement to reduce repetition and invalid checks.
-
- poppler/CairoOutputDev.cc | 102 ++++++++++++++++++---------------------------
- 1 files changed, 41 insertions(+), 61 deletions(-)
-
-commit 52f3704fed16cfc1e9dd85f72dde7922371e4099
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jul 8 11:40:52 2009 +0200
-
- [TODO] Update TODO file
-
- TODO | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit ef261f5f72d37a0aa2709611ee2bad7d55340ed8
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jul 7 10:57:31 2009 +0200
-
- Do not use F and UF entries if Unix or DOS are present in FileSpec dict
-
- poppler/FileSpec.cc | 114 +++++++++++++++++++++++----------------------------
- 1 files changed, 51 insertions(+), 63 deletions(-)
-
-commit cafd4653dc6c7574214e80aa09489dcd24e347a6
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jul 1 11:41:32 2009 +0200
-
- [glib-demo] Fix a typo
-
- glib/demo/utils.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit a3c9c6d0c0ee55dccd2d03f20d5683ae300cdc6b
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Jul 8 02:01:39 2009 +0200
-
- start updating the TODO file
-
- TODO file had quite some rust and dust in it, making quite "difficult" for others to understand what can be done for helping.
- First step has been removing all the items done.
- Next is grouping items by areas, so it is more clear what should be done in what area; current areas are:
- - general items: for general stuff to be done, not specific to some area; an example could have been "use littlecms for color management?"
- - core: stuff which is specific to the core library
- - Qt4/Qt/glib/etc frontend: stuff specific for that frontend
- - new frontends: ideas for possible new frontends
-
- I was not sure about some items and Jeff Muizelaar's TODO, so I left them there.
-
- TODO | 47 +++++++++++++++--------------------------------
- 1 files changed, 15 insertions(+), 32 deletions(-)
-
-commit 92ad0ef89fe7690d83854b4821178dfdb2e22897
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Jul 4 00:19:23 2009 +0200
-
- [Qt4 demo] hopefully fix the page size on zoom change
-
- qt4/demos/pageview.cpp | 5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
-
-commit 97094d13bc0f144b25e13c1de7a5328608ab13e3
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Jul 4 00:07:12 2009 +0200
-
- [Qt4 demo] show a list of checked/unchecked items for the document permissions
-
- qt4/demos/permissions.cpp | 25 ++++++++-----------------
- qt4/demos/permissions.h | 6 +++---
- 2 files changed, 11 insertions(+), 20 deletions(-)
-
-commit 0d8f2ee0f03a14e7b8477c4b787c3441a758f26b
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Jul 3 23:55:42 2009 +0200
-
- [Qt4 demo] show page numbers in the toolbar as 1..n
-
- qt4/demos/navigationtoolbar.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit b0d48df9121c55f8162ddf0ee63832f9adebf37b
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Jul 3 17:55:31 2009 +0200
-
- [Qt4 demo] correctly use DPI values for the page sizes
-
- qt4/demos/pageview.cpp | 12 +++++++++---
- qt4/demos/pageview.h | 2 ++
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-commit dcc3c384919f1562b8f312ad3ac847e23f3e83ab
-Author: Sebastien Bacher <seb128@ubuntu.com>
-Date: Wed Jul 1 10:09:12 2009 +0200
-
- [test] Use gtkbuilder rather than libglade
-
- Fixes bug #21673
-
- cmake/modules/FindGTK.cmake | 1 -
- configure.ac | 4 +-
- test/Makefile.am | 2 +-
- test/pdf-inspector.cc | 34 ++--
- test/pdf-inspector.glade | 434 -------------------------------------------
- test/pdf-inspector.ui | 416 +++++++++++++++++++++++++++++++++++++++++
- 6 files changed, 439 insertions(+), 452 deletions(-)
-
-commit 28208d1c9b8afbb769a5f4d9b0655b99fd4af16e
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jul 1 09:52:12 2009 +0200
-
- [glib-demo] Do not use gio if glib < 2.15
-
- Fixes bug #22530.
-
- glib/demo/main.c | 33 +++++++++++++++++++++++++++++++--
- 1 files changed, 31 insertions(+), 2 deletions(-)
-
-commit 6ef83414ab55294cf46b6b05813927bb04066986
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jun 30 23:07:00 2009 +0200
-
- Check getFileSpecNameForPlatform succeeded before using it's return value
-
- Fixes crash on bug 22551
-
- poppler/Annot.cc | 7 ++++---
- poppler/Link.cc | 30 +++++++++++++++++-------------
- poppler/Sound.cc | 8 +++++---
- 3 files changed, 26 insertions(+), 19 deletions(-)
-
-commit 4b9db83841a8b97df1e0991c1b853897b7095777
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jun 30 11:24:29 2009 +0200
-
- [glib-demo] Do not fill the surface before rendering
-
- The surface is guaranteed to be cleared
-
- glib/demo/render.c | 11 ++---------
- 1 files changed, 2 insertions(+), 9 deletions(-)
-
-commit 5deb6db5d340c08f337d2ba67aa1fd690e4eedd8
-Author: William Bader <williambader@hotmail.com>
-Date: Mon Jun 29 21:55:49 2009 +0200
-
- Fix interpolate parameter position
-
- poppler/SplashOutputDev.cc | 3 ++-
- utils/ImageOutputDev.cc | 5 +++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-commit e1e9ae2826eff1665d798b4b50b5c63e8282246b
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Jun 28 20:11:42 2009 +0200
-
- [Qt4 demo] do not crash when changing the zoom with no document
-
- qt4/demos/pageview.cpp | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit a98de97137cb343182bd03c443fc08ff4e0fd9a5
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Jun 28 19:08:02 2009 +0200
-
- [Qt4 demo] add a zoom combobox
-
- qt4/demos/navigationtoolbar.cpp | 33 ++++++++++++++++++++++++++++++++-
- qt4/demos/navigationtoolbar.h | 7 ++++++-
- qt4/demos/pageview.cpp | 14 ++++++++++++--
- qt4/demos/pageview.h | 6 +++++-
- qt4/demos/viewer.cpp | 2 ++
- 5 files changed, 57 insertions(+), 5 deletions(-)
-
-commit 40002d2c765398869a3b7d8d92715f0608e39ab3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 28 16:45:19 2009 +0200
-
- Make sure the array is big enough to read from it
-
- poppler/Gfx.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0a1b41ff6de5a41e3450ecbcb1ba754dc06c29d9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jun 26 19:31:22 2009 +0200
-
- Do not crash when we can't find onStr
-
- Fixes crash in bug #22485
- Not sure this is the best solution, but Adobe doesn't even open the file
-
- poppler/Form.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 6cb846664e57b02c99f1e6ad2b4e9128c9622e0a
-Author: Ilya Gorenbein <igorenbein@finjan.com>
-Date: Thu Jun 25 20:13:29 2009 +0200
-
- Initilize AnnotColot properly when the Array is not correct
-
- poppler/Annot.cc | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 5fdc3acb8dded2e7d08e6ef30f4c5ae1a4a11b5e
-Author: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Mon Jun 22 21:38:23 2009 +0200
-
- Only change the page size when it really changes, otherwise duplex commands are lost
-
- poppler/PSOutputDev.cc | 10 +++++++++-
- poppler/PSOutputDev.h | 4 ++++
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
-commit bf69beeb257cfd750c6ddc8b68aeb859b36380b2
-Author: David Benjamin <davidben@mit.edu>
-Date: Sat Jun 20 23:51:09 2009 +0200
-
- Make DecryptStream return sane values for getPos()
-
- Many streams (notably JBIG2Stream) expect wrapped streams to return correct
- values for getPos(), i.e. increments by 1 when readChar() called, etc.
- Fixes bug #19706.
-
- poppler/Decrypt.cc | 8 ++++++++
- poppler/Decrypt.h | 3 +++
- 2 files changed, 11 insertions(+), 0 deletions(-)
-
-commit 5ee4ff2aaf98e2eaa1ec2dc9f7e659b3b01ba7bf
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jun 20 15:00:16 2009 +0200
-
- [glib-demo] Allow using relative paths in demo application
-
- glib/demo/main.c | 17 +++++------------
- 1 files changed, 5 insertions(+), 12 deletions(-)
-
-commit a568248d3255407fcaa7368c4925c20e95619d20
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jun 19 21:07:39 2009 +0200
-
- 0.11.1
-
- CMakeLists.txt | 2 +-
- NEWS | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 54 insertions(+), 8 deletions(-)
-
-commit ac99e239f2726db32617ff03174a6ce74361ea1b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jun 19 21:03:29 2009 +0200
-
- ship PopplerCache.h
-
- CMakeLists.txt | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 84984d2aa25917d68c9971cefe636e626eada13d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jun 19 20:54:15 2009 +0200
-
- Ship PopplerCache.h too
-
- poppler/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 3a52d46e5df8eb926b550d7f7a82f316dbf6808f
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jun 19 17:45:44 2009 +0200
-
- [glib-demo] Destroy pattern after using it
-
- glib/demo/render.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 2e97524e5d82a4c33a4e6410fead444681db6749
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jun 19 14:20:16 2009 +0200
-
- [glib-demo] Use a transparent surface and fill it in white after rendering
-
- glib/demo/render.c | 12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
-
-commit 009937842d5a8bfc12394e9e3ab71b7c33340a85
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jun 19 14:10:05 2009 +0200
-
- [glib-demo] Use cairo_paint instead of rectangle + fill
-
- glib/demo/render.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-commit 7248da095f67d57c3999cee7d980e62fd8a7cf49
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jun 19 09:37:02 2009 +0200
-
- Use Interpolate flag to decide whether applying image interpolation during rendering
-
- Fixes bug #9860
-
- poppler/ArthurOutputDev.cc | 4 +-
- poppler/ArthurOutputDev.h | 5 +-
- poppler/CairoOutputDev.cc | 92 +++++++++++++++++++++++++------------------
- poppler/CairoOutputDev.h | 48 +++++++++++++----------
- poppler/Gfx.cc | 49 +++++++++++++++++++---
- poppler/OutputDev.cc | 17 +++++---
- poppler/OutputDev.h | 13 ++++--
- poppler/PSOutputDev.cc | 8 ++-
- poppler/PSOutputDev.h | 8 ++-
- poppler/PreScanOutputDev.cc | 25 ++++++++++--
- poppler/PreScanOutputDev.h | 25 ++++++++++--
- poppler/SplashOutputDev.cc | 16 +++++--
- poppler/SplashOutputDev.h | 12 ++++--
- utils/HtmlOutputDev.cc | 16 ++++----
- utils/HtmlOutputDev.h | 7 ++-
- utils/ImageOutputDev.cc | 20 +++++-----
- utils/ImageOutputDev.h | 12 ++++--
- 17 files changed, 248 insertions(+), 129 deletions(-)
-
-commit 37e3f877ee725648734ff41e1e83870a210bcbd7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jun 19 00:37:21 2009 +0200
-
- Handle Streams in CMap definitions
-
- Fixes bug 22334
-
- poppler/CMap.cc | 50 +++++++++++++++++++++++++++++-----------------
- poppler/CMap.h | 17 +++++++++++----
- poppler/GfxFont.cc | 41 ++++++++++++++++++++++++++------------
- poppler/GlobalParams.cc | 6 ++--
- poppler/GlobalParams.h | 5 ++-
- 5 files changed, 77 insertions(+), 42 deletions(-)
-
-commit 47de8eef46300832556ce5ed869e391e477fd843
-Author: David Benjamin <davidben@mit.edu>
-Date: Fri Jun 19 00:30:35 2009 +0200
-
- Fix some bugs in JBIG2Stream handling
-
- For more info see bug 12014 and [poppler] Bug in JBIG2Stream from 08-June-2009
-
- poppler/JBIG2Stream.cc | 88 ++++++++++++++++++++++++++----------------------
- poppler/JBIG2Stream.h | 15 ++++++++
- 2 files changed, 63 insertions(+), 40 deletions(-)
-
-commit d30b1013ea3ce45b5ea942fe7357c0fd07ff47f4
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jun 2 11:44:08 2009 +0200
-
- Add setOpen() and setIcon() in AnnotText
-
- poppler/Annot.cc | 25 +++++++++++++++++++++++++
- poppler/Annot.h | 3 +++
- 2 files changed, 28 insertions(+), 0 deletions(-)
-
-commit 287feffc1c1c0aa42a398fc071b489acef9ef22e
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jun 2 11:26:40 2009 +0200
-
- Add setLabel() and setPopup() to AnnotMarkup
-
- poppler/Annot.cc | 36 ++++++++++++++++++++++++++++++++++++
- poppler/Annot.h | 4 ++++
- 2 files changed, 40 insertions(+), 0 deletions(-)
-
-commit 2a938af5624fbc79316dd6bee5e550f2b4270a76
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jun 2 10:59:44 2009 +0200
-
- Add setParent() and setOpen() to AnnotPopup
-
- poppler/Annot.cc | 19 +++++++++++++++++++
- poppler/Annot.h | 4 ++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
-
-commit 0af5464352dfa51f0458c57a3590c847a45964c7
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jun 2 10:37:49 2009 +0200
-
- Save parent reference of popup annotations
-
- poppler/Annot.cc | 16 +++++-----------
- poppler/Annot.h | 4 ++--
- 2 files changed, 7 insertions(+), 13 deletions(-)
-
-commit fc4bc43dcd6f6871a47b9198e8c2571a5d448c3e
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Jun 1 14:52:21 2009 +0200
-
- Fix a crash in pdf-inspector
-
- test/pdf-inspector.cc | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-commit 3da7a2657892fde52b62e1f73476cb33d6c75e96
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri May 29 13:35:39 2009 +0200
-
- Add Annot::setColor()
-
- poppler/Annot.cc | 19 ++++++++++++++++++-
- poppler/Annot.h | 6 +++++-
- 2 files changed, 23 insertions(+), 2 deletions(-)
-
-commit 3eabdf57729852205855cf74ff2d2f9d7bc03f73
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri May 29 13:23:26 2009 +0200
-
- Add construtors to create AnnotColor objects directly from color values
-
- poppler/Annot.cc | 26 ++++++++++++++++++++++++++
- poppler/Annot.h | 3 +++
- 2 files changed, 29 insertions(+), 0 deletions(-)
-
-commit 8045e7a1a84a3d54a1c9415ac63b5b9df5ecc349
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri May 29 13:06:40 2009 +0200
-
- Add Page::addAnnot() to add a new annotation to the page
-
- poppler/Page.cc | 28 ++++++++++++++++++++++++++++
- poppler/Page.h | 2 ++
- 2 files changed, 30 insertions(+), 0 deletions(-)
-
-commit fe80eb84ec711b7400cef95e791a74c8fd259af7
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri May 29 13:00:19 2009 +0200
-
- Add getRef() to get the annotation reference
-
- poppler/Annot.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 1c92657be72c44dba7185808ffb00dd85c5ab289
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri May 29 12:14:02 2009 +0200
-
- Save page object and ref in Page class
-
- This is needed to be able to modify the page object.
-
- poppler/Catalog.cc | 2 +-
- poppler/Page.cc | 6 +++++-
- poppler/Page.h | 4 +++-
- 3 files changed, 9 insertions(+), 3 deletions(-)
-
-commit 4ad2d663262008e4b97342c4ed67c686ff5abd13
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri May 29 11:43:30 2009 +0200
-
- Add annot constructors to create annot objects without a dict
-
- This allows to create annotation objects to be added to the document.
- Required fields on the annotation dictionary are constructor arguments,
- setters will be added for the other fields.
-
- poppler/Annot.cc | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h | 22 ++++-
- 2 files changed, 315 insertions(+), 7 deletions(-)
-
-commit e5c4862b0c1b08a0fab47070cb9c862026e93567
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 10 23:28:03 2009 +0200
-
- ignore++
-
- m4/.gitignore | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 572779f8037763c1e0ee64c47a3dad6df0d3b693
-Author: Koji Otani <sho@bbr.jp>
-Date: Wed Jun 10 22:55:26 2009 +0200
-
- Fix dashed line in page 1 of bug 20011
-
- poppler/Gfx.cc | 6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
-
-commit b97591672e0d9c31a3d044fe52e34cc80a491221
-Author: Koji Otani <sho@bbr.jp>
-Date: Wed Jun 10 22:54:57 2009 +0200
-
- Fix "Conditional jump or move depends on uninitialised value"
-
- When stroking with a pattern, set strokeColor with a copy of fillColor.
- This is wrong and the fillColor may be uninitialized.
- See bug 20011
-
- poppler/Gfx.cc | 13 +++++++++++--
- 1 files changed, 11 insertions(+), 2 deletions(-)
-
-commit a92b38836b1e4475d5a7a1b9cb8f3e9429cef275
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jun 9 22:39:19 2009 +0200
-
- Correctly duplicate the cache on PostScriptFunction(PostScriptFunction *func)
-
- poppler/Function.cc | 28 ++++++++++++++++++++++++++++
- poppler/PopplerCache.cc | 20 ++++++++++++++++++++
- poppler/PopplerCache.h | 14 ++++++++++++++
- 3 files changed, 62 insertions(+), 0 deletions(-)
-
-commit 2cecdf922f4c8178b0e55d3ddf86c31f8be3313a
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jun 9 11:04:39 2009 +0200
-
- [glib] Fix a crash when a destination points to an invalid page
-
- glib/poppler-action.cc | 21 +++++++++++++--------
- 1 files changed, 13 insertions(+), 8 deletions(-)
-
-commit 831288c13c3a7502bbccd1313c6e376283be367c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 7 18:37:20 2009 +0200
-
- Optimize roll() a bit
-
- If the number of times to roll is > than half the number of items
- rotate in the reverse direction
- Makes it be 33% of exec() instead of 42%
-
- poppler/Function.cc | 19 ++++++++++++++-----
- 1 files changed, 14 insertions(+), 5 deletions(-)
-
-commit 3d40dcad850a2bc0e28845a15722db0c79920135
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 7 13:38:50 2009 +0200
-
- Move the GfxState cache to the new poppler cache class
-
- poppler/GfxState.cc | 97 ++++++++++++++++++++++++---------------------------
- poppler/GfxState.h | 19 ++--------
- 2 files changed, 49 insertions(+), 67 deletions(-)
-
-commit 2619e09833f421fb3d8cc68d41d15081ae6824e4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 7 13:37:40 2009 +0200
-
- Implement a cache for PostscriptFunction transforms
-
- Makes time of rendering of bug 21562 go down from 24 to 8 seconds
-
- poppler/Function.cc | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Function.h | 2 +
- 2 files changed, 78 insertions(+), 0 deletions(-)
-
-commit 588bfe3c14f42be492066c2a98e30482475a6926
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 7 13:36:39 2009 +0200
-
- Add a code to a generic cache based on Koji's code for GfxState cache
-
- CMakeLists.txt | 1 +
- poppler/Makefile.am | 1 +
- poppler/PopplerCache.cc | 82 +++++++++++++++++++++++++++++++++++++++++++++++
- poppler/PopplerCache.h | 47 +++++++++++++++++++++++++++
- 4 files changed, 131 insertions(+), 0 deletions(-)
-
-commit d09478fcc44b5c594f1803fc24654af5e10fa129
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 7 01:34:01 2009 +0200
-
- Move index and pop to class definition too
-
- poppler/Function.cc | 32 +++++++++++++++-----------------
- 1 files changed, 15 insertions(+), 17 deletions(-)
-
-commit 2083264e8ab0fd9976294de08a18de615d5a1168
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 7 01:21:19 2009 +0200
-
- Move the implementations to the class definition
-
- Make gcc inline the functions and time to render a heavy PSFunction doc goes from 28 to 20 secs
-
- poppler/Function.cc | 151 ++++++++++++++++++++++++---------------------------
- 1 files changed, 71 insertions(+), 80 deletions(-)
-
-commit 24580fcd2be74db5f3140bdb2ebff8431b7d3f1e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jun 6 16:17:26 2009 +0200
-
- Add a debug saying how much rendering took
-
- qt4/tests/test-poppler-qt4.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 50cf7cffff760e41774957ad8f1f92803142438e
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jun 6 16:04:54 2009 +0200
-
- Use g_path_get_basename instead of g_basename in gtk-cairo-test
-
- Fixes bug #21361.
-
- test/gtk-cairo-test.cc | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit 4cc9dee35e03d7b295a476f937ec0f2c43bb6592
-Author: Christian Persch <chpe@gnome.org>
-Date: Sat Jun 6 12:13:48 2009 +0200
-
- Remove unneeded files from repo
-
- See bug #22094
-
- configure.ac | 2 +-
- glib/reference/Makefile.am | 4 +-
- gtk-doc.make | 155 --------------------------------------------
- m4/gtk-doc.m4 | 53 ---------------
- 4 files changed, 3 insertions(+), 211 deletions(-)
-
-commit c94e476dbff9e527c72e52377d830f35f29ba3d6
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Jun 5 11:09:44 2009 +0200
-
- when showing the tooltip for a text rect, show also its index in the page text boxes list
-
- qt4/tests/test-poppler-qt4.cpp | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-commit 2298acac267257b1916c802bdb902428e69e683b
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Jun 5 11:08:51 2009 +0200
-
- [Qt4 apidox] FontInterator is new in 0.12
-
- qt4/src/poppler-qt4.h | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 37c48c2521c623c485841472c4a174a1841aea33
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Jun 5 10:54:30 2009 +0200
-
- [CMake] Add poppler version defines and version check macro
-
- Add POPPLER_[MAJOR|MINOR|MICRO]_VERSION defines and
- POPPLER_CHECK_VERSION macro. FDO bug #22091.
-
- CMakeLists.txt | 5 ++++-
- glib/poppler-features.h.cmake | 9 +++++++++
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
-commit 26f6fb1d79c2589829cd896d57da63d16641f307
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Jun 5 10:51:26 2009 +0200
-
- [CMake] switch poppler-features.h.cmake to a more autotools-like syntax
-
- glib/CMakeLists.txt | 2 +-
- glib/poppler-features.h.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 89704635b727db42f6c72ba101091eb7eddb967a
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Jun 5 10:39:17 2009 +0200
-
- [Qt4 demo] compile the new thumbnail module with autotools as well
-
- qt4/demos/Makefile.am | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 291bafe64c8755fe5f85a51b184ac6e3d3170e1d
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jun 5 10:07:16 2009 +0200
-
- [glib] Use g_strerror instead of strerror
-
- Fixes bug #22095.
-
- glib/poppler-document.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0ca7e214fb5f9c9fb59792149bd23c1617d38cac
-Author: Christian Persch <chpe@gnome.org>
-Date: Thu Jun 4 22:35:40 2009 +0200
-
- Add poppler version defines and version check macro
-
- Add POPPLER_[MAJOR|MINOR|MICRO]_VERSION defines and
- POPPLER_CHECK_VERSION macro. FDO bug #22091.
-
- configure.ac | 11 ++++-
- glib/poppler-features.h.in | 9 +++
- glib/reference/poppler-docs.sgml | 1 +
- glib/reference/poppler-sections.txt | 10 ++++
- glib/reference/tmpl/poppler-features.sgml | 80 +++++++++++++++++++++++++++++
- 5 files changed, 110 insertions(+), 1 deletions(-)
-
-commit 4ce04da0040e5a2626c110f94a128e2d272401b9
-Author: Matthias Drochner <M.Drochner@fz-juelich.de>
-Date: Thu Jun 4 23:05:22 2009 +0200
-
- Use the correct value when creating the V field
-
- PDF Spec says:
- For items represented in the Opt array by a two-element array, the name string is the second of the two array elements.
-
- poppler/Form.cc | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-commit 7e01e37a834bfdd75d739ea2b48e9127ca7f259e
-Author: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Thu Jun 4 20:25:55 2009 +0200
-
- Add part of fix for bug 20420, the other part was checked in with Thomas patches
-
- poppler/PSOutputDev.cc | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 50a7b4bcaa6e5f56cc25fe6936f9dc537a1b4b37
-Author: Jeremy C. Reed <reed@reedmedia.net>
-Date: Thu Jun 4 20:19:03 2009 +0200
-
- [glib] Hyphenate UTF-8 and UTF-16BE
-
- Fixes bug #21953.
-
- where iconv() is called to fill in a text field, use "UTF-8" and
- "UTF-16BE" as encoding names rather than the less portable
- "UTF8" and "UTF16BE" -- this makes it work on NetBSD.
-
- glib/poppler-annot.cc | 2 +-
- glib/poppler-form-field.cc | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 2cf9e6a2318b770ae62572944c687576d1801d31
-Author: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Thu Jun 4 19:48:42 2009 +0200
-
- Support multiple page sizes when converting to PS
-
- Fixes byg #19777
-
- poppler/PSOutputDev.cc | 31 +++++++++++++++++++++++++++++--
- poppler/PSOutputDev.h | 4 +++-
- utils/pdftops.1 | 26 +++++++++++++++++++++-----
- utils/pdftops.cc | 17 ++++++++++++-----
- 4 files changed, 65 insertions(+), 13 deletions(-)
-
-commit 30fb7cb7e47cf6a8008c5083c8d0978fdfdf8e62
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jun 4 19:25:22 2009 +0200
-
- Add missing { }
-
- poppler/Gfx.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 1beec21ed3a016998fee3849d460166895db9047
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 3 22:37:43 2009 +0200
-
- Give an error when using level1sep without having CMYK support
-
- Fixes bug #22026
-
- poppler/PSOutputDev.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit e80d645c34c7d44d1f35da0a25669d1c4cde6e7f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 3 22:00:49 2009 +0200
-
- Also accept tokens with to leading 00
-
- Fixes bug 22025, based on a patch by William Bader
-
- poppler/CharCodeToUnicode.cc | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-commit e521c1efaeba3f35d10e46bca3d9650dabd2d889
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Wed Jun 3 22:08:57 2009 +0930
-
- Implement text in pattern colorspace for the cairo backend
-
- poppler/CairoOutputDev.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h | 19 ++++++++++++++++++
- 2 files changed, 66 insertions(+), 0 deletions(-)
-
-commit a87978b09a026b2db6b0f80271d87b44b336a121
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Jun 3 13:49:56 2009 +0200
-
- [Qt4 demo] show the checksum for embedded files
-
- qt4/demos/embeddedfiles.cpp | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit db5102842494a124d813db1696bb60820db3442b
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Jun 3 13:21:22 2009 +0200
-
- [Qt4 demo] remove checks for Qt >= 4.2
-
- poppler-qt4 requires Qt 4.3, so checking for 4.2 is no more needed
-
- qt4/demos/embeddedfiles.cpp | 2 --
- qt4/demos/fonts.cpp | 2 --
- qt4/demos/info.cpp | 2 --
- qt4/demos/optcontent.cpp | 2 --
- qt4/demos/permissions.cpp | 2 --
- qt4/demos/toc.cpp | 2 --
- 6 files changed, 0 insertions(+), 12 deletions(-)
-
-commit e8d897581656ee4a20e9bb87dd999425663ace3b
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Jun 3 02:54:29 2009 +0200
-
- [Qt4 demo] simplier way to change page from the thumbnail view
-
- qt4/demos/pageview.cpp | 5 -----
- qt4/demos/pageview.h | 3 ---
- qt4/demos/thumbnails.cpp | 2 +-
- qt4/demos/thumbnails.h | 3 ---
- qt4/demos/viewer.cpp | 1 -
- 5 files changed, 1 insertions(+), 13 deletions(-)
-
-commit f69a4fe47d3478cccbc03e4ac0929c7eada681c0
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Jun 3 01:24:21 2009 +0200
-
- [Qt4 demo] Add a thumbnail dock widget
-
- Useful to show the embedded page thumbnails in the document, if any.
- Based on a patch by Shawn Rutledge <shawn.t.rutledge@gmail.com>, reworked by me to be a QListWidget showing the page items at their full size.
-
- qt4/demos/CMakeLists.txt | 1 +
- qt4/demos/thumbnails.cpp | 84 ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/thumbnails.h | 51 ++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 11 +++++-
- 4 files changed, 146 insertions(+), 1 deletions(-)
-
-commit 2f24ac0f4bbd6de1c9f137110b3ac2bd3b23b0b9
-Author: Shawn Rutledge <shawn.t.rutledge@gmail.com>
-Date: Wed Jun 3 01:22:31 2009 +0200
-
- [Qt4 demo] add a public slot to set the current page
-
- qt4/demos/pageview.cpp | 5 +++++
- qt4/demos/pageview.h | 3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-commit 1f1baf186f9e37606765e51ec5b9893ddfbfa893
-Author: Shawn Rutledge <shawn.t.rutledge@gmail.com>
-Date: Wed Jun 3 01:19:16 2009 +0200
-
- [Qt4] Add Page::thumbnail()
-
- This function can be used to get the embedded thumbnail of the page, present in the document.
- Reindented by me, and avoid a memory leak because of non-freed data.
-
- qt4/src/poppler-page.cc | 21 ++++++++++++++++++++-
- qt4/src/poppler-qt4.h | 11 +++++++++++
- 2 files changed, 31 insertions(+), 1 deletions(-)
-
-commit 5cc24be1e9af0a27ab88ffa719bcabc2378868e4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 3 00:05:54 2009 +0200
-
- Remove unused variables
-
- poppler/SplashOutputDev.cc | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-commit 45823bf8f4abacbbf257f6708264de074eda3cf4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 3 00:02:54 2009 +0200
-
- Make it compile :-/
-
- poppler/SplashOutputDev.cc | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-commit f5ae14907261a46c121f3ed7aea9d7ad9b9c55de
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jun 2 23:52:59 2009 +0200
-
- Really fix the typo
-
- README | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 5d4b1995cdd57db7cef3d88704850aaf66ed7fff
-Author: William Bader <williambader@hotmail.com>
-Date: Tue Jun 2 23:10:53 2009 +0200
-
- Fix three typos in README
-
- README | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 104f9286ceb5fcb5f4795bca7633029142d5f6a4
-Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Tue Jun 2 22:59:42 2009 +0200
-
- Support colorizing text in pattern colorspace
-
- This implements commits the final patches for bug 19670 and 19994
- Also fixes bugs 15819 and 2807
- Also implements blending for SPLASH_CMYK in Splash
- It's a quite big change but i've done regression testing over my whole
- pdf suite and did not fit anything that went worse, just improvements
- Missing the Cairo support
-
- CMakeLists.txt | 1 +
- poppler/Gfx.cc | 135 ++++++++++++---
- poppler/Gfx.h | 7 +
- poppler/GfxState.cc | 58 +------
- poppler/GfxState_helpers.h | 80 +++++++++
- poppler/Makefile.am | 1 +
- poppler/OutputDev.h | 14 ++
- poppler/PSOutputDev.cc | 285 +++++++++++++++++++-------------
- poppler/PSOutputDev.h | 18 ++
- poppler/SplashOutputDev.cc | 404 +++++++++++++++++++++++++++++++++++++-------
- poppler/SplashOutputDev.h | 19 ++
- 11 files changed, 766 insertions(+), 256 deletions(-)
-
-commit d3e4563146cbff4cb507522783e60462461c7524
-Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Sun May 31 23:23:07 2009 +0200
-
- Set memory to 0 after allocation, fixes problems on Sun machines, should not hurt for others
-
- poppler/GfxState.cc | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 78a58931b4347ecb505bad5a51104382ef5f91c7
-Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Sun May 31 22:52:23 2009 +0200
-
- Add splashClearColor that assigns white to the given colorptr
-
- splash/SplashTypes.h | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-commit 47c26747b32c242ec8ac60e7b93150a67eb22e31
-Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Sun May 31 22:51:22 2009 +0200
-
- Fix splashColorModeNComps to correctly include all values for each SplashColorMode
-
- splash/SplashState.cc | 17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
-
-commit 41775d8c0b44bf591d8ff5ede7fad276e8fa9eef
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Jun 1 15:24:24 2009 +0200
-
- [glib-demo] Use poppler_annot_markup_has_popup()
-
- glib/demo/annots.c | 7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-commit f542c5294394e837298cb7e7d1d94bb336bfd09d
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Jun 1 15:24:04 2009 +0200
-
- [glib] Add poppler_annot_markup_has_popup()
-
- glib/poppler-annot.cc | 20 ++++++++++++++++++++
- glib/poppler-annot.h | 1 +
- 2 files changed, 21 insertions(+), 0 deletions(-)
-
-commit af32d56af779edcc539b680e634755941d1bf45c
-Author: Petr Gajdos <pgajdos@novell.com>
-Date: Thu May 21 00:37:18 2009 +0200
-
- Add the possibility of forcing no hinting of fonts
-
- poppler/ArthurOutputDev.cc | 2 +
- poppler/GlobalParams.cc | 20 +++++++++++
- poppler/GlobalParams.h | 4 ++
- poppler/SplashOutputDev.cc | 2 +
- splash/SplashFTFont.cc | 76 ++++++++++++++++++++++++++----------------
- splash/SplashFTFont.h | 2 +
- splash/SplashFTFontEngine.cc | 8 +++--
- splash/SplashFTFontEngine.h | 6 ++-
- splash/SplashFontEngine.cc | 4 ++-
- splash/SplashFontEngine.h | 2 +
- 10 files changed, 91 insertions(+), 35 deletions(-)
-
-commit 1a69d9638214943b3c2278f570694d9722a5de15
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 20 23:58:44 2009 +0200
-
- Do not create the GfxColorTransform if the lcms could not be created
-
- Fixes crash on pdf from bug 20108
-
- poppler/GfxState.cc | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-commit 95246d39c1289111a4ba3eb2ffbec50d7702e5eb
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 20 23:20:20 2009 +0200
-
- Check Mask entries are int before using them, also if they are real cast to int and try to use them
-
- Fixes bug #21841
-
- poppler/Gfx.cc | 11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-commit 0c3517bfb4e1e1a28962f8d490ad69ec5766b6a1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 20 23:08:41 2009 +0200
-
- Fix pdftops crash on file from KDE bug 174899
-
- Still does not generate a correct ps file, but at least the program does not crash now
-
- fofi/FoFiTrueType.cc | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-commit 548c72600b8a5e076647041660ed5031feedc7cc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 20 22:43:11 2009 +0200
-
- Do not exit(1) on a pdf i have lying around
-
- PDF is 0f03b3539a436a9f18d7e4e29d410f89 6607907.pdf
-
- poppler/JBIG2Stream.cc | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-commit f78d3a7ff5ef4b500d76d84ebc45aac3be162dab
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 18 20:44:40 2009 +0200
-
- Move lcms.h include to GfxState.cc, replace lcms typedefs by void *
-
- poppler/GfxState.cc | 70 ++++++++++++++++++++++++++++++++++++++++++++------
- poppler/GfxState.h | 64 ++++++++++------------------------------------
- 2 files changed, 75 insertions(+), 59 deletions(-)
-
-commit ec2467f9981b7e7c23d5dcd8eabf2e7c8cdf8930
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 17 20:00:53 2009 +0200
-
- Use the lcms include dir
-
- CMakeLists.txt | 3 +++
- poppler/Makefile.am | 2 ++
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-commit e0fcf7055af480498a81a000dcd9f977a783df66
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 17 12:07:05 2009 +0200
-
- Use pkgconfig for autotools cms check
-
- configure.ac | 12 +++++++-----
- poppler/Makefile.am | 2 +-
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-commit 657734c19274ab281328cba9297eca45e48777aa
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 17 12:06:47 2009 +0200
-
- Better lcms check comming from kdelibs
-
- cmake/modules/FindLCMS.cmake | 95 +++++++++++++++++++++++++++++++-----------
- 1 files changed, 71 insertions(+), 24 deletions(-)
-
-commit 0974b7b4bfe3f8cf3a1408741ddf01c667c28044
-Author: Patrick Spendrin <ps_ml@gmx.de>
-Date: Thu May 14 16:15:22 2009 +0200
-
- [Win32] Build fix for MSVC.
-
- poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit d1c0e8a6c63361304cd453bb4c51e84a1aab7efa
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu May 14 00:29:18 2009 +0200
-
- Kill support for specifying extension in openTmpFile
-
- We don't use it and it would not work anyway, see bug #21713
-
- goo/gfile.cc | 58 +++++++++--------------------------------
- goo/gfile.h | 3 +-
- poppler/CairoFontEngine.cc | 6 ++--
- splash/SplashFTFontEngine.cc | 3 +-
- splash/SplashT1FontEngine.cc | 3 +-
- splash/SplashT1FontFile.cc | 3 +-
- 6 files changed, 24 insertions(+), 52 deletions(-)
-
-commit e237d8b5c2ae8805487a0790d9fb218263686712
-Author: Pino Toscano <pino@kde.org>
-Date: Wed May 13 18:37:07 2009 +0200
-
- [Qt4] we don't need an output device anymore (since long, even) for resolving destinations
-
- qt4/src/poppler-document.cc | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-commit 9a2a851da93ef1a0c291fc9523a468e808ffd08e
-Author: Pino Toscano <pino@kde.org>
-Date: Wed May 13 18:19:11 2009 +0200
-
- [Qt4] Do not try to resolve named destinations for GoTo links pointing to external documents.
-
- In such cases, the named destination is a destination in the external document, so we would try to look up a destination which is not in the current document (thus the look up is unuseful).
- It is task of the users of poppler-qt4 detect such situations, and resolve the named when necessary, using Document::linkDestination(QString).
-
- qt4/src/poppler-document.cc | 2 +-
- qt4/src/poppler-link.cc | 2 +-
- qt4/src/poppler-page.cc | 6 ++++--
- qt4/src/poppler-private.cc | 4 ++--
- qt4/src/poppler-private.h | 5 +++--
- 5 files changed, 11 insertions(+), 8 deletions(-)
-
-commit 51f6cc26fc5fdccce1ba4d4816dec374ce85d67a
-Author: Pino Toscano <pino@kde.org>
-Date: Wed May 13 17:38:00 2009 +0200
-
- [Qt4] start a (basic) unit test for links & destinations
-
- qt4/tests/CMakeLists.txt | 1 +
- qt4/tests/Makefile.am | 5 ++
- qt4/tests/check_links.cpp | 96 +++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 102 insertions(+), 0 deletions(-)
-
-commit 174f8087f5e09c5d1915de128b7a15acf47c1e13
-Author: Pino Toscano <pino@kde.org>
-Date: Wed May 13 16:44:59 2009 +0200
-
- [Qt4] set the destination name only when it is not resolved
-
- qt4/src/poppler-link.cc | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-commit fb0cb2add9443992f166acdf744fbec875faaabf
-Author: Pino Toscano <pino@kde.org>
-Date: Tue May 12 01:53:43 2009 +0200
-
- [Qt4] Add LinkDestination::destinationName() that returns the name of the current destination.
-
- qt4/src/poppler-link.cc | 10 ++++++++++
- qt4/src/poppler-link.h | 7 +++++++
- 2 files changed, 17 insertions(+), 0 deletions(-)
-
-commit b8bd44f1302f7b6a6923d41c98ec74c118a5abb8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 11 20:49:34 2009 +0200
-
- Poppler 0.11.0 aka 0.12 Alpha 1
-
- CMakeLists.txt | 4 +-
- NEWS | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +-
- poppler/Makefile.am | 2 +-
- qt4/src/Doxyfile | 2 +-
- 6 files changed, 150 insertions(+), 8 deletions(-)
-
-commit 79bcedd5602729b959f21aed222445de621e7ecb
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon May 11 19:59:57 2009 +0200
-
- Update copyright headers for previous patches
-
- poppler/ArthurOutputDev.cc | 1 +
- poppler/CairoOutputDev.cc | 2 +-
- poppler/Page.cc | 2 +-
- poppler/Stream.cc | 1 +
- poppler/Stream.h | 1 +
- utils/HtmlOutputDev.cc | 1 +
- utils/ImageOutputDev.cc | 1 +
- 7 files changed, 7 insertions(+), 2 deletions(-)
-
-commit f16e36df3a74e1adf14513a6340be2e8665f8d65
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun May 10 19:24:32 2009 +0200
-
- Don't include popups annots with a parent in annots list
-
- poppler/Annot.cc | 13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-commit 5051ebed1477ff3f7721606f79d66d56a80c1145
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun May 10 19:10:51 2009 +0200
-
- Make sure ImageStream::close() is called after ImageStream::reset()
-
- poppler/ArthurOutputDev.cc | 1 +
- poppler/CairoOutputDev.cc | 20 +++++++++++++++++---
- poppler/Page.cc | 1 +
- poppler/Stream.cc | 4 ++++
- poppler/Stream.h | 3 +++
- utils/HtmlOutputDev.cc | 1 +
- utils/ImageOutputDev.cc | 1 +
- 7 files changed, 28 insertions(+), 3 deletions(-)
-
-commit 829ed964374676ddfa4a9048c940dc20a309ca47
-Author: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
-Date: Sun May 10 23:39:11 2009 +0200
-
- Fix axial shading fix to ensure the painting passes by the four edges of the bbox
-
- When j and teoricalj are the same, just change the value of ta[] not the next[] ones
-
- poppler/Gfx.cc | 23 ++++++++++++++++-------
- 1 files changed, 16 insertions(+), 7 deletions(-)
-
-commit 68d9644499676ed1553b2bfcdbfc9a5677c75345
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat May 9 22:25:12 2009 +0200
-
- Hidden property depends on parent being hidden, not only yourself
-
- Fixes bug #16093
-
- poppler/Gfx.cc | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 810a71ea66f0e07d9849a5e9bf28911472482d1b
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri May 8 09:36:31 2009 +0200
-
- [glib] Add poppler_annot_markup_get_popup_rectangle
-
- glib/demo/annots.c | 8 ++++++++
- glib/poppler-annot.cc | 35 +++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h | 2 ++
- 3 files changed, 45 insertions(+), 0 deletions(-)
-
-commit 5d328282da4713356fbe4283bd992ac2fc9010a2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu May 7 23:11:55 2009 +0200
-
- bitmap->h can be 0, move to _checkoverflow variant, code already knows how to deal with NULL
-
- splash/SplashFTFont.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 5b0fb6f94d6d54b1b0c97762db61e2ab0dd07c85
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 6 22:59:55 2009 +0200
-
- Fix format printing
-
- poppler/JBIG2Stream.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit c21b08a254f42f53d4b59ad4fb308c7c68c32d15
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed May 6 15:56:21 2009 +0200
-
- [glib] Several fixes in poppler_annot_get_color()
-
- PopplerColor is compatible with GdkColor where every component is in the
- range of 0 to 65535, we were returning values between 0 and 1 but
- converted to guint16.
- We were also showing a warning when AnnotColor::colorTransparent is
- used, but we decided to return a PopplerColor * to be able to represent
- transparent color returning NULL, so it's actually supported.
-
- glib/demo/annots.c | 25 +++++++++++--------------
- glib/poppler-annot.cc | 36 +++++++++++++++++++++---------------
- 2 files changed, 32 insertions(+), 29 deletions(-)
-
-commit 63cc40ec02498e1ec249d5f74e23f574c665872e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat May 2 14:08:23 2009 +0200
-
- Link pdftoabw to abiword libs
-
- Fixes bug #21520
-
- utils/Makefile.am | 22 ++++++++++++----------
- 1 files changed, 12 insertions(+), 10 deletions(-)
-
-commit 70e06e9ae28d08bb7495a7f2eb03b0b5714a1e54
-Author: Kouhei Sutou <kou@cozmixng.org>
-Date: Wed Apr 29 09:52:21 2009 +0900
-
- PopplerAttachment refers its document.
-
- glib/poppler-attachment.cc | 41 +++++++++++++++++++++++++++++++++++------
- 1 files changed, 35 insertions(+), 6 deletions(-)
-
-commit 977a13f1091700bf7e7b31859e0e6632dc323462
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Apr 25 19:07:01 2009 +0200
-
- [glib] Only create checksum string for valid checksums
-
- glib/poppler-attachment.cc | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-commit fb6e7141e3008ae230ae5819e2c7a0425296d8d2
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Apr 24 10:13:53 2009 +0200
-
- Update copyright headers
-
- glib/poppler-annot.cc | 1 +
- glib/poppler-annot.h | 1 +
- poppler/Annot.cc | 2 +-
- poppler/Annot.h | 2 +-
- poppler/DateInfo.cc | 1 +
- poppler/DateInfo.h | 1 +
- 6 files changed, 6 insertions(+), 2 deletions(-)
-
-commit fc7e52fef0317f9c85ead2c4f8a0e9b688decca3
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Apr 24 09:53:41 2009 +0200
-
- Fix typos in Annot::setContents() documentation
-
- poppler/Annot.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit df0032cf5f6e5dc44bad056c659180e4065d32e2
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Apr 23 13:19:25 2009 +0200
-
- Document Annot::setContents() method
-
- poppler/Annot.h | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 86a37a8f3f93e3378b446f8d81d80571267c7660
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Apr 23 13:16:04 2009 +0200
-
- Update the annotation last modified time when it's modified
-
- poppler/Annot.cc | 26 ++++++++++++++++----------
- poppler/Annot.h | 7 ++++---
- 2 files changed, 20 insertions(+), 13 deletions(-)
-
-commit 9662bfa2b4b2282d0fc29d2a327b62d8bde56ff2
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Apr 23 13:13:07 2009 +0200
-
- Add timeToDateString() to DateInfo
-
- This function converts a time_t into a string in PDF date format.
-
- configure.ac | 1 +
- poppler/DateInfo.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++
- poppler/DateInfo.h | 7 +++++++
- 3 files changed, 55 insertions(+), 0 deletions(-)
-
-commit dc4cf0c29b53cda5c1c2badc5026af3429502e3a
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Apr 21 21:51:52 2009 +0200
-
- add poppler-date.{cc,h}
-
- glib/CMakeLists.txt | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 0750c6502faeabff571f5730b567097e793dca64
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Apr 21 20:04:27 2009 +0200
-
- [glib-demo] Fix dates handling in annots demo
-
- glib/demo/annots.c | 69 ++++++++++-----------------------------------------
- 1 files changed, 14 insertions(+), 55 deletions(-)
-
-commit fe73bf9771e8294af4c8a11ec4c2891ff8f8d859
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Apr 21 20:02:25 2009 +0200
-
- [glib-demo] GTime is deprecated, use time_t instead
-
- glib/demo/utils.c | 2 +-
- glib/demo/utils.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 6d468cfa0cb89760e5d6cca43521cde6d99aa52e
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Apr 21 20:00:20 2009 +0200
-
- [glib-demo] Use format_date from utils and remove duplicated code
-
- glib/demo/info.cc | 27 ++-------------------------
- 1 files changed, 2 insertions(+), 25 deletions(-)
-
-commit e5f5ea01d0da4c4d877b93755523dc2a7f2ec049
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Apr 21 19:57:11 2009 +0200
-
- [glib] Fix poppler_annot_markup_get_date()
-
- Date field in Markup annots is also a PDF format date string, so it
- should be parsed and the resulting time_t used to create a correct
- GDate.
-
- glib/poppler-annot.cc | 22 +++++++++++-----------
- 1 files changed, 11 insertions(+), 11 deletions(-)
-
-commit 876ad1bcc8a7b2f37656bf15cee7eb888fd46ed4
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Apr 21 19:36:33 2009 +0200
-
- [glib] Add info about the return value in poppler_annot_get_modified() doc
-
- glib/poppler-annot.cc | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit 8c54a15e1715721ee7af7e82c90b8dda3689c65f
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Apr 21 19:35:14 2009 +0200
-
- [glib] Fix a typo in poppler_date_parse documentation
-
- glib/poppler-date.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 39d09fa237d06fa93b02eb916d2c0242c4e8fe85
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Apr 21 19:29:32 2009 +0200
-
- [glib] Add poppler_date_parse to parse PDF format date strings
-
- We need to make this public because the field M in the Annot dictionary
- might be a Date string (in PDF date format) or a text string. According
- to the PDF spec: "The preferred format is a date string as described in
- Section 3.8.3, “Dates,†but viewer applications should be prepared to
- accept and display a string in any format". The only way to know whether
- it's a PDF date string or not, is by trying to parse it. For this reason
- poppler_annot_get_modified() returns a gchar * instead of a time_t. So,
- viewers should try to parse the string in order to convert it to a
- time_t, and if it fails to parse, use the date string as provided by the
- document.
-
- glib/Makefile.am | 2 +
- glib/poppler-attachment.cc | 4 +-
- glib/poppler-date.cc | 66 ++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-date.h | 30 ++++++++++++++++++++
- glib/poppler-document.cc | 45 +++++------------------------
- glib/poppler-private.h | 2 +-
- glib/poppler.h | 1 +
- 7 files changed, 110 insertions(+), 40 deletions(-)
-
-commit 9c2714a3e1c02f445661618e24bcd27f1392b2b7
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Apr 21 18:08:06 2009 +0200
-
- [glib] Implement poppler_annot_set_contents()
-
- glib/poppler-annot.cc | 25 +++++++++++++++++++++++++
- glib/poppler-annot.h | 2 ++
- 2 files changed, 27 insertions(+), 0 deletions(-)
-
-commit eec550e8b3cf96aefed9b03a78d365c2848fb8f2
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Apr 21 18:06:34 2009 +0200
-
- Add setContents() to modify the annot contents
-
- poppler/Annot.cc | 26 +++++++++++++++++++++++++-
- poppler/Annot.h | 4 ++++
- 2 files changed, 29 insertions(+), 1 deletions(-)
-
-commit 047a8870a8cea9b680080e0d3bf68d0685431233
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Apr 20 23:38:53 2009 +0200
-
- In case of err3 or err2 in readPageTree we need to free kidRef too
-
- poppler/Catalog.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit cb61b555f2c4db8685dec5491ca86570c962aab6
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Apr 18 18:30:04 2009 +0200
-
- Extend test-poppler-glib to show more page annotations and actions
-
- Based on path by Thomas Viehmann <tv@beamnet.de>
-
- glib/test-poppler-glib.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 68 insertions(+), 0 deletions(-)
-
-commit 2221b8a9ae5e986c79ea3f6c9f3b0246d328c7ab
-Author: Matthias Franz <matthias@ktug.or.kr>
-Date: Sun Apr 19 23:29:18 2009 +0200
-
- Fix decryption using owner password on some pdf
-
- See bug #21270
-
- poppler/Decrypt.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit e20efbf6cc676758b8ef7d2ad607560fcdbbf89e
-Author: Peter Kerzum <kerzum@yandex-team.ru>
-Date: Fri Apr 17 22:14:26 2009 +0200
-
- Fix typo in GfxFont.cc
-
- poppler/GfxFont.cc | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-commit b760debea03380280d72cd39d792cbc1a380a87c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Apr 17 21:04:26 2009 +0200
-
- Fix rendering of axial shadings
-
- Fixes bug #19896
-
- poppler/Gfx.cc | 102 ++++++++++++++++++++++++++++++++++----------------------
- 1 files changed, 62 insertions(+), 40 deletions(-)
-
-commit 9f1312f3d7dfa7e536606a7c7296b7c876b11c00
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Apr 16 22:13:26 2009 +0200
-
- Fix problems that happen when parsing broken JBIG2 files
-
- Fixes
- CVE-2009-0799 xpdf OOB Read
- CVE-2009-0800 xpdf Multiple Input Validation Flaws
- CVE-2009-1179 xpdf Integer Overflow
- CVE-2009-1180 xpdf Invalid free()
- CVE-2009-1181 xpdf NULL dereference DoS
- CVE-2009-1182 xpdf MMR Decoder Buffer Overflows
- CVE-2009-1183 xpdf MMR Infinite Loop DoS
-
- Patch based on a patch by Derek Noonburg
- Some files still hit the exit(1) in goo.c but at least none is really crashing
-
- poppler/JBIG2Stream.cc | 447 ++++++++++++++++++++++++++++++++++--------------
- poppler/JBIG2Stream.h | 4 +
- 2 files changed, 324 insertions(+), 127 deletions(-)
-
-commit 284a92899602daa4a7f429e61849e794569310b5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Apr 13 21:51:12 2009 +0200
-
- Did a mistake in the gmalloc -> gmallocn commit, it's a 4 here not a 3
-
- poppler/SplashOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 9cf2325fb22f812b31858e519411f57747d39bd8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 11 00:31:57 2009 +0200
-
- More gmalloc → gmallocn
-
- glib/poppler-page.cc | 2 +-
- splash/Splash.cc | 8 ++++----
- splash/SplashBitmap.cc | 6 +++---
- splash/SplashFTFont.cc | 2 +-
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
-commit c399b2d512aa073b0d7cd8eb5413a4b43f0d6aef
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 11 00:26:23 2009 +0200
-
- Revert part of last commit, i need more math classes :D
-
- poppler/JBIG2Stream.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 7b2d314a61fd0e12f47c62996cb49ec0d1ba747a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 11 00:23:04 2009 +0200
-
- Be paranoid, use gmallocn or gmallocn3 in all gmalloc with *
-
- poppler/ArthurOutputDev.cc | 4 ++--
- poppler/CairoOutputDev.cc | 14 +++++++-------
- poppler/GfxState.cc | 8 ++++----
- poppler/JBIG2Stream.cc | 4 ++--
- poppler/PSOutputDev.cc | 6 +++---
- poppler/SplashOutputDev.cc | 20 ++++++++++----------
- 6 files changed, 28 insertions(+), 28 deletions(-)
-
-commit 0131f0a01cba8691d10a18de1137a4744988b346
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 11 00:20:55 2009 +0200
-
- Add gmallocn3 that does the same as gmallocn but with 3 arguments
-
- goo/gmem.cc | 22 ++++++++++++++++++++++
- goo/gmem.h | 2 ++
- 2 files changed, 24 insertions(+), 0 deletions(-)
-
-commit 75c3466ba2e4980802e80b939495981240261cd5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Apr 10 18:05:54 2009 +0200
-
- Make it compile in Solaris
-
- See bug #21080
-
- poppler/CairoFontEngine.cc | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-commit 3210970dc1d6faf51bce59bb7ecb6b881f9c0fe6
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Apr 10 13:09:37 2009 +0200
-
- [glib] Print annotations with the print flag enabled
-
- glib/poppler-page.cc | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit b0b9798c85c7c6d6f336f73135a98974897b9f60
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Mar 30 23:26:39 2009 +0200
-
- Fix clip test for fonts
-
- Fixes bug 20950
- I really don't remember why i put that -1 maybe i got mislead by SplashClip::testRect
- having a +1, but the idea of the +1 is correct because it's ints vs floats
-
- splash/SplashFTFont.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 5c08f57aa80092954746d722bb13655aee3f162c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Mar 29 23:52:31 2009 +0200
-
- Forgot Ross copyright
-
- poppler/TextOutputDev.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit c6d3e7884010ebdcc961d81ca8c692870fc9b139
-Author: Ross Moore <ross@maths.mq.edu.au>
-Date: Sun Mar 29 23:46:09 2009 +0200
-
- Fix extraction of some ActualText content
-
- Fixes bug #20013
-
- poppler/TextOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit e4b3f7cbcb6ccdfa8b18d8da5f7074f4140b776a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 25 22:16:07 2009 +0100
-
- Fix getGlyphAdvance to behave correctly on font size changes
-
- Fixes bug #20769
-
- splash/SplashFTFont.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 4acde05ac4d0b03466c949138321cc3445a14158
-Author: Eric Toombs <ewtoombs@uwaterloo.ca>
-Date: Wed Mar 25 21:11:03 2009 +0100
-
- Remove case-insensitive matching of filenames in PDFDoc constructor
-
- poppler/PDFDoc.cc | 39 ++++++++++-----------------------------
- 1 files changed, 10 insertions(+), 29 deletions(-)
-
-commit 120c7f6697ed1edaff6e17ae1ed202c69f03a73c
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Mar 24 22:56:33 2009 +0100
-
- declare the matrix at the beginning
-
- poppler/ArthurOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 441a9cd56935bfe2d8fddc5d3bc2c0104aeffaca
-Author: Eric Toombs <ewtoombs@uwaterloo.ca>
-Date: Sun Mar 22 22:50:14 2009 +0100
-
- Improved error reporting of ErrOpenFile errors
-
- See bug #20660 for more information
-
- glib/poppler-document.cc | 14 +++++++++--
- poppler/PDFDoc.cc | 54 +++++++++++++++++++++++++++------------------
- poppler/PDFDoc.h | 8 ++++++
- 3 files changed, 51 insertions(+), 25 deletions(-)
-
-commit 16af0ced4a0762f2f538135bd8dd72b469f6fdca
-Author: Michael K. Johnson <a1237@danlj.org>
-Date: Sat Mar 21 16:14:06 2009 +0100
-
- Support rendering non-square pixels in pdftoppm
-
- Bug #20702
-
- utils/pdftoppm.1 | 16 ++++++++++++++--
- utils/pdftoppm.cc | 37 ++++++++++++++++++++++++++++++++-----
- 2 files changed, 46 insertions(+), 7 deletions(-)
-
-commit a103c60abd5fe4c721b099c005daf22d6350c355
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 21 15:47:12 2009 +0100
-
- Update version we need of Qt4
-
- CMakeLists.txt | 2 +-
- configure.ac | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-commit c4b1754fdd3a4649551556de2655c8291daafddf
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 21 13:29:38 2009 +0100
-
- Bump cairo dependency to 1.8.4
-
- Cairo 1.8.4 fixes and important bug that affects the Type 3 font rendering
-
- CMakeLists.txt | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 50c4ee413929e5a70133839e3cde039da738fab2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 18 22:00:05 2009 +0100
-
- Add more _checkoverflow variants, rework internals
-
- goo/gmem.cc | 92 +++++++++++++++++++++++++++++------------------------------
- goo/gmem.h | 4 ++-
- 2 files changed, 48 insertions(+), 48 deletions(-)
-
-commit 121c44db0884f0d70ba1470a66aa78441257c421
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri Mar 20 23:25:19 2009 +1030
-
- Fix cairo luminosity smask when cairo ctm != identity
-
- poppler/CairoOutputDev.cc | 16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
-
-commit 3f55aff56a1d2002ba79f3efba5eb77e94575439
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu Mar 19 22:34:23 2009 +1030
-
- Fix bug in cairo backend with nested masks
-
- The previous smask was not restored after a q/Q pair or form xobject.
-
- poppler/CairoOutputDev.cc | 18 +++++++++++++++++-
- poppler/CairoOutputDev.h | 5 +++++
- 2 files changed, 22 insertions(+), 1 deletions(-)
-
-commit 4cc3cb8992ac554352d68e97563823b9bbd556ce
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Mar 20 12:38:28 2009 +0100
-
- Bump cairo dependency to 1.8.4
-
- Cairo 1.8.4 fixes and important bug that affects the Type 3 font
- rendering
-
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit da94fe717a1ab60fb074fae61d582d1ee7151fc2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Mar 16 22:54:27 2009 +0100
-
- Fix parsing of border arrays
-
- Fixes 19761
-
- poppler/Annot.cc | 54 ++++++++++++++++++++++++++++++++++++------------------
- 1 files changed, 36 insertions(+), 18 deletions(-)
-
-commit 8df0323f1ca4548a5d5824ece8736b356ce7ca42
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Mar 12 00:09:03 2009 +0100
-
- Really fix jpeg lib init order?
-
- poppler/DCTStream.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 12aac6774fc6f92def3d5567051117951cc32223
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 11 23:00:37 2009 +0100
-
- fontCIDType2OT fonts can also have a CIDToGIDMap
-
- Fixes bug #20605
-
- poppler/GfxFont.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 0ca9ae2848808d15e7a2b00f5eb33bb8f990c887
-Author: Vincent Torri <vtorri@univ-evry.fr>
-Date: Wed Mar 11 00:39:59 2009 +0100
-
- remove the fortran check during the initialisation of libtool
-
- configure.ac | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 710e329a3a6a9ee2eed997c9eeaea21c44237423
-Author: Vincent Torri <vtorri@univ-evry.fr>
-Date: Wed Mar 11 00:37:11 2009 +0100
-
- Add AC_CONFIG_MACRO_DIR([m4])
-
- It is used by autoreconf to trace changes in m4 macros that are in the m4/ subdirectory.
-
- configure.ac | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit d15e47158ae31909212d3875159046afb208de97
-Author: Vincent Torri <vtorri@univ-evry.fr>
-Date: Wed Mar 11 00:36:27 2009 +0100
-
- Better check for pkg-config
-
- configure.ac | 5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
-
-commit b3f569f9a6c117c097acac52ae6552209fcd2101
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 11 00:25:07 2009 +0100
-
- Check there is an optional content config before using it
-
- Fixes bug #20587
-
- poppler/Gfx.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 7a5d1e57b2757c986da17f7238415b927e73127f
-Author: Brian Ewins <Brian.Ewins@gmail.com>
-Date: Mon Mar 9 22:54:58 2009 +0100
-
- Check for pkgconfig before using it
-
- At the moment if pkgconfig is not installed, an unhelpful syntax
- error appears when testing for freetype. Identify the problem
- earlier on
-
- configure.ac | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 8dc9e4d57a4759de2b56a87d9bace80d5d563fef
-Author: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Sun Mar 8 15:29:02 2009 +0100
-
- use AC_CHECK_HEADER to find headers
-
- The original m4/libjpeg.m4 used AC_FIND_FILE to look for jpeg header file.
- This test is not cross-compiling save. This patch uses the autoconf function
- AC_CHECK_HEADER to look for the jpeg header, which works in the native and
- the cross compiling scenaria.
- Bug #20538
-
- m4/libjpeg.m4 | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-commit bf2e2f056cadbc488cd3e9576b44beb34689ec81
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Mar 8 13:44:44 2009 +0100
-
- Add the new croptting options explanations
-
- utils/pdftotext.1 | 15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-commit 663d9e5a448641421d290dd228be692a0f236b9c
-Author: Jan Jockusch <jan@jockusch.de>
-Date: Sun Mar 8 13:44:20 2009 +0100
-
- Make pdftotext to accept cropping options like pdftoppm
-
- Bug #20331
-
- utils/pdftotext.cc | 29 ++++++++++++++++++++++++++++-
- 1 files changed, 28 insertions(+), 1 deletions(-)
-
-commit cc4b61f19b69c31d9a73ae7361c4b6a94345d1c2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Mar 8 12:55:45 2009 +0100
-
- Fix the previous fix
-
- I should stop listening to people without checking that what they say is
- correct
-
- poppler/DCTStream.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit a4a73cd9f9ee9767d74fbb44ffe083d2057a9d61
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Mar 8 12:44:06 2009 +0100
-
- I should compile before commiting :-/
-
- poppler/DCTStream.cc | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit 6a6b3cc91053e771a67dffa979076d130f87ff11
-Author: Ryszard Trojnacki <rysiek@menel.com>
-Date: Sun Mar 8 12:38:42 2009 +0100
-
- set up the error-manager before calling jpeg_create_decompress
-
- Bug #20484
-
- poppler/DCTStream.cc | 11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
-
-commit 4dfa7460ddc4b5684d5ef8db17efa50b95b7b735
-Author: Nick Jones <nick.jones@network-box.com>
-Date: Tue Mar 3 00:55:53 2009 +0100
-
- Do not blindly follow loops parsing OutlineItem
-
- More details in bug 18364
-
- poppler/Outline.cc | 15 ++++++++++++++-
- 1 files changed, 14 insertions(+), 1 deletions(-)
-
-commit de3131ae38fc9442b198d4d7b0c57c6939ad66ce
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Mar 2 15:20:07 2009 +0100
-
- [Qt4] adapt to the new PDFDoc saving API
-
- store the error code instead of the bool
-
- qt4/src/poppler-pdf-converter.cc | 12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
-
-commit dac0542eb793603090416f1b7712ca08253f1e7f
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Mar 2 09:54:22 2009 +0100
-
- [glib] Correctly handle doc->saveAs() error code.
-
- Fixes bug #19915.
-
- glib/poppler-document.cc | 37 +++++++++++++++++++++++++++++++++----
- 1 files changed, 33 insertions(+), 4 deletions(-)
-
-commit bfc6572614727565d883b9545d4b6665f3c2fdfe
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Feb 28 13:16:49 2009 +0100
-
- Return an error code instead of a GBool when saving
-
- poppler/PDFDoc.cc | 22 +++++++++++-----------
- poppler/PDFDoc.h | 8 ++++----
- 2 files changed, 15 insertions(+), 15 deletions(-)
-
-commit f7c88148fdb671736d81dd5f01a3fb68f944510c
-Author: Koji Otani <sho@bbr.jp>
-Date: Wed Feb 25 23:38:35 2009 +0100
-
- Fix cache shifting
-
- poppler/GfxState.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 305af8cdb6822858e152e1f930bba2ce3904bf1b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 25 22:40:24 2009 +0100
-
- Make JBIG2Stream not crash in 2009-41414141.pdf
-
- poppler/JBIG2Stream.cc | 151 +++++++++++++++++++++++++++---------------------
- 1 files changed, 85 insertions(+), 66 deletions(-)
-
-commit 26a8217160c1eaeeadb92023b27e68f402e38dd0
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Feb 22 18:14:15 2009 +0100
-
- Check if cairo_shape is not NULL before using it.
-
- We were checking shape instead. It fixes a crash with some documents.
- See bug #17337.
-
- poppler/CairoOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 5e68e52da65b4d8c3817e5fbb6f1a937da321d48
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 21 18:03:15 2009 +0100
-
- [Qt4] do not assume the destination file name for links is ASCII
-
- qt4/src/poppler-page.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 439cb397fed33df627a09c70788d72bef20dc872
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 21 18:02:36 2009 +0100
-
- [Qt] do not assume the destination file name for links is ASCII
-
- qt/poppler-page.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 3ea5f45ad3e5a55e577a2e45f61b55932ed17013
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Feb 21 17:46:30 2009 +0100
-
- [glib] Make sure filename is valid utf-8 for remote dests
-
- glib/poppler-action.cc | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-commit b5989e4ffece6c1831610ee163d05fd80386a001
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Feb 21 17:45:18 2009 +0100
-
- Use the UF entry when present in Filespec dictionary
-
- poppler/FileSpec.cc | 14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-commit 943fca42b5fa815fad650e42da4ad6e806adc3b1
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Feb 21 12:08:00 2009 +0100
-
- [glib] Add a macro to define boxed types
-
- glib/poppler-action.cc | 26 +-----------
- glib/poppler-annot.cc | 15 +------
- glib/poppler-document.cc | 44 ++++----------------
- glib/poppler-page.cc | 99 +++++++++-------------------------------------
- glib/poppler-private.h | 20 +++++++++
- 5 files changed, 53 insertions(+), 151 deletions(-)
-
-commit 7406337ed2d38a86308f20f8273a152538e524de
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Feb 21 11:11:20 2009 +0100
-
- [glib] Use template files to create poppler-enums
-
- glib/Makefile.am | 43 ++++++++++++---------------------------
- glib/poppler-enums.c.template | 44 +++++++++++++++++++++++++++++++++++++++++
- glib/poppler-enums.h.template | 25 +++++++++++++++++++++++
- 3 files changed, 82 insertions(+), 30 deletions(-)
-
-commit 29bc9d1dd115b5d400975533c3924993c3adae30
-Author: Thomas Viehmann <tv@beamnet.de>
-Date: Sat Jan 17 13:16:38 2009 +0100
-
- glib small doc comment corrections
-
- glib/poppler-attachment.cc | 2 +-
- glib/poppler-layer.cc | 2 ++
- glib/poppler.cc | 2 --
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-commit a06e715d89a99b909b8e7b73b733066c67b1ade3
-Author: Thomas Viehmann <tv@beamnet.de>
-Date: Sat Jan 17 12:58:20 2009 +0100
-
- Make glib API reference more complete
-
- glib/reference/poppler-docs.sgml | 2 +
- glib/reference/poppler-sections.txt | 55 +++++
- glib/reference/tmpl/poppler-action.sgml | 9 +-
- glib/reference/tmpl/poppler-annot.sgml | 368 +++++++++++++++++++++++++++++++
- glib/reference/tmpl/poppler-layer.sgml | 79 +++++++
- 5 files changed, 511 insertions(+), 2 deletions(-)
-
-commit 3a21dafa46d42d86daec440a85b9d63b292a3c88
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Feb 3 21:33:00 2009 +0100
-
- Fix cache shifting
-
- If we do
- for (i = 0;i < GFX_ICCBASED_CACHE_SIZE-1 && cache[i].num > 0;i++) {
- cache[i+1] = cache[i];
- what we do at the end is copy position 0 to all others so
- we need to do it in the reverse order
-
- poppler/GfxState.cc | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-commit 0ed3fd52bb2d3375ed302285b18f076721b8028e
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Feb 1 10:37:25 2009 +0100
-
- [glib-demo] Fix a typo in format string
-
- glib/demo/page.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 2df6d530cd9acd8648a6196031218ef10e7b3891
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 29 00:51:13 2009 +0100
-
- Add line that for some reason was not imported from xpdf file
-
- Fixes bug 19789
-
- utils/ImageOutputDev.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 1fc342eadcbbb41302f190b215c5daf23c9ec9b1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 28 22:53:43 2009 +0100
-
- Fix crash on unexepcted Form Opt value
-
- Fixes crash on bug 19790
-
- poppler/Form.cc | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit b1d4efb082ac3dadd7752a557e5aeb6651e17471
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jan 27 00:26:08 2009 +0100
-
- PostScriptFunction::transform optimization
-
- Do not create and destroy a PSStack each time
- PostScriptFunction::transform is called gives a 7% speedup on heavy
- PostScriptFunction::transform pdf like nytimes firefox ad
-
- poppler/Function.cc | 12 ++++++++----
- poppler/Function.h | 15 +++++++++++++++
- 2 files changed, 23 insertions(+), 4 deletions(-)
-
-commit 90f95127d8d89cfcadeb7d701437ab07ce4a8a61
-Author: Koji Otani <sho@bbr.jp>
-Date: Sun Jan 25 23:17:39 2009 +0100
-
- Cache last 5 GfxICCBasedColorSpace
-
- poppler/GfxState.cc | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/GfxState.h | 15 ++++++++++++
- 2 files changed, 75 insertions(+), 0 deletions(-)
-
-commit d3f04f537fb3e963c149a7e2d8d83c7cb19da8c0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jan 23 23:08:46 2009 +0100
-
- Do not crash in some PDF we don't parse correctly
-
- Fixes bug 19702
-
- poppler/JBIG2Stream.cc | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 3990c9e52da7b17215506857c792c90a37ebac79
-Author: Koji Otani <sho@bbr.jp>
-Date: Mon Jan 19 09:53:00 2009 +0100
-
- Fix a problem in cairo backend when using a CMYK Profile
-
- poppler/GfxState.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 6e51ae7fe8b9dc8ad52b735f2fe056f8ea8f1dcb
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 15 22:33:04 2009 +0100
-
- calculate the limit in a way that one does not access an invalid index of the matrix
-
- poppler/DCTStream.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit ea2aa7bd1ceb0e3282398f52683e4f52ef401f74
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 15 22:18:48 2009 +0100
-
- Forgot my copyrights
-
- poppler/DCTStream.cc | 2 +-
- poppler/DCTStream.h | 2 +-
- poppler/Stream.cc | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-commit d65dd23752ec14635d0d224afa7dd605f98a10a4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 15 22:17:14 2009 +0100
-
- Minor optimizations
-
- poppler/DCTStream.cc | 17 ++++++++---------
- poppler/DCTStream.h | 3 ++-
- poppler/Stream.cc | 3 ++-
- 3 files changed, 12 insertions(+), 11 deletions(-)
-
-commit d3d2910f757dfc3e141aed62aa970136f9d7186f
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Jan 11 00:40:46 2009 +0100
-
- fix a (relatively small) memory leak when asking for a document-level JS
-
- poppler/Catalog.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 869584a84eed507775ff1c3183fe484c14b6f77b
-Author: Jonathan Kew <jonathan_kew@sil.org>
-Date: Sat Jan 10 18:28:47 2009 +0100
-
- Add the possibility of setting the datadir on runtime
-
- poppler/GlobalParams.cc | 27 ++++++++++++++++++++-------
- poppler/GlobalParams.h | 5 ++++-
- 2 files changed, 24 insertions(+), 8 deletions(-)
-
-commit cf112dceb1d6653beae73ce2fac6fb5eee48ff33
-Author: Koji Otani <sho@bbr.jp>
-Date: Sat Jan 10 18:11:20 2009 +0100
-
- Fix some problems with color management in CMYK Color Profile.
-
- Fixes bug 19483
-
- poppler/GfxState.cc | 106 +++++++++++++++++++++++++-------------------------
- 1 files changed, 53 insertions(+), 53 deletions(-)
-
-commit 6dd77338d16f80760ae32ff9f3e2be9768fc0c49
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Jan 8 11:49:45 2009 +0100
-
- [Qt4] use the cropbox for the annotations coordinates
-
- Fixes bug #18558.
-
- qt4/src/poppler-page.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 69c07c031159d36dde52609bffa6d48c3c56cef5
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Jan 8 00:59:19 2009 +0100
-
- update Poppler copyright to 2009
-
- msvc/poppler/poppler-config.h | 2 +-
- poppler-config.h.cmake | 2 +-
- poppler/poppler-config.h.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 79e0eea85cf063c6323caafbec97f3d71fc04ca2
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Jan 8 00:57:03 2009 +0100
-
- remove old cmake modules, add a new one
-
- Makefile.am | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-commit 0e6420ece2d6fcc046d5814b48a2754fb86771e2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 7 23:33:02 2009 +0100
-
- Require cmake 2.6.0, remove two cmake files provided upstream
-
- CMakeLists.txt | 4 +-
- cmake/modules/FindFreetype.cmake | 74 ---------------------
- cmake/modules/FindPackageHandleStandardArgs.cmake | 58 ----------------
- glib/CMakeLists.txt | 2 +-
- 4 files changed, 3 insertions(+), 135 deletions(-)
-
-commit a69add73bf7bef17c677c735db77934ba67188a5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 7 19:06:13 2009 +0100
-
- Update copyright notices
-
- poppler/FontInfo.cc | 1 +
- poppler/FontInfo.h | 1 +
- qt4/src/poppler-document.cc | 2 +-
- qt4/src/poppler-fontinfo.cc | 2 +-
- qt4/src/poppler-form.cc | 1 +
- qt4/src/poppler-form.h | 1 +
- qt4/src/poppler-private.h | 2 +-
- qt4/src/poppler-qt4.h | 2 +-
- 8 files changed, 8 insertions(+), 4 deletions(-)
-
-commit 18d584158a781fecb4f696b01fb4d17803ce7d7a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 7 17:55:48 2009 +0100
-
- Add lcms option to cmake buildsystem
-
- CMakeLists.txt | 9 +++++++++
- cmake/modules/FindLCMS.cmake | 37 +++++++++++++++++++++++++++++++++++++
- config.h.cmake | 3 +++
- 3 files changed, 49 insertions(+), 0 deletions(-)
-
-commit 140b8ed97416f9c2ec02eb749ca45ca50bd651a8
-Author: Koji Otani <sho@bbr.jp>
-Date: Wed Jan 7 17:43:44 2009 +0100
-
- Add initial support for color management
-
- configure.ac | 19 ++
- poppler/GfxState.cc | 697 +++++++++++++++++++++++++++++++++++++++++++++++----
- poppler/GfxState.h | 74 +++++-
- poppler/Makefile.am | 5 +
- 4 files changed, 738 insertions(+), 57 deletions(-)
-
-commit bdc76dc811a6e4d5fd929bbdc8cd3300aeaea31f
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Jan 6 15:45:37 2009 +0100
-
- [Qt4] apidox improvements for the font functions of Document; mark scanForFonts() as deprecated
-
- qt4/src/poppler-qt4.h | 22 ++++++++++++++++++----
- 1 files changed, 18 insertions(+), 4 deletions(-)
-
-commit 6630e715714161cd803fc064f5d3cf880f42b0a5
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Jan 6 15:36:19 2009 +0100
-
- tell Doxygen to consider Q_DECL_DEPRECATED as empty
-
- qt4/src/Doxyfile | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit d748d430b106580b8be29ca3ec75caf05b55812e
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Jan 6 15:24:25 2009 +0100
-
- [Qt4] Add a FontIterator for iterating through the fonts of the document, page by page.
-
- This new iterator class is the new preferred way for getting the fonts of a document in a page-by-page mode.
- * Document::fonts() is adapted to use it, instead of relying on scanForFonts()
- * scanForFonts() is ported to FontIterator, but keeping the old behaviour ("i can scan the document only once")
- * added unit tests for fonts(), scanForFonts() and FontIterator
-
- qt4/src/poppler-document.cc | 27 +++++---
- qt4/src/poppler-fontinfo.cc | 36 ++++++++++
- qt4/src/poppler-private.h | 27 +++++++-
- qt4/src/poppler-qt4.h | 65 +++++++++++++++++++
- qt4/tests/check_fonts.cpp | 149 +++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 291 insertions(+), 13 deletions(-)
-
-commit b9804542bb50216786dc11ca16efd84304f4b832
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Jan 6 15:16:53 2009 +0100
-
- Add the possibility to set the first page to scan.
-
- The default value is 0 (= first page), so it should be compatible with any usage so far.
-
- poppler/FontInfo.cc | 4 ++--
- poppler/FontInfo.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-commit af74fef03bfbd79334da5612c63c7793952542f9
-Author: Warren Toomey <poppler@tuhs.org>
-Date: Tue Jan 6 01:36:31 2009 +0100
-
- Add forgotten file to let the autotools based system build
-
- m4/libpng.m4 | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 99 insertions(+), 0 deletions(-)
-
-commit ae588500f62bab5666174ff3b1564c414c5a76c5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jan 6 01:35:38 2009 +0100
-
- Fix the cmake buildsystem
-
- CMakeLists.txt | 6 ++++++
- config.h.cmake | 3 +++
- utils/CMakeLists.txt | 4 ++++
- 3 files changed, 13 insertions(+), 0 deletions(-)
-
-commit 940d060a14712c09da427e2fac4ec579f7291b0f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jan 6 01:27:06 2009 +0100
-
- do not leak fName if fopen fails
-
- utils/HtmlOutputDev.cc | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 7be9198adb940ad7c5fffc6db0158cf7042e1b8f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jan 6 01:24:15 2009 +0100
-
- Do not leak pgNum and imgnum if fopen fails
-
- utils/HtmlOutputDev.cc | 16 +++++++++-------
- 1 files changed, 9 insertions(+), 7 deletions(-)
-
-commit dfba6c022b150553cb2b18b027e661b3b4625ce7
-Author: Warren Toomey <poppler@tuhs.org>
-Date: Tue Jan 6 01:16:31 2009 +0100
-
- Make pdftohtml output png images when the image stream is not a jpeg
-
- configure.ac | 14 +++++
- utils/HtmlOutputDev.cc | 126 +++++++++++++++++++++++++++++++++++++++++++++--
- utils/HtmlOutputDev.h | 3 +-
- utils/Makefile.am | 4 ++
- 4 files changed, 140 insertions(+), 7 deletions(-)
-
-commit 0963c276ba972a36c2895e4fe1c7475acd489738
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 4 16:54:32 2009 +0100
-
- Fix some checked checkboxes not rendering correctly
-
- If we are forcing ZaDb/ZapfDingbats to correctly draw a checkmark in the checkbox, but the file does not have such font defined we need to create a fake one so the system really renders it
- Fixes bug 19359
-
- poppler/Annot.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
- poppler/Annot.h | 2 ++
- poppler/Gfx.h | 7 ++++---
- 3 files changed, 53 insertions(+), 5 deletions(-)
-
-commit 46128cf83b322c112eb0c409c20052bdb2ea4a37
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 4 14:21:15 2009 +0100
-
- Remove wrong and unused FormWidget(FormWidget *dest) contructor
-
- poppler/Form.cc | 11 -----------
- poppler/Form.h | 3 +--
- 2 files changed, 1 insertions(+), 13 deletions(-)
-
-commit 5203aefc41fa47c461812cc46f28281edd226515
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 4 14:03:16 2009 +0100
-
- Plug some memory leaks
-
- poppler/Annot.cc | 5 ++++-
- poppler/Form.cc | 4 +++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-commit 5fb7ec7e6af4cfb2b256a5b9b9752e68330b4aec
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Dec 30 23:46:59 2008 +0100
-
- If Length2 is zero just write until we find EOF of the stream
-
- Fixes exporting to PS of the two pdf i have that have fonts with Length2 set to 0
-
- poppler/PSOutputDev.cc | 26 +++++++++++++++++++++-----
- 1 files changed, 21 insertions(+), 5 deletions(-)
-
-commit ca35fdbc7c31dae432d775b6c087a83fa9b897fc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Dec 30 23:03:57 2008 +0100
-
- We need spaces here too to satify other consumer parsers
-
- poppler/PDFDoc.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 3c07c73e07a9cb59ee4c23ca60d2adce92de45f7
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Dec 30 22:21:27 2008 +0100
-
- [Qt4-demo] load a document when passed via command line
-
- qt4/demos/main_viewer.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit aba0aaa896d634a51fbb3a3e6eae411be462f930
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Dec 29 00:31:18 2008 +0100
-
- More improvements in document writing
-
- Dictionary keys are names so need to be sanitized
- Add a space after num gen obj
-
- poppler/PDFDoc.cc | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-commit e5b93a847ae4e20a77fecef0938da4f14dfbe3eb
-Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Dec 28 22:59:14 2008 +0100
-
- Let compiler figure out CDECL
-
- CDECL is a compiler specific macro to specify C calling convention.
-
- On Windows, some functions must be forced to use this calling convention.
- To do this, you can use the macro CDECL, which is defined in windef.h.
-
- Poppler should not try to be smarter than the compiler and try to guess
- the correct definition for CDECL. Instead it should rely on the
- definitions in the windef.h file provided by the compiler.
-
- On Unix, specifying a calling convention is not nescessary, so CDECL can
- be an empty definition.
-
- poppler-config.h.cmake | 8 ++------
- poppler/poppler-config.h.in | 8 ++------
- 2 files changed, 4 insertions(+), 12 deletions(-)
-
-commit de70c0aeb37d788f595b0574796844f51ddedec1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 28 21:21:12 2008 +0100
-
- [qt4] improve doc a bit
-
- qt4/src/poppler-form.h | 2 +-
- qt4/src/poppler-qt4.h | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-commit effb32658019e09dc86c017e39154fd554fc94f8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 28 02:56:30 2008 +0100
-
- Form Rects are against the cropbox, not the media box
-
- Fixes second pdf at kde bug 161327
-
- qt4/src/poppler-form.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0f10561f3b1c90acc030d973399316bfca5f495e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 28 01:44:25 2008 +0100
-
- Fix my last commit, copy&paste is really evil
-
- goo/GooString.cc | 9 +++++----
- goo/GooString.h | 2 +-
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-commit 217b46484ff56bfd5906b293ebee70b82cc0263d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 28 01:29:41 2008 +0100
-
- Move PSOutputDev::filterPSName to GooString::sanitizedName so i can use it from PDFDoc::writeObject
-
- goo/GooString.cc | 36 +++++++++++++++++++++++++++++++++++
- goo/GooString.h | 7 ++++++
- poppler/PDFDoc.cc | 7 +++++-
- poppler/PSOutputDev.cc | 49 ++++++++---------------------------------------
- poppler/PSOutputDev.h | 3 +-
- 5 files changed, 59 insertions(+), 43 deletions(-)
-
-commit f41fa9ee71aef5539cf9976c79b32bf1713c8167
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 26 22:56:12 2008 +0100
-
- Change the overflow check to the same used in gmem.cc, much more easy to understand
-
- poppler/XRef.cc | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-commit b8ae7d91dedc9a75200b6050628ec2740af84b98
-Author: Hib Eris <hib@hiberis.nl>
-Date: Fri Dec 26 22:28:09 2008 +0100
-
- Fix compile warnings on auto imports for mingw32
-
- configure.ac | 3 +++
- glib/Makefile.am | 2 +-
- glib/demo/Makefile.am | 2 ++
- test/Makefile.am | 2 ++
- utils/Makefile.am | 2 ++
- 5 files changed, 10 insertions(+), 1 deletions(-)
-
-commit ba47bd2ba05f883306606eda30bff17bd4a8eec6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 26 19:47:42 2008 +0100
-
- BaseFile.h has never been used and it fact it's not part of xpdf sources
-
- Fixes bug 19298
-
- CMakeLists.txt | 1 -
- poppler/BaseFile.h | 82 ---------------------------------------------------
- poppler/Makefile.am | 1 -
- 3 files changed, 0 insertions(+), 84 deletions(-)
-
-commit 84366d9e63b0d6a5ee1aae2463648cfc2ff5e1b8
-Author: Hib Eris <hib@hiberis.nl>
-Date: Wed Dec 24 19:27:19 2008 +0100
-
- Let libtool build DLLs on windows too
-
- configure.ac | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-commit 08cef528f2e51cc62cff4125f179021ad9555317
-Author: Hib Eris <hib@hiberis.nl>
-Date: Wed Dec 24 17:48:46 2008 +0100
-
- Fix compile warning on string literal format
-
- test/pdf-inspector.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0606b4bba8e889204c7b7c9d376f63b659f83a4f
-Author: Hib Eris <hib@hiberis.nl>
-Date: Wed Dec 24 17:48:10 2008 +0100
-
- Fix compile warnings on parentheses and/or
-
- poppler/CairoOutputDev.cc | 13 +++++++------
- 1 files changed, 7 insertions(+), 6 deletions(-)
-
-commit eba2232cabd5fb1e177db2a6053f0d1a0aee882b
-Author: Hib Eris <hib@hiberis.nl>
-Date: Wed Dec 24 17:46:32 2008 +0100
-
- Fix some more warnings
-
- test/gtk-cairo-test.cc | 11 -----------
- test/pdf-inspector.cc | 9 +++++----
- 2 files changed, 5 insertions(+), 15 deletions(-)
-
-commit c80431eb1626d89e7b615e5a5149d3436b554b66
-Author: Hib Eris <hib@hiberis.nl>
-Date: Mon Dec 22 09:28:47 2008 +0100
-
- Fix compile warning on format type
-
- glib/test-poppler-glib.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit fda181c35b7c7500b6d3c6ca9d454addd54929c5
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Dec 22 00:53:44 2008 +0100
-
- group condition within brackets
-
- poppler/ArthurOutputDev.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit c1beeecbd6cbf82811d70c75cb24059b4b492abe
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Dec 22 00:46:49 2008 +0100
-
- [demo] use the proper format field for gsize types
-
- glib/demo/attachments.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit bfb975466f0ff78e9e292b6af7cac66e4c331456
-Merge: 3e27892 ea3546f
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Dec 22 00:29:38 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 3e2789257f5fc4ae0573a0c62ea380d8e83a5bb5
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Dec 22 00:24:23 2008 +0100
-
- [Qt] deserialize also the value of 'right'
-
- qt/poppler-link.cc | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-commit 7c053ab7623cea1ac650d3e960d2d91a1ef21557
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Dec 22 00:19:02 2008 +0100
-
- [Qt] move in a .cc file the implementation of the QString<->GooString functions and DocumentData::addTocChildren()
-
- qt/CMakeLists.txt | 1 +
- qt/Makefile.am | 1 +
- qt/poppler-document.cc | 10 ---
- qt/poppler-page.cc | 1 +
- qt/poppler-private.cc | 147 ++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-private.h | 106 ++--------------------------------
- 6 files changed, 157 insertions(+), 109 deletions(-)
-
-commit ea3546f84c5335c58cdb2906b1a1a4656be9c8ea
-Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Dec 21 23:33:49 2008 +0100
-
- Fix compile warnings on signed/unsigned comparison
-
- goo/gfile.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit ca672ae51d2c1fa59a891717b418ba86b5e7345c
-Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Dec 21 23:33:00 2008 +0100
-
- Fix compile warnings on ignored pragma with mingw compiler
-
- poppler/Gfx.cc | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-commit 86cfe8ab2b4e0b600f3f6682701c2fcfbe5d0ca9
-Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Dec 21 23:08:56 2008 +0100
-
- Fix compile warnings on signed/unsigned comparison
-
- poppler/GfxFont.cc | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-commit e34af7ffe0a4024e2eb39314bdb09eb9a662e53e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 21 22:16:39 2008 +0100
-
- Update copyright of last commits
-
- poppler/TextOutputDev.cc | 1 +
- poppler/TextOutputDev.h | 2 +-
- qt4/src/poppler-page.cc | 1 +
- 3 files changed, 3 insertions(+), 1 deletions(-)
-
-commit f6d84dcfc9cc587c7408af79b1ee7658d456f8d8
-Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Dec 21 22:09:00 2008 +0100
-
- Fix compile warning to suggest parentheses and/or
-
- poppler/TextOutputDev.cc | 14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
-
-commit 15205403eaa95d6fba0e36983de993877dd3a983
-Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Dec 21 21:59:45 2008 +0100
-
- Fix warning to suggest parentheses inside shift
-
- poppler/PSOutputDev.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit cc24f37e582bfc0069faf286da97a48fe4794db1
-Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Dec 21 21:35:29 2008 +0100
-
- Fix compile warning on ambiguous else
-
- test/perf-test.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit a8cc4ad8c2da804f25db8cca1c85433d5a63307c
-Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Dec 21 21:34:28 2008 +0100
-
- Fix compile warning on format not a string literal
-
- test/perf-test.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 3cbbf8226730aa7ee6273e154e4a9d58670a3cda
-Author: Hib Eris <hib@hiberis.nl>
-Date: Sun Dec 21 21:30:54 2008 +0100
-
- Fix compile warning about uninitialized variable
-
- poppler/ABWOutputDev.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit f675916277cb76cd1293225a1271f835a02148fb
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Dec 20 23:23:10 2008 +0100
-
- reset to NULL after being deleted
-
- found with poppler-qt4 unit tests =)
-
- poppler/TextOutputDev.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit c976770c64e4c991fff27e413414473583b6fd86
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Dec 20 22:25:55 2008 +0100
-
- [Qt4] use QHash instead of QMap where applicable
-
- using a hash table instead of a map mapes lookup faster;
- in these cases we don't need the sorting a map gives
-
- qt4/src/poppler-page.cc | 7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-commit 944f6049a50eb3be9fb29174d67adc4ad1d0b9fe
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Dec 20 20:13:43 2008 +0100
-
- add find.c and text.c
-
- glib/demo/CMakeLists.txt | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit ba91b889c3b50239e339938f3c9d31fffcd87d44
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Dec 20 19:29:40 2008 +0100
-
- Make destructor private in TextPage
-
- poppler/TextOutputDev.h | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 0da16537aa83f6ed6d8895c7e54266263a71c1cf
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Dec 19 19:08:21 2008 +0100
-
- Refactor actual text code adding a new ActualText class
-
- It's used by both Text and Cairo ouput devices avoiding duplicated code
- in such classes.
-
- poppler/CairoOutputDev.cc | 108 +++---------------------
- poppler/CairoOutputDev.h | 7 +--
- poppler/TextOutputDev.cc | 206 ++++++++++++++++++++++++++-------------------
- poppler/TextOutputDev.h | 34 ++++++--
- 4 files changed, 160 insertions(+), 195 deletions(-)
-
-commit 0f8ab301c633133eea3dbd4f2254f31c50e3c4a9
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Dec 14 13:12:34 2008 +0100
-
- [glib-demo] Add find demo
-
- glib/demo/Makefile.am | 2 +
- glib/demo/find.c | 282 +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/find.h | 31 ++++++
- glib/demo/main.c | 4 +-
- 4 files changed, 318 insertions(+), 1 deletions(-)
-
-commit 88df9e9aa9adb53f0a9714ea404d46f111495df3
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Dec 14 11:54:35 2008 +0100
-
- [glib-demo] Add Text demo
-
- glib/demo/Makefile.am | 2 +
- glib/demo/main.c | 4 +-
- glib/demo/text.c | 175 +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/text.h | 31 +++++++++
- 4 files changed, 211 insertions(+), 1 deletions(-)
-
-commit 5b0f2355d55a5104820fd0bf16b4e76b25959de4
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Dec 14 11:49:00 2008 +0100
-
- [glib] Use TextPage instead of TextOutputDev when cairo is enabled
-
- glib/poppler-page.cc | 148 +++++++++++++++++++++++++++++++++---------------
- glib/poppler-private.h | 4 +
- 2 files changed, 107 insertions(+), 45 deletions(-)
-
-commit 3ced71fb68d62308db7b9535367eafefb55d1cde
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Dec 14 11:18:00 2008 +0100
-
- Add optionally text support to CairoOutputDev
-
- If a TextPage is set, it'll be used when rendering so that we don't need
- to use TextOutputDev and render again.
-
- poppler/CairoOutputDev.cc | 144 +++++++++++++++++++++++++++++++++++++++++++--
- poppler/CairoOutputDev.h | 19 +++++-
- 2 files changed, 155 insertions(+), 8 deletions(-)
-
-commit 0bdad35cc4cfdb8da5acaf44678920b7a0025f99
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Dec 14 11:14:12 2008 +0100
-
- Add refcount support to TextPage
-
- poppler/TextOutputDev.cc | 12 +++++++++++-
- poppler/TextOutputDev.h | 5 +++++
- qt4/src/poppler-page.cc | 2 +-
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-commit f86514c3fbc867fc6457feacba23451e89993524
-Author: Koji Otani <sho@bbr.jp>
-Date: Wed Dec 17 00:36:39 2008 +0100
-
- Fix wrong PS generation when a large image is in Patterns
-
- Bug 18908
-
- poppler/PSOutputDev.cc | 114 ++++++++++++++++++++++++++++++------------------
- 1 files changed, 72 insertions(+), 42 deletions(-)
-
-commit fc395eb90b418e43453acefb42cd04baf0b7ad40
-Author: Richard Airlie <richard.airlie@maglabs.net>
-Date: Tue Dec 16 21:11:53 2008 +0100
-
- Allow the use of cropbox in pdftoppm
-
- utils/pdftoppm.cc | 16 +++++++++++++---
- 1 files changed, 13 insertions(+), 3 deletions(-)
-
-commit 80f415176952635a485356cf36048eee53396c25
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Dec 16 20:37:39 2008 +0100
-
- Make destructors private/protected since you are not supposed to use them
-
- poppler/GfxFont.cc | 2 +-
- poppler/GfxFont.h | 11 +++++------
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-commit dbcebda953cb36a45a125aada68e85249fb73f43
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Dec 15 20:10:31 2008 +0100
-
- Do not leak on AnnotScreen destructor
-
- Fixes bug 19095
-
- poppler/Annot.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit aaeb0d137232bf1cb11dc5e37b8b45b50c6f9c6a
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Dec 12 00:43:19 2008 +0100
-
- update the xpdf headers installation
-
- CMakeLists.txt | 32 +++++++++++++++++++++-----------
- 1 files changed, 21 insertions(+), 11 deletions(-)
-
-commit 7c6527fa05389f705872aaaaff12e739b5d1577e
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Dec 12 00:41:21 2008 +0100
-
- don't install Function.cc, as it is not an header
-
- poppler/Makefile.am | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit 0179e21b128ffccb5afd13203137ab8435197609
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 12 00:16:38 2008 +0100
-
- Be more helpful with bad boys that want to use poppler core directly
-
- fofi/Makefile.am | 10 ++++++++++
- splash/SplashClip.h | 2 +-
- splash/SplashPath.h | 2 +-
- splash/SplashXPath.h | 2 +-
- 4 files changed, 13 insertions(+), 3 deletions(-)
-
-commit 401632e4eeb4b10b1183a820f32461da77e8e4f2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 12 00:14:04 2008 +0100
-
- Try harder to look for openjpeg
-
- cmake/modules/FindLIBOPENJPEG.cmake | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit ab539f46089702f60b96b1ba2b2bc1544173c264
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Dec 11 23:15:45 2008 +0100
-
- Fix crash when reading outline
-
- Fixes bug 19024. Last as reference is required if the item has children (Table 8.4) so if there is no last reference, don't try to read children.
-
- poppler/Outline.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit c9a755f9fd14511f43a2ca7fcda36bdd64bb1d87
-Author: Ilya Gorenbein <igorenbein@finjan.com>
-Date: Sun Dec 7 17:59:19 2008 +0100
-
- Fix memory leak
-
- Bug 18924
-
- poppler/Page.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 4cd364c179ae91ed383a8237ba1ad263952fd7aa
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Nov 30 16:57:52 2008 +0100
-
- add my copyright here
-
- qt4/src/poppler-private.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 6b1676deb773675d90469adc84c3de8dcdaf174c
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Nov 30 16:56:43 2008 +0100
-
- [Qt4] support URI actions for TOC items
-
- qt4/src/poppler-private.cc | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit b5cd58b5565055fd0c13771461245ddcd80edfcf
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Nov 30 16:34:57 2008 +0100
-
- extract the LinkAction "serialization" in an own function, and make it more safe
-
- qt4/src/poppler-private.cc | 85 ++++++++++++++++++++++++++++++-------------
- 1 files changed, 59 insertions(+), 26 deletions(-)
-
-commit ee191363e22940ae7b06945e68c4738b17c78348
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Nov 30 16:17:32 2008 +0100
-
- move the addTocChildren() implementation in the cpp
-
- qt4/src/poppler-form.cc | 1 +
- qt4/src/poppler-page.cc | 1 +
- qt4/src/poppler-private.cc | 65 ++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-private.h | 64 +-----------------------------------------
- 4 files changed, 69 insertions(+), 62 deletions(-)
-
-commit f8eaabf1aa7e384619129a7509be85d0c3bfb825
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Nov 30 13:33:12 2008 +0100
-
- Update copyrights of the last commits
-
- poppler/TextOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 5f4fedfae6098e25644ffe5d4b1ed0bac043841d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Nov 29 19:51:27 2008 +0100
-
- Use the Length specified in the Stream as initial bufSize
-
- This is a optimization to save a few reallocations, if the Length value is incorrect it will still work
-
- poppler/JPEG2000Stream.cc | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-commit 12f6d6ba2052fbdc8ea4ba7c7c9277e75bf170a5
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Nov 23 18:20:14 2008 +0100
-
- Fix a crash when the second argument of opMarkPoint is not a dictionary
-
- According to the spec "If any of the values are indirect references to
- objects outside the content stream, the property list dictionary must
- instead be defined as a named resource.
-
- poppler/Gfx.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 817e123a28e9f6b7e5be23f7ac2ba3bcec5e3f3f
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Nov 22 21:48:37 2008 +1030
-
- Don't compare print flag for non Type 3 fonts in cairo font cache
-
- poppler/CairoFontEngine.cc | 7 ++++++-
- poppler/CairoFontEngine.h | 4 +++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-commit 68f8ade28764855d4f663607c50c8202b1268296
-Author: Albert Astals Cid <tsdgeos@samsung.localdomain>
-Date: Sun Nov 23 10:54:46 2008 +0100
-
- Compile with -pedantic
-
- Thanks to Bernard Leak for notifying
-
- test/pdf-inspector.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 4a4fa7ed44a87e47a6078a1f7bb6f41071672ea7
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Nov 18 20:11:07 2008 +0100
-
- Fix a crash when selecting text in word mode
-
- poppler/TextOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit a6f5032ab0d6edbf3879f39efff7916b1f7233da
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Nov 16 18:24:06 2008 +0100
-
- optContentConfig is not actually stored in PDFDoc but in Catalog
-
- poppler/PDFDoc.h | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit b843ac34c6c4ca1580f99fa2220c59dfcd91f026
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Nov 15 14:49:02 2008 +0100
-
- [Qt4] deserialize the value of the 'right' coordinate, too
-
- qt4/src/poppler-link.cc | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-commit 03061fdae49842556c9ff48e61914fc88502e1d8
-Author: Tim Mooney <enchanter@users.sourceforge.net>
-Date: Thu Nov 13 22:32:22 2008 +0100
-
- Fix build on Solaris 10 + Sun Studio 12.
-
- Fixes bug 17496
-
- configure.ac | 14 ++++++++++++++
- test/Makefile.am | 6 ++++--
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-commit 17b18be4fd25f2ca2b4ed7382d9fda50410c44f1
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Wed Nov 12 20:40:57 2008 +1030
-
- Ensure cairo font matrix is invertable
-
- Fixes bugs #18254 and #18429
-
- poppler/CairoOutputDev.cc | 15 ++++++++++++++-
- 1 files changed, 14 insertions(+), 1 deletions(-)
-
-commit e2257e6916cd1067d43db9ed45f944413c61ed64
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Nov 9 22:44:48 2008 +0100
-
- Update copyrights of the last commits
-
- poppler/CairoFontEngine.cc | 1 +
- poppler/CairoFontEngine.h | 1 +
- poppler/Form.cc | 2 +-
- poppler/Gfx.h | 1 +
- poppler/OptionalContent.h | 1 +
- qt4/src/poppler-optcontent.cc | 1 +
- 6 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 069f8ad9453e612e907b561aa50983c34400193d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Nov 9 20:36:06 2008 +0100
-
- MakeItBuild
-
- glib/CMakeLists.txt | 1 +
- glib/demo/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 04025c4f65bbb7e4330f6d17d917a035c0906f3d
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Nov 9 17:03:20 2008 +0100
-
- Fix a crash when initializing an Annot with a null catalog
-
- Forms crate a temp annot just to get the font size of the form field
- passing a NULL catalog.
-
- poppler/Annot.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 471255c5a3850984997d91c7850759eb0c7e8a9c
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Nov 8 20:58:57 2008 +0100
-
- [glib-demo] Add Optional Content demo
-
- glib/demo/Makefile.am | 2 +
- glib/demo/layers.c | 511 +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/layers.h | 31 +++
- glib/demo/main.c | 4 +-
- 4 files changed, 547 insertions(+), 1 deletions(-)
-
-commit 7363c25e1d83332932d9b4fe16d7fb4e364da628
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Oct 26 19:47:35 2008 +0100
-
- [glib] Add Optional Content support
-
- glib/Makefile.am | 2 +
- glib/poppler-document.cc | 377 +++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-document.h | 12 ++
- glib/poppler-layer.cc | 201 ++++++++++++++++++++++++
- glib/poppler-layer.h | 43 +++++
- glib/poppler-private.h | 21 +++
- glib/poppler.h | 3 +
- glib/test-poppler-glib.cc | 52 ++++++-
- 8 files changed, 710 insertions(+), 1 deletions(-)
-
-commit c674566f458b54097f21aae0d4bf8637146565c5
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Oct 26 19:42:53 2008 +0100
-
- Fix memory leaks in OptionalContent
-
- poppler/OptionalContent.cc | 13 +++----------
- poppler/OptionalContent.h | 10 ++++++----
- 2 files changed, 9 insertions(+), 14 deletions(-)
-
-commit 06ca313b8ecb8abb8dec3b418d118525b7bb0fdf
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Oct 26 19:11:45 2008 +0100
-
- Check annotation optional content properties before drawing it
-
- poppler/Annot.cc | 20 ++++++++++++--------
- poppler/Annot.h | 4 ++--
- 2 files changed, 14 insertions(+), 10 deletions(-)
-
-commit a6d58927b048aa043cb6b6ed3ee9aeb213578924
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Nov 8 20:50:40 2008 +0100
-
- Do not show hidden optional content
-
- Before any draw operation we first check whether we are inside an
- optional marked content element that is currently hidden.
-
- poppler/Gfx.cc | 113 +++++++++++++++++++++++++++++++++++++++-----------------
- poppler/Gfx.h | 7 ++-
- 2 files changed, 84 insertions(+), 36 deletions(-)
-
-commit 5f168f991477e291290350a28f4a60a565e187b9
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Oct 20 17:56:11 2008 +0200
-
- [glib] Show action titles when printing the index in test program
-
- glib/test-poppler-glib.cc | 13 ++++++++-----
- 1 files changed, 8 insertions(+), 5 deletions(-)
-
-commit a906d12e16748d9a40c0db4043a576fd3d004341
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Nov 8 20:20:00 2008 +0100
-
- Minor code cleanup and consistency issues
-
- poppler/OptionalContent.cc | 22 +++++++++++-----------
- poppler/OptionalContent.h | 8 ++++----
- qt4/src/poppler-optcontent.cc | 6 +++---
- qt4/tests/check_optcontent.cpp | 8 ++++----
- 4 files changed, 22 insertions(+), 22 deletions(-)
-
-commit e73c2ce906b7e1f06d641f7e0733aad6336b4091
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Oct 19 12:44:13 2008 +0200
-
- Delete the optContent object if it's invalid
-
- poppler/Catalog.cc | 4 ++++
- poppler/OptionalContent.cc | 3 +++
- poppler/OptionalContent.h | 5 +++++
- 3 files changed, 12 insertions(+), 0 deletions(-)
-
-commit 2900e7e4c920d735d5a727e9e39f71df97bd7b93
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Nov 8 18:12:47 2008 +0100
-
- A new cairo is needed
-
- CMakeLists.txt | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit aaaecd2e86769d3a99e21577448a193711985958
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 5 22:47:30 2008 +0100
-
- Do not abort if indexHighA is 'invalid', move it to the closest valid value and try with it
-
- For the bug 18374 it works and does not seem a security problem
-
- poppler/GfxState.cc | 7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-commit 82f4228a50efe6447c68f7f6d34a7805b7e4b75e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 5 20:57:17 2008 +0100
-
- Add myself here
-
- qt4/demos/viewer.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 8df7d83439f0e9ab200840f912f1c08bbf44bd6e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 5 20:49:01 2008 +0100
-
- [Qt4Demo] Fix leak
-
- qt4/demos/viewer.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit d3c424e0362f53bda5c4e2e415823d78ace76253
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 5 20:14:17 2008 +0100
-
- Rename i to j so that code is more clear by not shadowing the function parameter
-
- poppler/Catalog.cc | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 9d12de9b59de4336eabb423f7bf0363b6a35e2a8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 5 20:00:01 2008 +0100
-
- Fix crash in case indices is NULL
-
- Putting more than one "logical line" per "real line" is evil, we think if will group it, but does not
-
- poppler/UnicodeTypeTable.cc | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-commit fc61dad9daa15f83802ffa5c3cd9b59d80bb310b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 5 19:52:00 2008 +0100
-
- [Qt] Fix leak
-
- qt/poppler-link.cc | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 981fb857b0afb1cda7836744dcf37906285512b4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 5 19:49:18 2008 +0100
-
- [Qt] Fix memory leak
-
- qt/poppler-document.cc | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit e925e92d5cbfc009c138ece117227a3b0894ead6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 5 19:44:40 2008 +0100
-
- Do not leak uBuf in the error case
-
- poppler/CharCodeToUnicode.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 0741a402632ec5a8641ff11707142bf2731c1833
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Nov 1 22:27:48 2008 +1030
-
- Restore the cairo Type3 font image prescaling funtionality
-
- poppler/CairoFontEngine.cc | 49 ++++++++++++++++++++++++++------------------
- poppler/CairoFontEngine.h | 20 ++++++++++-------
- poppler/CairoOutputDev.cc | 2 +-
- poppler/CairoOutputDev.h | 2 +-
- 4 files changed, 43 insertions(+), 30 deletions(-)
-
-commit 91a7c3fdd44f30b0b50ed05a3313bbb1b5c86e71
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Nov 1 20:57:24 2008 +1030
-
- Remove cairo font matrix y flip when inside a Type 3 char
-
- Not sure why this was previously required but it now produces
- incorrect results.
-
- poppler/CairoOutputDev.cc | 5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-commit 3bf4d7d75b455a9a0b5ee3a8c78b218e5af5185a
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Nov 1 20:50:07 2008 +1030
-
- Transform the glyph advance by the font matrix
-
- poppler/CairoFontEngine.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 4aa32bad61d008a854fdc9e902d6834bb1687d7e
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Nov 1 20:49:04 2008 +1030
-
- Use the font BBox, not the font matrix to set the Gfx BBox
-
- poppler/CairoFontEngine.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 987955440c7711f440c3d2b5cc8c05ec07228a77
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Nov 1 20:47:05 2008 +1030
-
- Ensure both the font matrix and y-axis flip are in the matrix
-
- we use for transforming the glyph metrics.
-
- poppler/CairoFontEngine.cc | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 5c051aa117477cba5d350adfc539acb4b5f2a56a
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Nov 1 01:59:07 2008 +1030
-
- Require cairo 1.8.2 for user-font support
-
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit a3edfa30680864b95a5196c5619846de42980857
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Nov 1 01:57:32 2008 +1030
-
- Implement Type 3 fonts in cairo backend using cairo user-fonts
-
- poppler/CairoFontEngine.cc | 174 ++++++++++++++++++++++++++++++++++++++++++--
- poppler/CairoFontEngine.h | 18 +++++
- poppler/CairoOutputDev.cc | 9 ++-
- poppler/CairoOutputDev.h | 4 +-
- 4 files changed, 194 insertions(+), 11 deletions(-)
-
-commit feab1e982a2ee39bb372d593633a06b6a499822f
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Nov 1 01:21:39 2008 +1030
-
- Add CairoOutputDev functions for getting Type 3 glyph metrics
-
- poppler/CairoOutputDev.cc | 10 ++++++++++
- poppler/CairoOutputDev.h | 7 +++++++
- 2 files changed, 17 insertions(+), 0 deletions(-)
-
-commit a75efe208d899d4a23d5e2fcef200e4225721636
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sat Nov 1 00:26:40 2008 +1030
-
- Make the catalog available to CairoFontEngine
-
- glib/poppler-document.cc | 3 ++-
- poppler/CairoFontEngine.cc | 2 +-
- poppler/CairoFontEngine.h | 3 ++-
- poppler/CairoOutputDev.cc | 7 +++++--
- poppler/CairoOutputDev.h | 3 ++-
- test/pdf-inspector.cc | 2 +-
- 6 files changed, 13 insertions(+), 7 deletions(-)
-
-commit 941d3976c496b75a3c5a9d19b80044fc2b57bd98
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri Oct 31 22:44:41 2008 +1030
-
- Allow multiple instances of CairoOutputDev to be created
-
- for the same document that shares the same CairoFontEngine.
-
- poppler/CairoOutputDev.cc | 16 +++++++++++-----
- poppler/CairoOutputDev.h | 4 +++-
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-commit 94cff513d8589f51b243fcb078f82cb931bb6d35
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri Oct 31 21:11:01 2008 +1030
-
- Use correct return type in _ft_new_face
-
- poppler/CairoFontEngine.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0b5ee897a24ce1edfca19a3b843f9b7ee7026d07
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri Oct 31 20:55:14 2008 +1030
-
- Refactor CairoFont
-
- Create a CairoFreeType subclass and move the FreeType specific code
- into it.
-
- poppler/CairoFontEngine.cc | 197 +++++++++++++++++++++++++-------------------
- poppler/CairoFontEngine.h | 26 +++++--
- 2 files changed, 131 insertions(+), 92 deletions(-)
-
-commit a5865dae5b414de5f6dbda2a512101050c374e06
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Oct 28 10:30:59 2008 +0100
-
- [glib] Add DISABLE_SINGLE_INCLUDES flags and fix glib-demo
-
- configure.ac | 4 ++++
- glib/Makefile.am | 3 ++-
- glib/demo/Makefile.am | 3 ++-
- glib/demo/annots.h | 2 +-
- glib/demo/attachments.h | 2 +-
- glib/demo/fonts.h | 2 +-
- glib/demo/forms.h | 2 +-
- glib/demo/images.h | 2 +-
- glib/demo/info.h | 2 +-
- glib/demo/links.h | 2 +-
- glib/demo/outline.h | 2 +-
- glib/demo/page.h | 2 +-
- glib/demo/render.h | 2 +-
- glib/demo/transitions.h | 2 +-
- glib/demo/utils.h | 2 +-
- 15 files changed, 20 insertions(+), 14 deletions(-)
-
-commit e07bfb54b77430e10e50c33151cf0afc9854006c
-Author: Christian Persch <chpe@gnome.org>
-Date: Tue Oct 28 10:29:51 2008 +0100
-
- [glib] Fix build when compiling with GTK_DISABLE_SINGLE_INCLUDES
-
- glib/poppler-page.h | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-commit a84d272ffd2b593ac98148e71b83fba299c60fea
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Oct 28 10:01:00 2008 +0100
-
- [glib] Add disable deprecated compile flags and fix compile warnings
-
- configure.ac | 6 ++++++
- glib/Makefile.am | 3 ++-
- glib/demo/Makefile.am | 4 +++-
- glib/demo/attachments.c | 4 ++--
- 4 files changed, 13 insertions(+), 4 deletions(-)
-
-commit 43f2b84a81625abee84c93cdced7fb92c99cd944
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Oct 21 23:00:55 2008 +0200
-
- [Qt4] Small docu improvement
-
- qt4/src/poppler-qt4.h | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 00f9995b4960575cd1f392474c585f2140c8e587
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 12 14:20:01 2008 +0200
-
- Do not crash if there is not font
-
- See bug 18023 for more info
-
- poppler/TextOutputDev.cc | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit 084cc4335cfe2c0e66219eba4c1177ee7ff018c5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Oct 10 23:15:35 2008 +0200
-
- obj4 should be the index 1 on the Array, not the 0, that's already obj3
-
- poppler/Form.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit d7442c90206d4b7a8ebc58f995647eb87ac35f42
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Oct 9 22:53:00 2008 +0200
-
- If Name is a Ref we want to get the String it references, not the Ref
-
- poppler/OptionalContent.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 93f8dd9e837557bbfc0f058a664c356e3d6e82c0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Oct 9 21:28:27 2008 +0200
-
- Poppler 0.10.0
-
- CMakeLists.txt | 2 +-
- NEWS | 16 ++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 22 insertions(+), 6 deletions(-)
-
-commit cdd9bf016de0d3f96b1d5e304c9d02f2bf71ff18
-Author: Mark Kaplan <mkaplan@finjan.com>
-Date: Wed Oct 8 22:29:11 2008 +0200
-
- Initialize properly OptionalContentGroup::m_name
-
- poppler/OptionalContent.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit c7b87f3b8cbbcca29a1974debc2233f621a2e33b
-Author: Carlo Bramini <carlo.bramix@libero.it>
-Date: Mon Oct 6 19:32:27 2008 +0200
-
- Fix link on Mingw+Msys
-
- test/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit e92255296511cae9cbbac8de800d8b26e5f681f1
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Oct 5 15:57:06 2008 +0200
-
- [Qt4] when the PDF exporting fails, delete the file if it was created by
- the (failed) exporting
-
- qt4/src/poppler-pdf-converter.cc | 13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-commit 360f470b852e37d400949343763a18bf598820e8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Oct 4 20:04:44 2008 +0200
-
- Remove unused var
-
- poppler/Annot.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit df7317f1320513b4f66cb6618d753b82042671f5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Oct 4 19:48:57 2008 +0200
-
- free the object
-
- poppler/PDFDoc.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 9946d9af9dd5d5b96d5c777413a3e253dfd1f291
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Oct 4 19:39:46 2008 +0200
-
- If we try saving a document that was encrypted, we break everything, so just fail early
-
- poppler/PDFDoc.cc | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-commit 108959432af7714cb8ffe42d98d40c97f936a2e6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Oct 4 19:39:24 2008 +0200
-
- Correctly return wheter it was saved or not
-
- qt4/src/poppler-pdf-converter.cc | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-commit 4c6cb1c204d782e2ac2113b57f6d372b4716017d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Oct 4 01:46:58 2008 +0200
-
- Remove spurious //
-
- fofi/FoFiType1.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit e8e7809ab4b115cbe67251da12989fc024912514
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Oct 4 01:43:02 2008 +0200
-
- There are files that have more than one encoding definition per line, make them work
-
- Fixes bug 17018, while at it, i've added some comments and some error() to make things a bit clearer
-
- fofi/FoFiType1.cc | 28 ++++++++++++++++++++++++----
- 1 files changed, 24 insertions(+), 4 deletions(-)
-
-commit 7604e025038fee24c2cb3001f2100d5d1e48efe1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Oct 4 00:35:46 2008 +0200
-
- Fix Poppler::Link::linkArea for rotated pages
-
- we suck :-( Fixes kde bug 172105
-
- qt4/src/poppler-link-extractor.cc | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 450b21e4528a8e890d3dda37ecb0a68602f8efaa
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Oct 1 00:46:29 2008 +0200
-
- I've changed these files this year too, update copyright
-
- goo/gmem.cc | 2 +-
- goo/gmem.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 98310ca24841789cf53b10d34e271ceb4e054001
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 30 23:59:43 2008 +0200
-
- Fix StitchingFunction(StitchingFunction *func) and GfxAxialShading(GfxAxialShading *shading)
-
- Fixes bug 17852
-
- poppler/Function.cc | 2 ++
- poppler/GfxState.cc | 2 +-
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-commit d12f5f4395eb18f8d29182e24acddd3e2b5cfe88
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 30 23:20:26 2008 +0200
-
- 0.9.3
-
- CMakeLists.txt | 2 +-
- NEWS | 17 +++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 23 insertions(+), 6 deletions(-)
-
-commit d61e464754521555a06ed0901955f49be4def29a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 30 19:26:17 2008 +0200
-
- Timothy also agreed, now Ed Catmur is the last one missing to answer
-
- utils/ImageOutputDev.cc | 3 +++
- utils/ImageOutputDev.h | 3 +++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 3225f54fea7cbb6b25d7223268cdeccfdd823375
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 30 00:27:49 2008 +0200
-
- And Marco said yes to GPLv2+
-
- Only Timothy Lee and Ed Catmur left :-)
-
- poppler/Catalog.cc | 3 +++
- poppler/Outline.cc | 3 +++
- poppler/Outline.h | 3 +++
- splash/Splash.cc | 3 +++
- splash/Splash.h | 3 +++
- 5 files changed, 15 insertions(+), 0 deletions(-)
-
-commit 268d803c9dd67b7f78f8dcdc3c7653c8b2c2d08f
-Author: Warren Toomey <wkt@tuhs.org>
-Date: Mon Sep 29 21:14:40 2008 +0200
-
- Let HmtlOutputDev process images
-
- utils/HtmlOutputDev.h | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit a29984ab777c64a1cb286b667a6a91ad9b191f40
-Merge: f399afe 6865872
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Sep 28 23:39:08 2008 +0200
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit f399afe6f6b9c250327d0e4c5b3f2839889d7095
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Sep 28 23:38:34 2008 +0200
-
- [Qt4] various apidox improvements
-
- qt4/src/Mainpage.dox | 10 +---
- qt4/src/poppler-link.h | 92 +++++++++++++++++++++++++++++++++---
- qt4/src/poppler-qt4.h | 121 ++++++++++++++++++++++++++++++++---------------
- 3 files changed, 168 insertions(+), 55 deletions(-)
-
-commit 68658721583b05ebacb1165ac36e91d49735bbd9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Sep 28 19:29:06 2008 +0200
-
- If tables is null, don't try to write to file as it'll crash, fixes crash on 17811 when using cairooutputdev
-
- fofi/FoFiTrueType.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 3cb5b7fc5ae168ef58fd1905f61c1b9abe6cb86c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Sep 28 19:25:53 2008 +0200
-
- Introduce greallocn_checkoverflow and use it in FoFiTrueType::parse
-
- Fixes the other part of bug 17811
-
- fofi/FoFiTrueType.cc | 4 ++--
- goo/gmem.cc | 21 +++++++++++++++++++++
- goo/gmem.h | 1 +
- 3 files changed, 24 insertions(+), 2 deletions(-)
-
-commit aa7ef03af49f74ed558dcbab8ad4c594bb2b7d53
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Sep 28 19:24:43 2008 +0200
-
- If libjpeg tells us to abort, let's abort :D
-
- Fixes part of bug 17811
-
- poppler/DCTStream.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit e2461c9aa4d74b5511621d7222979948e31541ad
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Sep 28 18:07:25 2008 +0200
-
- [Qt4] Activate the 'printing' flag by default in the PSConverter.
-
- qt4/src/poppler-ps-converter.cc | 2 +-
- qt4/src/poppler-qt4.h | 2 ++
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-commit 957d7acb66635e9748c6bc7a31cdbbcbb8da9011
-Author: Carlo Bramini <carlo.bramix@libero.it>
-Date: Sat Sep 27 17:23:20 2008 +0200
-
- Misc mingw fixes
-
- configure.ac | 2 +-
- glib/Makefile.am | 2 +-
- glib/demo/info.cc | 1 +
- m4/libjpeg.m4 | 2 +-
- 4 files changed, 4 insertions(+), 3 deletions(-)
-
-commit b3828203c4e594754957033ea826e8e22164fd5b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Sep 26 23:08:14 2008 +0200
-
- Carl agreed too, so CairoOutputDev.cc is done
-
- Only miss, Marco Pesenti Gritti, Timothy Lee and Ed Catmur
-
- poppler/CairoOutputDev.cc | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit a197a07728d19abc2708979c95b4ef53e88fcb55
-Author: Carlo Bramini <carlo.bramix@libero.it>
-Date: Fri Sep 26 18:42:05 2008 +0200
-
- Compile where localtime_r is not available
-
- glib/demo/info.cc | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-commit 38884e1722ac7e15c62cece20035c5fb0020f4b3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 24 14:18:38 2008 +0200
-
- Do what Jeff really want to do, mark the font as invalid if it matches any of the known collections that Identity is not a good fallback
-
- Fixes pdf on KDE bug 171365
-
- poppler/GfxFont.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0e080aaf44816e5d5b9008f3c2fb54868932f0ac
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 24 13:12:13 2008 +0200
-
- Remove non-needed X includes
-
- Spotted by Carlo Bramini
-
- test/gtk-cairo-test.cc | 3 ---
- test/pdf-inspector.cc | 3 ---
- 2 files changed, 0 insertions(+), 6 deletions(-)
-
-commit 6888b023fdb199d3c5fb705bd928aedf68eeffdb
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 23 23:28:04 2008 +0200
-
- Only do the scale to 'm' size trick on non embedded fonts as it was meant to be
-
- Fixes bug 17744
-
- poppler/SplashOutputDev.cc | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit 539d29f4f3b24b98c9fc5f88d3477e427fbe409d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 23 22:39:50 2008 +0200
-
- 0.9.2
-
- CMakeLists.txt | 2 +-
- NEWS | 19 +++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 25 insertions(+), 6 deletions(-)
-
-commit abd070a79d8345bda3853395a39e4e2882c4ff8a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 22 20:23:11 2008 +0200
-
- Check the types here too
-
- Benchmarking in release mode, both in "human feel" and callgrind the benefit/lost is almost inexistant
-
- poppler/Object.h | 36 ++++++++++++++++++++++--------------
- 1 files changed, 22 insertions(+), 14 deletions(-)
-
-commit df47e4c441e4ec79b1bb40de7044c9501f243b76
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue Sep 16 12:56:04 2008 +0100
-
- Check for duplicate open fonts.
-
- Before creating a new FT_Face for a font, check to see if there is a
- duplicate amongst the list of open fonts, kept alive by either Poppler's
- or Cairo's font cache .
-
- A quick example of the benefit of this check is that it reduces the RSS of
- the Poppler converter in the Cairo test suite from over 900 MiB to just 90
- MiB.
-
- configure.ac | 1 +
- poppler/CairoFontEngine.cc | 214 ++++++++++++++++++++++++++++++++++++++-----
- 2 files changed, 190 insertions(+), 25 deletions(-)
-
-commit 41d1edddcf84ca23c0fc39c5f4f3a49e408a9f1a
-Author: Kouhei Sutou <kou@cozmixng.org>
-Date: Sun Sep 21 16:33:33 2008 +0200
-
- [glib-demo] Fix a crash in forms demo
-
- glib/demo/forms.c | 12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
-
-commit fe26075353226be9a02c8cf1a6a29586de15ce86
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Sep 21 12:03:21 2008 +0200
-
- really use the key passed to it
-
- poppler/Form.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 8aa531cb478d6ae838a94f9f31e6a0bbd0dd957c
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Sep 21 11:18:22 2008 +0200
-
- Read the 'readOnly' attribute directly in the FormField constructor.
-
- poppler/Form.cc | 12 +++---------
- 1 files changed, 3 insertions(+), 9 deletions(-)
-
-commit b56f64d676bdabd4a3ebe0eb2237f4c202a3707d
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Sep 21 00:53:54 2008 +0200
-
- Handle streams as entries for the catalog JS name tree.
-
- poppler/Catalog.cc | 18 +++++++++++++-----
- 1 files changed, 13 insertions(+), 5 deletions(-)
-
-commit 93386d67b3d7adbd87547e9742e4df1c10eadbc1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 20 16:20:03 2008 +0200
-
- Compile with -pedantic
-
- poppler/Form.h | 4 ++--
- qt4/src/poppler-embeddedfile.cc | 4 ++--
- qt4/src/poppler-movie.cc | 3 ++-
- qt4/src/poppler-sound.cc | 3 ++-
- qt4/src/poppler-textbox.cc | 2 +-
- 5 files changed, 9 insertions(+), 7 deletions(-)
-
-commit 6961fd8efe3db6ee7077dc2ed072498696dae31a
-Author: Tomas Are Haavet <tomasare@gmail.com>
-Date: Sat Sep 20 16:13:37 2008 +0200
-
- Remove some warnings and errors when compiling with gcc and -pedantic
-
- fofi/FoFiTrueType.cc | 3 ++-
- glib/poppler-annot.cc | 8 ++++----
- glib/poppler-attachment.cc | 2 +-
- glib/poppler-document.cc | 6 +++---
- glib/poppler-form-field.cc | 2 +-
- glib/poppler-page.cc | 2 +-
- poppler/Annot.h | 5 +++--
- splash/SplashTypes.h | 3 ++-
- 8 files changed, 17 insertions(+), 14 deletions(-)
-
-commit 4e9a04da358b1527a08102e601a52f07930532f2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 20 16:10:50 2008 +0200
-
- Add mention of GPLv2 or later in poppler changes to all files except Splash.cc and Splash.h, i've still no answer from Marco :-(
-
- splash/SplashBitmap.cc | 3 +++
- splash/SplashBitmap.h | 3 +++
- splash/SplashErrorCodes.h | 3 +++
- splash/SplashFTFont.cc | 3 +++
- splash/SplashFTFont.h | 3 +++
- splash/SplashFTFontEngine.cc | 3 +++
- splash/SplashFTFontEngine.h | 3 +++
- splash/SplashFTFontFile.cc | 3 +++
- splash/SplashFTFontFile.h | 3 +++
- splash/SplashFont.cc | 3 +++
- splash/SplashFont.h | 3 +++
- splash/SplashFontEngine.cc | 3 +++
- splash/SplashFontEngine.h | 3 +++
- splash/SplashFontFile.cc | 3 +++
- splash/SplashFontFile.h | 3 +++
- splash/SplashT1Font.cc | 3 +++
- splash/SplashT1Font.h | 3 +++
- splash/SplashT1FontEngine.cc | 3 +++
- splash/SplashT1FontFile.cc | 3 +++
- splash/SplashT1FontFile.h | 3 +++
- splash/SplashTypes.h | 3 +++
- splash/SplashXPathScanner.cc | 3 +++
- 22 files changed, 66 insertions(+), 0 deletions(-)
-
-commit beb87362072d5b480cf6b2c02445ec17c119ff56
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 20 15:47:25 2008 +0200
-
- Add Tomas' Copyright
-
- utils/HtmlFonts.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 8ccb1bb651b129875ef802356c4a229b2ce31973
-Author: Tomas Are Haavet <tomasare@gmail.com>
-Date: Sat Sep 20 15:45:47 2008 +0200
-
- Initialize pos the correct value to not have crashes
-
- utils/HtmlFonts.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 77bf8ec94e36fef7e120f1dc4bb1390be71cfb97
-Author: Tomas Are Haavet <tomasare@gmail.com>
-Date: Sat Sep 20 14:17:06 2008 +0200
-
- Fix memory leak
-
- utils/HtmlOutputDev.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit b22be54dc2205269974315ca748d835d0990d6da
-Author: Tomas Are Haavet <tomasare@gmail.com>
-Date: Sat Sep 20 14:16:26 2008 +0200
-
- Fix mismatched free/delete
-
- utils/HtmlOutputDev.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit ac16174da1d6f19445f78e7cd7c4a18cb9524dde
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 20 00:52:19 2008 +0200
-
- make sure the image is setup before using it, otherwise some things don't print correctly like PDF from bug 17645
-
- poppler/PSOutputDev.cc | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit ffa4ffdf7fe83035c72addd8c4c8ee566621ba06
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 17 23:27:30 2008 +0200
-
- 0.9.1
-
- CMakeLists.txt | 2 +-
- NEWS | 13 +++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 19 insertions(+), 6 deletions(-)
-
-commit f57cbe32bcde0808943b9be2456dd69fa5b6dd27
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Sep 14 22:18:38 2008 +0200
-
- If when looking for an object we get objSomeNumberAfter assume it was an int of SomeNumberAfter
-
- Fixes bug 17568 and i don't see how it can break existing things because it's already on an error path
-
- poppler/XRef.cc | 25 +++++++++++++++++++++++++
- 1 files changed, 25 insertions(+), 0 deletions(-)
-
-commit 1a852064ff5a1a15bc315ddca472a0ad74292581
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Sep 13 12:11:41 2008 +0200
-
- [glib-demo] Do not try to get info about remote destinations
-
- glib/demo/utils.c | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-commit 951cffeb2cbff4e179043033b5ac7f5eb764d6dc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Sep 12 12:05:53 2008 +0200
-
- Make sure DecryptAESState::bufIdx is never bigger than 16, otherwise we crash
-
- I am not sure this is the correct fix, but fixes crash on files of bugs 13972, 16092 and 17523 and they seem to work ok
-
- poppler/Decrypt.cc | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 491109edbe827860e764b5fcb67456867923858d
-Author: Haruyuki Kawabe <Haruyuki.Kawabe@unisys.co.jp>
-Date: Wed Sep 10 23:00:32 2008 +0200
-
- Generate the outline file at the same place the other files are generated
-
- Fixes bug 17504
-
- utils/HtmlOutputDev.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 7dfc1e4c9348d537896bda7b0f2ae591afc72866
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 10 00:03:50 2008 +0200
-
- we want to distribute this file too
-
- qt4/src/Makefile.am | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit ddb73e8dc1ccbddf3b170e12c7153ccaf716d7cc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 9 23:47:33 2008 +0200
-
- We want to distribute cmake/modules/FindLIBOPENJPEG.cmake too
-
- Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 646ccc2bb8563d411dc25bdbab53725ae08572ba
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 9 23:22:17 2008 +0200
-
- m_doc->doc->getOptContentConfig() can be null, so check for it
-
- qt4/src/poppler-document.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit d7f0bce67101f37f8d3e69d7d701388bcdc7200f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 9 23:18:49 2008 +0200
-
- Qt4 frontend had timezone parsing that got lost when moving to the common function, i suck
-
- glib/poppler-document.cc | 6 ++++--
- poppler/DateInfo.cc | 20 ++++++++++++++------
- poppler/DateInfo.h | 2 +-
- qt/poppler-document.cc | 6 ++++--
- qt4/src/poppler-document.cc | 22 +++++++++++++++++++---
- utils/pdfinfo.cc | 6 ++++--
- utils/pdftohtml.cc | 6 ++++--
- 7 files changed, 50 insertions(+), 18 deletions(-)
-
-commit 0af8609e6c932de2d85168cc9147854ee84b3a1b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 9 20:55:27 2008 +0200
-
- i want this packaged too
-
- utils/Makefile.am | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit dd0f4c1510382e17cf33d3fe163e384da1d6d289
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 9 20:48:04 2008 +0200
-
- Fix includepath
-
- fofi/FoFiTrueType.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 16c0842c3e01608a72709af55cc5cb8b567efedf
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 9 20:36:18 2008 +0200
-
- API changed, so increase soname
-
- glib/CMakeLists.txt | 2 +-
- glib/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 217c0d1f80a78713977a7bfbe680fce90f1c6b36
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 8 23:56:28 2008 +0200
-
- change version to 0.9.0
-
- Now only need to wait for Carlos and Iñigo's answer to a BIC change in glib/ and we'll have 0.9.0 :-)
-
- CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-commit e34022a8fcfb9fe211dd6b561377d855972b2087
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 8 23:36:04 2008 +0200
-
- Increase soname for libpoppler, i'm almost sure we broke BC there
-
- CMakeLists.txt | 2 +-
- poppler/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit bc275049d6ef083daf71a043ccf23fd0634f5c4d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 8 23:33:24 2008 +0200
-
- soname 3.1.0 for qt4 libs, we are BC/SC but got new API
-
- qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 06743a25a73adc3fba95f7b4ad74a6dde1a54ead
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 8 23:23:06 2008 +0200
-
- added news for 0.9.0
-
- NEWS | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 115 insertions(+), 0 deletions(-)
-
-commit d35ca2ce5df12d40e295873e44b1f18ea40ba897
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Sep 7 01:13:33 2008 +0200
-
- [Qt4] apidox improvements
-
- qt4/src/poppler-annotation.h | 70 +++++++++++++++++++++++++++++++++++++++--
- qt4/src/poppler-link.h | 12 +++++--
- qt4/src/poppler-qt4.h | 22 +++++++++++--
- 3 files changed, 93 insertions(+), 11 deletions(-)
-
-commit 796d4c002d47c85716775d173eddfb2ae8866eaf
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Sep 6 22:48:13 2008 +0200
-
- no more need for including the qt3 paths
-
- qt4/demos/CMakeLists.txt | 1 -
- qt4/src/CMakeLists.txt | 1 -
- qt4/tests/CMakeLists.txt | 1 -
- 3 files changed, 0 insertions(+), 3 deletions(-)
-
-commit db7ee3b3ae0f42155f9245691e4bfdef98a8ed6f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 6 23:16:05 2008 +0200
-
- [Qt4] Fix docu
-
- qt4/src/poppler-qt4.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 3366059a25611f19ab592cda18c5efe0b9359771
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Sep 6 16:34:58 2008 +0200
-
- [Qt4] add option flags for the PS converter
-
- - map the 'strictMargins' and 'forceRasterize' bool options as flags
- - add a flag for setting the "printing" mode
-
- qt4/src/poppler-ps-converter.cc | 34 ++++++++++++++++++++++++++--------
- qt4/src/poppler-qt4.h | 26 ++++++++++++++++++++++++++
- 2 files changed, 52 insertions(+), 8 deletions(-)
-
-commit afa26d5c9ac9feb61aad30eb65dc00c9854d7f2e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 6 15:46:12 2008 +0200
-
- we are printing so pass the print flag as true
-
- qt/poppler-document.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit f5d1eb5eaabaf3ab4bb87b8b4b901bbf30b20b29
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 6 15:43:32 2008 +0200
-
- We are pringint here, so pass the printing flag as true
-
- Fixes KDE bug 170459, you'd wonder how many times i've made the same mistake...
-
- qt4/src/poppler-ps-converter.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 58e828d732f06bae9133dd518d89fa4348f1cca8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Sep 5 18:45:23 2008 +0200
-
- Only like QtTest to the tests, not to the lib itself
-
- configure.ac | 13 +++++++++++--
- qt4/tests/Makefile.am | 22 +++++++++++-----------
- 2 files changed, 22 insertions(+), 13 deletions(-)
-
-commit 49b3e4560f62a9a7db350d94d50e229f5e1208bf
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Sep 5 18:17:45 2008 +0200
-
- Movie filename is not a string, but a File Specification
-
- Fixes a crash when filename is a dictionary
-
- poppler/Annot.cc | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-commit 996d2e176057e22acbc374cff7a712ce6fd92d93
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Sep 5 18:17:25 2008 +0200
-
- Unify multiple File Specification parsers
-
- CMakeLists.txt | 2 +
- poppler/FileSpec.cc | 146 ++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/FileSpec.h | 24 ++++++++
- poppler/Link.cc | 104 +++++-----------------------------
- poppler/Link.h | 4 -
- poppler/Makefile.am | 2 +
- poppler/PSOutputDev.cc | 35 +-----------
- poppler/PSOutputDev.h | 1 -
- poppler/Sound.cc | 7 ++-
- 9 files changed, 197 insertions(+), 128 deletions(-)
-
-commit 31f3eb2d6b43f7fbf4d978730d109b08b1563989
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 3 21:49:23 2008 +0200
-
- Only set the state to true if the AS value is the same as parent's V
-
- Fixes bug 16121 and 15535
-
- poppler/Form.cc | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-commit c75abac7ba07990ef54a46fa0d429eea580a71ef
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 2 19:16:55 2008 +0200
-
- Kjartan was missing and just agreed
-
- utils/HtmlOutputDev.cc | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 630aa133017d15ddc7bf96c79f43c5b60fa9749a
-Merge: b2bc9b3 de82255
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Sep 2 01:25:55 2008 +0200
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit b2bc9b3f59ef8e5fea18f0bc91b71fc9eb9a4157
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Sep 2 01:24:39 2008 +0200
-
- [Qt4] small apidox improvements
-
- mostly the start of the \since marker addition, plus few other
- documentation addition/improvements
-
- qt4/src/poppler-annotation.h | 9 ++++++
- qt4/src/poppler-form.h | 8 +++++
- qt4/src/poppler-link.h | 14 ++++++++--
- qt4/src/poppler-optcontent.h | 11 ++++++++
- qt4/src/poppler-qt4.h | 59 ++++++++++++++++++++++++++++++++++++-----
- 5 files changed, 90 insertions(+), 11 deletions(-)
-
-commit 6bc4881477ea15d70d420e57b5663052f2f9df76
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Sep 2 00:47:56 2008 +0200
-
- expand the macros, extract poppler-optcontent.h
-
- enable the macro expansion and define POPPLER_QT4_EXPORT to be empty, so
- we don't have it in the apidox
-
- qt4/src/Doxyfile | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-commit de822554acdb1b2bc9e70c0668c43a10c0ec129a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 1 23:50:37 2008 +0200
-
- Initialize widget to null before calling initialize not after :-(
-
- poppler/Annot.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 1a7b7199112d97e816a099cbc1a5672c83e64156
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 1 20:42:06 2008 +0200
-
- Add my copyright
-
- poppler/Dict.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 1fef34782a003f46fceab0d3bed36212bbf32c4c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 1 20:35:37 2008 +0200
-
- Find reverse way in Dict
-
- This fixes Greg Stolze - Marriage Of Virtue & Viciousness.pdf
- The issue with this pdf is that has a Dict with two entries with the same key
- The pdf spec says if that happens, results are undefined, but Acroread uses the
- second key while we were using the first, searching backwards we use the second now too and the pdf works
-
- poppler/Dict.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit bb7996eaaad6a70404891bb2ff530160737ea3d7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 1 20:29:25 2008 +0200
-
- Do not crash on documents with no pages
-
- qt4/tests/test-poppler-qt4.cpp | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 0c11d390e4b0e3765ae20968359c7562c9857db7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 1 20:13:33 2008 +0200
-
- All poppler commiters to these files agreed to GPLv2+
-
- Still missing to answer
- Marco Pesenti Gritti
- Catalog.cc
- Outline.cc
- Outline.h
-
- Kjartan Maraas
- HtmlOutputDev.cc
-
- Timothy Lee
- ImageOutputDev.h
- ImageOutputDev.cc
-
- Carl Worth
- CairoOutputDev.cc
-
- Ed Catmur
- GfxFont.cc
- GlobalParams.cc
- TextOutputDev.cc
- TextOutputDev.h
- UnicodeTypeTable.cc
- UnicodeTypeTable.h
-
- poppler/Annot.cc | 3 +++
- poppler/Annot.h | 3 +++
- poppler/Array.cc | 3 +++
- poppler/Array.h | 3 +++
- poppler/ArthurOutputDev.cc | 3 +++
- poppler/ArthurOutputDev.h | 3 +++
- poppler/CMap.cc | 3 +++
- poppler/CMap.h | 3 +++
- poppler/CairoFontEngine.cc | 3 +++
- poppler/CairoFontEngine.h | 3 +++
- poppler/CairoOutputDev.h | 3 +++
- poppler/Catalog.h | 3 +++
- poppler/CharCodeToUnicode.cc | 3 +++
- poppler/CharCodeToUnicode.h | 3 +++
- poppler/Decrypt.cc | 3 +++
- poppler/Decrypt.h | 3 +++
- poppler/Dict.cc | 3 +++
- poppler/Dict.h | 3 +++
- poppler/Error.cc | 3 +++
- poppler/Error.h | 3 +++
- poppler/Function.cc | 3 +++
- poppler/Gfx.cc | 3 +++
- poppler/Gfx.h | 3 +++
- poppler/GfxFont.h | 3 +++
- poppler/GfxState.cc | 3 +++
- poppler/GfxState.h | 3 +++
- poppler/GlobalParams.h | 3 +++
- poppler/JBIG2Stream.cc | 3 +++
- poppler/JPXStream.cc | 3 +++
- poppler/Lexer.cc | 3 +++
- poppler/Lexer.h | 3 +++
- poppler/Link.cc | 3 +++
- poppler/Link.h | 3 +++
- poppler/Object.cc | 3 +++
- poppler/Object.h | 3 +++
- poppler/OutputDev.cc | 3 +++
- poppler/OutputDev.h | 3 +++
- poppler/PDFDoc.cc | 3 +++
- poppler/PDFDoc.h | 3 +++
- poppler/PDFDocEncoding.cc | 3 +++
- poppler/PDFDocEncoding.h | 3 +++
- poppler/PSOutputDev.cc | 3 +++
- poppler/PSOutputDev.h | 3 +++
- poppler/PSTokenizer.cc | 3 +++
- poppler/PSTokenizer.h | 3 +++
- poppler/Page.cc | 3 +++
- poppler/Page.h | 3 +++
- poppler/Parser.cc | 3 +++
- poppler/Parser.h | 3 +++
- poppler/SplashOutputDev.cc | 3 +++
- poppler/SplashOutputDev.h | 3 +++
- poppler/Stream-CCITT.h | 3 +++
- poppler/Stream.cc | 3 +++
- poppler/Stream.h | 3 +++
- poppler/UTF8.h | 3 +++
- poppler/XRef.cc | 3 +++
- poppler/XRef.h | 3 +++
- utils/HtmlFonts.cc | 3 +++
- utils/HtmlLinks.cc | 3 +++
- utils/HtmlOutputDev.h | 3 +++
- utils/parseargs.c | 3 +++
- utils/parseargs.h | 3 +++
- utils/pdffonts.cc | 3 +++
- utils/pdfimages.cc | 3 +++
- utils/pdfinfo.cc | 3 +++
- utils/pdftohtml.cc | 3 +++
- utils/pdftoppm.cc | 3 +++
- utils/pdftops.cc | 3 +++
- utils/pdftotext.cc | 3 +++
- 69 files changed, 207 insertions(+), 0 deletions(-)
-
-commit 8670bfed7900586725b30e3af67f6849acc6efda
-Author: Vasile Gaburici <gaburici@cs.umd.edu>
-Date: Sat Aug 30 12:47:13 2008 +0200
-
- Fix extraction of images
-
- See bug 16999 for more info
-
- utils/ImageOutputDev.cc | 12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-commit 1c98f197664b1a2c06e2caf32116a8487f4054bf
-Author: Vasile Gaburici <gaburici@cs.umd.edu>
-Date: Sat Aug 30 12:44:02 2008 +0200
-
- Read sMap reverse so CMap entries take precedence
-
- See bug 17321 for a more in depth explanation
-
- poppler/CharCodeToUnicode.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 8f1deb3f8000bdeb845a6c786a654bc7eb684f0a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 29 23:06:19 2008 +0200
-
- Are we a lib or aren't we? Unify String to Date parsing so we all behave the same way
-
- CMakeLists.txt | 2 +
- glib/poppler-document.cc | 29 ++--------------
- poppler/DateInfo.cc | 62 +++++++++++++++++++++++++++++++++++
- poppler/DateInfo.h | 27 +++++++++++++++
- poppler/Makefile.am | 2 +
- qt/poppler-document.cc | 22 +-----------
- qt4/src/poppler-annotation-helper.h | 16 +--------
- qt4/src/poppler-document.cc | 52 +++--------------------------
- utils/pdfinfo.cc | 16 ++-------
- utils/pdftohtml.cc | 9 ++---
- 10 files changed, 111 insertions(+), 126 deletions(-)
-
-commit c39f23dca98d3efe8d094c9a3e1bd460ba57d1ce
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 29 20:50:57 2008 +0200
-
- Add a readme for contributors with licensing and misc info
-
- README.contributors | 20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
-
-commit 35a72590ffd3284e63601af79599e5fa025e567f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Aug 28 00:58:11 2008 +0200
-
- Be more protective against huge font sizes in bogus documents like the one in http://bugs.freedesktop.org/show_bug.cgi?id=17326
-
- 10 MB in size is a font of 3200x3200, huge enough to be discarted
-
- poppler/SplashOutputDev.cc | 20 +++++++++++++++++++-
- 1 files changed, 19 insertions(+), 1 deletions(-)
-
-commit 33727cf6773b12d736ba245fdd146559ce93102d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 24 20:36:13 2008 +0200
-
- fix location of the comment
-
- fofi/FoFiType1.cc | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-commit abe29b4fdb33f449649fdea5d7af2deeb702f0bb
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 24 20:24:35 2008 +0200
-
- All changes made to fofi/ files under the poppler project are by people that accepts to license the code under GPLv2+
-
- fofi/FoFiBase.cc | 3 +++
- fofi/FoFiTrueType.cc | 3 +++
- fofi/FoFiTrueType.h | 3 +++
- fofi/FoFiType1.cc | 3 +++
- fofi/FoFiType1C.h | 3 +++
- 5 files changed, 15 insertions(+), 0 deletions(-)
-
-commit 6346d7050a03935c71336c65d5f8f0fe2860d321
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 24 20:23:50 2008 +0200
-
- All changes made to goo/ files under the poppler project are by people that accepts to license the code under GPLv2+
-
- goo/GooString.cc | 3 +++
- goo/GooString.h | 3 +++
- goo/gfile.cc | 3 +++
- goo/gfile.h | 3 +++
- goo/gmem.cc | 3 +++
- goo/gmem.h | 3 +++
- 6 files changed, 18 insertions(+), 0 deletions(-)
-
-commit d6e1f1fb4e83527d3ece51d98fa20262713b7da1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 24 20:22:06 2008 +0200
-
- .cc -> .h
-
- poppler/FontInfo.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 9f0ac70f7ad806cadce379d4fabb90eff697ad52
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 24 19:25:27 2008 +0200
-
- Add missing addresses
-
- poppler/ABWOutputDev.cc | 4 ++--
- poppler/ABWOutputDev.h | 2 +-
- poppler/FlateStream.cc | 2 +-
- poppler/FlateStream.h | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-commit 22f6af73961686895f207fe13022a21333455862
-Merge: 12a9e42 6d6913a
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Aug 24 19:03:24 2008 +0200
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 12a9e427fb487165b1797f81d52d733c27bfa2e1
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Aug 24 18:57:52 2008 +0200
-
- [Qt4] add showControl and playMode properties of MovieObject's
-
- qt4/src/poppler-movie.cc | 14 ++++++++++++++
- qt4/src/poppler-qt4.h | 20 ++++++++++++++++++++
- 2 files changed, 34 insertions(+), 0 deletions(-)
-
-commit c444c652859b6e52160e5571e84f8eb1292d65f1
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Aug 24 18:47:58 2008 +0200
-
- [Qt4] make the MovieObject ctor private, with only Page able to use it
-
- qt4/src/poppler-qt4.h | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-commit 6d6913a79779769ce0fe2f0b516a90a50e51b947
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 24 18:45:45 2008 +0200
-
- fix Jeff's entry
-
- poppler/DCTStream.cc | 2 +-
- poppler/DCTStream.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 25bd5967f9f550a32e20eea91cd00cbeff98249e
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Aug 24 18:45:25 2008 +0200
-
- [Qt4] initialize the MovieObject from an AnnotMovie
-
- the annotation has all the data we need, so just init from that
-
- qt4/src/poppler-movie.cc | 8 ++++----
- qt4/src/poppler-page.cc | 4 +---
- qt4/src/poppler-qt4.h | 4 ++--
- 3 files changed, 7 insertions(+), 9 deletions(-)
-
-commit 47f54ad4de111f62a5b8c25520ef6b2bca6026d2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 24 18:18:13 2008 +0200
-
- Add more correct copyright statements on fofi, goo, poppler and util directories to be more compliant with GPL that requires such modification statements to be present. Meanwhile i did that, i did qt and qt4 dirs too, glib is missing if someone wants to fix it, but it's not crucial as it's not a fork of some other GPL software
-
- AUTHORS | 4 +++-
- fofi/FoFiBase.cc | 11 +++++++++++
- fofi/FoFiTrueType.cc | 14 ++++++++++++++
- fofi/FoFiTrueType.h | 12 ++++++++++++
- fofi/FoFiType1.cc | 12 ++++++++++++
- fofi/FoFiType1C.h | 11 +++++++++++
- goo/GooString.cc | 13 +++++++++++++
- goo/GooString.h | 12 ++++++++++++
- goo/GooTimer.cc | 3 +++
- goo/GooTimer.h | 8 ++++++--
- goo/GooVector.h | 12 ++++++++++++
- goo/gfile.cc | 13 +++++++++++++
- goo/gfile.h | 11 +++++++++++
- goo/gmem.cc | 13 +++++++++++++
- goo/gmem.h | 13 +++++++++++++
- poppler/ABWOutputDev.cc | 3 ++-
- poppler/ABWOutputDev.h | 2 +-
- poppler/Annot.cc | 19 +++++++++++++++++++
- poppler/Annot.h | 17 +++++++++++++++++
- poppler/Array.cc | 11 +++++++++++
- poppler/Array.h | 11 +++++++++++
- poppler/ArthurOutputDev.cc | 14 +++++++++++++-
- poppler/ArthurOutputDev.h | 13 ++++++++++++-
- poppler/CMap.cc | 12 ++++++++++++
- poppler/CMap.h | 11 +++++++++++
- poppler/CairoFontEngine.cc | 17 +++++++++++++++++
- poppler/CairoFontEngine.h | 17 +++++++++++++++++
- poppler/CairoOutputDev.cc | 19 +++++++++++++++++++
- poppler/CairoOutputDev.h | 16 ++++++++++++++++
- poppler/Catalog.cc | 19 +++++++++++++++++++
- poppler/Catalog.h | 16 ++++++++++++++++
- poppler/CharCodeToUnicode.cc | 14 ++++++++++++++
- poppler/CharCodeToUnicode.h | 13 +++++++++++++
- poppler/DCTStream.cc | 5 ++++-
- poppler/DCTStream.h | 6 +++++-
- poppler/Decrypt.cc | 12 ++++++++++++
- poppler/Decrypt.h | 11 +++++++++++
- poppler/Dict.cc | 13 +++++++++++++
- poppler/Dict.h | 13 +++++++++++++
- poppler/Error.cc | 13 +++++++++++++
- poppler/Error.h | 13 +++++++++++++
- poppler/FlateStream.cc | 2 ++
- poppler/FlateStream.h | 2 ++
- poppler/FontInfo.cc | 22 ++++++++++++++++++++++
- poppler/FontInfo.h | 21 +++++++++++++++++++++
- poppler/Form.cc | 10 +++++++++-
- poppler/Form.h | 6 +++++-
- poppler/Function.cc | 12 ++++++++++++
- poppler/Gfx.cc | 23 +++++++++++++++++++++++
- poppler/Gfx.h | 13 +++++++++++++
- poppler/GfxFont.cc | 19 +++++++++++++++++++
- poppler/GfxFont.h | 16 ++++++++++++++++
- poppler/GfxState.cc | 14 ++++++++++++++
- poppler/GfxState.h | 13 +++++++++++++
- poppler/GlobalParams.cc | 19 +++++++++++++++++++
- poppler/GlobalParams.h | 15 +++++++++++++++
- poppler/JBIG2Stream.cc | 13 +++++++++++++
- poppler/JPXStream.cc | 11 +++++++++++
- poppler/Lexer.cc | 12 ++++++++++++
- poppler/Lexer.h | 12 ++++++++++++
- poppler/Link.cc | 14 ++++++++++++++
- poppler/Link.h | 12 ++++++++++++
- poppler/Movie.cc | 17 ++++++++++++++++-
- poppler/Object.cc | 11 +++++++++++
- poppler/Object.h | 12 ++++++++++++
- poppler/OptionalContent.cc | 5 ++++-
- poppler/Outline.cc | 11 +++++++++++
- poppler/Outline.h | 11 +++++++++++
- poppler/OutputDev.cc | 13 +++++++++++++
- poppler/OutputDev.h | 14 ++++++++++++++
- poppler/PDFDoc.cc | 15 +++++++++++++++
- poppler/PDFDoc.h | 15 +++++++++++++++
- poppler/PDFDocEncoding.cc | 13 ++++++++++++-
- poppler/PDFDocEncoding.h | 11 +++++++++++
- poppler/PSOutputDev.cc | 15 +++++++++++++++
- poppler/PSOutputDev.h | 14 ++++++++++++++
- poppler/PSTokenizer.cc | 12 ++++++++++++
- poppler/PSTokenizer.h | 11 +++++++++++
- poppler/Page.cc | 20 ++++++++++++++++++++
- poppler/Page.h | 16 ++++++++++++++++
- poppler/PageLabelInfo.cc | 12 ++++++++++++
- poppler/PageLabelInfo.h | 12 ++++++++++++
- poppler/PageTransition.h | 18 ++++++++++++++++++
- poppler/Parser.cc | 12 ++++++++++++
- poppler/Parser.h | 11 +++++++++++
- poppler/SplashOutputDev.cc | 16 ++++++++++++++++
- poppler/SplashOutputDev.h | 11 +++++++++++
- poppler/Stream-CCITT.h | 11 +++++++++++
- poppler/Stream.cc | 14 ++++++++++++++
- poppler/Stream.h | 13 +++++++++++++
- poppler/TextOutputDev.cc | 18 ++++++++++++++++++
- poppler/TextOutputDev.h | 15 +++++++++++++++
- poppler/UTF8.h | 11 +++++++++++
- poppler/UnicodeTypeTable.cc | 13 +++++++++++++
- poppler/UnicodeTypeTable.h | 11 +++++++++++
- poppler/XRef.cc | 17 ++++++++++++++++-
- poppler/XRef.h | 14 ++++++++++++++
- qt/poppler-document.cc | 3 +++
- qt/poppler-fontinfo.cc | 3 +--
- qt/poppler-page.cc | 7 ++++++-
- qt/poppler-private.h | 4 ++++
- qt/poppler-qt.h | 5 ++++-
- qt4/src/poppler-annotation-helper.h | 1 +
- qt4/src/poppler-annotation.cc | 3 ++-
- qt4/src/poppler-annotation.h | 4 +++-
- qt4/src/poppler-document.cc | 4 +++-
- qt4/src/poppler-embeddedfile.cc | 1 +
- qt4/src/poppler-fontinfo.cc | 5 ++++-
- qt4/src/poppler-form.cc | 2 +-
- qt4/src/poppler-form.h | 2 +-
- qt4/src/poppler-link-extractor-private.h | 2 +-
- qt4/src/poppler-link-extractor.cc | 2 +-
- qt4/src/poppler-link.cc | 3 ++-
- qt4/src/poppler-link.h | 1 +
- qt4/src/poppler-optcontent-private.h | 1 +
- qt4/src/poppler-optcontent.cc | 1 +
- qt4/src/poppler-optcontent.h | 1 +
- qt4/src/poppler-page-private.h | 2 ++
- qt4/src/poppler-page.cc | 4 ++++
- qt4/src/poppler-private.h | 4 +++-
- qt4/src/poppler-ps-converter.cc | 1 +
- qt4/src/poppler-qt4.h | 5 ++++-
- qt4/src/poppler-textbox.cc | 2 ++
- splash/Splash.cc | 12 ++++++++++++
- splash/Splash.h | 12 ++++++++++++
- splash/SplashBitmap.cc | 12 ++++++++++++
- splash/SplashBitmap.h | 11 +++++++++++
- splash/SplashErrorCodes.h | 11 +++++++++++
- splash/SplashFTFont.cc | 12 ++++++++++++
- splash/SplashFTFont.h | 11 +++++++++++
- splash/SplashFTFontEngine.cc | 11 +++++++++++
- splash/SplashFTFontEngine.h | 11 +++++++++++
- splash/SplashFTFontFile.cc | 11 +++++++++++
- splash/SplashFTFontFile.h | 11 +++++++++++
- splash/SplashFont.cc | 11 +++++++++++
- splash/SplashFont.h | 11 +++++++++++
- splash/SplashFontEngine.cc | 11 +++++++++++
- splash/SplashFontEngine.h | 11 +++++++++++
- splash/SplashFontFile.cc | 12 ++++++++++++
- splash/SplashFontFile.h | 12 ++++++++++++
- splash/SplashT1Font.cc | 11 +++++++++++
- splash/SplashT1Font.h | 11 +++++++++++
- splash/SplashT1FontEngine.cc | 11 +++++++++++
- splash/SplashT1FontFile.cc | 11 +++++++++++
- splash/SplashT1FontFile.h | 11 +++++++++++
- splash/SplashTypes.h | 11 +++++++++++
- splash/SplashXPathScanner.cc | 11 +++++++++++
- utils/HtmlFonts.cc | 24 ++++++++++++++++++++++++
- utils/HtmlFonts.h | 12 ++++++++++++
- utils/HtmlLinks.cc | 23 +++++++++++++++++++++++
- utils/HtmlLinks.h | 12 ++++++++++++
- utils/HtmlOutputDev.cc | 13 +++++++++++++
- utils/HtmlOutputDev.h | 11 +++++++++++
- utils/ImageOutputDev.cc | 13 +++++++++++++
- utils/ImageOutputDev.h | 12 ++++++++++++
- utils/parseargs.c | 13 +++++++++++++
- utils/parseargs.h | 11 +++++++++++
- utils/pdffonts.cc | 12 ++++++++++++
- utils/pdfimages.cc | 11 +++++++++++
- utils/pdfinfo.cc | 12 ++++++++++++
- utils/pdftoabw.cc | 26 +++++++++++++++++++-------
- utils/pdftohtml.cc | 11 +++++++++++
- utils/pdftoppm.cc | 11 +++++++++++
- utils/pdftops.cc | 12 ++++++++++++
- utils/pdftotext.cc | 12 ++++++++++++
- 165 files changed, 1795 insertions(+), 37 deletions(-)
-
-commit 0dfbb8996ee91aa044eb2bdf2859ef64005116f8
-Author: Loïc Minier <lool@dooz.org>
-Date: Wed Aug 20 22:10:07 2008 +0200
-
- Fixes escaping of hyphens in man pages
-
- utils/pdfinfo.1 | 2 +-
- utils/pdftops.1 | 16 ++++++++--------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-commit 6cfa0e598a81460e5d0a7d60d8584366d2a70165
-Author: Loïc Minier <lool@dooz.org>
-Date: Wed Aug 20 19:57:42 2008 +0200
-
- Fix synopsis of pdftops in man page to clarify that a PDF file is required in all cases
-
- utils/pdftops.1 | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 48a73cc709a8bed9d2d0f9cbd2a9d2b6c0dad05b
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 23 19:26:01 2008 +0200
-
- [Qt4] convert the title of movie annotations
-
- qt4/src/poppler-page.cc | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 419ec15ac825f2e0052b411462f00ac57fed030e
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 23 19:25:04 2008 +0200
-
- [Qt4] get/set the title for movie annotations
-
- qt4/src/poppler-annotation.cc | 13 +++++++++++++
- qt4/src/poppler-annotation.h | 3 +++
- 2 files changed, 16 insertions(+), 0 deletions(-)
-
-commit 63bcaf113fcb5a4a9e5c120df2c3dafb2977c90a
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 23 01:58:30 2008 +0200
-
- [Qt4] convert the movie annotation from the core type to the Qt4 one
-
- qt4/src/poppler-page.cc | 18 +++++++++++++++---
- 1 files changed, 15 insertions(+), 3 deletions(-)
-
-commit 5cc490de74af12726bdeb9b5a6a0f0d1d79383b5
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 23 01:55:41 2008 +0200
-
- [Qt4] first version of a MovieAnnotation
-
- right mow it just holds the movie object
-
- qt4/src/poppler-annotation.cc | 74 +++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-annotation.h | 26 ++++++++++++++-
- 2 files changed, 99 insertions(+), 1 deletions(-)
-
-commit 3d5c2e22d790d7c139e1cd28aebb21cfe76b8b6b
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 23 01:54:30 2008 +0200
-
- compile the new poppler-movie.cc
-
- qt4/src/CMakeLists.txt | 1 +
- qt4/src/Makefile.am | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 599698a9b133999f1f0bb0548489111e9d7b6f05
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 23 01:52:58 2008 +0200
-
- [Qt4] first version of a MovieObject object for movies
-
- slightly differs from the version in core
-
- qt4/src/poppler-movie.cc | 73 ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 34 +++++++++++++++++++++
- 2 files changed, 107 insertions(+), 0 deletions(-)
-
-commit 820f15009845870701e1f4e7f4fc4fb93312ab3e
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 23 01:45:07 2008 +0200
-
- fix Movie::copy()
-
- the default copy ctor already does the vertbatim copies, so no need to
- do them on our own; what needs to be done is checking whether an object
- is valid before either doing a "smart copy" or "postprocessing" it
-
- poppler/Movie.cc | 14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
-
-commit c3a006ae35250e9a5638c2ce713b7470380751c7
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Aug 23 01:04:34 2008 +0200
-
- compile attachments.c in the demo with cmake as well
-
- glib/demo/CMakeLists.txt | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit b5a7987a50b3d28fbfa219e2cef85b9e53aaf079
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Aug 21 20:40:18 2008 +0200
-
- [glib-demo] Fix attachments demo with documents that don't contain attachments
-
- glib/demo/attachments.c | 27 ++++++++++++++++++++-------
- 1 files changed, 20 insertions(+), 7 deletions(-)
-
-commit a2b0aefedbdb20ce0ef8398a700202021fcf00db
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Aug 21 20:14:50 2008 +0200
-
- [glib-demo] Fix typo
-
- glib/demo/attachments.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 9e563d6d877624b1caf82ac30c5ae30a1eb48f21
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Aug 21 20:12:33 2008 +0200
-
- [glib-demo] Add checksum validation to attachments demo
-
- glib/demo/attachments.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 101 insertions(+), 0 deletions(-)
-
-commit e233325e6f13d8b232bf68a2812fe755e7fccd4d
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Aug 21 19:03:32 2008 +0200
-
- [glib-demo] Add demo for attachments
-
- glib/demo/Makefile.am | 2 +
- glib/demo/attachments.c | 242 +++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/attachments.h | 31 ++++++
- glib/demo/main.c | 4 +-
- glib/demo/utils.c | 23 +++++
- glib/demo/utils.h | 1 +
- 6 files changed, 302 insertions(+), 1 deletions(-)
-
-commit 0e2efa0fce5bf059ce85d3e3bec2293b405ec3c9
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Aug 21 19:02:24 2008 +0200
-
- [glib] Make sure name and descripction are valid utf8 strings
-
- glib/poppler-attachment.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 15a73704ab6b009ca5e07c08f0b12d970adc387d
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue Aug 19 09:18:03 2008 +0100
-
- Memleak and invalid free.
-
- CairoOutputDev::setSoftMask() fails to free the cairo_t and mask it uses
- to draw the opaque soft mask and attempts to destroy a reference to a
- surface it does not own (this bug was masked by the fact that a reference
- was still being held by the unfreed cairo_t).
-
- poppler/CairoOutputDev.cc | 11 ++++++++---
- 1 files changed, 8 insertions(+), 3 deletions(-)
-
-commit d3110e392097db54e9ee59300213e490dee39126
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Aug 19 19:19:09 2008 +0200
-
- Fix include so it can be used in the unsupported way of installing internal poppler/ headers
-
- Notified by Caolan McNamara <caolanm@redhat.com>
-
- poppler/PreScanOutputDev.h | 2 +-
- poppler/SecurityHandler.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 303249e5548bfbf6823e97850e498970d802b4a0
-Author: Albert Astals Cid <tsdgeos@samsung.localdomain>
-Date: Fri Aug 15 01:52:52 2008 +0200
-
- Revert 123a87aff2e35b10efe6a1d715585b427e4a9afa it creates problems with some pdf files
-
- poppler/Gfx.cc | 14 ++------------
- poppler/Gfx.h | 3 ---
- 2 files changed, 2 insertions(+), 15 deletions(-)
-
-commit 27ddf3c5e839358c8553d41743faa8ee304767bf
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Aug 13 13:55:57 2008 +0200
-
- [Qt4] make sure to use the correct page width/height for form widgets coordinates
-
- qt4/src/poppler-form.cc | 12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
-
-commit 2e7b0eb4af8cf5938833e5659d01b77096e7b7f7
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Aug 12 13:49:52 2008 +0200
-
- [Qt4] add a method to get the activation action of a FormField
-
- qt4/src/poppler-form.cc | 19 +++++++++++++++++++
- qt4/src/poppler-form.h | 8 ++++++++
- 2 files changed, 27 insertions(+), 0 deletions(-)
-
-commit f9e679adbd6830da26eb9909bcb16e3bdf0da6b4
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Aug 12 13:47:15 2008 +0200
-
- create a static version of PageData::convertLinkActionToLink()
-
- qt4/src/poppler-page-private.h | 2 ++
- qt4/src/poppler-page.cc | 5 +++++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-commit a6ecc864ea3e94d7232cff6a2e8f49919d8f24ff
-Author: Albert Astals Cid <tsdgeos@samsung.localdomain>
-Date: Tue Aug 12 01:23:21 2008 +0200
-
- initialize widget, fixes crash on EC2006.pdf
-
- poppler/Annot.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 123a87aff2e35b10efe6a1d715585b427e4a9afa
-Author: Albert Astals Cid <tsdgeos@samsung.localdomain>
-Date: Tue Aug 12 00:37:09 2008 +0200
-
- Cache the last created GfxResource, very useful because some pdf created by pstopdf push and pop the same GfxResource all the time
-
- This brings us a speedup of 16 times (from 11 seconds to about 600 msec) in kde bug 168663
-
- poppler/Gfx.cc | 14 ++++++++++++--
- poppler/Gfx.h | 3 +++
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-commit 5ad1a12183f4b8e328f32386a74b5616e7e59070
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 4 20:34:42 2008 +0200
-
- Be less strict when parsing TTF tables
-
- With this change and freetype from CVS i can render Bug 16940 using the splash renderer
-
- fofi/FoFiTrueType.cc | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-commit d322720428fa416b7d5f23acc72d1d4b4f74d041
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 4 20:16:50 2008 +0200
-
- Report an error when FoFiTrueType::load or FoFiTrueType::make fail
-
- poppler/SplashOutputDev.cc | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 901ebc84ff7c0872c3f9f5e6eaf418ba6400fa10
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Aug 3 10:54:09 2008 +0200
-
- [Qt4] Make the paper color setting working as it should.
-
- A BGR colorspace means that colors should be set as blue,green,red, and
- not red,green,blue.
-
- qt4/src/poppler-private.h | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 66b34c78943be598778a3ef438b0cefac668c6a2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 2 13:54:34 2008 +0200
-
- This should not be here, breaks jpeg rendering when not using libjpeg
-
- That was included erroneously when the file writing code was added
-
- poppler/Stream.cc | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit fd8d71ea8b12393201ece9c09372fd69c7573025
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 1 23:47:51 2008 +0200
-
- These defines are unneeded too
-
- msvc/poppler/poppler-config.h | 30 ------------------------------
- poppler-config.h.cmake | 30 ------------------------------
- poppler/poppler-config.h.in | 30 ------------------------------
- 3 files changed, 0 insertions(+), 90 deletions(-)
-
-commit 391b5d5cdd9f63fe90229f88cdad628fb63c0206
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 1 23:36:09 2008 +0200
-
- Get rid of more defines, say our version on command line tools, also say our copyright
-
- Did not modify PSOutputDev.cc output as PS is too fragile
-
- msvc/poppler/poppler-config.h | 9 +--------
- poppler-config.h.cmake | 9 +--------
- poppler/PSOutputDev.cc | 2 +-
- poppler/poppler-config.h.in | 9 +--------
- utils/pdffonts.cc | 3 ++-
- utils/pdfimages.cc | 3 ++-
- utils/pdfinfo.cc | 3 ++-
- utils/pdftohtml.cc | 3 ++-
- utils/pdftoppm.cc | 3 ++-
- utils/pdftops.cc | 3 ++-
- utils/pdftotext.cc | 3 ++-
- 11 files changed, 18 insertions(+), 32 deletions(-)
-
-commit d14fb1513be045363f7edec21cee04fd4937ede2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 1 23:14:28 2008 +0200
-
- Add GooList *getEncodingNames();
-
- Forgot to commit this earlier :-(
-
- poppler/GlobalParams.cc | 19 +++++++++++++++++++
- poppler/GlobalParams.h | 2 ++
- 2 files changed, 21 insertions(+), 0 deletions(-)
-
-commit 9fd34443d765ccd61864d18bceadc049d905b957
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 1 23:09:39 2008 +0200
-
- remove defines we don't use at all
-
- msvc/poppler/poppler-config.h | 4 ----
- poppler-config.h.cmake | 4 ----
- poppler/poppler-config.h.in | 4 ----
- 3 files changed, 0 insertions(+), 12 deletions(-)
-
-commit 0f13013dc3079915572b6b002dac8d01d2dbde04
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 1 23:06:50 2008 +0200
-
- xpdfrc has been dead for a while
-
- msvc/poppler/poppler-config.h | 25 -------------------------
- poppler-config.h.cmake | 25 -------------------------
- poppler/poppler-config.h.in | 25 -------------------------
- 3 files changed, 0 insertions(+), 75 deletions(-)
-
-commit 96392667d1331d2f8750f27c116e34bbf9282dca
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 1 22:20:55 2008 +0200
-
- Provide a default constructor for FontInfo so you can use it as metatype for qvariant
-
- qt4/src/poppler-fontinfo.cc | 5 +++++
- qt4/src/poppler-private.h | 7 +++++++
- qt4/src/poppler-qt4.h | 5 +++++
- 3 files changed, 17 insertions(+), 0 deletions(-)
-
-commit 9fd1077e63d97a316380b8df4821bf4c9434fb52
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 1 17:47:51 2008 +0200
-
- Build with cmake too
-
- utils/CMakeLists.txt | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit d8d6a3f46620d45c279b7ca1a4a2fa3a36285cde
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 1 17:44:07 2008 +0200
-
- Improve manpages and add -listenc to pdfinfo and pdftotext in the way
-
- Our manpages listed things like xpdfrc and -cfg options we don't support at all.
- Also some options were missing from the man pages
- Finally there was the -enc option you completely had to guess which string to pass,
- so i've added the -listenc option to get the user the list of encodings he can use
-
- utils/Makefile.am | 2 ++
- utils/pdffonts.1 | 18 ------------------
- utils/pdfimages.1 | 14 --------------
- utils/pdfinfo.1 | 28 ++++------------------------
- utils/pdfinfo.cc | 16 ++++++++++++++--
- utils/pdftoppm.1 | 42 +++++++++++++++++++++---------------------
- utils/pdftops.1 | 41 +++--------------------------------------
- utils/pdftotext.1 | 32 ++++----------------------------
- utils/pdftotext.cc | 16 ++++++++++++++--
- utils/printencodings.cc | 34 ++++++++++++++++++++++++++++++++++
- utils/printencodings.h | 24 ++++++++++++++++++++++++
- 11 files changed, 120 insertions(+), 147 deletions(-)
-
-commit f5b0ca794b0879e3d239bf1d6138b15ead27d9ca
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Tue Jul 29 20:18:33 2008 +0930
-
- Fix ActualText string length check in TextOutputDev.cc
-
- poppler/TextOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 21bbdc9d663995336900f1ce97cf294f04464e01
-Author: Boris Toloknov <tlknv@yandex.ru>
-Date: Mon Jul 28 21:02:07 2008 +0200
-
- make xml output valid xml
-
- utils/HtmlLinks.cc | 33 +++++++++++++++++-
- utils/HtmlOutputDev.cc | 85 ++++++++++++++++++++++++++++++-----------------
- 2 files changed, 85 insertions(+), 33 deletions(-)
-
-commit dccfc4c2910b47a77cd7b6019d9365f1684ffd0c
-Author: Boris Toloknov <tlknv@yandex.ru>
-Date: Mon Jul 28 20:58:13 2008 +0200
-
- Limit ascent and descent are to reasonable values.
-
- See bug 16592 to cases where this helps
-
- utils/HtmlOutputDev.cc | 14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
-commit 0fd5a3db1ddad447d44b64eff9abfb077a7853a0
-Author: Boris Toloknov <tlknv@yandex.ru>
-Date: Mon Jul 28 20:52:19 2008 +0200
-
- Make html output to keep all the spaces with &nbsp;
-
- utils/HtmlFonts.cc | 2 ++
- utils/HtmlOutputDev.cc | 2 +-
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-commit 650c73fa0f570f699d907e33060fb23290940b42
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jul 28 20:44:13 2008 +0200
-
- findDest crashes on null goostrings so rework the ifs a bit
-
- utils/HtmlOutputDev.cc | 16 +++++++++-------
- 1 files changed, 9 insertions(+), 7 deletions(-)
-
-commit adee9c0e9e8b2de20309b3ae6eb8e6d6ed05cf85
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jul 26 00:04:03 2008 +0200
-
- We are not storing the ctu, so decref and leak-- :-)
-
- poppler/Annot.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit e7b3e3ae3080bd6f239f7d96761729ad30b075ae
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 25 23:52:28 2008 +0200
-
- Fix leak
-
- qt4/src/poppler-form.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 006b974d4faae53e6bd51a4281dd923ab1c2d4e8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 25 23:15:11 2008 +0200
-
- Fix memory leak
-
- poppler/Annot.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 3a549d75acceedfa25dcf79074d0cdfb643c746e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 25 23:08:21 2008 +0200
-
- Free the previous modified object in case it exists
-
- poppler/XRef.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 040d244b97a554342061c777a286e99dbb9acabd
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 25 21:31:55 2008 +0200
-
- Need this or otherwise it crashes on complete overwrite
-
- poppler/PDFDoc.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 11ebceeef938a7e6fa9b5437e65b5b4b822f3018
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 25 21:30:24 2008 +0200
-
- Fix my last fix about saving, i think this is the correct one
-
- - One incremental update only write the modified entries xref, not all
- - Update gen to 0 when resizing entries
- - On XRef::add correctly initialize all newly allocated entries
-
- poppler/PDFDoc.cc | 4 +-
- poppler/XRef.cc | 57 ++++++++++++++++++++++++++++++++++++++++++----------
- poppler/XRef.h | 2 +-
- 3 files changed, 49 insertions(+), 14 deletions(-)
-
-commit 03d445f485f90972ab1c05d79b2999b763ab7377
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 25 20:16:54 2008 +0200
-
- Fix XRef::writeToFile after my change
-
- poppler/XRef.cc | 10 +++-------
- 1 files changed, 3 insertions(+), 7 deletions(-)
-
-commit 136fa97576f2df0d7a7563b34651ca222927ea57
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 25 20:12:51 2008 +0200
-
- Fix XRef::add and XRef::addIndirectObject, also remove num from XRefEntry
-
- Previous code was under some incorrect assumptions:
- * our XRef does not maintain the free link list so if you want to
- find a free entry you have to go though all of them
- * our XRefEntry does not need a num because the index itself is the num
-
- Conflicts:
-
- poppler/XRef.cc
-
- poppler/XRef.cc | 70 +++++++++++++++++++-----------------------------------
- poppler/XRef.h | 1 -
- 2 files changed, 25 insertions(+), 46 deletions(-)
-
-commit 55572b77da95c47393b78f3aff804ea9c5ae17e5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 22 22:50:00 2008 +0200
-
- Really do what the comment says and also init changeLeft, changeTop and changeZoom
-
- poppler/Link.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 8dc7afaeea08183de331ecfd41ce1971e7772fd0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 22 21:05:03 2008 +0200
-
- Some documents have loops in XObject dictionaries, make sure we don't get in an infinite loop while traversing them
-
- Fixes infinite loop on http://bugs.kde.org/show_bug.cgi?id=166145
-
- poppler/FontInfo.cc | 44 ++++++++++++++++++++++++++++++++++++--------
- poppler/FontInfo.h | 4 ++++
- 2 files changed, 40 insertions(+), 8 deletions(-)
-
-commit 9fb17c952dcff798e45280eeb9c718680147e766
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 20 13:47:11 2008 +0200
-
- Fix condition, we want thumb to be a Stream, not to be non null
-
- Fixes bug 16579
-
- glib/poppler-page.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 3696025977fd345b12767f75a2de6ed7e9467365
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Jul 18 23:32:25 2008 +0200
-
- initialize pageWidgets, otherwise it can be a rubbish pointer is Annots
- is not a valid object
-
- poppler/Page.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 0189ff8b86de18486f7397076f7a0fbf133a1a33
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 1 20:16:50 2008 +0200
-
- Fix condition, we want fetched_thumb to be a Stream, not to be non null
-
- Fixes bug 16579
-
- poppler/Page.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 5bd77dcdd5220d63934f4b3e78d85a936947a53d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 1 00:49:01 2008 +0200
-
- forgot about we use autofoo too
-
- qt4/tests/Makefile.am | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 5ed2503003d973b5461594af15485af49591451d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 1 00:43:26 2008 +0200
-
- unittesting about ActualText
-
- qt4/tests/CMakeLists.txt | 1 +
- qt4/tests/check_actualtext.cpp | 33 +++++++++++++++++++++++++++++++++
- 2 files changed, 34 insertions(+), 0 deletions(-)
-
-commit f3bb2eb556f5248242f6db85052ef045fcb697c6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 1 00:41:35 2008 +0200
-
- Unbreak ActualText extraction
-
- poppler/Gfx.cc | 10 +---------
- 1 files changed, 1 insertions(+), 9 deletions(-)
-
-commit 9e9543b105b39f8b0048c00fc94741e43ad615e9
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Jun 26 20:19:06 2008 +0200
-
- use FindPackageHandleStandardArgs
-
- cmake/modules/FindLIBOPENJPEG.cmake | 11 ++---------
- 1 files changed, 2 insertions(+), 9 deletions(-)
-
-commit fec41ceddebe194f139bcc5b2f3fa74e7d1ae502
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Jun 26 20:18:27 2008 +0200
-
- need to use LIBOPENJPEG_FOUND, as it really represents whether
- libopenjpeg was found or not
-
- CMakeLists.txt | 18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-commit 5498d93e59a0b79e5add3dc6181d5e98ba689217
-Author: Michael Vrable <mvrable@cs.ucsd.edu>
-Date: Fri Jun 20 21:42:34 2008 -0700
-
- Use a single global FT_Library in CairoOutputDev
-
- Cairo may internally keep references to the FreeType fonts loaded in
- CairoFontEngine even after poppler is done with them. Commit 42db4890e829
- ("Do not call FT_Done_Face on a live cairo_font_face_t") introduced a fix
- for one use-after-free bug, by delaying deleting an FT_Face objects until
- cairo is done with it.
-
- That fix doesn't correct all the bugs. An FT_Library object is created for
- each CairoOutputDev object, and deleted when the CairoOutputDev goes away.
- But the FT_Library object should not be deleted while fonts loaded using it
- are still in use. And cairo can keep references to fonts around more or
- less indefinitely.
-
- To more fully fix the problem, we can either:
- 1. Keep a count of not-yet-deleted fonts associated with each FT_Library,
- and wait to call FT_Done_FreeType until it drops to zero.
- 2. Never call FT_Done_FreeType.
-
- The second option is the simplest. To avoid leaking memory FT_Library
- objects, use a single global FT_Library instead of a per-CairoOutputDev
- copy.
-
- poppler/CairoOutputDev.cc | 18 +++++++++++++++---
- poppler/CairoOutputDev.h | 4 +++-
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-commit c75632d62a052d3c3739b96f5586f97c68baf25b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jun 24 02:31:43 2008 +0200
-
- Open in WriteOnly mode, fixes the fact that when writing to an existing file, the contents beyond what we wrote were still there
-
- qt4/src/poppler-base-converter.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 9810fdfc54aac80aa99561a9d820d11b062e4637
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jun 24 02:12:21 2008 +0200
-
- the entry is not updated here either, fix uninitialized variable use
-
- poppler/XRef.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 2da15db4751d3cb93d40b48e348dbc51f6e7a29f
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jun 20 11:39:08 2008 +0200
-
- Do not create an OCGs object if there isn't an OCProperties dictionary in the Catalog
-
- poppler/Catalog.cc | 5 +++--
- poppler/Gfx.cc | 12 +++++++++++-
- poppler/OptionalContent.cc | 25 +++++--------------------
- 3 files changed, 19 insertions(+), 23 deletions(-)
-
-commit d6fb5dcb7b7596961800d9744d17b6adb8d9a2ad
-Author: Michael Vrable <mvrable@cs.ucsd.edu>
-Date: Wed Jun 18 11:24:05 2008 -0700
-
- Fix a crash in the cairo backend with Type 3 glyphs
-
- Commit 86b7e8a3bee7 ("Ensure cairo renders Type 3 glyphs with only the fill
- color") introduced a bug into the Cairo backend, causing evince to crash
- with the message
- evince: cairo-pattern.c:679: cairo_pattern_destroy: Assertion
- `((*&(&pattern->ref_count)->ref_count) > 0)' failed.
- Fix this by updating reference counts to the fill and stroke patterns when
- modifying them in beginType3Char.
-
- Simplify the code as well by not saving the old stroke pattern before
- overriding it; this is already done since beginType3Char/endType3Char is
- wrapped by calls to saveState/restoreState in Gfx::doShowText.
-
- poppler/CairoOutputDev.cc | 4 ++--
- poppler/CairoOutputDev.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-commit c3a00c83f1d24c1f88e7ed3b3f772460e578f3cc
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Jun 15 02:39:31 2008 +0200
-
- poppler-page-transition.h is here now
-
- qt4/src/Doxyfile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 2affed0fc97b958ae46f531c471a3cf0b04c0f55
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jun 14 01:24:49 2008 +0200
-
- Give warnings if the build configuration for stream decoders is different from default one
-
- configure.ac | 20 +++++++++++++++++---
- 1 files changed, 17 insertions(+), 3 deletions(-)
-
-commit 8e74bc612cb4102891324ffdbfcdb47293ecb95e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jun 14 01:13:53 2008 +0200
-
- Warn the user if he does not have any enabled rendering backend
-
- configure.ac | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 99d2361032cbaafd69bd796170757ed6482f208d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jun 14 00:53:38 2008 +0200
-
- Add a JPEG2000 decoder based on OpenJPEG
-
- Enabled by default since it's generally better than xpdf one
- See http://lists.freedesktop.org/archives/poppler/2008-June/003874.html for more information
-
- CMakeLists.txt | 30 ++++++-
- cmake/modules/FindLIBOPENJPEG.cmake | 44 +++++++++
- configure.ac | 33 +++++++
- poppler/JPEG2000Stream.cc | 181 +++++++++++++++++++++++++++++++++++
- poppler/JPEG2000Stream.h | 48 +++++++++
- poppler/Makefile.am | 22 ++++-
- poppler/Stream.cc | 7 +-
- 7 files changed, 360 insertions(+), 5 deletions(-)
-
-commit e368838d7f9691c7b1adf7d7f62f65abed91eea7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 11 00:48:53 2008 +0200
-
- [Qt4] Add the possibility of getting a QByteArray with the data of an embedded font
-
- qt4/src/poppler-document.cc | 23 +++++++++++++++++++++++
- qt4/src/poppler-private.h | 3 +++
- qt4/src/poppler-qt4.h | 5 +++++
- 3 files changed, 31 insertions(+), 0 deletions(-)
-
-commit 184292ffb8fef5aa5a72bdbfcc0c95b663f452bd
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jun 10 23:00:11 2008 +0200
-
- Make the fontRef and the embRef accessible to FontInfo users
-
- poppler/FontInfo.cc | 2 +-
- poppler/FontInfo.h | 3 +++
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-commit 86b7e8a3bee74c5b89c451137cf9c2758ba6913f
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Jun 8 18:00:05 2008 +0930
-
- Ensure cairo renders Type 3 glyphs with only the fill color
-
- poppler/CairoOutputDev.cc | 3 +++
- poppler/CairoOutputDev.h | 2 +-
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-commit 99e2d95728f41c91ab59a01c62d82b19a7a2e083
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Jun 1 00:49:32 2008 +0930
-
- glib: save/restore cairo state when rendering a page
-
- glib/poppler-page.cc | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 6f40ee4af6b59f9d2c326adc8d2574e45f4d4d29
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 8 23:46:04 2008 +0200
-
- Make sure we use Qt4 moc to generate moc files of the qt4 frontend
-
- configure.ac | 20 ++++++++++++++++++++
- qt4/demos/Makefile.am | 2 +-
- qt4/src/Makefile.am | 2 +-
- qt4/tests/Makefile.am | 2 +-
- 4 files changed, 23 insertions(+), 3 deletions(-)
-
-commit 86aa8fc0708f7da4a907a8bdb1845e53d29892b7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jun 5 19:21:08 2008 +0200
-
- Fix leak on ABWOutputDev.cc
-
- poppler/ABWOutputDev.cc | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 979ef1cafa968d776a2b804ce555b11212212397
-Author: Koji Otani <sho@bbr.jp>
-Date: Tue Jun 3 21:07:15 2008 +0200
-
- Support for surrogates outside the BMP plane
-
- poppler/TextOutputDev.cc | 19 ++++++++++++++++++-
- poppler/UTF8.h | 14 ++++++++++++++
- 2 files changed, 32 insertions(+), 1 deletions(-)
-
-commit 1614ab3036cf25c9b94967163996678d386ce0ac
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 1 16:32:55 2008 +0200
-
- Do not limit CharCodeToUnicodeString to 8 characters
-
- poppler/Annot.cc | 10 ++++----
- poppler/CharCodeToUnicode.cc | 37 ++++++++++++++++++++---------------
- poppler/CharCodeToUnicode.h | 2 +-
- poppler/Gfx.cc | 8 +++---
- poppler/GfxFont.cc | 43 +++++++++++++++++++++++------------------
- poppler/GfxFont.h | 6 ++--
- poppler/PSOutputDev.cc | 4 +-
- 7 files changed, 60 insertions(+), 50 deletions(-)
-
-commit bf95c6970dacaa62512de858cf60ff6cf0c1bf7c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 1 00:07:11 2008 +0200
-
- [Qt] Fix leak when calling Poppler::Document::scanForFonts
-
- qt/poppler-document.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit d21d7271fc74ab78cd157549138d0027cf179471
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat May 31 23:57:31 2008 +0200
-
- Make sure file exists before printing it
-
- utils/HtmlOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0480a788c0f25af1bc09360b599debb37f831e10
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue May 27 23:20:32 2008 +0200
-
- require gthread-2.0
-
- cmake/modules/FindGTK.cmake | 9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-commit 2e40ef652eb9fca7fe947acb2adfecc96ad3c50e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 26 22:13:38 2008 +0200
-
- Do not shadow a paramer with a local variable name
-
- qt4/src/poppler-page.cc | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 1fd856aa1fb48869111e5b86f263bfd94fa7af17
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 26 20:52:53 2008 +0200
-
- Do not leak tSplash if transpGroupStack->blendingColorSpace is NULL
-
- poppler/SplashOutputDev.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 492209ec8648342a3a5447611f3f1ce63b63e8e9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 26 20:51:06 2008 +0200
-
- Move variables only used inside the loop inside the loop, fix delete of uninitialized data due to my previous patch
-
- poppler/Page.cc | 16 ++++++----------
- 1 files changed, 6 insertions(+), 10 deletions(-)
-
-commit 79ab8cceb318f3bb5ebad431824e3ae593aea340
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 26 20:38:59 2008 +0200
-
- Do not leak memory if data_out is NULL
-
- poppler/Page.cc | 35 ++++++++++++++++++-----------------
- 1 files changed, 18 insertions(+), 17 deletions(-)
-
-commit f44c33344d4af31ee008826179bcd92db445f35a
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun May 25 19:16:12 2008 +0200
-
- [glib] Init glib threads in demo app as required by g_timer
-
- configure.ac | 4 ++--
- glib/demo/main.c | 4 ++++
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-commit 58d5b7b9ab9ac245481299c4765f3bd305580d2e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 21 22:18:29 2008 +0200
-
- [Qt4] Fix text() method
-
- I'm not sure this is the real and correct fix, but it works more than previous code so it's and improvement
-
- qt4/src/poppler-page.cc | 6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-commit e3e4113c73128f49f99289b592446d4382b5d65c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 12 15:39:43 2008 +0200
-
- Add getters to some TextBlock members.
-
- Needed by some reader using poppler internals, bad you!
-
- poppler/TextOutputDev.h | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit ff699e64bd1de78915aad4ddb79d6f529aef2b87
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 11 23:44:50 2008 +0200
-
- Check the OC we found exists before using it
-
- Fixes crash http://bugs.freedesktop.org/show_bug.cgi?id=15899
-
- poppler/OptionalContent.cc | 33 ++++++++++++++++++---------------
- 1 files changed, 18 insertions(+), 15 deletions(-)
-
-commit ac26ba5148b99a03a56e37ba201ad420b8619943
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri May 9 20:17:37 2008 +0200
-
- Do not crash on unlock with wrong password
-
- qt/poppler-private.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 19ec5a531cb03a7bee1cfcc9c7d5c4390fbd069d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu May 8 23:15:58 2008 +0200
-
- Fix build with --enable-fixedpoint
-
- splash/Splash.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 1cf5f0fda542efef575a123622637d81b9c42053
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 7 18:49:28 2008 +0200
-
- [Qt] Fix Document::unlock
-
- qt/poppler-document.cc | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit b5041924eb023cc095f2445935ff713cf65dacce
-Author: Pino Toscano <pino@kde.org>
-Date: Wed May 7 16:44:03 2008 +0200
-
- do not delete the GooString owned by an Object
-
- poppler/Annot.cc | 4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-commit 546a7b700862db00240de9fd50bdba1dd347765b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 4 15:26:26 2008 +0200
-
- Fix leaks on error conditions
-
- poppler/Annot.cc | 6 ++++++
- poppler/ArthurOutputDev.cc | 1 +
- poppler/JBIG2Stream.cc | 1 +
- 3 files changed, 8 insertions(+), 0 deletions(-)
-
-commit 914f1b1d814ab3d958aa0ca21ad73ef5aed20b89
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat May 3 18:21:28 2008 +0200
-
- A widget annot does not always belong to a form, so check before accessing the widget member
-
- poppler/Annot.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit c907e41ab18dda10cd3c9789bd0e7fe71b6402a8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Apr 30 00:42:34 2008 +0200
-
- findSegment can return NULL check for it
-
- poppler/JBIG2Stream.cc | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 8b7f29b577bca3295e99fea4a5cf4a6bb7ba2617
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Apr 30 00:26:28 2008 +0200
-
- new[] implies delete[]
-
- poppler/ABWOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 926c13825d5f7364286975db8ffa507b92f4b3ab
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 23:44:51 2008 +0200
-
- add lost return when adding kees patch
-
- poppler/Object.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit ba9283f6bc78e97006e52ef5de20c958ee9e1a37
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 23:42:00 2008 +0200
-
- make the function static
-
- utils/pdftoppm.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 931a8272f556ba8a35342f0c5bf53bdb57ea7a31
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 23:41:31 2008 +0200
-
- make the variable static
-
- utils/pdftoabw.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 1887d2910d2006c7fc3ecc95db0150f1537e9d0a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 23:35:17 2008 +0200
-
- constify some static arrays
-
- poppler/CompactFontTables.h | 2 +-
- poppler/Decrypt.cc | 8 ++++----
- poppler/Function.cc | 2 +-
- poppler/GfxFont.cc | 6 +++---
- poppler/GfxState.cc | 4 ++--
- poppler/JBIG2Stream.cc | 10 +++++-----
- poppler/JPXStream.cc | 4 ++--
- poppler/Lexer.cc | 2 +-
- poppler/PSOutputDev.cc | 6 +++---
- poppler/PSTokenizer.cc | 2 +-
- poppler/SplashOutputDev.cc | 2 +-
- poppler/Stream-CCITT.h | 12 ++++++------
- poppler/Stream.cc | 10 +++++-----
- poppler/UnicodeTypeTable.cc | 2 +-
- 14 files changed, 36 insertions(+), 36 deletions(-)
-
-commit 51140e2d9490696d716f77d3225da0bfdfc212b4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 23:14:59 2008 +0200
-
- more static markers
-
- poppler/Annot.cc | 2 +-
- poppler/DCTStream.cc | 2 +-
- poppler/Object.cc | 2 +-
- poppler/SplashOutputDev.cc | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 893703cb9eee879f728db329f7ee1fc19e7f980e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 23:03:51 2008 +0200
-
- add static
-
- poppler/XRef.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 7333bc913111e56ee241b7ef2bf6e9fea68b7da2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 23:01:13 2008 +0200
-
- add static
-
- poppler/JBIG2Stream.cc | 30 +++++++++++++++---------------
- 1 files changed, 15 insertions(+), 15 deletions(-)
-
-commit 1ea36507f9c9f163b6772268046e7560d0c00dbc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 22:47:19 2008 +0200
-
- make findModifier static
-
- poppler/GlobalParams.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit be9961571dbfabb982e6f69abd3bbc98fa971864
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 21:48:09 2008 +0200
-
- make variables not used outside static
-
- utils/pdftohtml.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit b157064a85350da6ea9c4f46e965e45ebc59d227
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 21:43:23 2008 +0200
-
- constify setPSPaperSize
-
- utils/pdftops.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit ee57ead8a6f34fa8de044399e5912395e0f3a425
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 21:37:57 2008 +0200
-
- constify argDesc arrays
-
- Gives me binaries 2KB smaller (in total) in release build
-
- utils/parseargs.c | 18 +++++++++---------
- utils/parseargs.h | 4 ++--
- utils/pdffonts.cc | 2 +-
- utils/pdfimages.cc | 2 +-
- utils/pdfinfo.cc | 2 +-
- utils/pdftoabw.cc | 2 +-
- utils/pdftohtml.cc | 2 +-
- utils/pdftoppm.cc | 2 +-
- utils/pdftops.cc | 2 +-
- utils/pdftotext.cc | 2 +-
- 10 files changed, 19 insertions(+), 19 deletions(-)
-
-commit 9f93d9eb464877e0d23dcf205295da9162f03253
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 29 20:45:01 2008 +0200
-
- make psOpNames static
-
- Makes my release build 64 bytes smaller
-
- poppler/Function.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 29e3e779c68371b7c4aadcf68ee0712046f39c6d
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 26 23:47:01 2008 +0200
-
- remember to call the base implementation here
-
- qt4/demos/optcontent.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit a188f3cd36775d78ace5b5d62c8ab7c059b3b2b1
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 26 23:42:09 2008 +0200
-
- reset the current page to 0, when closing a document
-
- qt4/demos/viewer.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 7eca6da6436ffc1c41cfed1a07be4dafa1172463
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 26 23:41:45 2008 +0200
-
- no need to manually disconnect from the model, as it will be deleted by the document anyway
-
- qt4/demos/optcontent.cpp | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit 6cddda7f3c3b8ddb95e6aba1b234a27c4454c23d
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 26 22:41:59 2008 +0200
-
- sync updateFont() with SplashOutputDev
-
- poppler/ArthurOutputDev.cc | 75 ++++++++++++++++++++++++++++++++++---------
- 1 files changed, 59 insertions(+), 16 deletions(-)
-
-commit ddc7c1f8c24762bae615e7dec92e92a58c827478
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 26 18:12:51 2008 +0200
-
- construct AnnotPolygon for Polygon and PolyLine annotations
-
- poppler/Annot.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit f9c7e8037b7165b6271ce7aea0d315053c4d66a5
-Merge: 59d33d8 f5fec4f
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 26 18:09:59 2008 +0200
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 59d33d8e99673f73ccf2ad9a62bd25fca51f0eb8
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 26 17:56:42 2008 +0200
-
- use the base implementation to update all the states
-
- poppler/ArthurOutputDev.cc | 11 +----------
- 1 files changed, 1 insertions(+), 10 deletions(-)
-
-commit 45d2a9529bf241554c59437118cb8c705554dc27
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 26 17:55:39 2008 +0200
-
- Set the font antialiasing from the painter settings, instead of the global settings.
-
- poppler/ArthurOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 5faa72fd70e0d85268e807a8b870d80dda9189a9
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 26 17:53:28 2008 +0200
-
- Get the font and painter matrices, and reenable the font drawing.
-
- poppler/ArthurOutputDev.cc | 28 +++++++++++++++++++++-------
- 1 files changed, 21 insertions(+), 7 deletions(-)
-
-commit f5fec4fdedd8d316b19968545e447e2036a1bb47
-Author: Kees Cook <kees@outflux.net>
-Date: Wed Apr 23 19:53:03 2008 +0200
-
- provide type-checking for union pointer accesses
-
- poppler/Object.h | 68 ++++++++++++++++++++++++++++++++++-------------------
- 1 files changed, 43 insertions(+), 25 deletions(-)
-
-commit a567c921ce538616f4ba0b7933086ef5a8ab0f55
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Tue Apr 22 23:09:10 2008 +0200
-
- Little change to avoid AnnotWidget crashing when they aren't related to FormWidgets.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 19 ++++++++++---------
- 1 files changed, 10 insertions(+), 9 deletions(-)
-
-commit 73798c95b8a4c0504e9246e6f73fd31f812ad6fa
-Author: Albert Astals Cid <tsdgeos@bluebox.(none)>
-Date: Mon Apr 21 19:56:52 2008 +0200
-
- Link to pthread when needed
-
- Should fix bug 15625
-
- configure.ac | 2 +
- m4/acx_pthread.m4 | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Makefile.am | 4 +
- 3 files changed, 286 insertions(+), 0 deletions(-)
-
-commit 6c248bdad77235a45402d9693a0b822cc208b6b9
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 20 18:32:59 2008 +0200
-
- the dtor should be virtual
-
- qt4/src/poppler-converter-private.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 68dba1a452ca70add5b05ab8e2adab838bc2cb73
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 20 16:21:10 2008 +0200
-
- if ncand is a Guint cand should be one too
-
- poppler/CMap.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0b91eb19f5a3d07b625ee5188f1fcb4b4b1544ea
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 20 16:17:50 2008 +0200
-
- Unused var--
-
- poppler/GfxFont.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 1ed3cc40987b691319fd9f1a30296d80de5732fd
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Apr 16 15:45:45 2008 +0200
-
- fix border style conversion
-
- qt4/src/poppler-page.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 7c8feb4e3627bde2052a7e536d2d49d1cbbce8ee
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 15 21:57:31 2008 +0200
-
- Hack to "support" 16 bits images
-
- Everywhere we assume a component fits in 8 bits, with this hack
- we treat 16 bit images as 8 bit ones until it's fixed correctly.
- Fixes http://bugs.kde.org/show_bug.cgi?id=158165
-
- poppler/GfxState.cc | 6 ++++++
- poppler/Stream.cc | 9 +++++++++
- 2 files changed, 15 insertions(+), 0 deletions(-)
-
-commit f338a9ded5d42dd65853c5c7bbe27f6724096416
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 13 21:41:51 2008 +0200
-
- [Qt4] convert the sound annotations
-
- qt4/src/poppler-page.cc | 16 ++++++++++++++--
- 1 files changed, 14 insertions(+), 2 deletions(-)
-
-commit 733d51fca04ee682fed2242f868edd545f3755fa
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 13 21:38:25 2008 +0200
-
- [Qt4] First version of a SoundAnnotation.
-
- qt4/src/poppler-annotation.cc | 87 +++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-annotation.h | 30 ++++++++++++++-
- 2 files changed, 116 insertions(+), 1 deletions(-)
-
-commit feb1ea091111bd7292879c465590acfd7671c876
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 13 21:36:26 2008 +0200
-
- First version of AnnotSound.
-
- poppler/Annot.cc | 37 ++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h | 26 ++++++++++++++++++++++++++
- 2 files changed, 62 insertions(+), 1 deletions(-)
-
-commit ec2cf81edf1b2c6707de4d30316ff5f5e24534d4
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 13 18:31:21 2008 +0200
-
- [Qt4] convert the file attachment annotations
-
- qt4/src/poppler-page.cc | 15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
-
-commit 9fa2e96c96d365ae67859545ebd635d726784fca
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 13 18:29:00 2008 +0200
-
- [Qt4] Initial version of FileAttachmentAnnotation
-
- qt4/src/poppler-annotation.cc | 88 +++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-annotation.h | 29 +++++++++++++-
- 2 files changed, 116 insertions(+), 1 deletions(-)
-
-commit 5899aff11f94e707654574e830e0757b1df558d4
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 13 10:50:39 2008 +0200
-
- [Qt4] Read the annotations from the core, instead of own parsing.
-
- Almost all the data are converted correctly, the results seem to be the same.
- Added TODOs in the few parts (not essential) I was not able to figure out how to convert, yet.
- Covert also the Caret annotations.
-
- qt4/src/poppler-annotation-helper.h | 2 +-
- qt4/src/poppler-page.cc | 851 ++++++++++++++++-------------------
- 2 files changed, 393 insertions(+), 460 deletions(-)
-
-commit 40a12793c5ccea206d79e0c17e2f2d0cf74bb4f3
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 13 02:21:55 2008 +0200
-
- add getters for the AnnotPolygon properties
-
- poppler/Annot.h | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 9311f75d4c3da991efb8afd00701a0ce1cbae1b0
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sun Apr 13 01:52:36 2008 +0200
-
- Almost full AnnotPolygon support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h | 37 ++++++++++++++++++++
- 2 files changed, 136 insertions(+), 0 deletions(-)
-
-commit 01aa052ed761a4ada471d196985825986bb58627
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sun Apr 13 01:13:49 2008 +0200
-
- Extend AnnotPath behaviour to include cooordinate array parsing.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 96 +++++++++++++++++++++++++++++------------------------
- poppler/Annot.h | 4 ++-
- 2 files changed, 55 insertions(+), 45 deletions(-)
-
-commit ca52830e9519ae7b778f98e5c2547daef7da5f09
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sun Apr 13 00:54:13 2008 +0200
-
- Added OptionalContent support to Annots.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 9 +++------
- poppler/Annot.h | 5 +++--
- 2 files changed, 6 insertions(+), 8 deletions(-)
-
-commit 4b87196b7829c87d15af4e8b4138ca97548fb519
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 13 00:18:24 2008 +0200
-
- Isolate the embedded file reading logic into a new EmbFile constructor.
-
- This way, it can be shared and reused in various places (Catalog, AnnotFileAttachment, etc).
-
- poppler/Catalog.cc | 205 ++++++++++++++++++++++++++++------------------------
- poppler/Catalog.h | 1 +
- 2 files changed, 112 insertions(+), 94 deletions(-)
-
-commit 45b407e51905948690065749085a4af1cbb29a8e
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 13 00:14:38 2008 +0200
-
- correctly get the FileSpec dictionary
-
- poppler/Annot.cc | 4 +++-
- poppler/Annot.h | 2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-commit c3aa3a97d9c553ea7976741d798901352fb5381c
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 12 22:45:57 2008 +0200
-
- properly initialize an AnnotPath
-
- poppler/Annot.cc | 9 ++-------
- 1 files changed, 2 insertions(+), 7 deletions(-)
-
-commit a3406fb2ace1390db1c181823a7bfc66c9174d98
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 12 22:40:42 2008 +0200
-
- properly dispose the memory of the ink lists
-
- poppler/Annot.cc | 13 ++++++++++++-
- poppler/Annot.h | 1 +
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
-commit 0dad70e2d12e8b587cab8ce2d914c81c6897a1d1
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 12 22:15:35 2008 +0200
-
- make AnnotInk working.
-
- - get the point indexes in the correct way
- - dispose with free what you allocate with malloc
- - fix logic when checking for an even number of points
-
- poppler/Annot.cc | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 77404e24ea1e175fc9b55097dc5b35cc34760659
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 12 21:08:54 2008 +0200
-
- a length is an int
-
- poppler/Annot.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit bc2b2ffd2144f951c311e968fba4bc50b7c43ff3
-Merge: cd5afe6 bacc1dd
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sat Apr 12 17:40:49 2008 +0200
-
- Fixed merging conflict.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
-commit cd5afe6d9eca687ee224ff7680a8cba28d81a36d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 12 00:44:08 2008 +0200
-
- Do not take into account Colorspace resource subdictionary for image XObjects
-
- Fixes bug 15125
- The motivation under that change is on section 4.5.2 of the spec:
- Certain objects, such as image XObjects, specify a
- color space as an explicit parameter, often associated with the key ColorSpace.
- In this case, the color space array or name is always defined directly as a PDF
- object, not by an entry in the ColorSpace resource subdictionary. This conven-
- tion also applies when color spaces are defined in terms of other color spaces.
-
- poppler/Gfx.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit bacc1dd9f37ff19c5e54878a5b08e7d734584bbf
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 12 17:20:09 2008 +0200
-
- Read the "in reply to" reference as such, without reading the associated annotation dictionary.
-
- poppler/Annot.cc | 10 ++++------
- poppler/Annot.h | 4 ++--
- 2 files changed, 6 insertions(+), 8 deletions(-)
-
-commit ffe09454a0948a6107bcc38f23ba2068151c547d
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sat Apr 12 17:17:59 2008 +0200
-
- Initial Annot3D parsing a few general improvements.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++---
- poppler/Annot.h | 84 +++++++++++++++++++++++++++++-----
- 2 files changed, 193 insertions(+), 21 deletions(-)
-
-commit 8757c577241dda31bc59c7d1c208c159ad428877
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sat Apr 12 10:38:07 2008 +0200
-
- AnnotFileAttachment support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 38 ++++++++++++++++++++++++++++++++++++--
- poppler/Annot.h | 25 +++++++++++++++++++++++++
- 2 files changed, 61 insertions(+), 2 deletions(-)
-
-commit 36989658149fc9e5e8a049ce070a102f35b7bddc
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sat Apr 12 09:55:26 2008 +0200
-
- AnnotInk support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h | 45 +++++++++++++++++++++
- 2 files changed, 158 insertions(+), 0 deletions(-)
-
-commit 464b171d0e9b989196c287f2ee4dfbbc14212aa9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 12 00:44:08 2008 +0200
-
- Do not take into account Colorspace resource subdictionary for image XObjects
-
- Fixes bug 15125
- The motivation under that change is on section 4.5.2 of the spec:
- Certain objects, such as image XObjects, specify a
- color space as an explicit parameter, often associated with the key ColorSpace.
- In this case, the color space array or name is always defined directly as a PDF
- object, not by an entry in the ColorSpace resource subdictionary. This conven-
- tion also applies when color spaces are defined in terms of other color spaces.
-
- poppler/Gfx.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 42db4890e8295aaec5a1be12d1414fc0a9048550
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu Mar 27 10:52:22 2008 +0000
-
- Do not call FT_Done_Face on a live cairo_font_face_t.
-
- Currently CairoFont calls FT_Done_Face on its deletion, but the FT_Face
- is usually still in use within cairo. This causes a failure later when
- cairo tries to create a glyph from its cairo_font_face_t.
-
- From http://bugs.freedesktop.org/show_bug.cgi?id=15216:
- ==13745== Invalid read of size 4
- ==13745== at 0x51BE572: FT_Load_Glyph (ftobjs.c:549)
- ==13745== by 0x4A24921: _cairo_ft_scaled_glyph_init (cairo-ft-font.c:1922)
- ==13745== by 0x4A117AB: _cairo_scaled_glyph_lookup
- (cairo-scaled-font.c:1674)
- ==13745== by 0x4A12A5A: _cairo_scaled_font_glyph_device_extents
- (cairo-scaled-font.c:1124)
- ==13745== by 0x4A21ECD: _cairo_analysis_surface_show_glyphs
- (cairo-analysis-surface.c:516)
- ==13745== by 0x4A144DC: _cairo_surface_show_glyphs (cairo-surface.c:2086)
- ==13745== by 0x4A1FCC8: _cairo_meta_surface_replay_internal
- (cairo-meta-surface.c:816)
- ==13745== by 0x4A214B1: _paint_page (cairo-paginated-surface.c:299)
- ==13745== by 0x4A2171E: _cairo_paginated_surface_show_page
- (cairo-paginated-surface.c:445)
- ==13745== by 0x4A14BDF: cairo_surface_show_page (cairo-surface.c:1702)
- ==13745== by 0x49FF661: cairo_show_page (cairo.c:2155)
- ==13745== by 0xA267D97:
- pdf_document_file_exporter_end_page(_EvFileExporter*) (ev-poppler.cc:1753)
- ==13745== Address 0x55c5630 is 88 bytes inside a block of size 552 free'd
- ==13745== at 0x402269C: free (vg_replace_malloc.c:326)
- ==13745== by 0x51B7ABC: ft_free (ftsystem.c:158)
- ==13745== by 0x51BB319: ft_mem_free (ftutil.c:171)
- ==13745== by 0x51BC318: destroy_face (ftobjs.c:856)
- ==13745== by 0x51BC3B2: FT_Done_Face (ftobjs.c:1972)
- ==13745== by 0x4363704: CairoFont::~CairoFont() (CairoFontEngine.cc:251)
- ==13745== by 0x436401D: CairoFontEngine::getFont(GfxFont*, XRef*)
- (CairoFontEngine.cc:335)
- ==13745== by 0x4366915: CairoOutputDev::updateFont(GfxState*)
- (CairoOutputDev.cc:318)
- ==13745== by 0x5093BF1: Gfx::opShowText(Object*, int) (Gfx.cc:3073)
- ==13745== by 0x508F901: Gfx::execOp(Object*, Object*, int) (Gfx.cc:726)
- ==13745== by 0x50906FF: Gfx::go(int) (Gfx.cc:594)
- ==13745== by 0x5090C96: Gfx::display(Object*, int) (Gfx.cc:557)
-
- The solution is to release the reference to the cairo_font_face_t upon
- destruction of the CairoFont, and then to release the FT_Face from the
- destroy notify of the cairo_font_face_t.
-
- poppler/CairoFontEngine.cc | 19 +++++++++----------
- 1 files changed, 9 insertions(+), 10 deletions(-)
-
-commit 5f60843824582ece36d806508ec388330ddee854
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Tue Apr 8 00:30:57 2008 +0200
-
- Added AnnotCoord support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 64 +++++++++++++++++--------------------------------
- poppler/Annot.h | 69 +++++++++++++++++++++++++-----------------------------
- 2 files changed, 54 insertions(+), 79 deletions(-)
-
-commit a6f70f465a3e6719d63cefbe3c27bae015be43c1
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 6 13:12:01 2008 +0200
-
- add getters for the coordinates in an AnnotLine
-
- poppler/Annot.h | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 1d83d6edf9a843335e37a4d1e0e0dd71eb23d93b
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 6 12:24:42 2008 +0200
-
- [Qt4] the caret symbol is an enum value, now
-
- qt4/src/poppler-annotation.cc | 35 ++++++++++++++++++++++++++++-------
- qt4/src/poppler-annotation.h | 7 +++++--
- 2 files changed, 33 insertions(+), 9 deletions(-)
-
-commit 229d991a3258cb9b56f5e00f2deb3c976253cf68
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 6 12:23:04 2008 +0200
-
- the caret symbol does not seem to allow additional values, so convert it to an enum
-
- poppler/Annot.cc | 11 +++++++----
- poppler/Annot.h | 9 +++++++--
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-commit fc24500ddd9182f97d23c46eaafc6be79a6721eb
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Apr 6 11:43:49 2008 +0200
-
- propetly initialise a couple of members; leak less
-
- poppler/ArthurOutputDev.cc | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 9409de1e7c5b3770c7ef00c01ee376953dd532a5
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sun Apr 6 01:38:25 2008 +0200
-
- Changed AnnotFreeText RD field to the new parseDiffRectangle.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 35 ++---------------------------------
- 1 files changed, 2 insertions(+), 33 deletions(-)
-
-commit 28c5ee2e9fc2a24d2f2efb3d74d5cf882a106239
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 23:19:33 2008 +0200
-
- typo fix
-
- poppler/Annot.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit ed02769688466ca72bf35d4223c3822a1245604b
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 19:36:21 2008 +0200
-
- read the destination of a link annotation
-
- poppler/Annot.cc | 5 ++++-
- poppler/Annot.h | 4 ++--
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-commit ca31bf12a9d70bac88e457f7799e9935aba58640
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 16:48:53 2008 +0200
-
- variable forgotten in the copy&paste...
-
- qt4/src/poppler-annotation.cc | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 4168daa141b76e5fcd07d046aca8dac2f3037ff9
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 16:34:12 2008 +0200
-
- [Qt4] deserialize also CaretAnnotation's
-
- qt4/src/poppler-annotation.cc | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit b55bcc2aa95825863bef23ab96364b350a49949d
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 16:31:31 2008 +0200
-
- [Qt4] first version of a CaretAnnotation.
-
- qt4/src/poppler-annotation.cc | 80 +++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-annotation.h | 25 ++++++++++++-
- 2 files changed, 104 insertions(+), 1 deletions(-)
-
-commit 4c9a02b7e49666efe10fdc16e7a03d8d520b65ec
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 16:01:58 2008 +0200
-
- First version of AnnotCaret.
-
- poppler/Annot.cc | 36 +++++++++++++++++++++++++++++++++++-
- poppler/Annot.h | 22 ++++++++++++++++++++++
- 2 files changed, 57 insertions(+), 1 deletions(-)
-
-commit d260fe9e514c667b66969b982119429cc922eb07
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 15:54:29 2008 +0200
-
- isolate the code for parsing a "difference rectangle" in an own function
-
- poppler/Annot.cc | 54 +++++++++++++++++++++++++++++++-----------------------
- 1 files changed, 31 insertions(+), 23 deletions(-)
-
-commit 760833e409c122c0a61f7c87fd3133eebc10b402
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 15:36:43 2008 +0200
-
- First version of AnnotGeometry.
-
- poppler/Annot.cc | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h | 24 +++++++++++++++++
- 2 files changed, 99 insertions(+), 2 deletions(-)
-
-commit 95d9d2362534c0524ad0448818b2d69b0909d482
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 03:23:00 2008 +0200
-
- finally, load the QuadPoints correctly
-
- when checking the validity of the coordinate, do the comparison just with the proper one (either X or Y);
- free the "point" object after each iteration
-
- poppler/Annot.cc | 11 ++++++++---
- 1 files changed, 8 insertions(+), 3 deletions(-)
-
-commit af1ffcbcec1730332d11f8da4a7ddac833b22408
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 02:54:00 2008 +0200
-
- More robust reading of QuadPoints (reset the allocated memory, use the heap)
-
- poppler/Annot.cc | 7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
-
-commit 68fd98d69bac20282665cf6b824da30c3b310f0b
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 02:51:41 2008 +0200
-
- Really implement AnnotTextMarkup.
-
- poppler/Annot.cc | 29 +++++++++++++++++++++++++----
- poppler/Annot.h | 2 +-
- 2 files changed, 26 insertions(+), 5 deletions(-)
-
-commit 69a2ecfaf8f8cffd3027db5c3cc88c41413e42f1
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Apr 5 01:38:28 2008 +0200
-
- Add the Stamp annotation type.
-
- poppler/Annot.cc | 28 +++++++++++++++++++++++++++-
- poppler/Annot.h | 20 ++++++++++++++++++++
- 2 files changed, 47 insertions(+), 1 deletions(-)
-
-commit 97be4332818bcf58461816be995d88926809a4e5
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Fri Apr 4 23:49:12 2008 +0200
-
- Updated glib bindings.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- glib/demo/annots.c | 32 +++++---------------------------
- glib/poppler-annot.cc | 27 +++++----------------------
- glib/poppler-annot.h | 13 +------------
- 3 files changed, 11 insertions(+), 61 deletions(-)
-
-commit 5caac407cdaf58621ac27e5561b31a995404ccb3
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Fri Apr 4 23:36:46 2008 +0200
-
- Fixed icon name in AnnotText.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 25 ++++++-------------------
- poppler/Annot.h | 15 +++------------
- 2 files changed, 9 insertions(+), 31 deletions(-)
-
-commit 0b714a61383da1b62daf2a60e3f6fcda09b4e9f2
-Author: Adam Batkin <adam@batkin.net>
-Date: Thu Apr 3 20:02:52 2008 +0200
-
- FindFirstFile returns INVALID_HANDLE_VALUE and not NULL on error
-
- goo/gfile.cc | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-commit be765f27cc5430d9bb2a3e113eb245d67c20a376
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Mar 31 12:37:33 2008 +0200
-
- [glib] Fix a crash in outline demo due to page_num == dest_page_num - 1
-
- glib/demo/utils.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit e991e9ac6fcc0b6928b96fe8326eebcf3cb720ca
-Author: Albert Astals Cid <tsdgeos@localhost.(none)>
-Date: Sat Mar 29 13:25:52 2008 +0100
-
- Add the export macro
-
- qt4/src/poppler-page-transition.h | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit b70ca35dce6da6efdff254c11a63de4f44228278
-Author: Albert Astals Cid <tsdgeos@localhost.(none)>
-Date: Sat Mar 29 00:30:31 2008 +0100
-
- Duplicate page-transition files on qt4
-
- qt4/src/CMakeLists.txt | 4 +-
- qt4/src/Makefile.am | 4 +-
- qt4/src/poppler-page-transition-private.h | 28 ++++++
- qt4/src/poppler-page-transition.cc | 95 +++++++++++++++++++
- qt4/src/poppler-page-transition.h | 146 +++++++++++++++++++++++++++++
- 5 files changed, 273 insertions(+), 4 deletions(-)
-
-commit b5312785063235cef7584ab6a5d198fb72de0988
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Wed Mar 26 23:56:49 2008 +0100
-
- Improved glib annot demo.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- glib/demo/annots.c | 314 +++++++++++++++++++++++++++++++++++++++++++++++----
- 1 files changed, 289 insertions(+), 25 deletions(-)
-
-commit 7cc8fd70f68d2cdab7ab83a0ecf6c8896c971d62
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Mar 26 21:03:34 2008 +0100
-
- remove damn error
-
- qt4/src/poppler-page.cc.orig | 1317 ------------------------------------------
- 1 files changed, 0 insertions(+), 1317 deletions(-)
-
-commit 7a47ff3b54678a3de6964d25050e02186484f39a
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Mar 26 21:00:32 2008 +0100
-
- [Qt4] Add support for JavaScript links, and create them when present.
-
- qt4/src/poppler-link.cc | 36 ++
- qt4/src/poppler-link.h | 32 +-
- qt4/src/poppler-page.cc | 7 +
- qt4/src/poppler-page.cc.orig | 1317 ++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 1391 insertions(+), 1 deletions(-)
-
-commit a6f2c10ee01ee62ae945b50f6b6eae380377fe03
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Mar 26 20:59:21 2008 +0100
-
- [Qt4] Read the document-level JavaScript scripts.
-
- qt4/src/poppler-document.cc | 15 +++++++++++++++
- qt4/src/poppler-qt4.h | 8 ++++++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
-
-commit b8a471e55b998836c09c65ff736afdef8ac55189
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Mar 26 20:56:01 2008 +0100
-
- Add support for JavaScript actions, and read them when found.
-
- poppler/Link.cc | 33 +++++++++++++++++++++++++++++++++
- poppler/Link.h | 23 +++++++++++++++++++++++
- 2 files changed, 56 insertions(+), 0 deletions(-)
-
-commit 2fd85dc1b8b2ababadfc60e285c08a844737e4bb
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Mar 26 20:53:42 2008 +0100
-
- Read the JavaScript codes in the NameTree of the Catalog.
-
- poppler/Catalog.cc | 39 +++++++++++++++++++++++++++++++++++++++
- poppler/Catalog.h | 7 +++++++
- 2 files changed, 46 insertions(+), 0 deletions(-)
-
-commit 312f14f5b7be1f0d62620477222919423c3869e0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 26 20:05:31 2008 +0100
-
- compile++
-
- fofi/FoFiBase.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 5bd750062e1fb136f77a55d1f35b2d6fabaad1b3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 26 19:42:43 2008 +0100
-
- update version
-
- CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-commit 10d4a8b9aed51902157c04d9deea0e99d829c4f6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 26 19:42:36 2008 +0100
-
- fill news
-
- NEWS | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-commit 2069826d61ebd527768b6455689276c0a8288085
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Mar 26 16:05:06 2008 +0100
-
- missing break
-
- qt4/src/poppler-page.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit d6a0c6a6803a03f402c2dcde41c6195e951470ba
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Mar 26 15:50:39 2008 +0100
-
- initialize posterStream to avoid crashing later
-
- poppler/Movie.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 0be811b3ad86b1cb14be94a017e70c65b8e64730
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Mar 25 22:59:22 2008 +0100
-
- Don't end up in an infinite recursive loop in case resObj dict is the same we are already in
-
- poppler/FontInfo.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0222c6ceb0fcf1d7c4422691a68a035a558ad614
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Mar 24 17:14:07 2008 +0100
-
- fix build when using cmake, not sure it's completely ok, but at least i can compile
-
- CMakeLists.txt | 1 +
- cmake/modules/FindGTK.cmake | 23 ++++++++++++++++-------
- config.h.cmake | 3 +++
- glib/CMakeLists.txt | 17 +++++++++++------
- glib/poppler-page.cc | 2 +-
- glib/test-poppler-glib.cc | 2 +-
- 6 files changed, 33 insertions(+), 15 deletions(-)
-
-commit 3e4164f2db69358adf07596195842dd00458b621
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Mar 24 15:10:31 2008 +0100
-
- fix some cmake HAVE_foo
-
- CMakeLists.txt | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 22f615aee488cc363a078330861e80f389f47061
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sun Mar 23 13:22:07 2008 +0100
-
- Fixed wrong functions.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- glib/poppler-annot.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit cccfe42ed9c53d27cf6a1403ae55bf34a053012d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 22 19:12:05 2008 +0100
-
- Fix rm line not to error when no *moc file is present
-
- qt4/src/Makefile.am | 2 +-
- qt4/tests/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit e60d39ba0e8b9742106a0c9b1385b1c907729c3f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 22 19:11:17 2008 +0100
-
- Fix rm line not to error if no *moc file is present
-
- qt4/demos/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit d9d52e622c6b28a9941168bb73839ec335ca7232
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 22 19:10:40 2008 +0100
-
- Fix configure to not require gdk when we are on try mode
-
- configure.ac | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-commit 9b8809298dd16cdbffcc12b6db8e274578934063
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 22 15:49:02 2008 +0100
-
- It's really only an error if < 0
-
- poppler/PDFDoc.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0fb1e697cc4100ce23298141c8b5829273872423
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 22 15:46:44 2008 +0100
-
- remove unneeded variable
-
- poppler/PDFDoc.cc | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit 3404cb626ee9b4520d6fe601e07560745a4cb42a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 22 15:44:50 2008 +0100
-
- Remove OutStream::reset since noone uses it
-
- This way we have a fseek less to care about if worked or not
-
- poppler/Stream.cc | 5 -----
- poppler/Stream.h | 5 -----
- qt4/src/poppler-qiodeviceoutstream-private.h | 1 -
- qt4/src/poppler-qiodeviceoutstream.cc | 5 -----
- 4 files changed, 0 insertions(+), 16 deletions(-)
-
-commit 066595dd06c930997d5ec65a06c822616af9baa0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 22 15:43:07 2008 +0100
-
- Check the document stream is seekable when opening it
-
- Fixes bug 14126
-
- poppler/PDFDoc.cc | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-commit 23b6475463f8973b5ac83bb21a6b7b6000cc435b
-Author: Ed Avis <eda@waniasset.com>
-Date: Sat Mar 22 13:55:59 2008 +0100
-
- Check for fseek return values
-
- fofi/FoFiBase.cc | 14 ++++++++++++--
- poppler/GfxFont.cc | 12 ++++++++++--
- 2 files changed, 22 insertions(+), 4 deletions(-)
-
-commit b33bb282e45cf1a083cfbb13603ac465d386c28d
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Fri Mar 21 13:53:21 2008 +0100
-
- Fixed poppler glib public api.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- glib/poppler-annot.cc | 4 ++--
- glib/poppler-annot.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 371932f413d570d7784c668f30834d3d92d7aa80
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Mar 20 11:44:32 2008 +0100
-
- [glib] Remove unused variable.
-
- glib/poppler-document.cc | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit 21fa476ac384256c15a954b708e009f2b336b06f
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Mar 20 11:42:32 2008 +0100
-
- [glib] Do not cache image_dev in poppler page.
-
- Thanks to Kouhei Sutou who caught the problem.
-
- glib/poppler-page.cc | 60 ++++++++++++++++++++++++++------------------
- glib/poppler-private.h | 3 --
- glib/test-poppler-glib.cc | 9 ++++++-
- 3 files changed, 43 insertions(+), 29 deletions(-)
-
-commit 22cd70d8fc308fb8b19d36d0172014ba532230fb
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 19 21:52:14 2008 +0100
-
- poppler_annot_markup_get_opacity returns a double so use %f
-
- glib/demo/annots.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit b9a5fd4671638caa91f8a389be278d993391f499
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 19 21:28:49 2008 +0100
-
- updated by gtk-doc
-
- glib/reference/tmpl/poppler-action.sgml | 1 +
- glib/reference/tmpl/poppler.sgml | 3 +++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-commit b7e0b740578ea1e84ac0ef850b5a03c66b2863e3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 19 21:28:01 2008 +0100
-
- Fill 0.7.3 news
-
- NEWS | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-commit 3adaff1dad8127fdd06653cf49196027ad414a08
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 19 21:27:46 2008 +0100
-
- Bump version to 0.7.3
-
- CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-commit 52dd710b63911be2d8c960de0232c497c35ecac8
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Mar 19 18:35:35 2008 +0100
-
- [glib] Update outline and links demos to the new POPPLER_ACTION_NONE
-
- glib/demo/utils.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 6a22f0a20df38156c06e8ba10649e0828a1da102
-Author: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
-Date: Wed Mar 19 18:32:48 2008 +0100
-
- [glib] Consider no action as an action of type None instead of Unknown
-
- glib/poppler-action.cc | 2 +-
- glib/poppler-action.h | 1 +
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 185d5818fd546f85934b041d5b0cdcdf1849b1dc
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Mar 18 20:08:21 2008 +0100
-
- Improve error handling when creating a document
-
- glib/poppler-document.cc | 40 ++++++++++++++++++++++++++++------------
- glib/poppler.h | 5 ++++-
- 2 files changed, 32 insertions(+), 13 deletions(-)
-
-commit 9bba2748985049515bfd9c9b44f26b92fa704078
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Mar 15 01:11:39 2008 +0100
-
- Some more free
-
- poppler/OptionalContent.cc | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit bfc308935fa138e27c4d2ad0e1c1cad20eba8e8a
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Mar 15 01:05:32 2008 +0100
-
- Use error instead of printf
-
- poppler/OptionalContent.cc | 15 ++++++++-------
- 1 files changed, 8 insertions(+), 7 deletions(-)
-
-commit 998b1523ee653c1585f03b4a580e0d95ba694aca
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Mar 15 01:02:31 2008 +0100
-
- Some free
-
- poppler/OptionalContent.cc | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit c65a66a82259f547927cbb918611bcf4a8e264b2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Mar 14 20:29:53 2008 +0100
-
- xx0 is non exclusive so that should be < not <=
-
- Fixes several warnings about writes on bad places
-
- splash/SplashXPathScanner.cc | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-commit bd2272f3079319d1c05ca93f7fb6eb0a5370b938
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Mar 14 19:52:04 2008 +0100
-
- Fix "Make sure we don't draw outside the bitmap on Splash::fillGlyph2" when painting with no aa
-
- Fixes bug 15009
-
- splash/Splash.cc | 12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-commit 5bf8d864e68854f0855e07fb67aa124e06c739cd
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 12 22:48:07 2008 +0100
-
- fix build
-
- glib/reference/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit d0be5c86dcd3310062d820b3515c31e4720af2ca
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 12 22:40:59 2008 +0100
-
- Update version to 0.7.2 and fill NEWS
-
- CMakeLists.txt | 2 +-
- NEWS | 20 ++++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 26 insertions(+), 6 deletions(-)
-
-commit 0b2ecf39572821a99374e6acec7c1bd438911bbc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 12 22:38:57 2008 +0100
-
- update soname here too
-
- glib/CMakeLists.txt | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit f5065016b168e4896e2fe774cd22bbd900849b52
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Mar 12 22:06:53 2008 +0100
-
- Make GDK dependency option for glib bindings
-
- Fixes bug #13719.
-
- configure.ac | 45 +++-
- glib/Makefile.am | 7 +-
- glib/demo/page.c | 88 ++++++-
- glib/demo/render.c | 4 +
- glib/poppler-action.h | 1 -
- glib/poppler-annot.cc | 26 +-
- glib/poppler-annot.h | 2 +-
- glib/poppler-document.h | 2 -
- glib/poppler-features.h.in | 1 +
- glib/poppler-page.cc | 661 ++++++++++++++++++++++++++------------------
- glib/poppler-page.h | 76 +++--
- glib/poppler.h | 2 +-
- glib/test-poppler-glib.cc | 2 +-
- 13 files changed, 593 insertions(+), 324 deletions(-)
-
-commit 46d4fab82332e71d0b68c0a8deeac78f2201ed14
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 12 20:35:33 2008 +0100
-
- Increment version of libpoppler and libpoppler-qt4
-
- CMakeLists.txt | 2 +-
- poppler/Makefile.am | 2 +-
- qt4/src/CMakeLists.txt | 2 +-
- qt4/src/Makefile.am | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 550c1fc73a6d2af65728751fd0b59ccc7110fa8b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 12 20:34:48 2008 +0100
-
- Init to false updated field of XRefEntries plus indenting fixes
-
- poppler/XRef.cc | 11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-commit 6a671686c6265ecdb4c48f04392de9c56d4e0936
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Wed Mar 12 21:43:12 2008 +1030
-
- Fix regression in cairo output when transforming ctm
-
- The commit:
- ec01926e5a9dc16e200060497c43e79a1623698d "Avoid setting a singular ctm"
- introduced a regression in the output when using a ctm.
-
- The check for an invertable matrix had the side effect of inverting
- the matrix. Instead, make a copy of the matrix before testing if it is
- invertable.
-
- poppler/CairoOutputDev.cc | 7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-commit 0b2c3bb25c908b07e760d824dbfe93c6051812aa
-Merge: 362fe01 9c472f7
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Wed Mar 12 00:23:58 2008 +0100
-
- Merge branch 'master' of ssh://inigomartinez@git.freedesktop.org/git/poppler/poppler
-
-commit 362fe013c0d96698b52d70cf5226cddca7fe52d4
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Wed Mar 12 00:07:12 2008 +0100
-
- Enabled back the AnnotWidget support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 9c472f76d2462d0e775c851fdbac6ca2bc9812ea
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 12 00:00:20 2008 +0100
-
- cmake build
-
- glib/demo/CMakeLists.txt | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 821858f5c36786955d9475044bfee57f5060ad2f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Mar 11 23:58:05 2008 +0100
-
- Return char bounding box instead of edge, it's much more useful for character positioning
-
- qt4/src/poppler-page.cc | 8 ++++++--
- qt4/src/poppler-private.h | 3 +--
- qt4/src/poppler-qt4.h | 6 ++----
- qt4/src/poppler-textbox.cc | 4 ++--
- 4 files changed, 11 insertions(+), 10 deletions(-)
-
-commit d7e642732ced592362d9787bddadb7a110dcc5a5
-Merge: 3642f0c 2d6c605
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Tue Mar 11 23:41:59 2008 +0100
-
- Merge branch 'master' of ssh://inigomartinez@git.freedesktop.org/git/poppler/poppler
-
-commit 3642f0c48bc49cd4d698e769544c1d8604c6482f
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Tue Mar 11 23:13:33 2008 +0100
-
- glib annots demo.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- glib/demo/Makefile.am | 2 +
- glib/demo/annots.c | 468 +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/annots.h | 31 ++++
- glib/demo/main.c | 4 +-
- 4 files changed, 504 insertions(+), 1 deletions(-)
-
-commit 2d6c60537317bd3ac9e0582e0da09e7365729097
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Mar 11 22:54:44 2008 +0100
-
- For now we cannot handle MovieLink's, so comment them out.
-
- qt4/src/poppler-annotation.cc | 2 ++
- qt4/src/poppler-link.cc | 4 ++++
- qt4/src/poppler-link.h | 2 ++
- 3 files changed, 8 insertions(+), 0 deletions(-)
-
-commit a354f7198c493990613a1db131c662ec27948863
-Author: Hugo Mercier <hmercier31@gmail.com>
-Date: Tue Mar 11 22:49:00 2008 +0100
-
- Initial Movie support (2)
-
- Now with the forgotten files
-
- poppler/Movie.cc | 443 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Movie.h | 177 ++++++++++++++++++++++
- 2 files changed, 620 insertions(+), 0 deletions(-)
-
-commit 43e5dd941d4bc35c4eebbad66c13235639e0c1a0
-Merge: aab1768 4fdd254
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Mar 11 22:31:22 2008 +0100
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit 4fdd254370ea6055e95c8ebee51b69e06c501714
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Mar 11 22:31:00 2008 +0100
-
- Fix build
-
- glib/poppler-page.cc | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-commit aab17684dc3f21ff2b1ee6eacdc0c565d368df78
-Author: Hugo Mercier <hmercier31@gmail.com>
-Date: Tue Mar 11 22:28:28 2008 +0100
-
- Initial Movie support
-
- CMakeLists.txt | 2 +
- poppler/Annot.cc | 316 ++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h | 125 ++++++++++++++++++++
- poppler/Link.cc | 108 +++++++++++++++---
- poppler/Link.h | 64 ++++++++++-
- poppler/Makefile.am | 2 +
- 6 files changed, 591 insertions(+), 26 deletions(-)
-
-commit 13a0d2390b9e4684af070c213f385485715353df
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Mar 11 22:27:38 2008 +0100
-
- Add poppler-annot to the cmake build system
-
- glib/CMakeLists.txt | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 19f0e3b40bce4d8157d8c8bd04eaf6bacbef38b8
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Tue Mar 11 22:09:04 2008 +0100
-
- Add preliminary annotations support in the glib frontend
-
- glib/Makefile.am | 2 +
- glib/poppler-annot.cc | 776 ++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h | 181 +++++++++++
- glib/poppler-page.cc | 166 +++++++++++
- glib/poppler-page.h | 15 +
- glib/poppler-private.h | 5 +-
- glib/poppler.h | 7 +
- 7 files changed, 1151 insertions(+), 1 deletions(-)
-
-commit 6fa3ab20fee311b4aff92be18870fd0e1730a81f
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Tue Mar 11 18:44:27 2008 +0100
-
- Changed AnnotMarkup inheritance
-
- poppler/Annot.cc | 9 +++++----
- poppler/Annot.h | 10 +++++-----
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-commit 3111cfe2ccb32f9680baaad0c3f0678dd5969f8b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Mar 10 22:12:36 2008 +0100
-
- And free the memory
-
- qt4/tests/test-poppler-qt4.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 58f88c23402ac2e678dc655f64d93d89bb1812be
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Mar 10 22:08:43 2008 +0100
-
- Add the -textRects option to the test app so we can check text rects are correct
-
- qt4/tests/test-poppler-qt4.cpp | 45 +++++++++++++++++++++++++++++++++++----
- 1 files changed, 40 insertions(+), 5 deletions(-)
-
-commit 94ceb3cae79dc7786fa59fd889a87160780ed5df
-Merge: 0f9e843 35f34bd
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Mar 9 23:34:11 2008 +0100
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit 0f9e84302ac2108f05bdbb10e7e57ae19ad1e9f3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Mar 9 23:33:11 2008 +0100
-
- Do not force default values to fontconfig patterns as fontconfig already fills in default values for us
-
- Fixes bug 14883
-
- poppler/GlobalParams.cc | 17 +++++++++--------
- 1 files changed, 9 insertions(+), 8 deletions(-)
-
-commit 35f34bd44c74eeb76a58b30acfbb0303d7285f06
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Mar 9 17:38:54 2008 +0100
-
- Fix build when compiling without cairo support
-
- glib/demo/images.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 32637db19dd80a9b8452f86eb677b10e77290627
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Mar 9 00:57:08 2008 +0100
-
- proper lib64 Qt detection
-
- Fixes bug 14583
-
- m4/qt.m4 | 15 ++++++++++++---
- 1 files changed, 12 insertions(+), 3 deletions(-)
-
-commit 65a88a95a5c54c890048e8a986df361585d601dd
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Mar 8 03:11:36 2008 +0100
-
- Provide the mime type for an embedded file, if known.
-
- Adapt the unit test for that.
-
- qt4/src/poppler-embeddedfile.cc | 5 +++++
- qt4/src/poppler-qt4.h | 5 +++++
- qt4/tests/check_attachments.cpp | 7 +++++++
- 3 files changed, 17 insertions(+), 0 deletions(-)
-
-commit 23da27a229c8b3cc2a0a0dd6354c40723934390c
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Mar 8 03:10:58 2008 +0100
-
- Optionally read the mimetype for the embedded files.
-
- poppler/Catalog.cc | 17 +++++++++--------
- poppler/Catalog.h | 7 ++++++-
- 2 files changed, 15 insertions(+), 9 deletions(-)
-
-commit 42c254b978c61e2ccfda083dfeffec9fc35a5fe7
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Mar 3 16:56:09 2008 +0100
-
- be safe about out-of-range values
-
- qt4/src/poppler-textbox.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 5db75df77938eb7620867d0618058be52ed2d3cb
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Mar 3 16:53:39 2008 +0100
-
- initialize nicely
-
- qt4/src/poppler-private.h | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 3ad0ab7e4abd37528284269c69be3cdfb8d31d2e
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Mar 3 16:49:23 2008 +0100
-
- apidox
-
- qt4/src/poppler-link.h | 17 +++++++++++++++++
- qt4/src/poppler-qt4.h | 23 ++++++++++++++++++++++-
- 2 files changed, 39 insertions(+), 1 deletions(-)
-
-commit ec01926e5a9dc16e200060497c43e79a1623698d
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Mar 2 20:15:20 2008 -0500
-
- Avoid setting a singular ctm
-
- Ignoring singular ctm's gives a better result than having
- our cairo context error and turn off. Related to #14398.
-
- poppler/CairoOutputDev.cc | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-commit 4882d7a118b93fdb5c441d70757e485be7ee25d7
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 28 15:12:23 2008 +0100
-
- printf -> qDebug
-
- qt4/src/poppler-optcontent.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 31ce4049bf12c2716be7ec0fb8eda502d989f66e
-Author: Brad Hards <bradh@saxicola.cuneata.net>
-Date: Thu Feb 28 22:09:30 2008 +1100
-
- Respect PageMode for optional content and embedded files.
-
- This makes the PDF 1.7 spec open with the embedded files showing.
-
- qt4/demos/embeddedfiles.cpp | 7 +++++++
- qt4/demos/embeddedfiles.h | 1 +
- qt4/demos/optcontent.cpp | 8 ++++++++
- qt4/demos/optcontent.h | 1 +
- 4 files changed, 17 insertions(+), 0 deletions(-)
-
-commit ff938c431799d49325c0f46f1e6cbe1033993a83
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 27 23:12:53 2008 +0100
-
- do not forget to distribute GlobalParamsWin.cc next time
-
- poppler/Makefile.am | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 277382b8186d137a9f2a62bc2d22e9f0cda7d923
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 27 22:56:33 2008 +0100
-
- fix typo
-
- glib/demo/images.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 5b2f8f21fca63508570a0c77c6f7221a322e6e57
-Merge: 7e65118 4254f12
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 22:10:12 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 7e651186f483976f9833de245b6c7add38e77a16
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 22:03:17 2008 +0100
-
- Properly enable/disable the contents when their parents are changed.
-
- Now, the children maintain the "checked state" they had, when their parent is unchecked;
- but, they are really disabled, both in the possibility to be checked and in the drawing of their associated content [applying the same to their children, and so on].
-
- qt4/src/poppler-optcontent-private.h | 8 ++++++-
- qt4/src/poppler-optcontent.cc | 37 +++++++++++++++++++++++++++++----
- 2 files changed, 39 insertions(+), 6 deletions(-)
-
-commit 4254f1237ebed09b8e1c85f935a20bde3d8f36ff
-Merge: ed6c0c2 0569ae7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 27 20:44:27 2008 +0100
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit 8d384c06f96ba8cb3e73c275b3c708c64da4595d
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 20:39:09 2008 +0100
-
- small header cleanup
-
- qt4/src/poppler-optcontent-private.h | 9 +++++++--
- qt4/src/poppler-optcontent.cc | 7 ++++---
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
-commit ed6c0c260837a0025279765ef7778b83d6ee2209
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 27 20:43:45 2008 +0100
-
- fix build and distcheck with autools
-
- qt4/demos/Makefile.am | 3 +++
- qt4/src/Makefile.am | 5 ++++-
- qt4/tests/Makefile.am | 3 +++
- 3 files changed, 10 insertions(+), 1 deletions(-)
-
-commit 344d55539b1b6bcabec609fd828db372a07491b4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 27 20:43:13 2008 +0100
-
- fill the NEWS for 0.7.1
-
- NEWS | 15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-commit 1c47633ba782021978fa34d41a4ab0badf3af9d3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 27 20:42:55 2008 +0100
-
- Increase version number to 0.7.1
-
- CMakeLists.txt | 2 +-
- configure.ac | 2 +-
- msvc/config.h | 6 +++---
- qt4/src/Doxyfile | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-commit 0569ae76b6af1723b4606af189242a23199f387d
-Merge: f395531 d8eba8c
-Author: Brad Hards <bradh@kde.org>
-Date: Thu Feb 28 06:26:09 2008 +1100
-
- Merge branch 'master' of ssh://bradh@git.freedesktop.org/git/poppler/poppler
-
-commit d8eba8c10834116b4f0f295375805172f5216993
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 19:07:46 2008 +0100
-
- export the OptContentModel
-
- qt4/src/poppler-optcontent.h | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit 0445e64a4124af7c1b84673f237022e133eb8542
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 19:04:03 2008 +0100
-
- make only the Document able to create OptContentsModel's
-
- qt4/src/poppler-optcontent.h | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-commit c965437b67a4f97ee8365a217bd10406fba3767a
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 18:58:31 2008 +0100
-
- setRootNode() is private (and unused) API
-
- qt4/src/poppler-optcontent-private.h | 2 ++
- qt4/src/poppler-optcontent.cc | 8 ++++----
- qt4/src/poppler-optcontent.h | 4 ----
- 3 files changed, 6 insertions(+), 8 deletions(-)
-
-commit e293bfc384e2dfc4ef04582053ce18d8c0bcb7b3
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 18:50:35 2008 +0100
-
- small cleanup
-
- qt4/src/poppler-optcontent.cc | 11 ++++-------
- 1 files changed, 4 insertions(+), 7 deletions(-)
-
-commit f11aa0008585e845ce509172d76f72f941be497d
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 18:44:09 2008 +0100
-
- adapt the tests to the new layout of the contents model
-
- qt4/tests/check_optcontent.cpp | 66 ++++++++++++++--------------------------
- 1 files changed, 23 insertions(+), 43 deletions(-)
-
-commit 4a324484b5c77ddc348746e7bcf6051ade28e389
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 18:04:52 2008 +0100
-
- free some objects (thus leak less)
-
- poppler/Gfx.cc | 2 ++
- poppler/OptionalContent.cc | 2 ++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 0f4e7791ab6884072a1aee56e9cec212d8cea263
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 15:58:21 2008 +0100
-
- ignore any generated .moc here
-
- qt4/src/.gitignore | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 136ae44f155b17d9e8b041b67f75531d8544337c
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 15:56:09 2008 +0100
-
- keep track of the items changed when toggling an item, so we can update them properly
-
- qt4/src/poppler-optcontent-private.h | 4 +-
- qt4/src/poppler-optcontent.cc | 38 ++++++++++++++++++++++++++-------
- 2 files changed, 32 insertions(+), 10 deletions(-)
-
-commit b73e2afef7e5e1b68d82a10c94bca3c201c5f8b3
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 15:52:06 2008 +0100
-
- fix indexFromItem once again, and make parent() call it with the right node
-
- qt4/src/poppler-optcontent-private.h | 2 +-
- qt4/src/poppler-optcontent.cc | 19 +++++++++----------
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-commit 803787f763578320aa5f405ed49c64e6b924bad3
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 15:30:18 2008 +0100
-
- compile with the autotools
-
- (second patch I forgot to apply with the first)
-
- qt4/src/Makefile.am | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-commit 0b527a8ed62677bb09df4587f072a310c2959750
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 14:34:13 2008 +0100
-
- Extract the OptContentItem -> QModelIndex creation in an own function.
-
- qt4/src/poppler-optcontent-private.h | 1 +
- qt4/src/poppler-optcontent.cc | 7 ++++++-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit c94d6cc95c6838f31e27832cb3090389bf4d8227
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 14:30:26 2008 +0100
-
- Make index(), data() and setData() more safe.
-
- Errors spotted using ModelTest.
-
- qt4/src/poppler-optcontent-private.h | 2 +-
- qt4/src/poppler-optcontent.cc | 15 +++++++++------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-commit b8e833733d84eaa93d6bae522710feb3075ca329
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 14:05:19 2008 +0100
-
- fix build with the autotools
-
- qt4/src/Makefile.am | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit f89ba474bae281f1cdeddb72ac8425dee1087e35
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 13:28:50 2008 +0100
-
- Put the check states of the optional contents in the same column as the name.
-
- This feels a bit more elegant than changing a value in a different column.
- Cleanup data()/setData() so they can be extended easily.
-
- qt4/src/poppler-optcontent.cc | 74 +++++++++++++++++++++--------------------
- 1 files changed, 38 insertions(+), 36 deletions(-)
-
-commit defa0ecb2790402a4069fea3b3c285a50675682d
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 12:24:16 2008 +0100
-
- Add a skeleton of OptContentModel::headerData().
-
- It does nothing yet, but we can add stuff later on w/o breaking BC.
-
- qt4/src/poppler-optcontent.cc | 5 +++++
- qt4/src/poppler-optcontent.h | 2 ++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-commit f395531a3e8f71a46b3c942f8f437ade1d9fdb57
-Author: Brad Hards <bradh@kde.org>
-Date: Wed Feb 27 22:22:51 2008 +1100
-
- Minor cleanup.
-
- qt4/src/poppler-optcontent.cc | 7 +++----
- 1 files changed, 3 insertions(+), 4 deletions(-)
-
-commit 0a19486cb4de57c0c987cc4ce2434a96bbd18338
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 12:15:44 2008 +0100
-
- refresh the current page when the data of the content model change
-
- qt4/demos/optcontent.cpp | 8 ++++++++
- qt4/demos/optcontent.h | 3 +++
- 2 files changed, 11 insertions(+), 0 deletions(-)
-
-commit 09b7cc2efb7d21fa4dabd23d2d2de877cc7d86ee
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 12:15:18 2008 +0100
-
- optional method to reload the current page
-
- qt4/demos/documentobserver.cpp | 5 +++++
- qt4/demos/documentobserver.h | 1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 39fe905be8f2ae79d9c26cd87547f3ea2608411e
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 12:00:29 2008 +0100
-
- Add a dock for showing the optional content tree.
-
- qt4/demos/CMakeLists.txt | 1 +
- qt4/demos/Makefile.am | 3 ++
- qt4/demos/optcontent.cpp | 55 ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/optcontent.h | 43 ++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 ++++++
- 5 files changed, 109 insertions(+), 0 deletions(-)
-
-commit f17dd5539501a996479b903ac9b8aceb3c4cfafe
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 11:53:32 2008 +0100
-
- cleanup
-
- qt4/src/poppler-optcontent-private.h | 3 ++-
- qt4/src/poppler-optcontent.h | 4 +---
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-commit f3cc894559f10dbd4277fa9f30de9931ed69dfd4
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 11:43:34 2008 +0100
-
- OptContentModel::itemFromRef() and OptContentItem are private API.
-
- Hide them in the implementation.
-
- qt4/src/poppler-optcontent-private.h | 43 ++++++++++++++++++++++++++++++++++
- qt4/src/poppler-optcontent.cc | 8 +++---
- qt4/src/poppler-optcontent.h | 42 ---------------------------------
- 3 files changed, 47 insertions(+), 46 deletions(-)
-
-commit 48e8b2105cf8f177ca655b969470e45e2407db82
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 11:28:16 2008 +0100
-
- move all the private stuff of OptContentModel into its d-pointer
-
- qt4/src/poppler-optcontent-private.h | 9 +++++++--
- qt4/src/poppler-optcontent.cc | 29 +++++++++++++++--------------
- qt4/src/poppler-optcontent.h | 4 ----
- 3 files changed, 22 insertions(+), 20 deletions(-)
-
-commit b78a7f7a0e8d5a9c22014d34754090d863030e0d
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 27 11:06:57 2008 +0100
-
- use a QPointer for the OptContentModel, so we are safe about ownership.
-
- qt4/src/poppler-document.cc | 4 ++--
- qt4/src/poppler-private.h | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-commit 48557da71adb0fe6bd4da2fb32433796a96c3576
-Author: Brad Hards <bradh@kde.org>
-Date: Wed Feb 27 19:39:18 2008 +1100
-
- We need to install the optional content header.
-
- qt4/src/CMakeLists.txt | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 6e2bb03b5ef256c03a8da1cbf9bbc87c593942ad
-Author: Brad Hards <bradh@kde.org>
-Date: Wed Feb 27 19:23:49 2008 +1100
-
- Partial d-pointer implementation.
-
- qt4/src/poppler-optcontent-private.h | 57 ++++++++++++++++++++++++++++++++++
- qt4/src/poppler-optcontent.cc | 49 ++++++++++++++++++-----------
- qt4/src/poppler-optcontent.h | 24 +++-----------
- 3 files changed, 92 insertions(+), 38 deletions(-)
-
-commit c627b7aa10ae9cdceb78b751a7e826170f402af0
-Author: Brad Hards <bradh@kde.org>
-Date: Wed Feb 27 16:12:38 2008 +1100
-
- A couple of cleanups suggested by Pino.
-
- qt4/src/poppler-document.cc | 6 +++---
- qt4/src/poppler-qt4.h | 8 +++++---
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-commit 81891667e18fcf164af02f5f366de07f78d67c8f
-Author: Brad Hards <bradh@kde.org>
-Date: Wed Feb 27 15:47:03 2008 +1100
-
- Add in the initial part of the optional content support.
-
- To see this work, compare ClarityOCGs.pdf with and
- without this change.
-
- Right now we only handle optional content using
- XObjects. Optional content using Marked Content has
- infrastructure, but is not implemented. That will be
- quite invasive in Gfx, and I'm not confident enough
- to do it this late in the process.
-
- CMakeLists.txt | 1 +
- poppler/Catalog.cc | 9 +
- poppler/Catalog.h | 4 +
- poppler/Gfx.cc | 65 +++++-
- poppler/Gfx.h | 12 +-
- poppler/Makefile.am | 2 +
- poppler/OptionalContent.cc | 322 ++++++++++++++++++++++++++
- poppler/OptionalContent.h | 85 +++++++
- poppler/PDFDoc.h | 5 +
- poppler/PSOutputDev.cc | 6 +-
- poppler/Page.cc | 2 +-
- qt4/src/.gitignore | 1 +
- qt4/src/CMakeLists.txt | 3 +
- qt4/src/Makefile.am | 6 +
- qt4/src/poppler-document.cc | 13 +
- qt4/src/poppler-optcontent.cc | 354 ++++++++++++++++++++++++++++
- qt4/src/poppler-optcontent.h | 122 ++++++++++
- qt4/src/poppler-private.h | 4 +
- qt4/src/poppler-qt4.h | 18 ++
- qt4/tests/.gitignore | 1 +
- qt4/tests/CMakeLists.txt | 1 +
- qt4/tests/Makefile.am | 5 +
- qt4/tests/check_optcontent.cpp | 499 ++++++++++++++++++++++++++++++++++++++++
- 23 files changed, 1532 insertions(+), 8 deletions(-)
-
-commit 11b70bcda905e618c199a067db6b0246612e101d
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Feb 26 23:01:27 2008 +0100
-
- fixup the default export macro name (added by cmake); _WIN32 is defined only on win32 (remove a plethora of warnings)
-
- qt4/src/poppler-export.h | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit d4d6c14cd83d04c61daa6618c3148a0bb47dc292
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Feb 26 22:57:02 2008 +0100
-
- install the export header
-
- qt4/src/CMakeLists.txt | 1 +
- qt4/src/Makefile.am | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 4ba2e2d21710135656adbf93c5994cfb46502308
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Feb 26 22:55:30 2008 +0100
-
- no need to include the export header in private headers
-
- qt4/src/poppler-annotation-helper.h | 1 -
- qt4/src/poppler-annotation-private.h | 1 -
- qt4/src/poppler-converter-private.h | 1 -
- qt4/src/poppler-link-extractor-private.h | 1 -
- qt4/src/poppler-page-private.h | 1 -
- qt4/src/poppler-private.h | 1 -
- qt4/src/poppler-qiodeviceoutstream-private.h | 1 -
- 7 files changed, 0 insertions(+), 7 deletions(-)
-
-commit 0a466c09fb70b92f39df19bc315b6575e419ad5b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Feb 26 22:47:31 2008 +0100
-
- We also need to distribute poppler-export.h
-
- qt4/src/Makefile.am | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 2034d57c700049bc9a6565bbb818e1c9f4467784
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Feb 26 22:46:29 2008 +0100
-
- Now for real: Add special casing in cmake buildsystem for MSVC, also add Export markers to qt4 classes, although symbol visibility is only used on MSVC at the moment
-
- CMakeLists.txt | 5 +++++
- qt4/src/CMakeLists.txt | 3 +++
- qt4/src/poppler-annotation-helper.h | 1 +
- qt4/src/poppler-annotation-private.h | 1 +
- qt4/src/poppler-annotation.h | 19 ++++++++++---------
- qt4/src/poppler-converter-private.h | 1 +
- qt4/src/poppler-export.h | 6 +++---
- qt4/src/poppler-form.h | 9 +++++----
- qt4/src/poppler-link-extractor-private.h | 1 +
- qt4/src/poppler-link.h | 17 +++++++++--------
- qt4/src/poppler-page-private.h | 1 +
- qt4/src/poppler-private.h | 1 +
- qt4/src/poppler-qiodeviceoutstream-private.h | 1 +
- qt4/src/poppler-qt4.h | 21 +++++++++++----------
- qt4/tests/CMakeLists.txt | 6 ++++++
- 15 files changed, 59 insertions(+), 34 deletions(-)
-
-commit b931920f63f4276ec355118faa061bafa5ac5244
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Feb 26 22:42:16 2008 +0100
-
- Add special casing in cmake buildsystem for MSVC, also add Export markers to qt4 classes, although symbol visibility is only used on MSVC at the moment
-
- qt4/src/poppler-export.h | 17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
-
-commit 1778fddb36d6cb2c7f7848bee06189158f69f16e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 24 23:02:08 2008 +0100
-
- Add the cmake files to EXTRA_DIST so they get added when i do make dist to get the release tarball
-
- Makefile.am | 39 +++++++++++++++++++++++++++++++++++++++
- 1 files changed, 39 insertions(+), 0 deletions(-)
-
-commit 51f171e10a42d492c8c32a5e2578d05b73d89238
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 24 22:47:46 2008 +0100
-
- ignore more
-
- qt4/demos/.gitignore | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit adb1ccdb9265f0583cb348c456a39efac610aff1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 24 22:46:33 2008 +0100
-
- ignore
-
- qt4/demos/.gitignore | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 101e526c63175ffc1a75e1b68da7bb4fff9cd530
-Author: Patrick Spendrin <ps_ml@gmx.de>
-Date: Sun Feb 24 20:52:41 2008 +0100
-
- define snprintf to _snprintf if we are building on MSVC
-
- config.h.cmake | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit f7f8ab488257c3979d20e5c0690ec5d7c2cd831b
-Author: Patrick Spendrin <ps_ml@gmx.de>
-Date: Sun Feb 24 20:43:11 2008 +0100
-
- define M_PI in case it is not defined
-
- poppler/Function.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit f00436b63bf9a42dcb2728a07db9c20f1f23d0bc
-Author: Patrick Spendrin <ps_ml@gmx.de>
-Date: Sun Feb 24 20:39:42 2008 +0100
-
- Add proper dirent.h guards
-
- utils/pdftoabw.cc | 2 ++
- utils/pdftohtml.cc | 2 ++
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-commit e1463451c584181f918265438cf6ddcb408bf731
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Feb 21 20:43:56 2008 +0100
-
- Code uses if USE_EXCEPTIONS, so we need to defined it to 1, not just define it
-
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 88d4bbbcf828e3247454c8ba3c2fb0fb58207b6a
-Author: Michael Vrable <mvrable@cs.ucsd.edu>
-Date: Thu Feb 21 19:53:03 2008 +0100
-
- If a bitmap's dimensions are invalid, do not try to display it.
-
- poppler/Gfx.cc | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 452ae6f5674b00b43955952961f7ca0583f73e27
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Feb 21 19:46:19 2008 +0100
-
- Make sure we don't draw outside the bitmap on Splash::fillGlyph2
-
- splash/Splash.cc | 76 ++++++++++++++++++++++++++++++++++-------------------
- 1 files changed, 49 insertions(+), 27 deletions(-)
-
-commit 7f60fa806bd6d3d28917f349a2a19b52f97f593a
-Author: James Cloos <cloos@jhcloos.com>
-Date: Thu Feb 21 13:00:05 2008 -0500
-
- Fix typo
-
- Signed-off-by: James Cloos <cloos@jhcloos.com>
-
- qt4/demos/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 053ecae534a4522d152b0139b6aed6da2059d760
-Author: Carl Worth <cworth@cworth.org>
-Date: Wed Feb 20 17:21:27 2008 -0800
-
- Keep cairo and cairo_shape consistent
-
- The 'cairo_shape' state was not always being modified at the same
- time as 'cairo'. In some cases this led to a sequence of ever
- larger matrix scale factors until things just blew up.
-
- poppler/CairoOutputDev.cc | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit bf6dd890994150406b4464e45355a4a99870fc60
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 21 01:23:07 2008 +0100
-
- Add a dock for showing the document metadata.
-
- qt4/demos/CMakeLists.txt | 1 +
- qt4/demos/Makefile.am | 3 ++
- qt4/demos/metadata.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/metadata.h | 43 +++++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 ++++++
- 5 files changed, 104 insertions(+), 0 deletions(-)
-
-commit b6f0c8f83924c08be20b602b128651bf018172a3
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 21 00:54:26 2008 +0100
-
- Do not assign conflicting accelerators.
-
- qt4/demos/viewer.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit e0c27a968c7e7a0f6a89a050ddbfe328229f431d
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 21 00:53:24 2008 +0100
-
- Apply the antialias settings w/o notify the observers.
-
- qt4/demos/viewer.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 2c6149abcecda15c6f73a1dee537072240ddd545
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 21 00:51:21 2008 +0100
-
- Add a settings menu to choose the render backend.
-
- qt4/demos/viewer.cpp | 28 ++++++++++++++++++++++++++++
- qt4/demos/viewer.h | 3 +++
- 2 files changed, 31 insertions(+), 0 deletions(-)
-
-commit db2b0778dca364751a1d22294be29f8c7799e2e9
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 21 00:33:23 2008 +0100
-
- Add a dock for showing the embedded files.
-
- TODO: show the checksum in a pretty format.
-
- qt4/demos/CMakeLists.txt | 1 +
- qt4/demos/Makefile.am | 3 ++
- qt4/demos/embeddedfiles.cpp | 75 +++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/embeddedfiles.h | 43 ++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 ++++
- 5 files changed, 129 insertions(+), 0 deletions(-)
-
-commit 51fba47ccb12a66282769fc504bac4c9f5123f75
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Feb 17 01:49:59 2008 +0100
-
- clear the page label when the document is closed
-
- qt4/demos/pageview.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit e964e2b9fbbe9b52b137ecd06729a06530835227
-Author: Michael Vrable <mvrable@cs.ucsd.edu>
-Date: Tue Feb 19 23:22:55 2008 +0100
-
- Allow grouped checkboxes to be selected individually.
-
- When checkboxes are in a group, they ought to behave like a collection of
- radio buttons. However, when deciding whether to draw a checkbox as
- selected or not, the checkbox-drawing code was looking up the value of the
- V field in the form dictionary, which is shared among all checkboxes in the
- group. Thus, checkboxes would either all be on or off in unison.
-
- Instead, look up the AS (appearance state) value in each checkbox's
- annotation dictionary, so that different checkboxes can be drawn
- differently.
-
- poppler/Annot.cc | 6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
-
-commit 702fdd6c56b5369554c683d8c8e0e2c66e80886c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Feb 19 00:18:04 2008 +0100
-
- changes from gtk-doc
-
- glib/reference/tmpl/poppler-document.sgml | 1 +
- glib/reference/tmpl/poppler-page.sgml | 2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 9e13b91ba38c20989d283588e73490a1601f5bb0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Feb 19 00:10:24 2008 +0100
-
- distribute the headers too
-
- qt4/demos/Makefile.am | 11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-commit 194e0ced7c38514ec3126666531862e3b29b4b77
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Feb 18 23:34:06 2008 +0100
-
- Fill NEWS and increase version number to 0.7
-
- CMakeLists.txt | 2 +-
- NEWS | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 2 +-
- msvc/config.h | 6 ++--
- qt4/src/Doxyfile | 2 +-
- 5 files changed, 102 insertions(+), 6 deletions(-)
-
-commit 3c407efe9f1f0cc3f6366d3a2b6e9b687656cc95
-Merge: 51f0cea 7f4acb8
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Feb 18 21:30:42 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 51f0cea0e3ba1acfc63877752e950fdd8c07e258
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Feb 18 21:29:41 2008 +0100
-
- make the poppler_qt4viewer compile with the auto"tools"
-
- qt4/demos/Makefile.am | 16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
-
-commit 7f4acb879d300e18dfaff768027c88195d7d8f1b
-Author: Timothy Lee <timothy.lee@siriushk.com>
-Date: Mon Feb 18 20:56:35 2008 +0100
-
- Implement ImageOutputDev::drawMaskedImage and ImageOutputDev::drawSoftMaskedImage so all images are exported when using pdfimages
-
- utils/ImageOutputDev.cc | 19 +++++++++++++++++++
- utils/ImageOutputDev.h | 11 +++++++++++
- 2 files changed, 30 insertions(+), 0 deletions(-)
-
-commit 064b316648e35416bb49336639da1d8d288d1ecf
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Feb 18 20:17:37 2008 +0100
-
- xref can be null so check for it before checking we went out of bounds
-
- Fixes bug 14549
-
- poppler/Lexer.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit b287b611b1c7b7dd00e12518cee3a6c35044e161
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Feb 17 01:21:07 2008 +0100
-
- Really niptick: help menu with about dialog for us and Qt.
-
- qt4/demos/viewer.cpp | 15 +++++++++++++++
- qt4/demos/viewer.h | 2 ++
- 2 files changed, 17 insertions(+), 0 deletions(-)
-
-commit 6400254fdabf3d0d32f27ebd00faa6958be62019
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Feb 17 01:12:27 2008 +0100
-
- Add a title to the viewer :)
-
- qt4/demos/viewer.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit b363c0568c9c61e7ee8ed86d808f0eed0b93b525
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Feb 17 01:09:57 2008 +0100
-
- Add the possibility to save a copy of the file.
-
- qt4/demos/viewer.cpp | 29 +++++++++++++++++++++++++++++
- qt4/demos/viewer.h | 2 ++
- 2 files changed, 31 insertions(+), 0 deletions(-)
-
-commit 42987dcdd8d7432145f78cfc550f0c099e6e7311
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Feb 17 00:33:01 2008 +0100
-
- Add a Permissions dock.
-
- qt4/demos/CMakeLists.txt | 1 +
- qt4/demos/Makefile.am | 1 +
- qt4/demos/permissions.cpp | 77 +++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/permissions.h | 43 +++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 ++++
- 5 files changed, 129 insertions(+), 0 deletions(-)
-
-commit 9d1dda64de1d9e3f6fc81e40a0c2246a6270dfa8
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 23:56:17 2008 +0100
-
- Add settings for antialias.
-
- qt4/demos/viewer.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.h | 4 ++++
- 2 files changed, 45 insertions(+), 0 deletions(-)
-
-commit 3abb8703d7d8b7a5fbcbb3c19d8e84d640abe88c
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 22:25:11 2008 +0100
-
- Add a TOC info dock.
-
- qt4/demos/CMakeLists.txt | 1 +
- qt4/demos/Makefile.am | 1 +
- qt4/demos/toc.cpp | 90 ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/toc.h | 43 ++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 ++++
- 5 files changed, 142 insertions(+), 0 deletions(-)
-
-commit 80925f06d125ebfc9909e36bdbe5d37fd0e48bdc
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 21:51:10 2008 +0100
-
- Adapt the Fonts and Info docks to the new abstract info dock.
-
- qt4/demos/fonts.cpp | 10 +++-------
- qt4/demos/fonts.h | 11 +++++------
- qt4/demos/info.cpp | 10 +++-------
- qt4/demos/info.h | 11 +++++------
- 4 files changed, 16 insertions(+), 26 deletions(-)
-
-commit c03531d691e56aba2b4c6538cf9e2463e1e0aa29
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 21:43:19 2008 +0100
-
- Introduce a base info dock for handling the "dirty" work.
-
- qt4/demos/CMakeLists.txt | 1 +
- qt4/demos/Makefile.am | 1 +
- qt4/demos/abstractinfodock.cpp | 57 ++++++++++++++++++++++++++++++++++++++++
- qt4/demos/abstractinfodock.h | 48 +++++++++++++++++++++++++++++++++
- 4 files changed, 107 insertions(+), 0 deletions(-)
-
-commit 0f7d51c7fc2439ee9392c166576c341238f00f36
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 18:49:52 2008 +0100
-
- Delete the poppler page after usage.
-
- qt4/demos/pageview.cpp | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit b41d069cdd1435ddb14b3de2986875069523c814
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 18:48:57 2008 +0100
-
- Initialize the current page number correctly.
-
- qt4/demos/viewer.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 75e516af0e72a2e3041660300e522ad00869372b
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 18:43:56 2008 +0100
-
- Add a side dock for showing the fonts of the document.
-
- qt4/demos/CMakeLists.txt | 1 +
- qt4/demos/Makefile.am | 1 +
- qt4/demos/fonts.cpp | 78 ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/fonts.h | 44 ++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 7 ++++
- 5 files changed, 131 insertions(+), 0 deletions(-)
-
-commit 8e642d1cbd48d4790a6769287cbfd90c3bc9fc34
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 17:21:30 2008 +0100
-
- Add a View menu where the dock widget toogle actions will be.
-
- As start, put the Info dock there.
-
- qt4/demos/viewer.cpp | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit c1feb7c2b5008cc04edb3c028f888072920ce4dc
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 17:14:00 2008 +0100
-
- Add a side dock for showing the info keys.
-
- qt4/demos/CMakeLists.txt | 1 +
- qt4/demos/Makefile.am | 1 +
- qt4/demos/info.cpp | 78 ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/info.h | 44 ++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 5 +++
- 5 files changed, 129 insertions(+), 0 deletions(-)
-
-commit abc9b00c6470f9f6b66c280455f544ad0ee3aa8c
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 16:09:52 2008 +0100
-
- Basic work in the demo PDF viewer, open documents and navigate into the pages.
-
- An observer structure was introduced, so extra components can be easily added and made aware of the document/page changes.
- Both the navigation toolbar and the page view are implemented as observers.
-
- qt4/demos/CMakeLists.txt | 3 +
- qt4/demos/Makefile.am | 3 +
- qt4/demos/documentobserver.cpp | 45 ++++++++++++++++++
- qt4/demos/documentobserver.h | 49 +++++++++++++++++++
- qt4/demos/navigationtoolbar.cpp | 98 +++++++++++++++++++++++++++++++++++++++
- qt4/demos/navigationtoolbar.h | 56 ++++++++++++++++++++++
- qt4/demos/pageview.cpp | 60 ++++++++++++++++++++++++
- qt4/demos/pageview.h | 44 +++++++++++++++++
- qt4/demos/viewer.cpp | 98 +++++++++++++++++++++++++++++++++++++-
- qt4/demos/viewer.h | 17 +++++++
- 10 files changed, 470 insertions(+), 3 deletions(-)
-
-commit 14c88853a5675f40efb72f3ef01f49eb06ab846c
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 00:32:30 2008 +0100
-
- Compile the poppler_qt4viewer.
-
- qt4/demos/CMakeLists.txt | 7 +++++++
- qt4/demos/Makefile.am | 12 ++++++++++--
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
-commit aeb591f015d5e7a2643ed75d872358d2b1256b99
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 16 00:31:46 2008 +0100
-
- Add a very minimal base PDF viewer.
-
- So minimal that it does nothing at the moment...
-
- qt4/demos/main_viewer.cpp | 29 ++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp | 46 +++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.h | 45 ++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 120 insertions(+), 0 deletions(-)
-
-commit 8da490b090487c4c37290b63bdc9abcfaf6d6940
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 15 23:59:39 2008 +0100
-
- Add a skeleton of directory where PopplerQt4 demos will be.
-
- configure.ac | 1 +
- qt4/CMakeLists.txt | 1 +
- qt4/Makefile.am | 2 +-
- qt4/demos/CMakeLists.txt | 10 ++++++++++
- qt4/demos/Makefile.am | 20 ++++++++++++++++++++
- 5 files changed, 33 insertions(+), 1 deletions(-)
-
-commit e24b49d52a5c1716641695ee731dd49848a114d9
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 14 22:21:54 2008 +0100
-
- do not print it as string
-
- qt4/src/poppler-private.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 2316455864e9c900c08d051c59b9508eddcb7c34
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 14 21:02:20 2008 +0100
-
- Pipe the poppler error messages through the Qt debug system.
-
- qt4/src/poppler-private.cc | 21 +++++++++++++++++++++
- qt4/src/poppler-private.h | 8 +++++++-
- 2 files changed, 28 insertions(+), 1 deletions(-)
-
-commit d985d3b0cdc57370137865add2a5f3a7802109c7
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 14 14:56:18 2008 +0100
-
- Use what FormWidgetText give us.
-
- qt4/src/poppler-form.cc | 13 +++----------
- 1 files changed, 3 insertions(+), 10 deletions(-)
-
-commit a69bd442e52f4495f8d6bfd3bb58b3ebd1be1a63
-Author: Michael Vrable <mvrable@cs.ucsd.edu>
-Date: Thu Feb 14 12:52:22 2008 +0100
-
- Provide Unicode mappings for some control characters in PDFDocEncoding.
-
- Though they do not represent glyphs, values such as carriage return can be
- found in text strings in PDFDocEncoding. Provide mappings for these bytes
- to Unicode.
-
- Additionally, map unknown characters to U+FFFD instead of U+0000, so that
- unknown characters do not result in nulls (which can truncate strings
- early, particularly if the string is later re-encoded into null-terminated
- UTF-8).
-
- poppler/PDFDocEncoding.cc | 23 +++++++++++++++++------
- 1 files changed, 17 insertions(+), 6 deletions(-)
-
-commit ce17383e0ed21770b471e88f25046a64a23e7e45
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Feb 13 20:56:39 2008 +0100
-
- Yet another fix for buggy documents, do not use the cache if the cache could not be created because it ought to be too big
-
- Fixes http://bugs.kde.org/show_bug.cgi?id=157777
-
- splash/SplashFont.cc | 48 ++++++++++++++++++++++++++++--------------------
- 1 files changed, 28 insertions(+), 20 deletions(-)
-
-commit 15a61cac718ae8cbf83911e299b4cfdd24cdf178
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 13 20:55:18 2008 +0100
-
- add images.c
-
- glib/demo/CMakeLists.txt | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 9cfe10ab7f51d329647e102e446baaef043d8cc6
-Merge: e918729 7d65b4d
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 13 20:53:43 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 7d65b4da1bc060aeb94d67c2ff26912cef48c030
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Feb 13 20:32:43 2008 +0100
-
- Add images demo
-
- glib/demo/Makefile.am | 2 +
- glib/demo/images.c | 338 +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/images.h | 31 +++++
- glib/demo/main.c | 4 +-
- 4 files changed, 374 insertions(+), 1 deletions(-)
-
-commit e9187292701e72db1020f7701d0725d83eee4b00
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 13 19:41:57 2008 +0100
-
- Do the one-time initialisation in initTestCase().
-
- qt4/tests/check_dateConversion.cpp | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-commit fb996c46e3c6b56a2c67819620000bcd804aacd6
-Author: Michael Vrable <mvrable@cs.ucsd.edu>
-Date: Wed Feb 13 18:44:41 2008 +0100
-
- Major rework of text display in form fields code.
-
- This adds support for UTF-16 strings as input, and will recode them to the
- appropriate character set for the font.
-
- The method Annot::layoutText packs a lot of functionality together, but I
- couldn't see a good way to split it apart. It will convert an input text
- string from PDFDocEncoding or UTF-16 (encoding is autodetected) to the
- appropriate encoding for the font which will be used to display the form
- field. At the same time, it can compute the width of the resulting string,
- and optionally break the string at a specified width to aid in wrapping
- multi-line text. Text wrapping is integrated with encoding conversion
- since wrapping is easiest with the original text (where spaces and newlines
- are easily identified), but text widths can only be computed after
- re-encoding.
-
- Support for composite fonts is included, so long as those fonts use an
- identity CMap, but this is still untested. Support for more complex CMaps
- is missing.
-
- The rewrite also includes a minor improvement to the formatting of comb
- fields; characters are now centered in the comb cells.
-
- poppler/Annot.cc | 507 ++++++++++++++++++++++++++++++++++--------------------
- poppler/Annot.h | 9 +-
- 2 files changed, 327 insertions(+), 189 deletions(-)
-
-commit 88c780aed4c9855f879e3c7a9f82500a859635a2
-Author: Michael Vrable <mvrable@cs.ucsd.edu>
-Date: Wed Feb 13 18:42:49 2008 +0100
-
- Fix what look to be a few bugs in functions for mapping to/from Unicode.
-
- - Endianness fix in pdfDocEncodingToUTF16 (previously looked to assume a
- little-endian processor)
- - Add support for CharCodeToUnicode::mapToCharCode for Unicode codepoints
- above 255.
-
- poppler/CharCodeToUnicode.cc | 4 ++--
- poppler/Form.cc | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 7574cb71f24ce5b32427f243c39b6029fb58ec81
-Merge: e798802 4e45e5c
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Feb 13 01:07:31 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 4e45e5ca4ab0ba2a6586505d80ed81f4b3426752
-Author: Patrick Spendrin <ps_ml@gmx.de>
-Date: Tue Feb 12 21:41:26 2008 +0100
-
- Do the right thing with CDECL, that is, undefine it if it is defined so we can redefine it later
-
- poppler-config.h.cmake | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit e798802f00bff0a24ee6d1312d6c62624395865a
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Feb 12 20:57:56 2008 +0100
-
- Apidox fix: state which checksum is returned (if available).
-
- qt4/src/poppler-qt4.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 4e2ba70a88c40fef6775053b1cc5fa30e622cea7
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Feb 12 11:25:34 2008 +0100
-
- Free the Object after you use it.
-
- poppler/Annot.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 039545fcd2c12631c7b8aea89c35f36cb387a17a
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Feb 12 11:13:27 2008 +0100
-
- Return the siblings even for checkboxes.
-
- qt4/src/poppler-form.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit fe5ee75cdf3e11e314318af12edf9d5bc8986250
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Feb 12 11:12:01 2008 +0100
-
- Initialize correctly; free your memory.
-
- poppler/Form.cc | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit e0eff92c7067d43faa8e93baed1f061863111251
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Feb 11 20:32:41 2008 +0100
-
- Update the field dict instead of the annot dict for non composed dicts
-
- We were always updating the annot dictionary, adding or updating
- the V field. While this is correct for composed dicts (annot + field)
- it isn't for non composed ones since the annot dictionary doesn't
- contain any V field because it's a field of the form field dictionary.
- In these cases the form field is not correctly updated and if the
- document is saved it will be wrong.
-
- poppler/Form.cc | 44 +++++++++++++++++++++++++++++++-------------
- poppler/Form.h | 2 ++
- 2 files changed, 33 insertions(+), 13 deletions(-)
-
-commit 905e6da9795fee94329022c0cafbc229055fd4f6
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Feb 10 19:22:50 2008 +0100
-
- Move forms specific draw methods from Annot to AnnotWidget class
-
- poppler/Annot.cc | 2345 +++++++++++++++++++++++++++---------------------------
- poppler/Annot.h | 87 +-
- poppler/Form.cc | 39 +-
- poppler/Form.h | 2 +
- poppler/Page.cc | 9 +-
- 5 files changed, 1221 insertions(+), 1261 deletions(-)
-
-commit 78afbc4d7819654e8742d4457c9847ad02b73bf1
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Feb 10 17:12:59 2008 +0100
-
- Some code refactoring and cleanup
-
- - Unused 'field' attribute in FormWidget class is now used and
- getField() method has been added
- - Method isReadOnly() in FormWidget class is not virtual anymore
- but implemented in the base class
- - Unused attribute 'catalog' in Form class has been removed and
- 'acroForm' has been added instead with a getObj() method to get it.
- - createFieldFromDict() method is now static
-
- poppler/Form.cc | 128 ++++++++++++++++++++++++++++---------------------------
- poppler/Form.h | 41 ++++++++---------
- 2 files changed, 84 insertions(+), 85 deletions(-)
-
-commit 5f8e2f9140ee2ede841700726b974768ec863672
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Feb 11 20:16:44 2008 +0100
-
- Use QVarLengthArray instead of relying on gcc-ism.
-
- qt4/src/poppler-page.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 7499764d382366823519aa13a38e1e44781c78af
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Feb 11 11:57:50 2008 +0100
-
- Add FormFieldButton::siblings().
-
- This is needed for grouping together the radio buttons.
-
- qt4/src/poppler-form.cc | 14 ++++++++++++++
- qt4/src/poppler-form.h | 8 ++++++++
- 2 files changed, 22 insertions(+), 0 deletions(-)
-
-commit 85bfa4f499a90d45b13df4d0a8760a7da6fc1532
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Feb 11 02:40:37 2008 +0100
-
- Small apidox fix.
-
- qt4/src/poppler-form.h | 11 ++---------
- 1 files changed, 2 insertions(+), 9 deletions(-)
-
-commit ada05055c91e967dc3e2af32a2176dd12cb7fe70
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Feb 11 02:27:19 2008 +0100
-
- Preliminary support for "button" form fields (ie, push buttons, check boxes, and radio buttons).
-
- qt4/src/poppler-form.cc | 55 +++++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-form.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc | 6 +++++
- 3 files changed, 115 insertions(+), 0 deletions(-)
-
-commit 278b33f25df418ef12798100002845a3e2ceebd3
-Merge: c730b33 fdb0a4a
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Feb 11 00:57:24 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit fdb0a4a2f1d86aec7a3b0fcd4b4d48455791ecad
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Feb 10 18:47:40 2008 -0500
-
- Avoid prescaling images when printing.
-
- Adds a function for letting the CairoOutputDev know whether it is targetting a
- screen or not. It then uses this knowledge to avoid prescaling images. This way
- cairo gets the full resolution image for use in the printed output.
-
- glib/poppler-page.cc | 1 +
- poppler/CairoOutputDev.cc | 3 ++-
- poppler/CairoOutputDev.h | 2 ++
- 3 files changed, 5 insertions(+), 1 deletions(-)
-
-commit c730b33f1ec2032c4b8c2660738448d954eb0f7d
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Feb 11 00:46:20 2008 +0100
-
- Keep the EmbFile object, and use this for getting the data.
-
- qt4/src/poppler-embeddedfile.cc | 33 +++++++++++----------------------
- qt4/src/poppler-private.h | 1 -
- 2 files changed, 11 insertions(+), 23 deletions(-)
-
-commit 5915e57e7785370ce305cbbb3c2fedf36886689f
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Feb 10 03:19:18 2008 +0100
-
- const & in foreach
-
- qt4/tests/poppler-fonts.cpp | 2 +-
- qt4/tests/stress-poppler-dir.cpp | 2 +-
- qt4/tests/stress-poppler-qt4.cpp | 2 +-
- qt4/tests/test-password-qt4.cpp | 2 +-
- qt4/tests/test-poppler-qt4.cpp | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-commit d8374e0c2eb3ba05be101687e20c5fcbc42c1ad0
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Feb 10 01:32:24 2008 +0100
-
- Include only what needed; remove extra includes.
-
- qt4/tests/poppler-attachments.cpp | 4 +++-
- qt4/tests/poppler-fonts.cpp | 4 +++-
- qt4/tests/stress-poppler-dir.cpp | 9 ++++++---
- qt4/tests/stress-poppler-qt4.cpp | 9 ++++++---
- qt4/tests/test-password-qt4.cpp | 10 ++++++----
- qt4/tests/test-poppler-qt4.cpp | 12 ++++++++----
- 6 files changed, 32 insertions(+), 16 deletions(-)
-
-commit fa01a1115c4554b18c3462b568d76860d2fbe17b
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Feb 10 01:09:57 2008 +0100
-
- Comment out unused vars.
-
- utils/pdftoabw.cc | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-commit d3275e4263372b534c276f81d0c997ecb6675487
-Merge: c2186c1 5347a97
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 9 23:57:03 2008 +0100
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit c2186c1829c695c4ddb6c471ef8ad4ffa23c1b70
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 9 23:56:32 2008 +0100
-
- Only check if we are out of bounds if the object we are searching for has a known id (0 also means not known)
-
- Found by Michael Vrable
-
- poppler/Lexer.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 5347a97e39388ae38cf2ab9c67f953b0f7a02a13
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 9 18:26:41 2008 +0100
-
- Add the operators for the flags we have.
-
- qt4/src/poppler-qt4.h | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 329ade4f936bf063539cdc887aaf9a1722a5b8e0
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 9 18:23:59 2008 +0100
-
- Add options for the PDF export; add the WithChanges flag for saving the changes to the document as well.
-
- qt4/src/poppler-pdf-converter.cc | 25 +++++++++++++++++++++++--
- qt4/src/poppler-qt4.h | 14 ++++++++++++++
- 2 files changed, 37 insertions(+), 2 deletions(-)
-
-commit afb255366d56551bdc307766199bef9c5021d3ac
-Merge: 8c44b17 8cb0e75
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 9 17:58:49 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 8c44b175081983c492821858341109fee9e86b16
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 9 17:57:57 2008 +0100
-
- Do not rely on GNU extensions, but at least use Qt.
-
- qt4/src/poppler-qiodeviceoutstream.cc | 11 ++++-------
- 1 files changed, 4 insertions(+), 7 deletions(-)
-
-commit 8cb0e75203daa01439413d1a775482b48e784baa
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 9 17:56:13 2008 +0100
-
- Domain order is x_min x_max y_min y_max and not x_min y_min x_max y_max
-
- poppler/GfxState.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit c8f734ba4258059fa4521a4d364f62ca1632840b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 9 13:37:04 2008 +0100
-
- PS cos and sin input values are degrees so convert to radians so we can use the cos and sin cmath functions
-
- poppler/Function.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 5fb0c9d31c1abf2e6ad306c112fbd2a7c33d8772
-Merge: 2655663 2255c85
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Feb 9 13:15:15 2008 +0100
-
- Merge branch 'master' of ssh://carlosgc@git.freedesktop.org/git/poppler/poppler
-
-commit 26556636e71d5abcbfdd1373f5576d1233532cf8
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Feb 9 13:14:41 2008 +0100
-
- Add saveWithoutChangesAs method to be able to save the document ignoring changes made in forms or annots
-
- glib/poppler-document.cc | 41 ++++++++++++++++++++++++++++++++++++++++-
- glib/poppler-document.h | 3 +++
- poppler/PDFDoc.cc | 38 ++++++++++++++++++++++++++++++++------
- poppler/PDFDoc.h | 4 ++++
- 4 files changed, 79 insertions(+), 7 deletions(-)
-
-commit 2255c85e4939a0752083dca21984ff4398baf8d2
-Merge: 5ba9287 56c9246
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 9 12:49:45 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 5ba928762471e1ea8b81acd4644dfd3f58d18f77
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 9 12:48:04 2008 +0100
-
- Fix placeholders in printf-like functions.
-
- glib/demo/page.c | 2 +-
- glib/test-poppler-glib.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 56c924609223196c5c41b9e6d9102bc248bad947
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 9 12:26:06 2008 +0100
-
- atan operator must yield a degrees result between 0 and 360
-
- See testcase at http://bugs.kde.org/show_bug.cgi?id=157497
-
- poppler/Function.cc | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-commit 2a39932ae35a2716842bd2a1c3d4f9ce6b1e3dd8
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 9 01:31:20 2008 +0100
-
- Few improvements to the password test.
-
- - QString::fromUtf8() instead of QFile::encodeName() to correctly pass the utf8 filenames
- - QVERIFY(!foo) instead of QCOMPARE(foo, false)
- - QVERIFY() also the return value of unlock()
-
- qt4/tests/check_password.cpp | 31 ++++++++++++++++---------------
- 1 files changed, 16 insertions(+), 15 deletions(-)
-
-commit cc9c124d4d859b845eebf4ca1e4397870a35fd4e
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Feb 9 01:09:02 2008 +0100
-
- Add an unit test case for few invalid dates.
-
- qt4/tests/check_dateConversion.cpp | 34 ++++++++++++++++++++++++++++++++++
- 1 files changed, 34 insertions(+), 0 deletions(-)
-
-commit eca91761741de5b340f7a2160db5b33401feb935
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 18:42:14 2008 +0100
-
- Remove unneeded headers.
-
- qt4/src/poppler-page.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 899627505a4645fb1cc7d3599adbeec449c57041
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 18:41:13 2008 +0100
-
- The return value is QString, so return QString's...
-
- qt4/src/poppler-document.cc | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-commit a1606fa4ff438983e3a7f55dd2d10a66f72e6711
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 17:31:32 2008 +0100
-
- Move checkDocument() inside the private class.
-
- qt4/src/poppler-document.cc | 6 +++---
- qt4/src/poppler-private.h | 2 ++
- qt4/src/poppler-qt4.h | 2 +-
- 3 files changed, 6 insertions(+), 4 deletions(-)
-
-commit f1ec70a83f807493dab5118761df31c0f67decad
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 17:26:41 2008 +0100
-
- Remove C-ism.
-
- qt4/src/poppler-document.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 3e994e8586fa1c87ef7e7f82af1cdacf2cd36310
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 12:21:56 2008 +0100
-
- Add the missing font types.
-
- qt4/src/poppler-fontinfo.cc | 11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-commit ba07963f85d777a441349e23d4c2f510e45c73be
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 12:19:04 2008 +0100
-
- Be safe against self-assignment.
-
- qt4/src/poppler-fontinfo.cc | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 834b86548e09f4b24cdb2f194299d053b9b55022
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 12:15:16 2008 +0100
-
- Small apidox fix.
-
- qt4/src/poppler-qt4.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 11a61eac5b8cde04bf762bbbe0deab5c0bd52951
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 02:21:32 2008 +0100
-
- Pack few bools together.
-
- qt4/src/poppler-annotation.cc | 8 ++++----
- qt4/src/poppler-link.cc | 10 +++++-----
- qt4/src/poppler-private.h | 4 ++--
- 3 files changed, 11 insertions(+), 11 deletions(-)
-
-commit 1aeba15b5eb9b30943259824678ebc9e4f56e870
-Merge: a489063 22d10c1
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 01:39:16 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit a4890637a2c2ab1623311d9a6920e82131c2597c
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 01:36:56 2008 +0100
-
- Move QStringToUnicodeGooString() and QStringToGooString() to the private module.
-
- qt4/src/poppler-document.cc | 10 ----------
- qt4/src/poppler-form.cc | 15 ---------------
- qt4/src/poppler-private.cc | 25 +++++++++++++++++++++++++
- qt4/src/poppler-private.h | 4 ++++
- 4 files changed, 29 insertions(+), 25 deletions(-)
-
-commit 5e44241c4976b819f7be6badd2d183fbfb8ee6de
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 01:30:07 2008 +0100
-
- Move the string functions implementation in a .cc file.
-
- qt4/src/CMakeLists.txt | 1 +
- qt4/src/Makefile.am | 1 +
- qt4/src/poppler-private.cc | 70 ++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-private.h | 46 ++--------------------------
- 4 files changed, 76 insertions(+), 42 deletions(-)
-
-commit 124d92139241ad95da559d22af48254b45ac4a2e
-Author: Pino Toscano <pino@kde.org>
-Date: Fri Feb 8 01:07:43 2008 +0100
-
- Include own header first, remove extra includes.
-
- qt4/src/poppler-document.cc | 1 -
- qt4/src/poppler-embeddedfile.cc | 3 ++-
- qt4/src/poppler-form.cc | 4 +++-
- qt4/src/poppler-link-extractor-private.h | 2 ++
- qt4/src/poppler-link-extractor.cc | 7 +++++--
- qt4/src/poppler-page-private.h | 6 +++++-
- qt4/src/poppler-private.h | 4 +++-
- qt4/src/poppler-qt4.h | 2 --
- qt4/src/poppler-sound.cc | 4 ++--
- 9 files changed, 22 insertions(+), 11 deletions(-)
-
-commit 22d10c19e232dea143bda372c92aa12b999e4921
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Feb 7 23:38:50 2008 +0100
-
- PDF spec says name tokens have a maximum length of 127, but there are some docs in the wild with more than that and they work on acroread so increase the allowed length to 128+127
-
- poppler/Lexer.cc | 25 +++++++++++++++++++++----
- 1 files changed, 21 insertions(+), 4 deletions(-)
-
-commit ee9f85915feb86b54ace1a403baa13bbdd7c3966
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 7 18:07:53 2008 +0100
-
- Having a PageData is mandatory.
-
- Just assert when constructing instead of checking for it in each link iteration.
-
- qt4/src/poppler-link-extractor.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit ad4b1361f6c25359e6ddb38599bfc1e4e3e80408
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 7 18:03:30 2008 +0100
-
- Precalc stuff we don't need to recalc in each link iteration.
-
- qt4/src/poppler-link-extractor-private.h | 3 ++-
- qt4/src/poppler-link-extractor.cc | 14 ++++++++------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-commit 82432dbc62a0879f4513640c2e0f594fda9347ad
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 7 17:51:50 2008 +0100
-
- Store the ::Page internally, so we don't need to get it again everytime.
-
- qt4/src/poppler-page-private.h | 3 +++
- qt4/src/poppler-page.cc | 37 ++++++++++++++-----------------------
- 2 files changed, 17 insertions(+), 23 deletions(-)
-
-commit 8ec51f7ca518aa6a4a69f30d373722d05f50cf07
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 7 16:48:16 2008 +0100
-
- Compile the stress-poppler-dir test as well.
-
- qt4/tests/CMakeLists.txt | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 8a946b76ae2e7c2c5238b4e580c1c226eb457dc9
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Feb 7 01:07:28 2008 +0100
-
- Micro-touches to the debug messages.
-
- qt4/src/poppler-page.cc | 26 +++++++++++++-------------
- 1 files changed, 13 insertions(+), 13 deletions(-)
-
-commit c31990dfe50c7a0e3999e6d967699fce5ccb3339
-Merge: 7701e2a 6d58cda
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Feb 5 00:38:00 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 7701e2a5c7d18fdaa0fa40c190e6ee0524746046
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Feb 5 00:37:01 2008 +0100
-
- Add a AnnotColor -> QColor conversion method.
-
- qt4/src/poppler-annotation-helper.h | 6 ++++++
- qt4/src/poppler-annotation.cc | 31 +++++++++++++++++++++++++++++++
- 2 files changed, 37 insertions(+), 0 deletions(-)
-
-commit 6d58cda82b0181f2cca6e9d95b15877793be0812
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Feb 4 23:33:51 2008 +0100
-
- Protect us against weird dateString values
-
- qt4/src/poppler-document.cc | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-commit aa0435f1544fe1adcf10173e34eaeaf2a7a703c7
-Merge: b43f4e9 37600b5
-Author: Pino Toscano <pino@kde.org>
-Date: Mon Feb 4 20:56:53 2008 +0100
-
- Merge branch 'master' of ssh://pino@git.freedesktop.org/git/poppler/poppler
-
-commit 37600b5e848386d2c92c3dff8219c9dda16b0dca
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sun Feb 3 22:42:51 2008 +0100
-
- Minor changes to Annot related stuff.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 15 ++++-----------
- poppler/Annot.h | 12 ++++++++++--
- poppler/Gfx.cc | 7 ++++---
- poppler/Page.cc | 9 +++++++++
- poppler/Page.h | 3 +++
- 5 files changed, 30 insertions(+), 16 deletions(-)
-
-commit b43f4e9a161a1fd7b827244dc21b1bd2a6df7054
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Feb 3 20:32:15 2008 +0100
-
- Pass the DocumentData to the Page (simplify a bit some code).
-
- qt4/src/poppler-document.cc | 2 +-
- qt4/src/poppler-link-extractor-private.h | 4 +-
- qt4/src/poppler-link-extractor.cc | 8 ++--
- qt4/src/poppler-page-private.h | 4 +-
- qt4/src/poppler-page.cc | 64 +++++++++++++++---------------
- qt4/src/poppler-qt4.h | 5 +-
- 6 files changed, 42 insertions(+), 45 deletions(-)
-
-commit 4e0bb0307fccefc21f74a4c5a3a0d7e8e687b550
-Author: Pino Toscano <pino@draco.(none)>
-Date: Sat Feb 2 12:57:25 2008 +0100
-
- Fix include guard.
-
- poppler/ArthurOutputDev.h | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 6f11ef660540fd13aad1350385beb90758ca86af
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Feb 1 23:55:37 2008 +0100
-
- Fix for end condition, init ucode to 0
-
- poppler/GfxFont.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 1da2091807ae7f7d4d3f446953c41b4c440d4b1b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 31 23:52:20 2008 +0100
-
- Ensure we don't draw outside the main bitmap on SplashOutputDev::setSoftMask
-
- Fixes crash on http://bugs.kde.org/show_bug.cgi?id=157000
-
- poppler/SplashOutputDev.cc | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-commit ecabc9469b137e8251344e5502de1cbf875223b9
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Jan 31 00:20:55 2008 +0100
-
- Set RelWithDebInfo as default build type, if not specified.
-
- cmake/modules/PopplerMacros.cmake | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 19da87a20b3906523a330e3c956903a58a3ede7f
-Author: Pino Toscano <pino@kde.org>
-Date: Thu Jan 31 00:11:58 2008 +0100
-
- Support the different CMake build modes.
-
- Now you can specify (using -DCMAKE_BUILD_TYPE=type) a CMake build type to have GCC or ICC w/ tuned C(XX)FLAGS.
- The supported build types are: None (as in no type is specified on command line), RelWithDebInfo, Release, Debug, DebugFull, Profile.
-
- CMakeLists.txt | 7 -------
- cmake/modules/PopplerMacros.cmake | 29 +++++++++++++++++++++++++++++
- 2 files changed, 29 insertions(+), 7 deletions(-)
-
-commit 37d2055137c310ceb217164a76814b188be3b1b2
-Author: Pino Toscano <pino@draco.(none)>
-Date: Wed Jan 30 23:12:03 2008 +0100
-
- Introduce the CMake-based build system.
-
- Mostly works nicely as the autotools, and it mimics (almost) all the autotools behaviours.
- Copied some scripts from the KDE cmake scripts (BSD-licensed).
- TODO: gtk-doc.
-
- CMakeLists.txt | 390 +++++++
- ConfigureChecks.cmake | 47 +
- cmake/modules/COPYING-CMAKE-SCRIPTS | 22 +
- cmake/modules/FindCairo.cmake | 44 +
- cmake/modules/FindFontconfig.cmake | 47 +
- cmake/modules/FindFreetype.cmake | 74 ++
- cmake/modules/FindGTK.cmake | 70 ++
- cmake/modules/FindPackageHandleStandardArgs.cmake | 58 +
- cmake/modules/FindQt3.cmake | 319 +++++
- cmake/modules/FindQt4.cmake | 1295 +++++++++++++++++++++
- cmake/modules/MacroBoolTo01.cmake | 20 +
- cmake/modules/MacroEnsureVersion.cmake | 117 ++
- cmake/modules/MacroOptionalFindPackage.cmake | 28 +
- cmake/modules/MacroPushRequiredVars.cmake | 47 +
- cmake/modules/PopplerDefaults.cmake | 10 +
- cmake/modules/PopplerMacros.cmake | 83 ++
- config.h.cmake | 149 +++
- glib/CMakeLists.txt | 107 ++
- glib/demo/CMakeLists.txt | 17 +
- glib/poppler-features.h.cmake | 24 +
- poppler-cairo.pc.cmake | 9 +
- poppler-config.h.cmake | 160 +++
- poppler-glib.pc.cmake | 13 +
- poppler-qt.pc.cmake | 12 +
- poppler-qt4.pc.cmake | 12 +
- poppler-splash.pc.cmake | 9 +
- poppler.pc.cmake | 11 +
- qt/CMakeLists.txt | 33 +
- qt4/CMakeLists.txt | 2 +
- qt4/src/CMakeLists.txt | 43 +
- qt4/tests/CMakeLists.txt | 47 +
- test/CMakeLists.txt | 52 +
- utils/CMakeLists.txt | 84 ++
- 33 files changed, 3455 insertions(+), 0 deletions(-)
-
-commit 1ea831d3eee6eda35fadfb3c75962a0c708e6c7b
-Author: Pino Toscano <pino@kde.org>
-Date: Wed Jan 30 22:17:38 2008 +0100
-
- Preprocessor #warning is GCC-specific.
-
- poppler/ArthurOutputDev.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 4c738cc6bd51f9d9e23ba83949c490c5c8691345
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jan 29 23:45:52 2008 +0100
-
- Scale text to match 'm' size
-
- Fixes bug 12304
-
- poppler/SplashOutputDev.cc | 37 +++++++++++++++++++++++++++++
- splash/SplashFTFont.cc | 55 +++++++++++++++++++++++++++++++++++++++++++-
- splash/SplashFTFont.h | 4 +++
- splash/SplashFont.h | 4 +++
- splash/SplashFontFile.cc | 1 +
- splash/SplashFontFile.h | 2 +
- 6 files changed, 102 insertions(+), 1 deletions(-)
-
-commit 64f16cf6ebf2870852fe8d937b25be58869ad40a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jan 29 23:41:15 2008 +0100
-
- Enable antialias by default on the test tool
-
- qt4/tests/test-poppler-qt4.cpp | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 90f0e6bc1e96d9f1666cb8476a92e127f5b927d4
-Author: Jonathan Kew <jonathan_kew@sil.org>
-Date: Tue Jan 29 20:23:08 2008 +0100
-
- Provide gstrndup as a portable substitue of strndup
-
- configure.ac | 1 -
- goo/gmem.cc | 7 +++++++
- goo/gmem.h | 5 +++++
- poppler/GfxFont.cc | 8 +-------
- 4 files changed, 13 insertions(+), 8 deletions(-)
-
-commit 77b91c852ad3d5554afc03aee92a1d928f233401
-Merge: 0babb0e 0533696
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jan 28 20:44:34 2008 +0100
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit 0babb0eb1afa343fb12a3fd037b98d2d1c794a1c
-Author: Jonathan Kew <jonathan_kew@sil.org>
-Date: Mon Jan 28 20:42:44 2008 +0100
-
- Introduce a check for strndup and alternative for systems without it
-
- configure.ac | 1 +
- poppler/GfxFont.cc | 6 ++++++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-commit 053369678963206a4afa88a614de1994872c7c5a
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Jan 27 19:36:28 2008 +0100
-
- Add ok_to_fill_form permission flag
-
- glib/poppler-document.cc | 2 ++
- glib/poppler-document.h | 3 ++-
- glib/test-poppler-glib.cc | 21 +++++++++++++++++++--
- 3 files changed, 23 insertions(+), 3 deletions(-)
-
-commit 3085a9495ad87a54758da0024372610fdaf88d57
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Jan 27 19:15:34 2008 +0100
-
- Fix slice rendering in poppler glib demo
-
- glib/demo/render.c | 41 ++++++++++++++++++++++++-----------------
- 1 files changed, 24 insertions(+), 17 deletions(-)
-
-commit 7ad6c4ba110b970516d5380444a03ae217496ddf
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 24 21:14:44 2008 +0100
-
- Incrementing the iterator would be a good idea
-
- qt4/src/poppler-annotation.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 7c99ec4635a4971321bbead7d1bc723da59b755e
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Thu Jan 24 19:18:15 2008 +0100
-
- Revert unwanted change on Dict, fix leak on writeTrailer
-
- poppler/Dict.cc | 2 +-
- poppler/PDFDoc.cc | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 2335fb6034d2e9ec304abba400119b88302b3160
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 23 23:26:20 2008 +0100
-
- Draw underlined Links correctly
-
- See http://bugs.kde.org/show_bug.cgi?id=151359 for an example
-
- poppler/Gfx.cc | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 96c532ea4b56a147de1deb965126e31f87df588b
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jan 23 13:30:12 2008 +0100
-
- Fix memory leak
-
- poppler/Form.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 6bca64407c675ca837f83a12c0f655f975f14407
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jan 23 13:27:45 2008 +0100
-
- Make sure default values are not loaded more than once for the same widget.
-
- poppler/Form.cc | 18 +++++++++++++++++-
- poppler/Form.h | 1 +
- 2 files changed, 18 insertions(+), 1 deletions(-)
-
-commit eccf84b51a1cf5d478c0ec84be3fc9be8e458f4f
-Author: Pino Toscano <pino@kde.org>
-Date: Tue Jan 22 23:28:16 2008 +0100
-
- Refactor the PSConverter and add a PDFConverter (for PDF export/save).
-
- Add an OutStream subclass to redirect the output to a QIODevice.
- Split the PSConverter in a base class (BaseConverter) w/ d_ptr structure.
- Add a new PDFConverter that inherit BaseConverter, and do the actual export
- making use of the new QIODeviceOutStream.
- The BaseConverter now handles automatically file or QIODevice output.
-
- qt4/src/Makefile.am | 5 +
- qt4/src/poppler-base-converter.cc | 99 ++++++++++++++++
- qt4/src/poppler-converter-private.h | 48 ++++++++
- qt4/src/poppler-document.cc | 5 +
- qt4/src/poppler-pdf-converter.cc | 68 +++++++++++
- qt4/src/poppler-ps-converter.cc | 162 +++++++++++---------------
- qt4/src/poppler-qiodeviceoutstream-private.h | 47 ++++++++
- qt4/src/poppler-qiodeviceoutstream.cc | 71 +++++++++++
- qt4/src/poppler-qt4.h | 85 +++++++++++---
- 9 files changed, 483 insertions(+), 107 deletions(-)
-
-commit 547db8be1ab0b2987f0f06d8529eaaed2414028c
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jan 22 13:22:20 2008 +0100
-
- Fix a crash when createAnnot returns NULL due to invalid annot dict.
-
- poppler/Annot.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 0d558841142587d66bd3b2025e5a9ca39f7a6159
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jan 21 21:43:39 2008 +0100
-
- Fix another reversed comparison due to cmp
-
- poppler/Annot.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit cb6a87e39336e2e3893f3e5f577e4d176d237a9f
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Mon Jan 21 10:07:35 2008 +0100
-
- Fixed a few compare issues with Annots.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 24 ++++++++++++------------
- 1 files changed, 12 insertions(+), 12 deletions(-)
-
-commit 7cf85dc8d7c895a211684c7d36757063ed4f469b
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Mon Jan 21 21:27:49 2008 +0100
-
- The glade file needs to be distributed
-
- test/Makefile.am | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 46e93d31dd9b5909ecd8f7a8f8de23329444a7bc
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Sun Jan 20 19:56:51 2008 +0100
-
- we need time.h if we use time()
-
- poppler/PDFDoc.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit a0adb006c38ea07f010a01d9c0bb07ca0f48939d
-Author: Pino Toscano <pino@kde.org>
-Date: Sun Jan 20 19:55:55 2008 +0100
-
- Added a saveAs() overload which takes a plain OutStream
-
- poppler/PDFDoc.cc | 9 +++++++--
- poppler/PDFDoc.h | 2 ++
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-commit fcdd5c51f370d040ae57aa64801c9bd4dbe88752
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jan 19 18:00:10 2008 +0100
-
- Do not render images when getting the image mapping, it can be done later on demand.
-
- glib/poppler-page.cc | 81 +++++++++++++++------------
- glib/poppler-page.h | 6 ++-
- poppler/CairoOutputDev.cc | 131 ++++++++++++++++++++++++++-------------------
- poppler/CairoOutputDev.h | 12 ++++-
- 4 files changed, 135 insertions(+), 95 deletions(-)
-
-commit 37ae465775d9a53e7c06cf51aa215439214fd79c
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Sat Jan 19 14:00:31 2008 +0100
-
- ignore pdf-fullrewrite binary
-
- test/.gitignore | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 1d160935ea4c1116b745c584ed7f1fd03fbbfb46
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sat Jan 19 13:59:46 2008 +0100
-
- AnnotWidget support and few fixes
-
- poppler/Annot.cc | 243 +++++++++++++++++++++++++++++++++++++++++++++++++++--
- poppler/Annot.h | 142 +++++++++++++++++++++++++++++--
- 2 files changed, 365 insertions(+), 20 deletions(-)
-
-commit 0e91a3973e525d65236d15930a8ea0e5bbb6a6cc
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sat Jan 19 13:59:25 2008 +0100
-
- AnnotTextMarkup support and improved AnnotQuadrilaterals
-
- poppler/Annot.cc | 356 +++++++++++++++++++++++++++++++++++++++++++-----------
- poppler/Annot.h | 130 +++++++++++++++++---
- 2 files changed, 400 insertions(+), 86 deletions(-)
-
-commit c13952cd56a40bad14a1bf28699b137f65162f10
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sat Jan 19 13:59:02 2008 +0100
-
- Changed AnnotQuadrilateral parsing inside AnnotLink
-
- poppler/Annot.cc | 246 +++++++++++++++++++++++++++++-------------------------
- poppler/Annot.h | 19 ++--
- 2 files changed, 144 insertions(+), 121 deletions(-)
-
-commit 2f821f10fbbba9363405201c86494cd861cec2b2
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sat Jan 19 13:49:43 2008 +0100
-
- Add AnnotQuadPoints class
-
- poppler/Annot.cc | 16 ++++++++++++++++
- poppler/Annot.h | 23 +++++++++++++++++++++++
- 2 files changed, 39 insertions(+), 0 deletions(-)
-
-commit de4c8fa6607e55c199bede1dc731227692ef4f53
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sun Dec 30 21:21:56 2007 +0100
-
- AnnotFreeText support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h | 127 +++++++++++++++++++++++++++++
- 2 files changed, 358 insertions(+), 1 deletions(-)
-
-commit c3504a87933ae1516b1ef05e527fd1c039091235
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Sun Dec 30 19:37:18 2007 +0100
-
- Improved AnnotLink support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h | 51 ++++++++++++++++++++++++
- 2 files changed, 167 insertions(+), 0 deletions(-)
-
-commit a20468cc38bb590124b2b028a08f364f90f2487f
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 13:02:17 2008 +0100
-
- Adds a test application to test full rewrite functionnality.
-
- test/Makefile.am | 11 ++++++++++-
- test/pdf-fullrewrite.cc | 44 ++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 54 insertions(+), 1 deletions(-)
-
-commit 246294714c6011651fd0e5b3649bd65919058c72
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 12:59:03 2008 +0100
-
- FormWidget's 'modified' member variable is now updated correctly each time an update is done.
-
- Before, only text FormWidget had their 'modified' field set to 'true' if they had been updated.
- It is now the case for the other type of FormWidgets.
-
- poppler/Form.cc | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 6e0f297b8b17afb95779724b8618ca39016e664a
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 12:54:09 2008 +0100
-
- Annot will save their generated appearance in their AP dict.
-
- poppler/Annot.cc | 42 ++++++++++++++++++++++++++++++++++++++----
- poppler/Annot.h | 1 +
- 2 files changed, 39 insertions(+), 4 deletions(-)
-
-commit e20f6a8e9ac3936b4bc03710a71fe390dfc4c094
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 12:52:02 2008 +0100
-
- Add deep copy constructor to Dict.
-
- poppler/Dict.cc | 14 +++++++++++++-
- poppler/Dict.h | 1 +
- 2 files changed, 14 insertions(+), 1 deletions(-)
-
-commit e8d46cab77c7167edb0896296118daafc0f13b6d
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 12:51:44 2008 +0100
-
- Adds the ability to save PDF using either incremental update or by rewriting completly the PDF.
-
- poppler/PDFDoc.cc | 379 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/PDFDoc.h | 18 +++-
- poppler/XRef.cc | 12 ++-
- poppler/XRef.h | 3 +-
- 4 files changed, 402 insertions(+), 10 deletions(-)
-
-commit 742b0c3dec01d8672b84f56d5bb0e2890b178594
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 12:51:27 2008 +0100
-
- Make the md5 method of Decrypt public so it can be used by other files.
-
- poppler/Decrypt.cc | 5 ++---
- poppler/Decrypt.h | 1 +
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-commit bb7867976740dea259d4110c072552fc5953910f
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 12:51:07 2008 +0100
-
- Modify the writeToFile method of XRef so it uses OutStream instead of a C file descriptor.
-
- poppler/XRef.cc | 10 +++++-----
- poppler/XRef.h | 2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-commit d80736587fdbc0e163077f27bfd21c5e3a7fa4c7
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 12:50:49 2008 +0100
-
- Adds addIndirectObject method to XRef. This method allow the creation of new indirect objects.
-
- poppler/XRef.cc | 39 +++++++++++++++++++++++++++++++++++++++
- poppler/XRef.h | 1 +
- 2 files changed, 40 insertions(+), 0 deletions(-)
-
-commit 8bd00dd0872191b8806e9411d9a1adc441f08a47
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 12:50:16 2008 +0100
-
- Add some unfiltered methods to input stream.
-
- With these methods, it is possible to read the raw content from the stream, without any filtering (even not the headers).
-
- poppler/Stream.cc | 41 ++++++++++++++++++++++++++++-------------
- poppler/Stream.h | 26 ++++++++++++++++++++++++++
- 2 files changed, 54 insertions(+), 13 deletions(-)
-
-commit 8bcda287ddd316f90b3e47a3a307fbe63a5c21f7
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 12:46:53 2008 +0100
-
- Add setNeedFree method to MemStream so it is possible to choose if the stream should take care of deleting the buffer.
-
- poppler/Stream.h | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 4fbd143de7e3a8ab386dd14b057e62b3b9fe04e4
-Author: Julien Rebetez <julien@fhtagn.net>
-Date: Sat Jan 19 12:45:54 2008 +0100
-
- Add Outstream, a base class for output streams and FileOutStream, which implements OutStream for output to a file.
-
- poppler/Stream.cc | 55 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/Stream.h | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 119 insertions(+), 0 deletions(-)
-
-commit 696eaa47169fb063b7e6998c876926c578b6fbfa
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Jan 17 15:56:59 2008 +0100
-
- Fix a crash when editing text form fields
-
- poppler/Annot.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 9ec1b28dcdade12498b94b650c26483581294ee6
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Jan 17 14:54:34 2008 +0100
-
- Fix a crash when a form field contains reference to non existant children
-
- poppler/Form.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit f7ed40c465033bad26dfda008c5984954baa0607
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jan 16 21:01:50 2008 +0100
-
- Add a cast to fix build
-
- glib/demo/info.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 1c0aa21e598b879ec49d96700e6438ccb8ac2283
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Fri Jan 11 20:28:49 2008 +0100
-
- rename info.c to info.cc to fix bug 14024
-
- glib/demo/Makefile.am | 2 +-
- glib/demo/info.c | 243 -------------------------------------------------
- glib/demo/info.cc | 243 +++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 244 insertions(+), 244 deletions(-)
-
-commit 88f8bf850b6c41d25b9576597b5fc5bd75a122f4
-Author: Kjartan Maraas <kmaraas@gnome.org>
-Date: Thu Jan 10 23:51:54 2008 +0100
-
- Fix two use after free bugs in HtmlOutputDev.cc
-
- utils/HtmlOutputDev.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 348f4f9d9d5b0f91da6f46e0fcefec80255d4179
-Merge: 8a8a4f0 4eca2e0
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Sat Jan 5 23:03:06 2008 +0100
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit 8a8a4f01272fb86898fafbda07129c0cbc03d527
-Author: Pino Toscano <pino@kde.org>
-Date: Sat Jan 5 23:02:22 2008 +0100
-
- Make Document::renderHints return the correct render hints
-
- qt4/src/poppler-document.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 4eca2e041c93349e0c4666e83ad1ca3caff91dee
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jan 1 14:34:00 2008 +0100
-
- Add page transitions demo
-
- glib/demo/Makefile.am | 2 +
- glib/demo/main.c | 16 ++-
- glib/demo/transitions.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/transitions.h | 31 +++++
- 4 files changed, 363 insertions(+), 7 deletions(-)
-
-commit e92b50bbd3dfc8657b611e3c33129d7c5bae2319
-Author: Koji Otani <sho@bbr.jp>
-Date: Wed Dec 26 18:56:01 2007 +0100
-
- Use getEmbeddedFontID instead of getEmbeddedFontName to check if a font is embedded or not
-
- poppler/GfxFont.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 30e9bae97e3742913015f7ea46636b2b80937612
-Author: Ed Catmur <ed@catmur.co.uk>
-Date: Sat Dec 22 22:54:51 2007 +0100
-
- Fixlets for Adobe Glyph Naming convention implementation
-
- poppler/GfxFont.cc | 94 ++++++++++++++++++++++++++-------------------------
- 1 files changed, 48 insertions(+), 46 deletions(-)
-
-commit 40551e616b007ceb15c9d6e3d77c24538ffec924
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Sat Dec 22 14:31:50 2007 +0100
-
- Check the destination page of the link does exist
-
- qt4/src/poppler-link.cc | 20 ++++++++++++--------
- 1 files changed, 12 insertions(+), 8 deletions(-)
-
-commit c06d6f2236d854f05e7621be280109ff27dc73b9
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Thu Dec 20 20:13:08 2007 +0100
-
- Use UnicodeParsedString that does exactly what this code does
-
- qt4/src/poppler-document.cc | 28 +---------------------------
- 1 files changed, 1 insertions(+), 27 deletions(-)
-
-commit 5f9f06a10fdb72a9d809ee1f779e1a8f549840e7
-Author: Koji Otani <sho@bbr.jp>
-Date: Thu Dec 20 19:59:26 2007 +0100
-
- Fix for latest CJK code
-
- See http://lists.freedesktop.org/archives/poppler/2007-December/003244.html for more information
-
- poppler/GfxFont.cc | 14 ++++++++++----
- 1 files changed, 10 insertions(+), 4 deletions(-)
-
-commit bb49e1e3909fc7392c197dc67d9b7f5312fd0dad
-Author: Ed Catmur <ed@catmur.co.uk>
-Date: Tue Dec 18 20:20:11 2007 +0100
-
- Implement Adobe Glyph Naming convention
-
- poppler/GfxFont.cc | 183 +++++++++++++++++++++++++++++++++++++++++++--------
- 1 files changed, 154 insertions(+), 29 deletions(-)
-
-commit 5634d63abdd64d371f2e8687a1c172f55b052008
-Author: Koji Otani <sho@bbr.jp>
-Date: Mon Dec 17 20:43:41 2007 +0100
-
- Allow seting some more Graphics States (Font, LW, LC, LJ, ML, D, RI, FL) by operator 'gs'
-
- poppler/Gfx.cc | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 67 insertions(+), 0 deletions(-)
-
-commit 7a9e7fc96b47b9d833300233ac38bbd60097f425
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Dec 16 21:21:08 2007 +0100
-
- Add AnnotLink class so that link annots are properly recognized
-
- Right now, all of the annots except Text, are created using the
- base class Annot which sets the type to unknown. For link annots this
- causes the border never be drawn, since we are checking first whether the
- annot is a Link and it's always false.
-
- poppler/Annot.cc | 12 +++++++++++-
- poppler/Annot.h | 10 ++++++++++
- 2 files changed, 21 insertions(+), 1 deletions(-)
-
-commit 796d9cb9b188a8af69d7fbf9bccbb408cbf6a71a
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Dec 15 15:21:49 2007 +0100
-
- Fix a crash when trying to create a temp annot with catalog = NULL
-
- poppler/Annot.cc | 7 +++++++
- poppler/Annot.h | 1 +
- poppler/Form.cc | 6 ++----
- 3 files changed, 10 insertions(+), 4 deletions(-)
-
-commit 99f049f0dfbfd9c22bea56ae96253837ae421e23
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Dec 14 15:26:24 2007 +0100
-
- Use the default dash array when it's not correct in AnnotBorderBS
-
- poppler/Annot.cc | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-commit cb2a997aa6f9dd5508ca8b04e63815da893497ef
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Dec 14 14:12:14 2007 +0100
-
- Fix another crash due to uninitialized variables
-
- poppler/Annot.cc | 18 ++++++++----------
- poppler/Annot.h | 1 +
- 2 files changed, 9 insertions(+), 10 deletions(-)
-
-commit f704e86d8c72bacbd9443c4d828cd284d3a11753
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Dec 14 12:58:12 2007 +0100
-
- Fix several crashes due to uninitialized variables in Annots.
-
- poppler/Annot.cc | 11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
-
-commit 0820a93ba1c0e893681024feb9f9bd120a9eeb4d
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Dec 14 12:38:58 2007 +0100
-
- Check whether top and left should be changed in FitH, FitV, FitBH and FitBV destinations
-
- According to the spec, if a null value is specified for top or left parameter in such
- destinations, the parameter should be retained unchanged.
-
- poppler/Link.cc | 36 ++++++++++++++++++++++++++++--------
- 1 files changed, 28 insertions(+), 8 deletions(-)
-
-commit 0fb42a2f557d5ec83b42326eb6b0be41622ca328
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Wed Dec 12 01:02:31 2007 +0100
-
- Changed getters to const
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 28 ++++++++++----------
- poppler/Annot.h | 72 +++++++++++++++++++++++++++---------------------------
- 2 files changed, 50 insertions(+), 50 deletions(-)
-
-commit 29d39a8ae120e6045a16a7aa0944c36560b42508
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Mon Dec 10 17:56:44 2007 +0100
-
- AnnotText support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h | 65 ++++++++++++++++++++++++----
- 2 files changed, 177 insertions(+), 11 deletions(-)
-
-commit 2acecde458122bd67487cc302478befa78bf6fbe
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Mon Dec 10 16:45:46 2007 +0100
-
- AnnotMarkup support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h | 51 ++++++++++++++++++++++++
- 2 files changed, 166 insertions(+), 0 deletions(-)
-
-commit 1f8c1fe34e04688d2ba200f1166cfdd1ffe563f0
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Mon Dec 10 16:34:01 2007 +0100
-
- AnnotPopup support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 34 ++++++++++++++++++++++++++++++++++
- poppler/Annot.h | 21 +++++++++++++++++++++
- 2 files changed, 55 insertions(+), 0 deletions(-)
-
-commit 6c83e06fb2eb77d0dbefd1ebfbcac3e5f0cbb622
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Mon Dec 10 16:24:38 2007 +0100
-
- Prepare code to Annotation Subtype support.
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- glib/poppler-page.cc | 11 +---
- poppler/Annot.cc | 160 ++++++++++++++++++++++++++++++++++++--------------
- poppler/Annot.h | 54 ++++++++++++++---
- poppler/Form.cc | 6 ++-
- 4 files changed, 167 insertions(+), 64 deletions(-)
-
-commit fa0bb5bbea5bf2769c8b3084f78770b7781002eb
-Author: Iñigo Martínez <inigomartinez@gmail.com>
-Date: Mon Dec 10 15:41:38 2007 +0100
-
- Various Annot improvements
-
- Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
-
- poppler/Annot.cc | 613 +++++++++++++++++++++++++++++++++++-------------------
- poppler/Annot.h | 140 +++++++++++-
- poppler/Gfx.cc | 21 ++-
- poppler/Gfx.h | 5 +-
- 4 files changed, 543 insertions(+), 236 deletions(-)
-
-commit e0f49fd5aef3c798798ad7e7dba55857bde1b4c0
-Author: Koji Otani <sho@bbr.jp>
-Date: Thu Dec 13 23:40:46 2007 +0100
-
- Some CJK charecters are displayed vertical glyphs incorrectly when horizontal mode
-
- poppler/GfxFont.cc | 46 +++++++++++++++++++++++++---------------------
- 1 files changed, 25 insertions(+), 21 deletions(-)
-
-commit 85901922bf354a1268037d0b6ec5cbf14da979a1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Dec 13 23:30:59 2007 +0100
-
- Yet another gmallocn to gmallocn_checkoverflow
-
- Fixes http://bugs.kde.org/show_bug.cgi?id=153949
-
- poppler/SplashOutputDev.cc | 23 ++++++++++++++++-------
- 1 files changed, 16 insertions(+), 7 deletions(-)
-
-commit f24259cddb9c5e02cf9d2071bfa0106f3e88bd59
-Author: Koji Otani <sho@bbr.jp>
-Date: Mon Dec 10 23:24:14 2007 +0100
-
- Display characters outside of unicode BMP with TT font
-
- fofi/FoFiTrueType.cc | 33 +++++++++++++++++++--
- fofi/FoFiTrueType.h | 2 +-
- poppler/CMap.cc | 34 ++++++++++++++++++++++
- poppler/CMap.h | 4 ++
- poppler/GfxFont.cc | 75 +++++++++++++++++++++++++++++++------------------
- 5 files changed, 115 insertions(+), 33 deletions(-)
-
-commit 7cbabbf378cf5a9c0411558ff02b44dec2040ea1
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Dec 10 22:00:30 2007 +0100
-
- Fix a crash when marked content properties operator is not a dict.
-
- poppler/Gfx.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit e807f9c72c7f0c5cc0655918f676f4af54739442
-Merge: bf57117 e2ea743
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 9 18:07:30 2007 +0100
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit bf57117df8786778faf31e5d843533004f867ff3
-Author: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun Dec 9 18:07:00 2007 +0100
-
- Add support for ActualText entries
-
- Patch by Adrian Johnson with two minor changes by me (one fordward declaration and a leak fix)
-
- poppler/Form.cc | 2 +-
- poppler/Gfx.cc | 2 +-
- poppler/OutputDev.cc | 2 +-
- poppler/OutputDev.h | 2 +-
- poppler/PDFDocEncoding.h | 4 ++
- poppler/TextOutputDev.cc | 98 +++++++++++++++++++++++++++++++++++++++++++++-
- poppler/TextOutputDev.h | 11 +++++
- 7 files changed, 116 insertions(+), 5 deletions(-)
-
-commit e2ea7430e7d6db50cbfdac34713915e5b0942a89
-Author: Albert Astals Cid <tsdgeos@localhost.(none)>
-Date: Sat Dec 8 23:21:34 2007 +0100
-
- disable warnings about assigning const char * to char *
-
- We have them all over the place and we are not going to fix it as that'll be too much overhead when re-merging xpdf changes
-
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit acf70c666d4f534cd97de64d4378bf6399e31fd4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Dec 6 23:58:26 2007 +0100
-
- Disable gtk tests if the user disabled glib frontend
-
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit bb0ec68f21d355081ff75aad641bc3809141e398
-Merge: 5a34cdd b925ea2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Dec 6 18:38:54 2007 +0100
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit b925ea232b6ed5028712600f9aebe453f3b2ba06
-Author: Brad Hards <bradh@kde.org>
-Date: Tue Dec 4 19:11:13 2007 +1100
-
- Remove redundant check.
-
- poppler/PSOutputDev.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 275afca4ef24020273df652ccfdf76c6994e9294
-Author: Brad Hards <bradh@kde.org>
-Date: Sun Dec 2 19:45:16 2007 +1100
-
- Preserve PDF page labels when we output as postscript.
-
- Resolves bug 13338.
-
- poppler/PSOutputDev.cc | 81 +++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/PSOutputDev.h | 2 +
- 2 files changed, 82 insertions(+), 1 deletions(-)
-
-commit 641edb83a457083c13f3e374f6ac6c570dd54d7f
-Author: Brad Hards <bradh@kde.org>
-Date: Wed Nov 28 19:42:53 2007 +1100
-
- Minor API documentation update
-
- qt4/src/poppler-annotation.h | 81 ++++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 79 insertions(+), 2 deletions(-)
-
-commit 3635ec6fcbc89daf633c03efb644df9031b80f59
-Author: Brad Hards <bradh@kde.org>
-Date: Wed Nov 28 19:42:22 2007 +1100
-
- Update doxygen configuration file to version 1.5.3
-
- qt4/src/Doxyfile | 185 +++++++++++++++++++++++++++++++++++++++++-------------
- 1 files changed, 141 insertions(+), 44 deletions(-)
-
-commit 02c7ea6e1fd3e225de1eda231813f4db0ffb9fdb
-Author: Brad Hards <bradh@kde.org>
-Date: Wed Nov 28 19:41:54 2007 +1100
-
- Fix off-by-one in printCommands path.
-
- poppler/Gfx.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 74af7c1209f47ed39addf7fde3ea106a7c77a408
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Nov 24 18:12:00 2007 +0100
-
- Convert passwords from utf-8 to latin-1 when needed. Fixes bug #4557
-
- glib/poppler-document.cc | 16 ++++++++++++++--
- 1 files changed, 14 insertions(+), 2 deletions(-)
-
-commit 5a34cddf043cb484549cb411e034786a7d8688a3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Nov 23 23:13:57 2007 +0100
-
- add a ignore
-
- glib/demo/.gitignore | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 21a58562cc1e575ec3d81b6e34bfcb21306eb67f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Nov 23 23:12:06 2007 +0100
-
- sscanf does not like null strings, so don't call it on empty qstrings
-
- qt/poppler-document.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 6f8451cf9d19f57f658d1568643ecb0f953e1075
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Nov 11 21:29:40 2007 -0500
-
- Add support for knockout groups to the cairo backend
-
- This is sort of hacky because we need to keep track of shape and opacity
- seperately. It is also probably not entirely correct. However, it should be
- closer than previously.
-
- poppler/CairoOutputDev.cc | 309 +++++++++++++++++++++++++++++++++++++++++++--
- poppler/CairoOutputDev.h | 8 +-
- 2 files changed, 303 insertions(+), 14 deletions(-)
-
-commit b0fbfb0ac366434d7e4c0350a9be83ddda7b03cf
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Nov 11 16:06:16 2007 -0500
-
- Track the AlphaIsShape and TextKnockout state
-
- Parse, store and notify the OutputDevices about these entries.
-
- poppler/Gfx.cc | 14 ++++++++++++++
- poppler/GfxState.h | 6 ++++++
- poppler/OutputDev.h | 2 ++
- 3 files changed, 22 insertions(+), 0 deletions(-)
-
-commit f6429b13a972f2deb25b3d3a9948dca024a54841
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Nov 10 14:08:09 2007 -0500
-
- Fix accidental mode change.
-
- 0 files changed, 0 insertions(+), 0 deletions(-)
-
-commit 5797f50a99d1494767edc5928f9c3e9d927b946d
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Nov 10 01:52:00 2007 -0500
-
- Scale text to match 'm' size
-
- This adds back the hack that was removed when fontconfig support was added long
- ago. It's not a great solution but lets us be at least as good as xpdf. Fixes
- #12304 with the cairo backend. The problem persists with the splash backend.
-
- poppler/CairoFontEngine.cc | 56 +++++++++++++++++++++++++++++++++++++++++--
- poppler/CairoFontEngine.h | 7 ++++-
- poppler/CairoOutputDev.cc | 8 ++++-
- 3 files changed, 65 insertions(+), 6 deletions(-)
-
-commit 551212e55127c7e46d9aff3318015fd9b5385687
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sat Nov 10 11:56:15 2007 +0100
-
- Fix uninitialized variable access
-
- Supported by Derek B. Noonburg
-
- poppler/GfxState.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 934a5ae45eb17bd0e2010be89f55510e8a69816b
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Nov 3 13:08:51 2007 -0400
-
- Avoiding using floating point when converting to luminance.
-
- The code now also does proper rounding instead of just truncating.
-
- poppler/CairoOutputDev.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 1b3f045a25e5d172357bc87c15ba591c8e1511a7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Nov 8 23:34:07 2007 +0100
-
- Move another gmallocn to gmallocn_checkoverflow. Fixes crashes on incorrect pdf sent by Red Hat
-
- poppler/Stream.cc | 21 +++++++++++++++------
- 1 files changed, 15 insertions(+), 6 deletions(-)
-
-commit 944d327fd7036332a33b4ad6476ceca7a650ef6e
-Merge: fb1d1f4 c340255
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 7 23:52:47 2007 +0100
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit fb1d1f459784a6c19034212a617268f7f5a90e9c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 7 23:51:58 2007 +0100
-
- merge ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
-
- poppler/Stream.cc | 417 ++++++++++++++++++++++++++++++-----------------------
- poppler/Stream.h | 10 +-
- 2 files changed, 245 insertions(+), 182 deletions(-)
-
-commit c340255f46bc95b5f850abcd3d9bcdc8594199bb
-Author: Brad Hards <bradh@kde.org>
-Date: Mon Nov 5 20:36:23 2007 +1100
-
- Update .gitignore
-
- Suppress the noise a bit.
-
- qt4/.gitignore | 1 +
- qt4/tests/.gitignore | 3 +++
- test/.gitignore | 2 ++
- 3 files changed, 6 insertions(+), 0 deletions(-)
-
-commit cebf770379e7d71166e729aebf771a4ca291d48b
-Author: Brad Hards <bradh@kde.org>
-Date: Mon Nov 5 20:31:18 2007 +1100
-
- Add a new unit test, for non-ASCII searching.
-
- There is a bug report (bug:7063) about not being able
- to find text that isn't ASCII. I think that the problem isn't
- in poppler core code - this unit test shows we can find
- characters as long as they are properly encoded (which the
- Qt4 front end does).
-
- qt4/tests/Makefile.am | 7 ++++++-
- qt4/tests/check_search.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 46 insertions(+), 1 deletions(-)
-
-commit 570fe464a2aae4f22d0b47cce73b8bc36b116e9f
-Merge: 1c7b7a0 7875067
-Author: Brad Hards <bradh@kde.org>
-Date: Mon Nov 5 15:55:39 2007 +1100
-
- Merge branch 'minor-fixes'
-
-commit 78750679e213d7307cce38166b6af32562e871b8
-Author: Brad Hards <bradh@kde.org>
-Date: Mon Nov 5 15:54:36 2007 +1100
-
- Additional check for password protected documents
-
- We need to bail out on locked documents. In the future,
- we could probably go interactive, and ask the user for
- a password.
-
- qt4/tests/test-poppler-qt4.cpp | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 1c7b7a0c581b542945cac257202bbb819d33694c
-Author: Brad Hards <bradh@kde.org>
-Date: Mon Nov 5 15:49:45 2007 +1100
-
- Minor Qt4 API documentation fix
-
- Also, this is a test of my git newbie-ness.
-
- qt4/src/poppler-form.h | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-commit b86fc565d175835cf27e9c8632da47a5e0b50237
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Nov 5 00:14:55 2007 +0100
-
- Fix FSF address
-
- glib/demo/fonts.c | 2 +-
- glib/demo/fonts.h | 2 +-
- glib/demo/forms.c | 2 +-
- glib/demo/forms.h | 2 +-
- glib/demo/info.c | 2 +-
- glib/demo/info.h | 2 +-
- glib/demo/links.c | 2 +-
- glib/demo/links.h | 2 +-
- glib/demo/main.c | 2 +-
- glib/demo/outline.c | 2 +-
- glib/demo/outline.h | 2 +-
- glib/demo/page.c | 2 +-
- glib/demo/page.h | 2 +-
- glib/demo/render.c | 2 +-
- glib/demo/render.h | 2 +-
- glib/demo/utils.c | 2 +-
- glib/demo/utils.h | 2 +-
- glib/poppler-action.cc | 2 +-
- glib/poppler-action.h | 2 +-
- glib/poppler-attachment.cc | 2 +-
- glib/poppler-attachment.h | 2 +-
- glib/poppler-document.cc | 2 +-
- glib/poppler-document.h | 2 +-
- glib/poppler-features.h.in | 2 +-
- glib/poppler-form-field.cc | 2 +-
- glib/poppler-form-field.h | 2 +-
- glib/poppler-page.cc | 2 +-
- glib/poppler-page.h | 2 +-
- glib/poppler.cc | 2 +-
- glib/poppler.h | 2 +-
- poppler/PageTransition.cc | 2 +-
- poppler/Sound.cc | 2 +-
- poppler/Sound.h | 2 +-
- qt/poppler-document.cc | 2 +-
- qt/poppler-fontinfo.cc | 2 +-
- qt/poppler-link-qt3.h | 2 +-
- qt/poppler-link.cc | 2 +-
- qt/poppler-page-transition-private.h | 2 +-
- qt/poppler-page-transition.cc | 2 +-
- qt/poppler-page-transition.h | 2 +-
- qt/poppler-page.cc | 2 +-
- qt/poppler-private.h | 2 +-
- qt/poppler-qt.h | 2 +-
- qt4/src/poppler-annotation-helper.h | 2 +-
- qt4/src/poppler-annotation-private.h | 2 +-
- qt4/src/poppler-annotation.cc | 2 +-
- qt4/src/poppler-annotation.h | 2 +-
- qt4/src/poppler-document.cc | 2 +-
- qt4/src/poppler-embeddedfile.cc | 2 +-
- qt4/src/poppler-fontinfo.cc | 2 +-
- qt4/src/poppler-form.cc | 2 +-
- qt4/src/poppler-form.h | 2 +-
- qt4/src/poppler-link-extractor-private.h | 2 +-
- qt4/src/poppler-link-extractor.cc | 2 +-
- qt4/src/poppler-link.cc | 2 +-
- qt4/src/poppler-link.h | 2 +-
- qt4/src/poppler-page-private.h | 2 +-
- qt4/src/poppler-page.cc | 2 +-
- qt4/src/poppler-private.h | 2 +-
- qt4/src/poppler-ps-converter.cc | 2 +-
- qt4/src/poppler-qt4.h | 2 +-
- qt4/src/poppler-sound.cc | 2 +-
- qt4/src/poppler-textbox.cc | 2 +-
- 63 files changed, 63 insertions(+), 63 deletions(-)
-
-commit 37776afc6f8a5733b41da6fb0f45e7ace4edf737
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Nov 5 00:03:55 2007 +0100
-
- Update from http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-
- COPYING | 27 +++++++++++++--------------
- 1 files changed, 13 insertions(+), 14 deletions(-)
-
-commit 34a90b35998b65539cf1e8f09194d45db71064a1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Nov 4 14:03:35 2007 +0100
-
- Remove duplicate checking
-
- poppler/JBIG2Stream.cc | 8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
-
-commit d694e1dd042fb97fbc62046b69cafe30d6f9ea58
-Merge: ba5b31c 432e657
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Nov 4 13:26:47 2007 +0100
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit ba5b31c6a8b2317332bfa148f6d80f66891fb9ce
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sun Nov 4 13:25:12 2007 +0100
-
- Require fontconfig >= 2.0 Fixes bug 9020
-
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 432e657a49cb097638a79e38c141088039572816
-Author: Jeff Muizelaar <jeff@freiheit.infidigm.net>
-Date: Mon Sep 17 19:15:21 2007 -0400
-
- Use realloc/free instead of new/delete when resizing GooStrings
-
- This allows for a large performance improvement when appending a large number
- of characters to a GooString. This is especially helpful for TextOutputDev on
- large PDFs. For example, the following code has the potential to be O(n) instead of
- O(n²) with a good implementation of realloc.
-
- while (n) {
- string.append(character);
- n--;
- }
-
- goo/GooString.cc | 30 +++++++++++++++++-------------
- 1 files changed, 17 insertions(+), 13 deletions(-)
-
-commit cb80112afed2c5b9642c3c43f1cc001ed88d08cb
-Author: Jonathan Kew <jonathan_kew@sil.org>
-Date: Thu Nov 1 20:53:05 2007 +0100
-
- Do not try to parse directories when processing nameToUnicode dir. Fixes ugly warnings on mingw32
-
- poppler/GlobalParams.cc | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-commit ad6b888edff7b30be72df948c4052b9934a37705
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Thu Nov 1 20:48:21 2007 +0100
-
- Add some castings to make it compile
-
- glib/test-poppler-glib.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit a968dcc759379f48265c91bea63ca4cf987d94a9
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Wed Oct 31 23:53:39 2007 +0100
-
- Tests for passwords
-
- qt4/tests/Makefile.am | 13 +++++-
- qt4/tests/check_password.cpp | 87 ++++++++++++++++++++++++++++++++++++++
- qt4/tests/stress-poppler-dir.cpp | 63 +++++++++++++++++++++++++++
- qt4/tests/test-poppler-qt4.cpp | 15 ++++++-
- 4 files changed, 175 insertions(+), 3 deletions(-)
-
-commit 7b7a08863a8278dee7aa1fe7789cf72223c26b35
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Wed Oct 31 23:53:27 2007 +0100
-
- Improve documentation
-
- qt4/src/poppler-qt4.h | 64 ++++++++++++++++++++++++++++++++++++++++++------
- 1 files changed, 56 insertions(+), 8 deletions(-)
-
-commit 96493c9409186a7e964e894c7f730962b6995fd7
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Wed Oct 31 23:51:25 2007 +0100
-
- remove old file
-
- glib/test-poppler-glib.c | 514 ----------------------------------------------
- 1 files changed, 0 insertions(+), 514 deletions(-)
-
-commit 951a05f7a11af4a44e4cb85a015939d6a3e513f5
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Sat Oct 27 12:33:22 2007 +0200
-
- Remove fordward declaration of a non-existant class
-
- poppler/Form.h | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit 289679405ab143bc2106cf269227c514a1602e56
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Oct 25 22:16:10 2007 -0400
-
- Avoid drawing borders unless /W and /S are specified in /BS
-
- Acroread doesn't sometimes doesn't draw borders when you'd
- expect it to. Special case that behaviour so that we do the
- same thing.
-
- poppler/Annot.cc | 15 ++++++++++++---
- 1 files changed, 12 insertions(+), 3 deletions(-)
-
-commit ab0a6c37faf9916edcd70e128d9f2654eb795ace
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Thu Oct 25 20:56:58 2007 +0200
-
- Fix compilation on mingw. Bug 12493
-
- Added a check for localtime_r in configure.ac
- Moved test-poppler-glib.c to test-poppler-glib.cc to get the correct compiler
-
- configure.ac | 1 +
- glib/Makefile.am | 2 +-
- glib/test-poppler-glib.cc | 520 +++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 522 insertions(+), 1 deletions(-)
-
-commit 6bd637dc135045b20abf024d394538d7a3160795
-Merge: c01ab71 25b273d
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Tue Oct 23 23:27:01 2007 +0200
-
- Merge branch 'master' of ssh://aacid@git.freedesktop.org/git/poppler/poppler
-
-commit c01ab714ecd42e39ecb0be1c0c2504635251ac01
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Tue Oct 23 23:26:21 2007 +0200
-
- Provide setters for some methods that only had getters. Fixes bug 12894
-
- poppler/GlobalParams.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++++
- poppler/GlobalParams.h | 7 ++++++
- 2 files changed, 56 insertions(+), 0 deletions(-)
-
-commit 25b273db677815c8df11e52fe9df29fe857a8a88
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon Oct 22 23:01:37 2007 -0400
-
- Unset the font if it doesn't exist or we can not load it properly
-
- Previously, the previous font stayed current and glyphs would be drawn using
- it. This resulted in random glyphs being chosen unless the encodings happened
- to match. Now, instead, we draw nothing which matches the behaviour of
- acroread.
-
- poppler/Gfx.cc | 4 ++++
- poppler/GfxFont.cc | 4 ++++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-commit 57331767ed5306eba1f9bf60e48fc88debdc2198
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Mon Oct 22 23:33:59 2007 +0200
-
- builddir != srcdir fixes by Christian Persch <chpe gnome org>
-
- autogen.sh | 7 ++++---
- glib/demo/Makefile.am | 1 +
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-commit 2a333e5a618b5c92f3c703816b950321f25d3aab
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Mon Oct 22 22:14:43 2007 +0200
-
- Splash rework, check if font is inside clip area before rendering it to a temporary bitmap. Fixes KDE bug 150693
-
- This change is not trivial. What i did is:
- It is getGlyph the one that does the intersection between clip area and rendering area of the font instead fillGlyph2
- That means some clipRes = state->clip->testRect but we win more robustness against broken pdf that specify HUGE fonts
-
- splash/Splash.cc | 207 ++++++++++++++++++++++++------------------------
- splash/Splash.h | 4 +-
- splash/SplashFTFont.cc | 23 +++++-
- splash/SplashFTFont.h | 4 +-
- splash/SplashFont.cc | 29 ++++++--
- splash/SplashFont.h | 5 +-
- splash/SplashT1Font.cc | 11 ++-
- splash/SplashT1Font.h | 4 +-
- 8 files changed, 162 insertions(+), 125 deletions(-)
-
-commit cf785cd12ae77e8dd778ed043584f8f26efe675f
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Mon Oct 22 21:59:35 2007 +0200
-
- Add gmallocn_checkoverflow, it's the same as gmallocn but returns NULL on overflow instead of doing exit()
-
- goo/gmem.cc | 18 ++++++++++++++++++
- goo/gmem.h | 3 +++
- 2 files changed, 21 insertions(+), 0 deletions(-)
-
-commit 37e16ac301a35ceca2e3535f8c6100d4cf723c82
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Mon Oct 22 21:54:02 2007 +0200
-
- exit(1) is bad in library code, use the src.abort method to describe failure
-
- poppler/DCTStream.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit dbe975c129999a3efceb1c86518fa6fda74f685c
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Oct 22 11:25:37 2007 +0200
-
- Fix a crash with invalid TrueType fonts
-
- fofi/FoFiTrueType.cc | 10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-commit 8bfe30a48fd7021591ab307bd51f86c06ff202b9
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Oct 19 15:46:50 2007 +0200
-
- Do not generate appearance stream for radio button that are not active
-
- poppler/Annot.cc | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 1a531dcfee1c6fc79a414c38cbe7327fbf9a59d8
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Oct 19 13:12:24 2007 +0200
-
- Fix a crash with invalid embedded fonts
-
- poppler/CairoFontEngine.cc | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit e1740278457e512676b623bcdf9968193f0a8d7b
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Oct 19 12:21:54 2007 +0200
-
- Do not draw annotations when rendering for printing
-
- glib/poppler-page.cc | 25 ++++++++++++++++++++++---
- poppler/Annot.h | 2 ++
- 2 files changed, 24 insertions(+), 3 deletions(-)
-
-commit a4d25f79dfc1a7e4998e2e113ef92312bd4af553
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Oct 16 15:24:08 2007 +0200
-
- Detect form fields at any depth level
-
- We were ignoring non root form fields that contain only a kids dictionary.
- See evince bug: http://bugzilla.gnome.org/show_bug.cgi?id=486957
-
- poppler/Form.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 03e1da99f7393fb1103643311b0b5af7b875e09c
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Oct 13 19:38:15 2007 -0400
-
- Add an implementation of CairoOutputDev::startPage()
-
- The implementation initializes fill_pattern and stroke_pattern
- to black matching SplashOutputDev. This fixes #12504.
-
- poppler/CairoOutputDev.cc | 9 +++++++++
- poppler/CairoOutputDev.h | 2 +-
- 2 files changed, 10 insertions(+), 1 deletions(-)
-
-commit 825c942d46e0c3e254028441015c5dd8440cc734
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Fri Oct 12 13:47:09 2007 +0200
-
- Copy the embeddef file description string correctly
-
- poppler/Catalog.cc | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-commit 5e60da78695eff44cc10dbce46ef170727f682b1
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Fri Oct 12 13:46:52 2007 +0200
-
- Correctly delete the embedded file stream
-
- qt4/src/poppler-embeddedfile.cc | 1 +
- qt4/src/poppler-private.h | 2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-commit 1627fbbde8be01af3bdd2583f3439897a37d5215
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Oct 6 23:27:40 2007 -0400
-
- Use maskWidth and maskHeight for reading from the mask image in CairoOutputDev::drawMaskedImage()
-
- Previously, drawMaskedImage() was incorrectly using the image width and height which is
- wrong when width != maskWidth or heigh != maskHeight. Fixes #12668.
-
- poppler/CairoOutputDev.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 3156d560c5eaf6970da422d0b09fd2e95bfe6d1d
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Oct 5 11:34:01 2007 +0200
-
- Fix a crash when Form Fields array contains references
- to non existent objects. Fixes bug #11865
-
- poppler/Form.cc | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-commit f0b5e6286e94c6153c8247b5fae63a18622c48d3
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Oct 4 15:22:01 2007 +0200
-
- Do not return unknown field type for signature form fields
-
- glib/poppler-form-field.cc | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 498fd7fb99b01a879d07e2ad12c0b9462a8fc438
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Oct 4 12:36:39 2007 +0200
-
- Add poppler_page_render_for_printing() and poppler_page_render_to_pixbuf_for_printing()
-
- We were unconditionally passing printing=gFalse to displaySlice. With these new
- functions we can render to a pixbuf or cairo surface passing printing=gTrue to
- displaySlice.
-
- glib/poppler-page.cc | 135 ++++++++++++++++++++++++++++++++++++++++----------
- glib/poppler-page.h | 10 ++++
- 2 files changed, 119 insertions(+), 26 deletions(-)
-
-commit 56af69787c78c2edbb69266e86a5a5b639ca6d3e
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Oct 3 23:02:25 2007 -0400
-
- Error out if we can't find a .cidToUnicode for a known character collection
-
- This situation was caused by the fixes for bug #11413. I'm not sure
- it's the best thing to do, but it seems better.
-
- poppler/GfxFont.cc | 19 +++++++++++++++++++
- 1 files changed, 19 insertions(+), 0 deletions(-)
-
-commit 3d0df46908379bce1d196b9dc41153b1adb5f725
-Author: Michael Wolf <maw@ximian.com>
-Date: Wed Oct 3 19:43:55 2007 +0200
-
- Fix compile warning
-
- glib/test-poppler-glib.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit aba29e12528025c2cc71bf46e02e76ac4db2b193
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Sep 28 21:01:50 2007 +0200
-
- Add forms demo to glib poppler demo
-
- glib/demo/Makefile.am | 2 +
- glib/demo/forms.c | 489 +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/forms.h | 31 +++
- glib/demo/main.c | 8 +-
- glib/demo/utils.c | 1 -
- 5 files changed, 527 insertions(+), 4 deletions(-)
-
-commit d0c0f26d2c95232c216e3daa15e98a3aff14ac27
-Merge: 59d55f7 38d5bb1
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Tue Sep 25 03:33:52 2007 -0700
-
- Merge branch 'master' of ssh://kjk@git.freedesktop.org/git/poppler/poppler
-
-commit 38d5bb150a5fe883da1d4256463d1f796d201283
-Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)>
-Date: Tue Sep 25 16:13:51 2007 -0700
-
- Silence deprecation warnings - annoying with msvc 2005.
-
- makefile.vc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 59d55f7371bee81c9392fa2d4174ceffaacde471
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Tue Sep 25 01:21:19 2007 -0700
-
- Fix misleading comment.
-
- goo/GooTimer.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit c36d8afc984795aca0a12a94ec7668092067db82
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Tue Sep 25 00:32:29 2007 -0700
-
- Revert "replace extremely confusing 'a*(int)sizeof(foo)/sizeof(foo) != a' which, due to type promotions, if a is int, is equivalent to a < 0; fix problems revealed by the change"
-
- This reverts commit 08bf7c1151d594d4c7d253a2c89f4f3a088ad8ec.
-
- poppler/XRef.cc | 25 +++++++++++++++++++++----
- 1 files changed, 21 insertions(+), 4 deletions(-)
-
-commit ff25e83abae1ca17e2e7dd6f20946026fca69fff
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Mon Sep 24 23:57:25 2007 -0700
-
- Make perf-test compile on unix as well.
-
- test/Makefile.am | 16 ++++++-
- test/perf-test-preview-dummy.cc | 1 +
- test/perf-test.cc | 104 ++++++++++++++++-----------------------
- 3 files changed, 59 insertions(+), 62 deletions(-)
-
-commit 70f3bf42b3028d9a2e4aefdc2e1a458b3c77b0e7
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Mon Sep 24 21:26:54 2007 -0700
-
- Let perf-test.cc manage lifetime of rendered bitmap.
-
- test/perf-test-preview-win.cc | 7 -------
- 1 files changed, 0 insertions(+), 7 deletions(-)
-
-commit b622b252cba068a15eae77df5deb261dd98affaf
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Mon Sep 24 21:20:12 2007 -0700
-
- Disable my_error for now - seems to corrupt memory.
-
- test/perf-test.cc | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit bde8c9669ca6b43cb6a664bd14df164a718041ea
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Mon Sep 24 21:08:58 2007 -0700
-
- Con't copy the file unless COPY_FILE is defined.
-
- test/perf-test.cc | 11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-commit bf9b46b012c64624818a2110af7c4b7e3b419728
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Mon Sep 24 20:13:54 2007 -0700
-
- Respect -loadonly cmd-line arg.
-
- test/perf-test.cc | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 2f664b654ca19135f0f8a0fe89872b9e0d526fa2
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Mon Sep 24 19:41:45 2007 -0700
-
- Fix msvc debug build. Fix bitmap leak in perf-test.
-
- makefile.vc | 6 ++++--
- test/perf-test.cc | 1 +
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-commit 05d41cd5aec39b4e3c8949445a9986e5ca8b50dd
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Mon Sep 24 08:10:37 2007 -0700
-
- Use GooTimer instead of my own timer.
-
- test/perf-test.cc | 98 ++++------------------------------------------------
- 1 files changed, 8 insertions(+), 90 deletions(-)
-
-commit 05fbce5b6657e883ece9054c79576b25271a05a4
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Mon Sep 24 08:01:11 2007 -0700
-
- Make GooTimer work for Windows/msvc build.
-
- goo/GooTimer.cc | 69 +++++++++++++++++++++++++++++++++++++-----------------
- goo/GooTimer.h | 28 +++++++++++++--------
- poppler/Gfx.cc | 11 +-------
- 3 files changed, 66 insertions(+), 42 deletions(-)
-
-commit 6347915085a487da08d39a859f4261fa812dab09
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Mon Sep 24 01:08:17 2007 -0700
-
- Add Error.cc in msvc build and use setErrorFunction in perf-test.
-
- makefile.vc | 3 +--
- test/perf-test.cc | 10 +++++-----
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-commit ed01b3965c57ce2a4eabf9c46b5319ea627d3324
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Mon Sep 24 01:03:09 2007 -0700
-
- Match declaration of setErrorFunction with its definition.
-
- Also enable this code for Windows, since CDECL was what
- was throwing msvc off.
-
- poppler/Error.cc | 12 +++---------
- 1 files changed, 3 insertions(+), 9 deletions(-)
-
-commit 71fb15f8bd131a13d8cf0f394fe601cfbb6e1772
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Mon Sep 24 00:38:29 2007 -0700
-
- Even less compiler warnings.
-
- poppler/CairoOutputDev.cc | 6 +++---
- qt/poppler-page.cc | 3 +++
- utils/HtmlOutputDev.cc | 10 ++++++----
- 3 files changed, 12 insertions(+), 7 deletions(-)
-
-commit 7ba3f198a0651d2a7c91b7d9e10a5173dc3de0a3
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Mon Sep 24 00:32:37 2007 -0700
-
- Even less compiler warnings.
-
- qt/poppler-document.cc | 8 ++++++++
- qt/poppler-private.h | 8 --------
- qt4/src/poppler-document.cc | 10 ++++++++++
- qt4/src/poppler-form.cc | 15 +++++++++++++++
- qt4/src/poppler-private.h | 25 -------------------------
- 5 files changed, 33 insertions(+), 33 deletions(-)
-
-commit ab1059f594cb9fccd8568ca2a535a363c7521daa
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Mon Sep 24 00:14:01 2007 -0700
-
- Don't break aliasing.
-
- poppler/GlobalParams.cc | 40 ++++++++++++++++++----------------------
- 1 files changed, 18 insertions(+), 22 deletions(-)
-
-commit 71c47b30adf687a0bcece22834933267053360de
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Sun Sep 23 23:49:31 2007 -0700
-
- Reduce compiler warnings.
-
- poppler/JBIG2Stream.cc | 16 ++++++++++++----
- 1 files changed, 12 insertions(+), 4 deletions(-)
-
-commit 8466d94929844c976bbad8bb7d1ea7f7f77cc196
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Sun Sep 23 23:34:52 2007 -0700
-
- Reduce compiler warnings. Tabs to spaces.
-
- fofi/FoFiType1C.cc | 30 +++++++++++++++---------------
- 1 files changed, 15 insertions(+), 15 deletions(-)
-
-commit c53b8ccfba6fa4345086493f9e44212721c11d0a
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Sun Sep 23 23:23:34 2007 -0700
-
- Reduce number of compiler warnings.
-
- poppler/CharCodeToUnicode.cc | 2 +-
- poppler/Gfx.cc | 6 ++----
- poppler/PageLabelInfo.cc | 2 ++
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-commit abede2a06c5c9dc97b40479deda49621458f1171
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Sun Sep 23 23:03:36 2007 -0700
-
- Reduce number of compiler warnings.
-
- glib/poppler-action.cc | 1 -
- glib/poppler-document.cc | 9 ++-------
- glib/poppler-page.cc | 3 +--
- qt/poppler-document.cc | 1 -
- qt4/src/poppler-annotation.cc | 16 +++++++++++++---
- 5 files changed, 16 insertions(+), 14 deletions(-)
-
-commit 60f5bcea4a920441e25ae11d677636242aabb2db
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Sun Sep 23 22:48:06 2007 -0700
-
- Remove unused variables.
-
- utils/pdftoppm.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 3179eee44eb0afbc642675268b9a4abb16ccdde3
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Sun Sep 23 22:47:21 2007 -0700
-
- Remove unused variables.
-
- utils/HtmlOutputDev.cc | 23 -----------------------
- 1 files changed, 0 insertions(+), 23 deletions(-)
-
-commit e9dc379190aa3166870d0b11a05ccc4e9dad2706
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Sun Sep 23 22:41:59 2007 -0700
-
- Remove unused variables.
-
- poppler/ArthurOutputDev.cc | 16 +++++-----------
- 1 files changed, 5 insertions(+), 11 deletions(-)
-
-commit 08bf7c1151d594d4c7d253a2c89f4f3a088ad8ec
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Sun Sep 23 22:28:16 2007 -0700
-
- replace extremely confusing 'a*(int)sizeof(foo)/sizeof(foo) != a' which, due to type promotions, if a is int, is equivalent to a < 0; fix problems revealed by the change
-
- poppler/XRef.cc | 25 ++++---------------------
- 1 files changed, 4 insertions(+), 21 deletions(-)
-
-commit 5a1f670a4d16affeed86cdf643ab22f481caa3a5
-Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)>
-Date: Sun Sep 23 20:42:59 2007 -0700
-
- ignore *.o files
-
- .gitignore | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit c156aed7234f82dea4cb384c1b8a7acdd34545be
-Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)>
-Date: Sun Sep 23 20:41:19 2007 -0700
-
- remove unused variables
-
- poppler/ABWOutputDev.cc | 10 ++--------
- 1 files changed, 2 insertions(+), 8 deletions(-)
-
-commit d0bdef4752be5fa609a0766ee87aa54d51611d9a
-Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)>
-Date: Sat Sep 22 13:38:03 2007 -0700
-
- undo accidental changes to file permissions
-
- 0 files changed, 0 insertions(+), 0 deletions(-)
-
-commit 6c69473f2f4a49757614ddd249e65bb7a13c63c1
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Fri Sep 21 08:09:53 2007 -0700
-
- undo accidental mode change
-
- 0 files changed, 0 insertions(+), 0 deletions(-)
-
-commit e7e386e7ce8cb8eb8a7037ebdaa601524d332ae7
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Fri Sep 21 08:08:53 2007 -0700
-
- more simplification by removing unneded code
-
- makefile.vc | 2 +-
- test/perf-test.cc | 60 ++++++++---------------------------------------------
- 2 files changed, 10 insertions(+), 52 deletions(-)
-
-commit 3e10604637ec193269a3155985476d3b83dc7d62
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Fri Sep 21 07:48:38 2007 -0700
-
- for portability use bool/true/false instead of BOOL/TRUE/FALSE
-
- test/perf-test.cc | 176 ++++++++++++++++++++++++++---------------------------
- 1 files changed, 86 insertions(+), 90 deletions(-)
-
-commit 634718936f2a95fac2a9d12fcea483b3d0ca8fa6
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Fri Sep 21 07:41:14 2007 -0700
-
- simplify perf-test
-
- test/perf-test-pdf-engine.h | 78 -----------------------------------------
- test/perf-test-preview-win.cc | 5 +--
- test/perf-test.cc | 75 ++++++++++++++++++++++++++++++++++++++-
- 3 files changed, 75 insertions(+), 83 deletions(-)
-
-commit 617550199762fab42ca2e202e641e047b3efbac0
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Fri Sep 21 05:20:16 2007 -0700
-
- simplify perf-test code
-
- test/perf-test-pdf-engine.h | 67 +++--------------------
- test/perf-test-preview-dummy.cc | 3 +-
- test/perf-test-preview-win.cc | 80 +++++++++++++++++++++++----
- test/perf-test.cc | 114 +++-----------------------------------
- 4 files changed, 86 insertions(+), 178 deletions(-)
-
-commit fb5bf808b88992c1772a10e4ed9fe788fb618417
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Fri Sep 21 03:03:26 2007 -0700
-
- more msvc build fixes
-
- makefile.vc | 2 +-
- test/perf-test.cc | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit 60829b08a7440f36014f68ec54bee7a742412738
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Fri Sep 21 03:02:34 2007 -0700
-
- msvc build fixes
-
- msvc/poppler/poppler-config.h | 143 +++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 143 insertions(+), 0 deletions(-)
-
-commit 853c22a174bae81139edc9aeded7f26ae2655cef
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Thu Sep 20 23:21:35 2007 -0700
-
- add pre-made config.h for msvc build
-
- msvc/config.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 62 insertions(+), 0 deletions(-)
-
-commit 31c43b118bd4372134018be6f6693f77d1f6a39b
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Thu Sep 20 22:10:09 2007 -0700
-
- remove unused variables
-
- poppler/CairoFontEngine.cc | 6 ++----
- poppler/CairoOutputDev.cc | 14 ++------------
- splash/SplashFTFontEngine.cc | 2 ++
- 3 files changed, 6 insertions(+), 16 deletions(-)
-
-commit 01b99f60e36dd955817f23911ef38947360f61f7
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Thu Sep 20 21:14:17 2007 -0700
-
- remove unused variables
-
- poppler/GfxState.cc | 11 ++---------
- poppler/SplashOutputDev.cc | 9 +++------
- poppler/TextOutputDev.cc | 3 ---
- 3 files changed, 5 insertions(+), 18 deletions(-)
-
-commit 7c406400532d68524a43cf963d894d3c4b269400
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Thu Sep 20 20:57:44 2007 -0700
-
- remove unused variables
-
- poppler/Catalog.cc | 1 -
- poppler/Form.cc | 5 -----
- poppler/GfxFont.cc | 6 ++----
- poppler/Page.cc | 2 +-
- splash/Splash.cc | 5 ++++-
- 5 files changed, 7 insertions(+), 12 deletions(-)
-
-commit 70f23389c97b1870b7311d97322cdd16b580a79d
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Thu Sep 20 20:23:59 2007 -0700
-
- don't silence warnings about unused variables/functions to keep programmers honest
-
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit cdb6fcf98137473efd993e1374a6f010e9db67db
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Thu Sep 20 20:00:56 2007 -0700
-
- Remove unused variables
-
- poppler/Annot.cc | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-commit 0e76b49ac852a5a7ebae4c1f67b153e0b7c9f905
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Tue Sep 18 01:04:50 2007 -0700
-
- Explain how to compile on Windows using msvc makefile.
-
- README.windows | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 63 insertions(+), 0 deletions(-)
-
-commit c002b4dc75b2688ffe8a734cf3e15f5891797842
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Tue Sep 18 00:04:47 2007 -0700
-
- Add Windows/msvc makefile.
-
- Add native msvc windows makefile and pre-made
- config.h for windows in msvc directory.
-
- makefile.vc | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 149 insertions(+), 0 deletions(-)
-
-commit 1f33fc58201c92120c587189d2e0e819f83167da
-Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
-Date: Mon Sep 17 23:53:02 2007 -0700
-
- Start on a test program.
-
- Test program can be used for regression testing and
- performance testing. It renders a page (or pages)
- in a given PDF (or PDFs) and records rendering times.
- For historical reasons the code is ugly and probably
- only compiles on windows, but it'll get better.
-
- test/perf-test-pdf-engine.h | 131 ++++
- test/perf-test-preview-dummy.cc | 22 +
- test/perf-test-preview-win.cc | 222 ++++++
- test/perf-test.cc | 1428 +++++++++++++++++++++++++++++++++++++++
- 4 files changed, 1803 insertions(+), 0 deletions(-)
-
-commit b96db4ad27535c2666fccdfe0a3c04cc7c37792d
-Author: Jeff Muizelaar <jeff@freiheit.infidigm.net>
-Date: Mon Sep 17 20:28:38 2007 -0400
-
- Avoid double free caused by 302 merge
-
- The ownership of the the string returned by getKey() changed with the 302 merge
- but this code was not updated. Found by Matthew Woehlke.
-
- qt4/src/poppler-document.cc | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-commit 2a495f19d4465e15fd2fa96656d904315c79a443
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Sep 17 16:52:45 2007 -0400
-
- Simplify ChangeLog rule a bit.
-
- ChangeLog.mk | 81 ----------------------------------------------------------
- Makefile.am | 7 +++--
- 2 files changed, 4 insertions(+), 84 deletions(-)
-
-commit 7d5abbeec55e4b90b139671d96cfdf58bdab70b8
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Sep 17 15:45:26 2007 -0400
-
- Add dist hook to generate ChangeLog.
-
- Taken from cairo. It still need some tweaking.
-
- ChangeLog.mk | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- Makefile.am | 4 +++
- configure.ac | 2 +-
- 3 files changed, 86 insertions(+), 1 deletions(-)
-
-commit 15ad81c64cd8b1cb438d41be402daa19a239db3d
-Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
-Date: Mon Sep 17 19:39:29 2007 +0200
-
- Use = instead of == in qt.m4
-
- m4/qt.m4 | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 70fabcb96e207b9b889bb32c0cf5ea3fc0aa08f8
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun Sep 16 20:40:53 2007 -0400
-
- Rename .cvsignore files to .gitignore and drop ChangeLog file.
-
- .cvsignore | 25 -
- .gitignore | 25 +
- ChangeLog | 4586 ---------------------------------------------
- fofi/.cvsignore | 8 -
- fofi/.gitignore | 8 +
- glib/.cvsignore | 11 -
- glib/.gitignore | 11 +
- glib/reference/.cvsignore | 18 -
- glib/reference/.gitignore | 18 +
- goo/.cvsignore | 8 -
- goo/.gitignore | 8 +
- poppler/.cvsignore | 10 -
- poppler/.gitignore | 10 +
- qt/.cvsignore | 7 -
- qt/.gitignore | 7 +
- qt4/.cvsignore | 3 -
- qt4/.gitignore | 3 +
- qt4/src/.cvsignore | 8 -
- qt4/src/.gitignore | 8 +
- qt4/tests/.cvsignore | 20 -
- qt4/tests/.gitignore | 20 +
- splash/.cvsignore | 8 -
- splash/.gitignore | 8 +
- test/.cvsignore | 11 -
- test/.gitignore | 11 +
- utils/.cvsignore | 12 -
- utils/.gitignore | 12 +
- 27 files changed, 149 insertions(+), 4735 deletions(-)
-
-commit c9f9403ffc5b95ae790c3c81284c7786afe33f4d
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Fri Sep 14 20:50:07 2007 +0000
-
- Windows implementation for matching fonts that doesn't use fontconfig
-
- ChangeLog | 6 +
- poppler/GlobalParamsWin.cc | 285 ++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 291 insertions(+), 0 deletions(-)
-
-commit d18b5361a0504458da805ed6be037c9d648f9372
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Fri Sep 14 20:47:11 2007 +0000
-
- Update ChangeLog for previous checkin
-
- ChangeLog | 15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-commit 3330763ddca66b30d5ee60aab94d6fe0bbae9c8f
-Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-Date: Fri Sep 14 06:17:35 2007 +0000
-
- windows/msvc compilation fixes
-
- poppler/DCTStream.h | 2 +-
- poppler/Error.cc | 6 ++++++
- poppler/FlateStream.h | 2 +-
- poppler/GlobalParams.cc | 12 ++++++++++--
- poppler/GlobalParams.h | 17 +++++++++++++++++
- poppler/Stream.cc | 2 +-
- splash/SplashFTFontEngine.cc | 2 ++
- splash/SplashFontEngine.cc | 2 +-
- splash/SplashFontFile.cc | 2 ++
- splash/SplashFontFile.h | 3 ++-
- splash/SplashT1FontEngine.cc | 2 +-
- 11 files changed, 44 insertions(+), 8 deletions(-)
-
-commit 6eb159ef34eb7e2fb8adcfc48afd84d5f50efbbd
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 10 17:38:05 2007 +0000
-
- * autogen.sh: Support automake-1.10.
- Patch by Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-
- ChangeLog | 5 +++++
- autogen.sh | 11 ++++++-----
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
-commit 31bbc8c727cfecc79bd8da962ad8d99a0d1d3d33
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 8 10:40:17 2007 +0000
-
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-ps-converter.cc:
- Add PSConverter::setOutputDevice() to set a QIODevice where
- writing the resulting PS.
-
- ChangeLog | 7 +++++
- qt4/src/poppler-ps-converter.cc | 51 +++++++++++++++++++++++++++++++++++---
- qt4/src/poppler-qt4.h | 5 +++-
- 3 files changed, 58 insertions(+), 5 deletions(-)
-
-commit b3d63d03c310f01cc5b23d00ffd2103c6891fef2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 5 20:22:32 2007 +0000
-
- * qt4/src/poppler-ps-converter.cc: Fix Right<->Left interchange
-
- ChangeLog | 1 +
- qt4/src/poppler-ps-converter.cc | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-commit 64368582d5ca4e28c236f440482c96f1dd3a8897
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 5 18:22:52 2007 +0000
-
- * poppler/PSOutputDev.cc: Fix printing of second parameter
-
- ChangeLog | 4 ++++
- poppler/PSOutputDev.cc | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit eaf9d06cf0d08ccdc183759e0331dc2439a6f10f
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Sep 5 10:57:09 2007 +0000
-
- 2007-09-05 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-page.cc:
- * glib/demo/render.c: Fix build with --disable-cairo-output.
-
- ChangeLog | 5 +++++
- glib/demo/render.c | 31 +++++++++++++++++++++++++++----
- glib/poppler-page.cc | 22 ++++++++++++----------
- 3 files changed, 44 insertions(+), 14 deletions(-)
-
-commit c0f488c2b0e115be3e1b7e4dc7baa38db5837498
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 4 22:04:52 2007 +0000
-
- did not want to commit this
-
- gtk-doc.make | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 3462851b4ea342651095f1803cd488bc3b3f5749
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 4 22:02:06 2007 +0000
-
- * utils/pdftoppm.cc: Fix build on Sun Studio compiler.
- Patch by Brian Cameron <brian.cameron@sun.com>
-
- ChangeLog | 5 +++++
- gtk-doc.make | 2 +-
- utils/pdftoppm.cc | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-commit cdf3b9062cc54d558b8dbeefb3211a920ff2cb94
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 3 19:23:11 2007 +0000
-
- write news
- fix qt4 build
-
- NEWS | 13 +++++++++++++
- qt4/src/Makefile.am | 3 ++-
- 2 files changed, 15 insertions(+), 1 deletions(-)
-
-commit c82208a44f3b09c27bc33831641e4f746dd4361f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 3 18:28:44 2007 +0000
-
- * configure.ac: Bump version to 0.6
- * glib/Makefile.am
- * poppler/Makefile.am
- * qt/Makefile.am
- * qt4/src/Makefile.am: Bump sonames
-
- ChangeLog | 8 ++++++++
- configure.ac | 2 +-
- glib/Makefile.am | 2 +-
- poppler/Makefile.am | 2 +-
- qt/Makefile.am | 2 +-
- qt4/src/Makefile.am | 2 +-
- 6 files changed, 13 insertions(+), 5 deletions(-)
-
-commit 2a12409ebbf96ea3ca4556b71231a45ae37cb052
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 3 17:09:01 2007 +0000
-
- * poppler/JBIG2Stream.cc:
- * poppler/Stream.cc: Patch by Derek B. Noonburg <derekn@foolabs.com>
- to fix some errors in CCITTFaxStream and JBIG2Stream.cc
-
- ChangeLog | 6 ++++++
- poppler/JBIG2Stream.cc | 7 ++++---
- poppler/Stream.cc | 2 +-
- 3 files changed, 11 insertions(+), 4 deletions(-)
-
-commit 0b483e71ef02b4040b665935c1018c8b30b9c1ca
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Sep 3 08:54:01 2007 +0000
-
- 2007-09-03 Carlos Garcia Campos <carlosgc@gnome.org>
- * gtk-doc.make:
- * glib/poppler-document.cc:
- * glib/poppler-form-field.cc:
- * glib/poppler-page.cc:
- * glib/reference/poppler-docs.sgml:
- * glib/reference/poppler-sections.txt:
- * glib/reference/poppler.types:
- * glib/reference/tmpl/poppler-action.sgml:
- * glib/reference/tmpl/poppler-attachment.sgml:
- * glib/reference/tmpl/poppler-document.sgml:
- * glib/reference/tmpl/poppler-enums.sgml:
- * glib/reference/tmpl/poppler-form-field.sgml:
- * glib/reference/tmpl/poppler-page.sgml:
- * glib/reference/tmpl/poppler-private.sgml:
- * glib/reference/tmpl/poppler.sgml: Update glib bindings API
- documentation.
-
- ChangeLog | 19 ++
- glib/poppler-document.cc | 10 +
- glib/poppler-form-field.cc | 205 +++++++++++++++++
- glib/poppler-page.cc | 12 +-
- glib/reference/poppler-docs.sgml | 2 +
- glib/reference/poppler-sections.txt | 108 +++++++++-
- glib/reference/poppler.types | 2 +
- glib/reference/tmpl/poppler-action.sgml | 36 +++-
- glib/reference/tmpl/poppler-attachment.sgml | 65 ++++++
- glib/reference/tmpl/poppler-document.sgml | 50 +++++
- glib/reference/tmpl/poppler-enums.sgml | 60 +++++
- glib/reference/tmpl/poppler-form-field.sgml | 315 +++++++++++++++++++++++++++
- glib/reference/tmpl/poppler-page.sgml | 236 ++++++++++++++++++++-
- glib/reference/tmpl/poppler-private.sgml | 6 +
- glib/reference/tmpl/poppler.sgml | 49 ++++
- gtk-doc.make | 34 ++--
- 16 files changed, 1181 insertions(+), 28 deletions(-)
-
-commit 289e3893cda45055951bb8d3b82a45644bc0b6c6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Sep 2 17:02:55 2007 +0000
-
- * poppler/GfxState.cc: Pad zeroes instead of aborting when rendering
- 1-bit images and the stream is "too short" to mimic Acroread and
- ghostscript behaviour. Patch by <darren.kenny@sun.com>. Fixes #12208
-
- ChangeLog | 3 +++
- poppler/GfxState.cc | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-commit 6f6c2180aca2e26ea0e3c2f21f11bc8f457c19c0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Sep 2 16:31:19 2007 +0000
-
- * glib/demo/Makefile.am: Add $(top_builddir)/poppler/libpoppler.la
- * poppler/TextOutputDev.cc: Patch from Ed Catmur <ed@catmur.co.uk> to
- improve matching of half strings of decomposed characters/ligatures.
-
- ChangeLog | 3 +++
- glib/demo/Makefile.am | 1 +
- poppler/TextOutputDev.cc | 21 +++++++++++++--------
- 3 files changed, 17 insertions(+), 8 deletions(-)
-
-commit be1b5a0196cdfc78f74e08a023b477cac16eb0f3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Sep 2 16:06:03 2007 +0000
-
- poppler/PDFDoc.cc: Don't enforce %%EOF at the end of file
-
- ChangeLog | 4 ++++
- poppler/PDFDoc.cc | 3 ++-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 500a87af9240344806c18ebbd05a89f4f4c69955
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Sep 2 00:53:42 2007 +0000
-
- 2007-09-01 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc:
- * poppler/Error.cc:
- * poppler/Error.h: Report any cairo errors when destroying the cairo
- context.
-
- ChangeLog | 7 +++++++
- poppler/CairoOutputDev.cc | 7 ++++++-
- poppler/Error.cc | 7 +++++++
- poppler/Error.h | 1 +
- 4 files changed, 21 insertions(+), 1 deletions(-)
-
-commit 0c22556bf70ff67eb388cdcd9784603030397785
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Sep 1 23:38:04 2007 +0000
-
- 2007-09-01 Jeff Muizelaar <jeff@infidigm.net>
-
- * glib/demo/Makefile.am: Only build the demo app if the cflags will be
- appropriately set.
-
- ChangeLog | 5 +++++
- glib/demo/Makefile.am | 2 ++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-commit a23d45dd6cd8a2ac4181170a9ee924fe49a9781b
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Sep 1 23:00:59 2007 +0000
-
- 2007-09-01 Jeff Muizelaar <jeff@infidigm.net>
-
- * glib/poppler-page.cc: Add note about clipping
-
- ChangeLog | 4 ++++
- glib/poppler-page.cc | 2 ++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit bf489d5cebc467807f2b38f74f6a6e34a503a9ca
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Aug 30 18:39:51 2007 +0000
-
- * poppler/Form.h: Remove unused methods. Fixes 12013
-
- ChangeLog | 4 ++++
- poppler/Form.h | 3 ---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-commit a81cc06c855385911dffa826b9e1407d6097e8c8
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Aug 30 18:15:34 2007 +0000
-
- 2007-08-30 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/TextOutputDev.cc:
- * poppler/TextOutputDev.h:
- * glib/poppler.h:
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/test-poppler-glib.c: Add support for word and line
- selections. Based on patch by Kristian Høgsberg.
-
- ChangeLog | 10 ++++++
- glib/poppler-page.cc | 81 ++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h | 2 +
- glib/poppler.h | 4 +-
- glib/test-poppler-glib.c | 2 +-
- poppler/TextOutputDev.cc | 74 +++++++++++++++++++++++++++++-------------
- poppler/TextOutputDev.h | 34 +++++++++++++++----
- 7 files changed, 163 insertions(+), 44 deletions(-)
-
-commit 59ddb5cc8bec54305b6d256ad9975e95ecdcb935
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 27 18:37:55 2007 +0000
-
- * poppler/UnicodeTypeTable.cc: Fix error on the NFKC text matching
- routine. Fixes bug #11775. Patch by Ed Catmur <ed@catmur.co.uk>
-
- ChangeLog | 5 +++++
- poppler/UnicodeTypeTable.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit a6e46ce61670679f368e66c1a98a7d5d1c960c5b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 27 17:56:29 2007 +0000
-
- * qt4/src/Doxyfile:
- * qt4/src/Mainpage.dox:
- * qt4/src/poppler-annotation.h:
- * qt4/src/poppler-form.h:
- * qt4/src/poppler-link.h:
- * qt4/src/poppler-qt4.h:
- A few API documentation fixes and improvements.
-
- ChangeLog | 10 ++++++
- qt4/src/Doxyfile | 26 +++++------------
- qt4/src/Mainpage.dox | 26 ++++++++++------
- qt4/src/poppler-annotation.h | 34 ++++++++++++++++++++++
- qt4/src/poppler-form.h | 18 ++++++------
- qt4/src/poppler-link.h | 63 +++++++++++++++++++++++++++++++++++++++--
- qt4/src/poppler-qt4.h | 44 ++++++++++++++++++++---------
- 7 files changed, 166 insertions(+), 55 deletions(-)
-
-commit a7f8d92fba8c45d6ca83568c045d5e324158ee6b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 27 17:17:14 2007 +0000
-
- * qt4/src/poppler-link.cc:
- * qt4/src/poppler-link.h:
- Initialise correctly, and missing empty destructor.
- * qt4/src/poppler-annotation.cc:
- Don't leak the private class.
-
- ChangeLog | 9 +++++++++
- qt4/src/poppler-annotation.cc | 4 ++--
- qt4/src/poppler-link.cc | 8 ++++++--
- qt4/src/poppler-link.h | 1 +
- 4 files changed, 18 insertions(+), 4 deletions(-)
-
-commit 2b1ef8f06879eb0b79288d57540c238ea833db24
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 26 21:39:22 2007 +0000
-
- Fix bug 12121
-
- ChangeLog | 4 ++++
- utils/ImageOutputDev.cc | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit 20bcac5ee1988befb9c590a0d16cb615f0c49901
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 26 21:28:34 2007 +0000
-
- forgot to cvs add
-
- qt4/src/poppler-annotation-private.h | 49 ++++++++++++++++++++++++++++++++++
- 1 files changed, 49 insertions(+), 0 deletions(-)
-
-commit e48de657db0ef439457b4b5ca39b937da25d531e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 26 18:11:01 2007 +0000
-
- * qt4/src/poppler-annotation.cc:
- * qt4/src/poppler-annotation.h:
- Move all the private members of the *Annotation classes into a common
- shared private.
-
- ChangeLog | 4 +
- qt4/src/poppler-annotation.cc | 969 ++++++++++++++++++++++++++++++++++-------
- qt4/src/poppler-annotation.h | 277 ++++++++----
- qt4/src/poppler-page.cc | 249 +++++++----
- 4 files changed, 1155 insertions(+), 344 deletions(-)
-
-commit 392f050f909b6a1250acf1971446a1849534482c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 26 16:42:46 2007 +0000
-
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-embeddedfile.cc:
- * qt4/src/poppler-fontinfo.cc:
- * qt4/src/poppler-form.cc:
- * qt4/src/poppler-form.h:
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-sound.cc:
- * qt4/src/poppler-textbox.cc:
- API work: remove 'const' and 'const&' from return values with Qt
- classes; make the non-copiable classes really non-copiable;
- uninline a Document::page() method; other related small changes.
- * qt4/src/poppler-link.cc:
- * qt4/src/poppler-link.h:
- Make LinkDestination an implicitely shared class, with all the private
- members into the private class; move all the private members of the
- Link* classes into a common shared private.
-
- ChangeLog | 23 +++-
- qt4/src/poppler-document.cc | 7 +-
- qt4/src/poppler-embeddedfile.cc | 12 --
- qt4/src/poppler-fontinfo.cc | 12 +-
- qt4/src/poppler-form.cc | 16 +-
- qt4/src/poppler-form.h | 14 +-
- qt4/src/poppler-link.cc | 373 ++++++++++++++++++++++++++++++---------
- qt4/src/poppler-link.h | 67 +++++---
- qt4/src/poppler-qt4.h | 32 +++--
- qt4/src/poppler-sound.cc | 7 -
- qt4/src/poppler-textbox.cc | 4 +-
- 11 files changed, 404 insertions(+), 163 deletions(-)
-
-commit f215aca25fdd8fe287b717dde53f0be273d995e4
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun Aug 26 10:52:19 2007 +0000
-
- 2007-08-26 Carlos Garcia Campos <carlosgc@gnome.org>
- * configure.ac:
- * glib/Makefile.am:
- * glib/demo/Makefile.am:
- * glib/demo/fonts.[ch]:
- * glib/demo/info.[ch]:
- * glib/demo/links.[ch]:
- * glib/demo/main.c:
- * glib/demo/outline.[ch]:
- * glib/demo/page.[ch]:
- * glib/demo/render.[ch]:
- * glib/demo/utils.[ch]: Add poppler glib demo tool.
-
- ChangeLog | 14 ++
- configure.ac | 1 +
- glib/Makefile.am | 2 +-
- glib/demo/Makefile.am | 26 +++
- glib/demo/fonts.c | 276 +++++++++++++++++++++++++++
- glib/demo/fonts.h | 31 +++
- glib/demo/info.c | 243 ++++++++++++++++++++++++
- glib/demo/info.h | 31 +++
- glib/demo/links.c | 289 ++++++++++++++++++++++++++++
- glib/demo/links.h | 31 +++
- glib/demo/main.c | 205 ++++++++++++++++++++
- glib/demo/outline.c | 218 +++++++++++++++++++++
- glib/demo/outline.h | 31 +++
- glib/demo/page.c | 249 ++++++++++++++++++++++++
- glib/demo/page.h | 31 +++
- glib/demo/render.c | 498 +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/render.h | 31 +++
- glib/demo/utils.c | 234 +++++++++++++++++++++++
- glib/demo/utils.h | 42 ++++
- 19 files changed, 2482 insertions(+), 1 deletions(-)
-
-commit 7c9529b70dc44bb001d21a3b47fc65916813dec1
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Aug 23 20:39:31 2007 +0000
-
- 2007-08-23 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-page.cc: Add missing comma.
-
- ChangeLog | 4 ++++
- glib/poppler-page.cc | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit 3c4a85503261ee81a829a1683f1f5fa85d41f8ee
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Aug 23 20:15:46 2007 +0000
-
- 2007-08-23 Jeff Muizelaar <jeff@infidigm.net>
-
- * glib/poppler-page.cc: pass in -1 to displaySlice so that it sets up
- the slice size for us. This fixes the case of the wrong values being
- used when the pdf was rotated on its side.
- Fixes #11913.
-
- ChangeLog | 7 +++++++
- glib/poppler-page.cc | 5 ++---
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-commit 3ba088d8caee3c40c2aba0cd85adcf9195ae88a3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Aug 22 21:29:32 2007 +0000
-
- * splash/SplashBitmap.cc:
- * splash/SplashBitmap.h:
- * utils/pdftoppm.cc: Add the following features to pdftoppm
- - if omitting input filename or using - for input filename
- reads pdf from stdin
- - if omitting output filename, prints output to stdout
- - create image of a cropped rectangle of the pdf
- - scale pdf to fit in a square of wanted size
- Patch by Ilmari Heikkinen <ilmari.heikkinen@gmail.com>
-
- ChangeLog | 12 +++++
- splash/SplashBitmap.cc | 18 ++++++--
- splash/SplashBitmap.h | 2 +
- utils/pdftoppm.cc | 107 ++++++++++++++++++++++++++++++++++++++++-------
- 4 files changed, 119 insertions(+), 20 deletions(-)
-
-commit 567e82c13aace4f40c7a555a62a3a4d223a46d92
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Aug 22 19:34:02 2007 +0000
-
- 2007-08-22 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/GlobalParams.cc: Fix debug spew. Patch from Matthias Clasen.
-
- ChangeLog | 4 ++++
- poppler/GlobalParams.cc | 1 -
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-commit bc499987074d046baf29deafe4a29d57039c0c5e
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Aug 22 19:28:24 2007 +0000
-
- 2007-08-22 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Fix the computation of the padding in the
- image scaling code.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 6 ++++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-commit d9719233447cb4f85f2bf9d9ec6ef089caa21140
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Aug 19 16:20:21 2007 +0000
-
- 2007-08-19 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Avoid allocating the glyph array if
- currentFont is not set in beginString. This closes a possible
- memory leak.
-
- ChangeLog | 6 ++++++
- poppler/CairoOutputDev.cc | 3 +++
- 2 files changed, 9 insertions(+), 0 deletions(-)
-
-commit 099eb56896046e020f4ef0365e1ee382f85ec1ab
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Aug 15 18:52:20 2007 +0000
-
- * poppler/JBIG2Stream.cc: Quick fix for bug #12014
-
- ChangeLog | 4 ++++
- poppler/JBIG2Stream.cc | 16 +++++++++++-----
- 2 files changed, 15 insertions(+), 5 deletions(-)
-
-commit 3b7e3645c85c7a3d341457f105835b58c935bd67
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Aug 15 00:04:48 2007 +0000
-
- RC2 is out! (0.5.91)
-
- ChangeLog | 1 +
- NEWS | 18 ++++++++++++++++++
- configure.ac | 2 +-
- 3 files changed, 20 insertions(+), 1 deletions(-)
-
-commit c240daefe660ac3456dc0c5f5dc82aa53ebc3313
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Aug 14 23:10:37 2007 +0000
-
- * poppler/Stream.cc: Fix CVE-2007-3387 by merging xpdf-3.02pl1.patch
-
- ChangeLog | 1 +
- poppler/Stream.cc | 12 +++++-------
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-commit 1ba884b6b98ac8d755c9adc9f23a7a68d8b17b54
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Aug 14 22:47:30 2007 +0000
-
- * configure.ac:
- * pòppler/Makefile.am: Patch by Vincent Torri <vtorri@univ-evry.fr> to
- fix linking under MinGW
-
- ChangeLog | 6 ++++++
- configure.ac | 13 +++++++++++++
- poppler/Makefile.am | 5 +++--
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-commit 3c31f923fcf1aeb361910eb1e9445cc28aa5b3ca
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Aug 7 16:22:12 2007 +0000
-
- 2007-08-07 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Don't use the prescaleMethod
- when we have a rotation as that case has not been tested.
- Also make sure that scaledHeight is at least 1.
-
- ChangeLog | 6 ++++++
- poppler/CairoOutputDev.cc | 7 ++++++-
- 2 files changed, 12 insertions(+), 1 deletions(-)
-
-commit af97e5f8e0f3beeb43acde92a0788c02d9718adf
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Aug 6 17:41:17 2007 +0000
-
- 2007-08-06 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/Annot.cc:
- * poppler/Annot.h:
- * poppler/Form.cc:
- * poppler/Form.h:
- * poppler/Page.cc: Do not always regenerate appearance stream for
- every form widget, but only when it's actually needed.
-
- ChangeLog | 9 +++++
- poppler/Annot.cc | 86 ++++++++++++++++++++++++++++++++---------------------
- poppler/Annot.h | 8 ++--
- poppler/Form.cc | 25 ++-------------
- poppler/Form.h | 4 ++-
- poppler/Page.cc | 8 +----
- 6 files changed, 74 insertions(+), 66 deletions(-)
-
-commit 74627e71388ca0a4c0938a472c291ef87186f370
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Jul 31 21:40:19 2007 +0000
-
- 2007-07-31 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/GlobalParams.cc: s/GList/GooList/ some Windows code.
-
- ChangeLog | 4 ++++
- poppler/GlobalParams.cc | 8 ++++----
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-commit f421e2151345ac855b75e819e19343a90789b3bf
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Jul 31 16:50:06 2007 +0000
-
- 2007-07-31 Jeff Muizelaar <jeff@infidigm.net>
-
- * glib/poppler-document.cc:
- * glib/poppler-document.h: Add poppler_fonts_iter_get_file_name.
-
- ChangeLog | 5 +++++
- glib/poppler-document.cc | 16 ++++++++++++++++
- glib/poppler-document.h | 1 +
- 3 files changed, 22 insertions(+), 0 deletions(-)
-
-commit 4d57b8a12b845d5d5ac321d7a4bca980d60d429f
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Jul 31 16:48:35 2007 +0000
-
- 2007-07-31 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.h: Add comment about CairoImageOutputDevice's
- implementation.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.h | 1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit f04a67006abdb5843ab481aa1e25b51abd1b1b64
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jul 31 11:41:53 2007 +0000
-
- 2007-07-31 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/Form.cc:
- * poppler/Form.h: Fix memory leak.
-
- ChangeLog | 5 +++++
- poppler/Form.cc | 9 +++++----
- poppler/Form.h | 4 ++--
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-commit ee9d556a8b413160911a535a0e9089b919ca29f5
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jul 31 11:40:22 2007 +0000
-
- 2007-07-31 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/CairoOutputDev.h: Empty implementation of transparency
- groups and soft masks in CairoImageOutputDev. Fixes a crash in
- poppler_page_get_image_mapping.
-
- ChangeLog | 6 ++++++
- poppler/CairoOutputDev.h | 11 +++++++++++
- 2 files changed, 17 insertions(+), 0 deletions(-)
-
-commit e08779856c801b9968dc2d47e28e86abc1ec7110
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Jul 31 05:29:57 2007 +0000
-
- 2007-07-31 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/GfxFont.cc: Fix the case where the Encoding is "Identity"
- and ToUnicode exists. GfxCIDFont::getCodeToGIDMap makes CIDTOGID map
- from ToUnicde map, but when encoding is Identity, it should not use
- ToUnicode map to get GID. If encoding is Identity, No CIDTOGID map is
- needed.
- Patch by Koji Otani.
- Fixes #11413.
-
- ChangeLog | 10 ++++++++++
- poppler/GfxFont.cc | 1 +
- 2 files changed, 11 insertions(+), 0 deletions(-)
-
-commit 86fc9a6f343be920f5159e745947401227e41a37
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon Jul 30 19:28:17 2007 +0000
-
- 2007-07-30 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Prescale image masks before giving them
- to cairo to improve the quality of the scaled image. Improves #5589.
-
- ChangeLog | 6 +
- poppler/CairoOutputDev.cc | 300 +++++++++++++++++++++++++++++++++++++++++++--
- poppler/CairoOutputDev.h | 10 ++-
- 3 files changed, 303 insertions(+), 13 deletions(-)
-
-commit f754246e47161e9bf99887201e283c1419ade4f1
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon Jul 30 19:07:45 2007 +0000
-
- 2007-07-30 Jeff Muizelaar <jeff@infidigm.net>
-
- * configure.ac: Update require cairo version to 1.4
-
- ChangeLog | 4 ++++
- configure.ac | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit bb20249ac676995725b617ef442f5feb01f78205
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon Jul 30 18:44:41 2007 +0000
-
- 2007-07-30 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Add transparency group support.
- Fixes #7856.
-
- ChangeLog | 6 ++
- poppler/CairoOutputDev.cc | 133 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h | 21 +++++++-
- 3 files changed, 159 insertions(+), 1 deletions(-)
-
-commit a85acecaeb0d122becbc52a385d918561e995eca
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon Jul 30 00:22:35 2007 +0000
-
- 2007-07-29 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: transform the original matrix for type3 fonts
- instead of using set_matrix()
-
- ChangeLog | 6 ++++++
- poppler/CairoOutputDev.cc | 20 +++++++++++++++++---
- poppler/CairoOutputDev.h | 1 +
- 3 files changed, 24 insertions(+), 3 deletions(-)
-
-commit a81a082169de32d01c36c969616a5c2279f1bac7
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon Jul 30 00:18:59 2007 +0000
-
- 2007-07-29 Jeff Muizelaar <jeff@infidigm.net>
-
- * glib/test-poppler-glib.c: include <time.h> to fix compilation.
-
- ChangeLog | 4 ++++
- glib/test-poppler-glib.c | 1 +
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 81393cb30f6287caf5195265cdc039555f2767d3
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jul 28 08:22:40 2007 +0000
-
- 2007-07-28 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/Annot.cc:
- * poppler/Annot.h:
- * poppler/Form.cc:
- * poppler/Form.h: Make fieldLookup static in Form and use it from
- both Form and Annot.
-
- ChangeLog | 8 ++++++
- poppler/Annot.cc | 43 +++++++++-------------------------
- poppler/Annot.h | 1 -
- poppler/Form.cc | 66 ++++++++++++++++++++++++++---------------------------
- poppler/Form.h | 2 +
- 5 files changed, 54 insertions(+), 66 deletions(-)
-
-commit 81b669dcb14bf821a49c9879f8d4129075647f5f
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jul 28 08:05:11 2007 +0000
-
- 2007-07-28 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-page.h: Remove unneeded declarations. Fixes bug
- #11744. Patch by Kouhei Sutou <kou@cozmixng.org>.
-
- ChangeLog | 5 +++++
- glib/poppler-page.h | 2 --
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-commit f2c4e5305009f1da770c99d3e2e3371ff37c75f3
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri Jul 27 09:17:40 2007 +0000
-
- 2007-07-27 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-document.cc:
- * glib/poppler-document.h:
- * glib/poppler-private.h:
- * glib/test-poppler-glib.c: Make PopplerFontInfo GObject. Patch by
- Kouhei Sutou <kou@cozmixng.org>.
-
- ChangeLog | 8 ++++++++
- glib/poppler-document.cc | 44 ++++++++++++++++++++++++++++++++++++++++----
- glib/poppler-document.h | 6 +++++-
- glib/poppler-private.h | 1 +
- glib/test-poppler-glib.c | 2 +-
- 5 files changed, 55 insertions(+), 6 deletions(-)
-
-commit 975c7cff10d9b00359e147329ae2c7a93f8a3833
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jul 25 17:20:06 2007 +0000
-
- micro optimization
-
- qt4/src/poppler-page.cc | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 525a7f49dd95f2644870a1c59ca15124e30026b4
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jul 24 16:45:25 2007 +0000
-
- 2007-07-24 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/Annot.cc:
- * poppler/Form.cc: Several fixes in forms. Generate appearance for
- field buttons that don't have an AP dict. Do not remove the first
- character of the second and following lines in multiline text
- fields. Fix a crash with pdf documents created by ooo which have
- radio buttons. Look for some inheritable attributes in the
- parent when needed.
-
- ChangeLog | 10 +++++++
- poppler/Annot.cc | 27 ++++++++++---------
- poppler/Form.cc | 77 +++++++++++++++++++++++++++++++++++++----------------
- 3 files changed, 78 insertions(+), 36 deletions(-)
-
-commit 633a1cde65f86ee6577a68f4f8d36de43d14c714
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 15 21:03:50 2007 +0000
-
- * utils/HtmlOutputDev.cc:
- * utils/HtmlOutputDev.h: Create the html files in the correct place,
- not in the invocation dir. Fixes bug #11610
-
- ChangeLog | 6 ++++++
- utils/HtmlOutputDev.cc | 37 ++++++++++---------------------------
- utils/HtmlOutputDev.h | 4 ----
- 3 files changed, 16 insertions(+), 31 deletions(-)
-
-commit ccb2d420ca8d818aa9ba1d64f08f5e94ab313a72
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 15 17:09:29 2007 +0000
-
- * poppler/DCTStream.cc
- * poppler/DCTStream.h: Implement less evil error handling. On a
- error_exit level error we don't want to actually exit the program. See
- http://bugs.kde.org/show_bug.cgi?id=147878 for a pdf with this
- problem. libjpeg was printing "Bogus Huffman table definition" and
- exiting the program.
- * poppler/Stream.cc: Remove bogus #warning
-
- ChangeLog | 10 ++++++++++
- poppler/DCTStream.cc | 17 ++++++++++++++++-
- poppler/DCTStream.h | 1 +
- poppler/Stream.cc | 1 -
- 4 files changed, 27 insertions(+), 2 deletions(-)
-
-commit f9d82dfd299ae23a1baf3e35e2c3cd351129c525
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jul 14 18:23:42 2007 +0000
-
- * utils/pdftops.cc: init width/height to -1 so it is calculated if not
- specified
-
- ChangeLog | 5 +++++
- utils/pdftops.cc | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-commit 1c04136e9538ccfaa2d6b968861682ca3b69ffb3
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jul 14 15:23:31 2007 +0000
-
- 2007-07-14 Pino Toscano <pino@kde.org>
- * glib/poppler-action.h:
- * glib/poppler-document.h: Remove trailing comma from the last
- item of enums.
-
- ChangeLog | 6 ++++++
- glib/poppler-action.h | 2 +-
- glib/poppler-document.h | 8 ++++----
- 3 files changed, 11 insertions(+), 5 deletions(-)
-
-commit b9b68cabce19a5e23911e5432ace8c13bd237391
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jul 14 15:15:57 2007 +0000
-
- 2007-07-14 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-form-field.cc:
- * glib/poppler-form-field.h:
- * glib/test-poppler-glib.c: Make is_password a property instead of
- a text form field type, since a text field could be multiline and
- password at the same time.
-
- ChangeLog | 8 ++++++++
- glib/poppler-form-field.cc | 10 ++++++++--
- glib/poppler-form-field.h | 2 +-
- glib/test-poppler-glib.c | 4 ++--
- 4 files changed, 19 insertions(+), 5 deletions(-)
-
-commit 14a8361039d708661b8699b2e7c4496135021a85
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 13 22:18:05 2007 +0000
-
- * fofi/FoFiTrueType.cc
- * fofi/FoFiTrueType.h
- * poppler/CairoFontEngine.cc
- * poppler/CharCodeToUnicode.cc
- * poppler/CharCodeToUnicode.h
- * poppler/GfxFont.cc
- * poppler/GfxFont.h
- * poppler/SplashOutputDev.cc: Patch by
- Koji Otani <sho@bbr.jp> to fix several problems with Japanese fonts.
- Fixes bug 11413
-
- ChangeLog | 13 ++
- fofi/FoFiTrueType.cc | 305 ++++++++++++++++++++++++++++++++++++++++++
- fofi/FoFiTrueType.h | 12 ++
- poppler/CairoFontEngine.cc | 47 ++-----
- poppler/CharCodeToUnicode.cc | 16 +++
- poppler/CharCodeToUnicode.h | 1 +
- poppler/GfxFont.cc | 232 ++++++++++++++++++++++++++++----
- poppler/GfxFont.h | 2 +
- poppler/SplashOutputDev.cc | 53 ++------
- 9 files changed, 578 insertions(+), 103 deletions(-)
-
-commit 8389099d8e8940e3f8920b14a83075d69bcd8e6c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 13 18:21:02 2007 +0000
-
- * poppler/FontInfo.cc: Fix the FontInfoScanner::scan method to
- actually scan the number of requested pages
-
- ChangeLog | 6 ++++++
- poppler/FontInfo.cc | 12 ++++++------
- 2 files changed, 12 insertions(+), 6 deletions(-)
-
-commit 9ced4442372d08375e0ded62f79052d8a3ec9cd6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 13 18:08:44 2007 +0000
-
- * poppler/GlobalParams.cc: Remove dead unused code from Win32 ifdef
-
- ChangeLog | 4 ++++
- poppler/GlobalParams.cc | 6 ------
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-commit fb89fdb8de608ff94082e16819f042cddabf2bcc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jul 11 18:52:12 2007 +0000
-
- * poppler/PSOutputDev.cc
- * poppler/PSOutputDev.h
- * utils/pdftohtml.cc: Fix bug 9746. pdftohtml complex mode had text
- twice
-
- ChangeLog | 7 +++++++
- poppler/PSOutputDev.cc | 5 +++++
- poppler/PSOutputDev.h | 2 ++
- utils/pdftohtml.cc | 3 +--
- 4 files changed, 15 insertions(+), 2 deletions(-)
-
-commit 0c9fa59bf5edf3cfcca1792da51b904a7c7f7615
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jul 11 18:30:19 2007 +0000
-
- 2007-07-11 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/Form.cc:
- * poppler/XRef.cc:
- * poppler/XRef.h: Fix memory leak.
-
- ChangeLog | 6 ++++++
- poppler/Form.cc | 49 ++++++++++++++++++++++++-------------------------
- poppler/XRef.cc | 22 ++++++++++------------
- poppler/XRef.h | 2 +-
- 4 files changed, 41 insertions(+), 38 deletions(-)
-
-commit 4ae7d43bd54c5b3e2f08c48441f741d3099e228f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jul 11 18:12:26 2007 +0000
-
- * goo/GooVector.h: Rename guard from _VECTOR_H to GOO_VECTOR_H
- * goo/gfile.cc: GString -> GooString in Windows code
- * poppler/GlobalParams.cc: GString -> GooString in Windows code
- * splash/SplashT1FontEngine.cc
- * splash/SplashT1FontEngine.h
- * splash/SplashT1FontFile.cc
- * splash/SplashT1FontFile.h: T1 code is not supported, but at least
- make it compile :-D
-
- ChangeLog | 11 +++++++++++
- goo/GooVector.h | 4 ++--
- goo/gfile.cc | 6 +++---
- poppler/GlobalParams.cc | 26 +++++++++++++-------------
- splash/SplashFontEngine.cc | 2 +-
- splash/SplashT1FontEngine.cc | 8 ++++----
- splash/SplashT1FontEngine.h | 7 +++----
- splash/SplashT1FontFile.cc | 8 +++++---
- splash/SplashT1FontFile.h | 4 ++--
- 9 files changed, 44 insertions(+), 32 deletions(-)
-
-commit 7bd125ce96c603fd5cf42d7c6a29b542e82dd4ec
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jul 11 18:08:07 2007 +0000
-
- 2007-07-11 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/Form.cc:
- * poppler/Form.h:
- * glib/poppler-form-field.cc:
- * glib/poppler-form-field.h:
- * glib/test-poppler-glib.c: Add a method to get the max length
- allowed in text form fields.
-
- ChangeLog | 9 +++++++++
- glib/poppler-form-field.cc | 8 ++++++++
- glib/poppler-form-field.h | 1 +
- glib/test-poppler-glib.c | 1 +
- poppler/Form.cc | 11 +++++++++++
- poppler/Form.h | 4 ++++
- 6 files changed, 34 insertions(+), 0 deletions(-)
-
-commit 8a68855735e9d295d71685e82de39204d639ea7a
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Jul 9 08:52:58 2007 +0000
-
- 2007-07-09 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/Annot.cc:
- * poppler/Annot.h: Render '*' instead of the actual content in
- password form fields. Patch by Julien Rebetez <julien@fhtagn.net>
-
- ChangeLog | 6 ++++++
- poppler/Annot.cc | 52 +++++++++++++++++++++++++++++-----------------------
- poppler/Annot.h | 5 +++--
- 3 files changed, 38 insertions(+), 25 deletions(-)
-
-commit 53cf7d7084dc03a28239f11c94f2095bb02d6108
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jul 7 16:23:56 2007 +0000
-
- 2007-07-07 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/Form.cc:
- * poppler/Form.h:
- * glib/poppler-form-field.cc:
- * glib/poppler-form-field.h:
- * glib/test-poppler-glib.c: Add a method to get the type of a Form
- Field Button.
-
- ChangeLog | 9 +++++++++
- glib/poppler-form-field.cc | 18 ++++++++++++++++++
- glib/poppler-form-field.h | 8 ++++++++
- glib/test-poppler-glib.c | 26 +++++++++++++++++++++++---
- poppler/Form.cc | 5 +++++
- poppler/Form.h | 2 ++
- 6 files changed, 65 insertions(+), 3 deletions(-)
-
-commit de0a40181e5832a0dc263d40ed0a269867764623
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jul 7 15:28:29 2007 +0000
-
- 2007-07-07 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/Form.cc: Fix a crash when setting state on buttons that
- don't have state.
-
- ChangeLog | 5 +++++
- poppler/Form.cc | 3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-commit a33518a3283ff25aa5517bc535ddb61383b1cfdc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 6 09:08:44 2007 +0000
-
- * poppler/Form.cc: Fix a bug with FormField's destructor which was not
- checking if the FormField is terminal to determine wether it needs to
- delete children or widgets. Patch by
- Julien Rebetez <julien@fhtagn.net>
-
- ChangeLog | 4 ++++
- poppler/Form.cc | 17 +++++++++++------
- 2 files changed, 15 insertions(+), 6 deletions(-)
-
-commit 43f0d5b9bb198cdcbc2f7111f294c6f947105314
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 6 08:47:11 2007 +0000
-
- * goo/GooString.cc:
- * poppler/ABWOutputDev.cc: Build on Sun Force compiler, patch by
- Darren Kenny <darren.kenny@sun.com>
-
- ChangeLog | 6 ++++++
- goo/GooString.cc | 2 +-
- poppler/ABWOutputDev.cc | 4 +++-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-commit 4e7405071b69889362e4d49de3f881f0e3e261e3
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Jul 5 13:04:01 2007 +0000
-
- 2007-07-05 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-form-field.cc: Allow to set NULL in form fields
- that can contain text.
-
- ChangeLog | 5 +++++
- glib/poppler-form-field.cc | 30 ++++++++++++------------------
- 2 files changed, 17 insertions(+), 18 deletions(-)
-
-commit 625510797c528257527003477fe28adbacfe80e7
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Thu Jul 5 08:13:51 2007 +0000
-
- 2007-07-05 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-attachment.cc:
- * glib/poppler-attachment.h:
- * glib/test-poppler-glib.c: Rename cdate and mdate again to ctime
- and mtime, since they are public attributes and we don't want to
- break the API.
-
- ChangeLog | 8 ++++++++
- glib/poppler-attachment.cc | 4 ++--
- glib/poppler-attachment.h | 4 ++--
- glib/test-poppler-glib.c | 4 ++--
- 4 files changed, 14 insertions(+), 6 deletions(-)
-
-commit 9b2640f156f24b07c797d9461f84e64d550efa1a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jul 4 13:57:31 2007 +0000
-
- * qt4/src/poppler-form.cc: QStringToGooString ->
- QStringToUnicodeGooString has FormWidgetText::setContent wants to have
- the unicode formated string
- * qt4/src/poppler-private.h: create QStringToUnicodeGooString
-
- ChangeLog | 7 +++++++
- qt4/src/poppler-form.cc | 2 +-
- qt4/src/poppler-private.h | 15 +++++++++++++++
- 3 files changed, 23 insertions(+), 1 deletions(-)
-
-commit b70115cf979b29f75c644518ae0e9c0dd9892ebf
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jul 4 13:06:38 2007 +0000
-
- 2007-07-04 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-form-field.cc: Convert strings from UTF8 to UTF16BE
- before setting them.
-
- ChangeLog | 5 +++++
- glib/poppler-form-field.cc | 34 ++++++++++++++++++++++++----------
- 2 files changed, 29 insertions(+), 10 deletions(-)
-
-commit d37843877a6f93a9f27502d07ad82cba79e9aa73
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Wed Jul 4 08:26:52 2007 +0000
-
- 2007-07-04 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-attachment.cc:
- * glib/poppler-attachment.h: Add size, creation and modification
- date and checksum properties to attachments. Fix memory leaks.
- * glib/test-poppler-glib.c:
- * glib/poppler.h:
- * glib/poppler-private.h:
- * glib/poppler-document.cc: Add a function to convert a pdf date
- into a GTime that is used by attachments and document
- properties. Fix memory leak in attachments.
-
- ChangeLog | 12 ++++
- glib/poppler-attachment.cc | 25 +++++++-
- glib/poppler-attachment.h | 16 +++--
- glib/poppler-document.cc | 142 +++++++++++++++++++++++---------------------
- glib/poppler-private.h | 6 +-
- glib/poppler.h | 1 +
- glib/test-poppler-glib.c | 56 +++++++++++++++--
- 7 files changed, 171 insertions(+), 87 deletions(-)
-
-commit d933f47d4af0992059148259a189373b42499bbe
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 3 20:31:20 2007 +0000
-
- * qt4/tests/poppler-fonts.cpp: For the sake of completeness, add all
- the enums
-
- ChangeLog | 2 ++
- qt4/tests/poppler-fonts.cpp | 28 ++++++++++++++++++++--------
- 2 files changed, 22 insertions(+), 8 deletions(-)
-
-commit d90b166cfbdc4857351baa627d158d5e0b6652b4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 3 16:46:51 2007 +0000
-
- * poppler/Catalog.cc: Fix crash, embeddedFileNameTree.getName(i)
- returns a reference to its own data so does not have to be deleted
- * qt4/tests/poppler-attachments.cpp: Delete the doc, just for sake of
- correctness
-
- ChangeLog | 7 +++++++
- poppler/Catalog.cc | 1 -
- qt4/tests/poppler-attachments.cpp | 1 +
- 3 files changed, 8 insertions(+), 1 deletions(-)
-
-commit 7fa87eb2b093770271bc3a72de5b0b9dc228aa1b
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jul 3 14:01:40 2007 +0000
-
- 2007-07-03 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-form-field.cc:
- * glib/poppler-form-field.h:
- * glib/test-poppler-glib.c: Add choice_commit_on_change function
- to glib bindings.
-
- ChangeLog | 7 +++++++
- glib/poppler-form-field.cc | 8 ++++++++
- glib/poppler-form-field.h | 1 +
- glib/test-poppler-glib.c | 2 ++
- 4 files changed, 18 insertions(+), 0 deletions(-)
-
-commit 8b67e0403f6eaab6770cc0b7861074ae0b6d85bb
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Tue Jul 3 13:49:18 2007 +0000
-
- 2007-07-03 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-form-field.cc:
- * glib/poppler-form-field.h:
- * glib/test-poppler-glib.c: Fix a typo.
-
- ChangeLog | 6 ++++++
- glib/poppler-form-field.cc | 2 +-
- glib/poppler-form-field.h | 2 +-
- glib/test-poppler-glib.c | 2 +-
- 4 files changed, 9 insertions(+), 3 deletions(-)
-
-commit 33a5765eb404a4b321b09c26af74c1ed64a5d474
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 3 13:22:54 2007 +0000
-
- * poppler/Catalog.cc:
- * poppler/Catalog.h: Add size and checksum properties to the embeded
- files
- * qt4/src/poppler-embeddedfile.cc:
- * qt4/src/poppler-qt4.h: Add size and checksum properties to the qt4
- frontend
-
- ChangeLog | 9 +++++++++
- poppler/Catalog.cc | 19 ++++++++++++++++---
- poppler/Catalog.h | 13 +++++++++++--
- qt4/src/poppler-embeddedfile.cc | 16 ++++++++++++++++
- qt4/src/poppler-qt4.h | 14 ++++++++++++++
- 5 files changed, 66 insertions(+), 5 deletions(-)
-
-commit c7d21f9354bbe090cce6459124dcaadf1e46639e
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Jul 2 13:39:32 2007 +0000
-
- 2007-07-02 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-form-field.cc:
- * glib/poppler-form-field.h:
- * glib/test-poppler-glib.c:
- Use FILE_SELECT instead of FILESELECT and fix a typo. Patch by
- Kouhei Sutou
-
- ChangeLog | 9 +++++++++
- glib/poppler-form-field.cc | 2 +-
- glib/poppler-form-field.h | 2 +-
- glib/test-poppler-glib.c | 2 +-
- 4 files changed, 12 insertions(+), 3 deletions(-)
-
-commit 5e301064c62c6d58f488839d7bf804af912a3de1
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Mon Jul 2 13:34:26 2007 +0000
-
- 2007-07-02 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-form-field.cc:
- * glib/poppler-form-field.h:
- * glib/test-poppler-glib.c:
- Add poppler_form_field_is_read_only to glib bindings. Patch by
- Kouhei Sutou
-
- ChangeLog | 9 +++++++++
- glib/poppler-form-field.cc | 8 ++++++++
- glib/poppler-form-field.h | 1 +
- glib/test-poppler-glib.c | 6 +++++-
- 4 files changed, 23 insertions(+), 1 deletions(-)
-
-commit 11875746ce28e8999bcad46167fcfea131cd267a
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jun 30 08:33:30 2007 +0000
-
- 2007-06-30 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-page.cc: Use poppler_page_transition_get_type
- instead of poppler_page_transition which doesn't exist. Patch by
- Kouhei Sutou
-
- ChangeLog | 6 ++++++
- glib/poppler-page.cc | 2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 0a5acaae3b9bfcd731bc4e072f35f9433aa773da
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jun 30 08:25:15 2007 +0000
-
- 2007-06-30 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/Makefile.am:
- * glib/poppler-form-field.cc:
- * glib/poppler-form-field.h:
- * glib/poppler-document.cc:
- * glib/poppler-document.h:
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler-private.h:
- * glib/poppler.h:
- * glib/test-poppler-glib.c: Improve forms API in the glib bindings
- in order to make it more consistent with the current API and
- easier to use.
-
- ChangeLog | 15 ++
- glib/Makefile.am | 2 +
- glib/poppler-document.cc | 197 ++-------------------------
- glib/poppler-document.h | 55 +--------
- glib/poppler-form-field.cc | 316 ++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-form-field.h | 96 +++++++++++++
- glib/poppler-page.cc | 210 ++++++++++++-----------------
- glib/poppler-page.h | 55 ++-------
- glib/poppler-private.h | 11 +-
- glib/poppler.h | 40 ++----
- glib/test-poppler-glib.c | 119 ++++++++++++++---
- 11 files changed, 662 insertions(+), 454 deletions(-)
-
-commit 2212874e57a6eb9db733b2e9a98f0cfcb88a8fc1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jun 26 21:31:07 2007 +0000
-
- * poppler/Form.cc: Don't crash on documents with AcroForm but no
- AcroForm->Fields (it's mandatory but...)
-
- ChangeLog | 5 +++++
- poppler/Form.cc | 54 +++++++++++++++++++++++++++++-------------------------
- 2 files changed, 34 insertions(+), 25 deletions(-)
-
-commit e48ee9c4af6bf98b6988c51dcab9ee9ef6e3cafe
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sat Jun 23 18:06:07 2007 +0000
-
- 2007-06-23 Carlos Garcia Campos <carlosgc@gnome.org>
- * poppler/Annot.cc:
- * poppler/Form.cc: Fix memory leaks.
-
- ChangeLog | 5 +++++
- poppler/Annot.cc | 2 +-
- poppler/Form.cc | 13 +++++++++----
- 3 files changed, 15 insertions(+), 5 deletions(-)
-
-commit d874a2753e3ac51b6f539dfdf980435c8c381b4f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 20 20:07:15 2007 +0000
-
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-document.cc: Allow access to a document's metadata contents
- from the qt4 binding. Based on patch by Jason Kivlighn
- * qt4/tests/test-poppler-qt4.cpp: Print metadata if it exists
-
- ChangeLog | 5 +++++
- qt4/src/poppler-document.cc | 13 +++++++++++++
- qt4/src/poppler-qt4.h | 5 +++++
- qt4/tests/test-poppler-qt4.cpp | 1 +
- 4 files changed, 24 insertions(+), 0 deletions(-)
-
-commit 08d4c437e735ac50a340c4ae17ee0eeccd00dc20
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 20 18:40:03 2007 +0000
-
- * glib/poppler-document.cc: Allow access to a document's metadata stream
- through the glib binding. Patch by Jason Kivlighn
- <jkivlighn@gmail.com> Approved by Carlos
-
- ChangeLog | 6 ++++++
- glib/poppler-document.cc | 21 +++++++++++++++++++++
- 2 files changed, 27 insertions(+), 0 deletions(-)
-
-commit cdd2a49dc99aa16ded674c58dbb50298f06cf18a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jun 15 18:15:53 2007 +0000
-
- * poppler/ABWOutputDev.cc: Replaces the getBiggestSeperator function
- at the ABWoutputdev with one that is easier to read/debug
- and less likely to contain bugs. Some cosmetic fixes at the
- functions recursiveXYC and splitnodes. Patch by
- Jauco Noordzij <jauco.noordzij@gmail.com>. More info at bug #11273
-
- ChangeLog | 8 +
- poppler/ABWOutputDev.cc | 384 ++++++++++++-----------------------------------
- 2 files changed, 106 insertions(+), 286 deletions(-)
-
-commit 7f23383197b0e2fa24be7b4925ea6f39eb95bbc1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 13 20:39:21 2007 +0000
-
- * poppler/ABWOutputDev.cc
- * poppler/ABWOutputDev.h: Remove dependency on debugxml. Patch by
- Jauco Noordzij <jauco.noordzij@gmail.com>. Fixes bug #11187
-
- ChangeLog | 6 +++
- poppler/ABWOutputDev.cc | 80 ++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/ABWOutputDev.h | 1 +
- 3 files changed, 86 insertions(+), 1 deletions(-)
-
-commit 948520cd529ce47d1970aae6a0b8058128e37c30
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 13 18:50:40 2007 +0000
-
- * goo/FixedPoint.h
- * goo/gmem.h
- * poppler/SecurityHandler.h
- * poppler/poppler-config.h.in
- * utils/ImageOutputDev.h:
- Patch by Axel Howind <Axel.Howind@htp-tel.de>
- - include USE_EXCEPTIONS and USE_FIXEDPOINT in poppler-config.h.in
- - fix typo (MULTITHREADED/MULTITHREADING) in poppler.config.h.in
- - change installed headers to include poppler-config.h instead of
- config.h
- - use <poppler/poppler-config.h> instead of <poppler-config.h> so that
- installed headers can be used without including .../include/poppler
- in the include path
-
- ChangeLog | 16 ++++++++++++++++
- goo/FixedPoint.h | 2 +-
- goo/gmem.h | 2 +-
- poppler/SecurityHandler.h | 2 +-
- poppler/poppler-config.h.in | 12 +++++++++++-
- utils/ImageOutputDev.h | 2 +-
- 6 files changed, 31 insertions(+), 5 deletions(-)
-
-commit 825461e47b05595805e87a0d2960b07197c8da8b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 13 18:24:56 2007 +0000
-
- configure.ac: Fix detection of glib
-
- ChangeLog | 4 ++++
- configure.ac | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit a67a93fc6b4812a4f892b311c5b299e59283cd47
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jun 11 21:14:22 2007 +0000
-
- * poppler/CMap.h:
- * poppler/CharCodeToUnicode.h:
- * poppler/GlobalParams.h:
- * poppler/PageLabelInfo.h:
- * poppler/UnicodeMap.h: Further include cleanup. Patch by Axel Howind
- on bug #11228
-
- ChangeLog | 9 +++++++++
- poppler/CMap.h | 2 +-
- poppler/CharCodeToUnicode.h | 2 +-
- poppler/GlobalParams.h | 2 +-
- poppler/PageLabelInfo.h | 6 +++---
- poppler/UnicodeMap.h | 2 +-
- 6 files changed, 16 insertions(+), 7 deletions(-)
-
-commit 051b31af053cac4727718169b79b25451a4bdd95
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jun 11 21:11:05 2007 +0000
-
- * qt/poppler-qt.h
- * qt4/src/poppler-qt4.h: Headers cleanup
-
- ChangeLog | 5 +++++
- qt/poppler-qt.h | 6 +++---
- qt4/src/poppler-qt4.h | 8 ++++----
- 3 files changed, 12 insertions(+), 7 deletions(-)
-
-commit 3e1597b80fc6750f1ec3269f9819aa8225879524
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jun 8 22:39:23 2007 +0000
-
- poppler/Annot.cc: Fix leak
-
- ChangeLog | 4 ++++
- poppler/Annot.cc | 1 +
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 49535c20b4f71d1c1381134233e2e1449cf560c0
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Jun 7 21:23:03 2007 +0000
-
- 2007-06-07 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/ABWOutputDev.cc: Change "and", "or", "not" to "&&", "||",
- "!" for consistency with the rest of the code. Patch by Jens Granseuer
-
- ChangeLog | 5 +++
- poppler/ABWOutputDev.cc | 93 ++++++++++++++++++++++++-----------------------
- 2 files changed, 52 insertions(+), 46 deletions(-)
-
-commit dd8fa975bf51dd18120369d0ef2d8f1781e04d93
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jun 2 09:18:11 2007 +0000
-
- correct form of patch 11102
-
- utils/HtmlFonts.cc | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-commit cdf70857ece0748f13b11c923ccf9626094555b4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jun 1 18:34:48 2007 +0000
-
- * poppler/ArthurOutputDev.cc
- * splash/SplashFTFont.cc
- * splash/SplashMath.h: Make it compile with --enable-fixedpoint. Fixes
- bug 11110
-
- ChangeLog | 7 +++++++
- poppler/ArthurOutputDev.cc | 8 ++++----
- splash/SplashFTFont.cc | 8 ++++----
- splash/SplashMath.h | 2 +-
- 4 files changed, 16 insertions(+), 9 deletions(-)
-
-commit 90b1a404629a884cc32737a3a729c9a75f7a59c1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 30 18:33:24 2007 +0000
-
- * configure.ac: Fix to check for glib-2.0 not glib that is 1.0. Patch
- came though Pardus developers and they don't remember where they got
- it from.
-
- ChangeLog | 6 ++++++
- configure.ac | 2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 03d766ea1ddd4ce6d938f96b53906a7dc8bd179a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 30 18:29:57 2007 +0000
-
- make dist needs this
-
- qt4/src/Makefile.am | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit d540c04268047fdd125ad932ca05c7553a97c0fe
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 30 17:50:00 2007 +0000
-
- * utils/HtmlFonts.cc: Make pdftohtml not pollute stdout. Patch by
- Nanning Buitenhuis <nanning@elvenkind.com>
-
- And some changes in glib/reference/tmpl
-
- ChangeLog | 5 +
- glib/reference/tmpl/poppler-document.sgml | 4 +
- glib/reference/tmpl/poppler-enums.sgml | 150 +++++++++++++++++++++++++++++
- glib/reference/tmpl/poppler-page.sgml | 5 +-
- glib/reference/tmpl/poppler-unused.sgml | 130 -------------------------
- utils/HtmlFonts.cc | 2 +-
- 6 files changed, 162 insertions(+), 134 deletions(-)
-
-commit ce414f2a36f4d97a3bddfd42baabdc1e34bf9321
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue May 29 22:01:58 2007 +0000
-
- 2007-05-29 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/gen-unicode-tables.py: Add this script to fix distcheck.
-
- ChangeLog | 4 ++++
- poppler/gen-unicode-tables.py | 38 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 42 insertions(+), 0 deletions(-)
-
-commit 97e602752b05f3690acb1821bdca31c5771361e1
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun May 27 11:24:40 2007 +0000
-
- 2007-05-27 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/test-poppler-glib.c: Add forms test
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- Fix indentation, some code cleanups and memory leaks.
-
- ChangeLog | 7 ++
- glib/poppler-page.cc | 198 +++++++++++++++++++++++++++------------------
- glib/poppler-page.h | 6 +-
- glib/test-poppler-glib.c | 39 +++++++++
- 4 files changed, 168 insertions(+), 82 deletions(-)
-
-commit 3d31c2b1ea913fc80211f1c6fed9b3666f124049
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Sun May 27 10:12:56 2007 +0000
-
- 2007-05-27 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- Add missing image mapping type definition.
-
- ChangeLog | 6 ++++++
- glib/poppler-page.cc | 48 +++++++++++++++++++++++++++++++++++++++++++++---
- glib/poppler-page.h | 5 +++++
- 3 files changed, 56 insertions(+), 3 deletions(-)
-
-commit 8284a769568322066a9d4626bd9b2cf3d18a6487
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat May 26 23:20:12 2007 +0000
-
- * configure.ac:
- * NEWS: Bump release to 0.5.9 (0.6 Release Candidate)
-
- ChangeLog | 2 ++
- NEWS | 15 +++++++++++++++
- configure.ac | 2 +-
- 3 files changed, 18 insertions(+), 1 deletions(-)
-
-commit e6ff9e0d95e058f6aff3c72d5f4d7d7ccf661999
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat May 26 22:33:21 2007 +0000
-
- * poppler-qt.pc.in:
- * poppler-qt4.pc.in:
- * qt/Makefile.am:
- * qt4/src/Makefile.am: Install qt3 and qt4 headers in separate dirs.
- That way be can reuse poppler-page-transition.h and distros don't get
- conflicts when making separate qt3 and qt4 packages
-
- ChangeLog | 9 +++++++++
- poppler-qt.pc.in | 2 +-
- poppler-qt4.pc.in | 2 +-
- qt/Makefile.am | 2 +-
- qt4/src/Makefile.am | 2 +-
- 5 files changed, 13 insertions(+), 4 deletions(-)
-
-commit fefefe495a182c1745314186b99441b9e76ba5b4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri May 25 23:17:58 2007 +0000
-
- * qt4/src/poppler-link-extractor-private.cc:
- * qt4/src/poppler-link-extractor-private.h:
- * qt4/src/poppler-link.cc:
- * qt4/src/poppler-link.h: Return link coordinates in 0..1 range
- instead of 0..size, much more easier to do user<->dev transformations
- * qt4/src/poppler-private.h: Fix indentation
-
- ChangeLog | 6 ++++++
- qt4/src/poppler-link-extractor-private.h | 1 +
- qt4/src/poppler-link-extractor.cc | 12 ++++++------
- qt4/src/poppler-link.cc | 25 +++++++++++++++----------
- qt4/src/poppler-link.h | 7 ++++++-
- qt4/src/poppler-private.h | 15 ++++++++-------
- 6 files changed, 42 insertions(+), 24 deletions(-)
-
-commit ecaeaa9512d1dae4a036703ea8739102a8e463f0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri May 25 22:30:20 2007 +0000
-
- * qt4/src/poppler-link-extractor.cc: Use correct page box to extract
- link clickable area
-
- ChangeLog | 5 +++++
- qt4/src/poppler-link-extractor.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 774a9456c668ef70b2e8f17d59f8f427aa97bad5
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Fri May 25 18:43:04 2007 +0000
-
- 2007-05-25 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/GfxFont.cc:
- * poppler/GfxFont.h:
- * poppler/GlobalParams.cc:
- Don't cache DisplayFontParams by font name, instead cache them
- in GfxFont. Fixes #8140.
-
- ChangeLog | 8 ++++++++
- poppler/GfxFont.cc | 2 ++
- poppler/GfxFont.h | 6 ++++++
- poppler/GlobalParams.cc | 4 ++--
- 4 files changed, 18 insertions(+), 2 deletions(-)
-
-commit a88fadf0bb9af55c83c9c4f7d08deb17d6aa9ae4
-Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri May 25 17:33:37 2007 +0000
-
- 2007-05-25 Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler.h:
- Add selection style parameter to render_selection in order to allow
- requesting selections of words and paragraphs.
-
- ChangeLog | 8 ++++++++
- glib/poppler-page.cc | 30 ++++++++++++++++--------------
- glib/poppler-page.h | 6 ++++--
- glib/poppler.h | 7 +++++++
- 4 files changed, 35 insertions(+), 16 deletions(-)
-
-commit bf195b489c22875695e202d6ca6659144ef57e61
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 23 21:20:58 2007 +0000
-
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-private.h:
- Better handle the setting of the vector antialiasing for Splash.
- * qt4/src/Mainpage.dox:
- * qt4/src/poppler-link.h:
- * qt4/src/poppler-qt4.h:
- A few of API documentation fixes and improvements.
-
- ChangeLog | 10 +++++++
- qt4/src/Mainpage.dox | 8 +----
- qt4/src/poppler-document.cc | 5 ++-
- qt4/src/poppler-link.h | 4 ++-
- qt4/src/poppler-private.h | 1 +
- qt4/src/poppler-qt4.h | 57 ++++++++++++++++++++++++++++--------------
- 6 files changed, 57 insertions(+), 28 deletions(-)
-
-commit 36d1fe292778ba29990a389c50a0df0d51f11913
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 21 21:42:38 2007 +0000
-
- Fix assert in bug 11023
-
- ChangeLog | 4 ++++
- glib/poppler-action.cc | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit 5b411246a2cce6ed3bb2d8c9e9d856227b6aba7f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 21 21:39:08 2007 +0000
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- poppler_page_render_section() for cairo. Bug 7023
-
- ChangeLog | 6 +++
- glib/poppler-page.cc | 88 ++++++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h | 9 +++++
- 3 files changed, 93 insertions(+), 10 deletions(-)
-
-commit 409f2a9cb31add29accb87011331c50dc08110cd
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 21 21:35:10 2007 +0000
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler-private.h:
- * glib/poppler.h:
- * glib/test-poppler-glib.c:
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Extend CairoOutputdev to do
- image caching when rendering
-
- ChangeLog | 11 +++
- glib/poppler-page.cc | 161 ++++++++++++++++++++++++++++++++--
- glib/poppler-page.h | 10 ++
- glib/poppler-private.h | 3 +
- glib/poppler.h | 9 +-
- glib/test-poppler-glib.c | 27 ++++++-
- poppler/CairoOutputDev.cc | 215 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h | 122 +++++++++++++++++++++++++
- 8 files changed, 545 insertions(+), 13 deletions(-)
-
-commit afd11ec66430dae084b5a5560333e933460fc637
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 21 21:29:09 2007 +0000
-
- * poppler/Annot.cc: avoid crashing if the font for the drawing methods
- can not be found
- * poppler/Form.cc: fix memory leak
- * qt4/src/poppler-private.h: fix the UnicodeParsedString function to
- really work and not crash
- * splash/SplashTypes.h: RGB8X mode makes max number of components in
- any SplashColor always be 4
-
- ChangeLog | 11 +++++++++++
- poppler/Annot.cc | 6 ++++++
- poppler/Form.cc | 1 +
- qt4/src/poppler-private.h | 5 ++++-
- splash/SplashTypes.h | 6 +-----
- 5 files changed, 23 insertions(+), 6 deletions(-)
-
-commit f019c8a8efde004e1663ea88cb48c0e46318d936
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu May 17 21:32:57 2007 +0000
-
- 2007-05-17 Pino Toscano <pino@kde.org>
-
- * qt4/src/poppler-link.cc:
- Give some default values to LinkDestination
- * qt4/src/poppler-private.h:
- Fix memory leak when converting QString -> GooString
-
- ChangeLog | 7 +++++++
- qt4/src/poppler-link.cc | 12 ++++++++++++
- qt4/src/poppler-private.h | 4 +++-
- 3 files changed, 22 insertions(+), 1 deletions(-)
-
-commit d68a4eb44b5390b3093774f39a6805ad2e95c146
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun May 13 00:53:43 2007 +0000
-
- 2007-05-12 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/Annot.cc: Only do appearance generation for text, choice or
- other fields that contain text. Patch by Julien Rebetez.
-
- ChangeLog | 5 +++++
- poppler/Annot.cc | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
- 2 files changed, 51 insertions(+), 6 deletions(-)
-
-commit 96f8731e90af1abce67d00a3febc11880c69ce62
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 7 18:41:09 2007 +0000
-
- * Catalog.cc: Fix leak
- * Form.cc: Fix leak, provide empty FormPageWidgets::~FormPageWidgets
- implementation
- * Page.cc: Fix leak
-
- ChangeLog | 7 +++++++
- poppler/Catalog.cc | 1 +
- poppler/Form.cc | 5 +++++
- poppler/Page.cc | 1 +
- 4 files changed, 14 insertions(+), 0 deletions(-)
-
-commit d46553d696b2d7fe416ce8db40db54dd1d7c6733
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Apr 30 22:34:21 2007 +0000
-
- * poppler/Makefile.am: Don't link cairo to all poppler, just to
- poppler_cairo so when compiling the qt frontend and the glib frontend
- the qt one does not end up depending on cairo
-
- ChangeLog | 6 ++++++
- poppler/Makefile.am | 1 -
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit d5c52409c532a126bcb8eb65f6f1390113a5f258
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 29 17:37:38 2007 +0000
-
- jeff committed this line by mistake
-
- ChangeLog | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit 6ddc11ef4c534369ee104422bfb989603c466790
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Apr 29 17:33:58 2007 +0000
-
- 2007-04-29 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/UnicodeTypeTable.cc: Make some of the unicode tables const
- which gets rid of about 20k of data.
-
- text data bss dec hex filename
- before: 1415838 128864 8 1544710 179206 libpoppler.so
- after: 1404574 140128 8 1544710 179206 libpoppler.so
-
- ChangeLog | 10 ++++++++++
- poppler/UnicodeTypeTable.cc | 24 ++++++++++++------------
- 2 files changed, 22 insertions(+), 12 deletions(-)
-
-commit c5613ab5ce65fc84eb3a5584cee1454171173fa7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 28 23:25:59 2007 +0000
-
- * poppler/SplashOutputDev.cc:
- * qt/poppler-private.h:
- * qt4/src/poppler-private.h:
- * splash/Splash.cc:
- * splash/SplashBitmap.cc:
- * splash/SplashTypes.h: Rename splashModeRGBX8 to splashModeXBGR8 and
- hopefully fix qt frontends image generation
-
- ChangeLog | 10 ++++
- poppler/SplashOutputDev.cc | 102 ++++++++++++++++++++++++++++++++------------
- qt/poppler-private.h | 2 +-
- qt4/src/poppler-private.h | 2 +-
- splash/Splash.cc | 44 ++++++++++---------
- splash/SplashBitmap.cc | 16 +++---
- splash/SplashTypes.h | 4 +-
- 7 files changed, 120 insertions(+), 60 deletions(-)
-
-commit 6479ce224f1393235ca9888dfe0710327fbfccd2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 28 22:12:22 2007 +0000
-
- fix merging problems
-
- splash/Splash.cc | 1 +
- splash/SplashBitmap.cc | 1 -
- 2 files changed, 1 insertions(+), 1 deletions(-)
-
-commit e2ac4ada3e29139053871ff7f53772e1ccc7adc0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 28 15:39:36 2007 +0000
-
- \n at the end of the printf
- Although i'm not sure we want to printf this...
-
- poppler/GlobalParams.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 9b8133940638c95940edcb9b98126ca9a4f7b8d4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 28 12:00:38 2007 +0000
-
- * qt4/src/Makefile.am:
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-ps-converter.cc:
- * qt4/src/poppler-qt4.h: Replace Document::print function with lots of
- arguments with a helper class with lots of functions. Will help
- mantaining BC in case we decide to add more functionality to the
- printing process.
-
- ChangeLog | 10 ++
- qt4/src/Makefile.am | 1 +
- qt4/src/poppler-document.cc | 39 +-------
- qt4/src/poppler-ps-converter.cc | 190 +++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 119 +++++++++++++++++++++----
- 5 files changed, 307 insertions(+), 52 deletions(-)
-
-commit 26d5fefcd4c858e2ebd689d963a65773957ac808
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 28 11:35:34 2007 +0000
-
- * qt4/src/poppler-page.cc:
- Hopefully fix the calculation of the image size when rendering using
- ArthurOutputDev.
-
- ChangeLog | 6 ++++++
- qt4/src/poppler-page.cc | 2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 218364bc4951682de8e63e1bd3f061636b08b615
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 28 11:34:14 2007 +0000
-
- * glib/poppler-document.h:
- * poppler/FontInfo.h:
- * qt/poppler-qt.h:
- * qt4/src/poppler-qt4.h: GfxFontType changed, adapt enums of the
- frontends and helper classes. Forgot to do it before merging.
-
- ChangeLog | 8 ++++++++
- glib/poppler-document.h | 6 +++++-
- poppler/FontInfo.h | 6 +++++-
- qt/poppler-qt.h | 6 +++++-
- qt4/src/poppler-qt4.h | 20 ++++++++++++--------
- 5 files changed, 35 insertions(+), 11 deletions(-)
-
-commit c1a40d3b4e9b27e34c94c9477a0313534563a394
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 28 11:20:58 2007 +0000
-
- * qt4/src/poppler-annotation.h:
- Make the header clean.
-
- ChangeLog | 5 +++++
- qt4/src/poppler-annotation.h | 3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-commit 3f4bf880b95e28a1ae7a38b18b341e089860780c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 28 11:16:49 2007 +0000
-
- * qt4/src/Makefile.am:
- * qt4/src/poppler-link-extractor-private.h:
- * qt4/src/poppler-link-extractor.cc:
- * qt4/src/poppler-page-private.h:
- * qt4/src/poppler-page.cc:
- * qt4/src/poppler-private.h:
- * qt4/src/poppler-qt4.h:
- Getting the links of a page now is not more dependant on the current
- output device, and can be done anytime; thus, the doLinks parameter
- of the Page::render() can be dropped.
-
- ChangeLog | 13 +++++
- qt4/src/Makefile.am | 3 +-
- qt4/src/poppler-link-extractor-private.h | 55 ++++++++++++++++++++++
- qt4/src/poppler-link-extractor.cc | 74 ++++++++++++++++++++++++++++++
- qt4/src/poppler-page-private.h | 38 +++++++++++++++
- qt4/src/poppler-page.cc | 52 +++------------------
- qt4/src/poppler-private.h | 5 ++-
- qt4/src/poppler-qt4.h | 4 +-
- 8 files changed, 195 insertions(+), 49 deletions(-)
-
-commit 7f9eec9ef4e7dc895d2a3e38014b6368cc7564b6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Apr 27 22:41:10 2007 +0000
-
- 2007-04-28 Albert Astals Cid <aacid@kde.org>
-
- * qt4/*: Stop requyring users to declare UNSTABLE_POPPLER_QT4
-
- ChangeLog | 4 ++++
- qt4/src/Doxyfile | 2 +-
- qt4/src/Mainpage.dox | 3 +--
- qt4/src/poppler-document.cc | 2 --
- qt4/src/poppler-embeddedfile.cc | 2 --
- qt4/src/poppler-fontinfo.cc | 2 --
- qt4/src/poppler-form.cc | 1 -
- qt4/src/poppler-link.cc | 2 --
- qt4/src/poppler-page.cc | 1 -
- qt4/src/poppler-qt4.h | 3 ---
- qt4/src/poppler-sound.cc | 2 --
- qt4/src/poppler-textbox.cc | 2 --
- qt4/tests/check_attachments.cpp | 1 -
- qt4/tests/check_dateConversion.cpp | 1 -
- qt4/tests/check_fonts.cpp | 1 -
- qt4/tests/check_metadata.cpp | 1 -
- qt4/tests/check_pagelayout.cpp | 1 -
- qt4/tests/check_pagemode.cpp | 1 -
- qt4/tests/check_permissions.cpp | 1 -
- qt4/tests/poppler-attachments.cpp | 1 -
- qt4/tests/poppler-fonts.cpp | 1 -
- qt4/tests/stress-poppler-qt4.cpp | 1 -
- qt4/tests/test-password-qt4.cpp | 1 -
- qt4/tests/test-poppler-qt4.cpp | 1 -
- 24 files changed, 6 insertions(+), 32 deletions(-)
-
-commit 45993a6faafd7646075bc6630d5d2ad7a44f7e20
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Apr 27 22:26:09 2007 +0000
-
- 2007-04-28 Carlos Garcia Campos <carlosgc@gnome.org>
- reviewed and some code by: Albert Astals Cid <aacid@kde.org>
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler.h:
- * glib/test-poppler-glib.c:
- * poppler/Makefile.am:
- * poppler/PageTransition.cc:
- * poppler/PageTransition.h:
- * qt/poppler-page-transition.cc:
- * qt/poppler-page-transition.h: Move Page Transition parsing from qt
- frontends to poppler core. Expose Page transitions on the glib
- frontend.
-
- ChangeLog | 15 +++
- glib/poppler-page.cc | 122 +++++++++++++++++++++++++
- glib/poppler-page.h | 111 ++++++++++++++----------
- glib/poppler.h | 58 +++++++++---
- glib/test-poppler-glib.c | 60 +++++++++++++
- poppler/Makefile.am | 2 +
- poppler/PageTransition.cc | 197 +++++++++++++++--------------------------
- poppler/PageTransition.h | 86 ++++++++++++++++++
- qt/poppler-page-transition.cc | 145 ++++++-------------------------
- qt/poppler-page-transition.h | 9 ++-
- 10 files changed, 497 insertions(+), 308 deletions(-)
-
-commit 877d6b202a75eb12119b16e740f85cc8b477d589
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Apr 27 21:25:30 2007 +0000
-
- * glib/poppler-page.cc:
- * poppler/PSOutputDev.cc:
- * poppler/PSOutputDev.h:
- * qt/poppler-document.cc:
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-qt4.h:
- * utils/pdftohtml.cc:
- * utils/pdftops.cc:
- Add option to force rasterizing the pages when printing them
- Add functionality to output the title field on the PS file
- Only Qt4 frontend exposes the functionality
-
- Bringing this features from KPDF 3.5.7 to poppler
- Testers welcome
- Patches for other frontends more than welcome
- Comments and suggestions even more than welcome :-)
-
- ChangeLog | 14 ++++++++++++
- glib/poppler-page.cc | 3 +-
- poppler/PSOutputDev.cc | 48 +++++++++++++++++++++++++++++-------------
- poppler/PSOutputDev.h | 17 +++++++++-----
- qt/poppler-document.cc | 2 +-
- qt4/src/poppler-document.cc | 9 ++++++-
- qt4/src/poppler-qt4.h | 2 +-
- utils/pdftohtml.cc | 2 +-
- utils/pdftops.cc | 2 +-
- 9 files changed, 71 insertions(+), 28 deletions(-)
-
-commit 99053be5357235c47a87775985646ef8d9880ed9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Apr 26 17:57:01 2007 +0000
-
- * goo/Makefile.am: Remove duplicate gmem.h
-
- ChangeLog | 4 ++++
- goo/Makefile.am | 1 -
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-commit f6adb46cd88d23b34f1918d3be31c05b68b6a443
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Apr 25 21:31:17 2007 +0000
-
- ignore pdftoabw binary
-
- utils/.cvsignore | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit e09f231ac6c03ac2c3606f1bf20ba1bde3d85abd
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Apr 25 21:25:06 2007 +0000
-
- 2007-04-25 Albert Astals Cid <aacid@kde.org>
-
- * qt4/src/poppler-document.cc: remove a delete[] no longer needed
- * qt4/src/poppler-private: initilize m_hints
-
- ChangeLog | 5 +++++
- qt4/src/poppler-document.cc | 1 -
- qt4/src/poppler-private.h | 1 +
- 3 files changed, 6 insertions(+), 1 deletions(-)
-
-commit bf7e0e980bf29994021cb1228f89f582adddf284
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Apr 25 19:59:09 2007 +0000
-
- Merge xpdf302branch in HEAD as noone vetoed it.
- Testing more than welcome
-
- ChangeLog | 140 ++
- configure.ac | 4 +
- fofi/FoFiTrueType.cc | 458 +++-
- fofi/FoFiTrueType.h | 42 +-
- fofi/FoFiType1.cc | 65 +-
- fofi/FoFiType1C.cc | 590 +++--
- fofi/FoFiType1C.h | 7 +-
- glib/poppler-action.cc | 12 +-
- glib/poppler-document.cc | 5 +-
- glib/poppler-page.cc | 8 +-
- goo/FixedPoint.cc | 31 +-
- goo/FixedPoint.h | 5 +
- goo/GooString.cc | 444 ++++-
- goo/GooString.h | 41 +-
- goo/Makefile.am | 2 +-
- goo/gfile.cc | 54 +-
- goo/gmem.c | 238 --
- goo/gmem.cc | 264 +++
- goo/gmem.h | 27 +-
- poppler/ABWOutputDev.cc | 1 -
- poppler/ABWOutputDev.h | 1 -
- poppler/Annot.cc | 1685 +++++++++++---
- poppler/Annot.h | 83 +-
- poppler/ArthurOutputDev.cc | 13 +-
- poppler/Catalog.cc | 79 +-
- poppler/Catalog.h | 16 +-
- poppler/CharCodeToUnicode.cc | 31 +-
- poppler/DCTStream.cc | 2 +-
- poppler/DCTStream.h | 4 +-
- poppler/Decrypt.cc | 427 ++++-
- poppler/Decrypt.h | 54 +-
- poppler/Dict.cc | 23 +-
- poppler/Dict.h | 27 +-
- poppler/FontInfo.cc | 1 -
- poppler/Form.cc | 19 +-
- poppler/Form.h | 2 +-
- poppler/Function.cc | 65 +-
- poppler/Function.h | 8 +-
- poppler/Gfx.cc | 1247 ++++++++---
- poppler/Gfx.h | 39 +-
- poppler/GfxFont.cc | 45 +-
- poppler/GfxFont.h | 7 +-
- poppler/GfxState.cc | 209 ++-
- poppler/GfxState.h | 42 +-
- poppler/GlobalParams.cc | 399 ++++-
- poppler/GlobalParams.h | 41 +-
- poppler/JBIG2Stream.cc | 96 +-
- poppler/JBIG2Stream.h | 4 +-
- poppler/JPXStream.cc | 246 ++-
- poppler/JPXStream.h | 8 +-
- poppler/Lexer.cc | 18 +-
- poppler/Link.cc | 150 +--
- poppler/Link.h | 49 +-
- poppler/Makefile.am | 4 +-
- poppler/Object.cc | 5 +-
- poppler/Object.h | 29 +-
- poppler/Outline.cc | 1 -
- poppler/OutputDev.cc | 2 +
- poppler/OutputDev.h | 62 +-
- poppler/PDFDoc.cc | 100 +-
- poppler/PDFDoc.h | 21 +-
- poppler/PSOutputDev.cc | 2407 +++++++++++++++----
- poppler/PSOutputDev.h | 58 +-
- poppler/PSTokenizer.cc | 2 +-
- poppler/Page.cc | 227 ++-
- poppler/Page.h | 22 +-
- poppler/PageLabelInfo.cc | 1 -
- poppler/Parser.cc | 66 +-
- poppler/Parser.h | 11 +-
- poppler/PreScanOutputDev.cc | 255 ++
- poppler/PreScanOutputDev.h | 128 +
- poppler/SecurityHandler.cc | 17 +-
- poppler/SecurityHandler.h | 5 +
- poppler/SplashOutputDev.cc | 1480 +++++++-----
- poppler/SplashOutputDev.h | 41 +-
- poppler/Stream.cc | 338 ++--
- poppler/Stream.h | 39 +-
- poppler/TextOutputDev.cc | 537 ++++-
- poppler/TextOutputDev.h | 77 +-
- poppler/UGooString.cc | 182 --
- poppler/UGooString.h | 79 -
- poppler/XRef.cc | 29 +-
- poppler/XRef.h | 6 +-
- qt/poppler-document.cc | 15 +-
- qt/poppler-page-transition.cc | 1 -
- qt/poppler-page.cc | 4 +-
- qt/poppler-private.h | 72 +-
- qt4/src/poppler-annotation-helper.h | 38 +-
- qt4/src/poppler-document.cc | 7 +-
- qt4/src/poppler-embeddedfile.cc | 6 +-
- qt4/src/poppler-form.cc | 12 +-
- qt4/src/poppler-page.cc | 8 +-
- qt4/src/poppler-private.h | 76 +-
- splash/Splash.cc | 4402 ++++++++++++++++++-----------------
- splash/Splash.h | 137 +-
- splash/SplashBitmap.cc | 110 +-
- splash/SplashBitmap.h | 10 +-
- splash/SplashClip.cc | 276 ++-
- splash/SplashClip.h | 28 +-
- splash/SplashFTFont.cc | 104 +-
- splash/SplashFTFont.h | 5 +-
- splash/SplashFTFontEngine.cc | 54 +-
- splash/SplashFTFontEngine.h | 9 +-
- splash/SplashFTFontFile.cc | 19 +-
- splash/SplashFTFontFile.h | 9 +-
- splash/SplashFont.cc | 6 +-
- splash/SplashFont.h | 13 +-
- splash/SplashFontEngine.cc | 72 +-
- splash/SplashFontEngine.h | 11 +-
- splash/SplashFontFile.cc | 1 -
- splash/SplashFontFile.h | 2 +-
- splash/SplashMath.h | 15 +-
- splash/SplashPath.cc | 42 +-
- splash/SplashPath.h | 31 +-
- splash/SplashPattern.cc | 28 -
- splash/SplashPattern.h | 25 -
- splash/SplashScreen.cc | 304 +++-
- splash/SplashScreen.h | 18 +-
- splash/SplashState.cc | 63 +-
- splash/SplashState.h | 14 +-
- splash/SplashT1Font.cc | 101 +-
- splash/SplashT1Font.h | 6 +-
- splash/SplashT1FontEngine.cc | 4 +-
- splash/SplashT1FontFile.cc | 9 +-
- splash/SplashT1FontFile.h | 7 +-
- splash/SplashTypes.h | 72 +-
- splash/SplashXPath.cc | 353 ++--
- splash/SplashXPath.h | 26 +-
- splash/SplashXPathScanner.cc | 143 ++
- splash/SplashXPathScanner.h | 13 +
- utils/HtmlOutputDev.cc | 15 +-
- utils/HtmlOutputDev.h | 15 +-
- utils/pdffonts.cc | 15 +-
- utils/pdfinfo.cc | 21 +-
- utils/pdftoabw.cc | 1 -
- utils/pdftohtml.cc | 3 +-
- utils/pdftoppm.cc | 8 +
- utils/pdftops.cc | 8 +-
- utils/pdftotext.cc | 1 -
- 139 files changed, 14088 insertions(+), 6589 deletions(-)
-
-commit ba74bb3b0632593d1937911d73709fc870480efd
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Apr 16 21:25:46 2007 +0000
-
- * qt4/src/poppler-private.h:
- Add the information about the open/close item in the DOM tree
- of the TOC.
-
- ChangeLog | 7 +++++++
- qt4/src/poppler-private.h | 5 ++++-
- 2 files changed, 11 insertions(+), 1 deletions(-)
-
-commit 6c7969f37c85f326327aca98e0346f2ebc86ffda
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 14 23:19:46 2007 +0000
-
- * utils/HtmlFonts.cc: Fix rendering of text colors on complex mode.
- * utils/pdftohtml.cc: Fix rendering of links.
-
- ChangeLog | 5 +++++
- utils/HtmlFonts.cc | 8 ++++----
- utils/pdftohtml.cc | 2 +-
- 3 files changed, 10 insertions(+), 5 deletions(-)
-
-commit add8515d7b3fba59c20ed1bbb058cea9e138c1a8
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sat Apr 14 07:29:04 2007 +0000
-
- Not sure what this was intended to do, but it triggers a lot of
- problems with the unit tests (essentially, duplicate delete's).
-
- CCMAIL: aacid@kde.org
-
- qt4/src/poppler-embeddedfile.cc | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-commit f3ded10305f6ac682640c37c21f569db0f830756
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Apr 7 21:12:35 2007 +0000
-
- 2007-04-07 Jeff Muizelaar <jeff@infidigm.net>
-
- * utils/pdftoabw.cc: Fixing passing the wrong type
- to fprintf. Patch by Kouhei Sutou. Fixes #10554.
-
- ChangeLog | 5 +++++
- utils/pdftoabw.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 2fcb76df955c143153fe4b273d0388fcb7f67d8a
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Fri Apr 6 15:27:52 2007 +0000
-
- 2007-04-06 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/ABWOutputDev.cc:
- * utils/pdftoabw.cc: Fix a number of issues with the new AbiWord code:
- *) Allows you to save to a file other than stdout
- *) Checks for error conditions when reading the PDF doc and
- writing the ABW doc
- *) Removes dead code in pdftoabw.cc
- *) Fixes a SEGV I encountered when converting my new home's floor plan
- *) Returns proper error conditions should the conversion fail for any reason
- Patch by Dominic Lachowicz
-
- ChangeLog | 12 ++++++
- poppler/ABWOutputDev.cc | 3 +
- utils/pdftoabw.cc | 101 +++++++++++++++++++++++++++-------------------
- 3 files changed, 74 insertions(+), 42 deletions(-)
-
-commit 29da65ec48b5ba91139084e197ce457d3cff3732
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Apr 5 12:13:51 2007 +0000
-
- * poppler/PSOutputDev.cc: Readd code wrongly removed when doing the GlobalParams cleaning
-
- ChangeLog | 5 +++++
- poppler/PSOutputDev.cc | 5 +++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-commit 722b2bd86f58f2d7a914571cccfa195485a70c47
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Apr 4 02:42:29 2007 +0000
-
- 2007-04-03 Jeff Muizelaar <jeff@infidigm.net>
-
- * configure.ac:
- * poppler/ABWOutputDev.cc:
- * poppler/ABWOutputDev.h:
- * poppler/Makefile.am:
- * utils/Makefile.am:
- * utils/pdftoabw.cc: Add AbiWord output device and pdftoabw program.
- Patch by Jauco Noordzij. Autotools stuff by Dominic Lachowicz.
-
- ChangeLog | 10 +
- configure.ac | 15 +
- poppler/ABWOutputDev.cc | 1286 +++++++++++++++++++++++++++++++++++++++++++++++
- poppler/ABWOutputDev.h | 140 +++++
- poppler/Makefile.am | 17 +
- utils/Makefile.am | 16 +-
- utils/pdftoabw.cc | 138 +++++
- 7 files changed, 1620 insertions(+), 2 deletions(-)
-
-commit c9b467da290476da5ebbe8dc25699cd25e589b57
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Mar 22 20:56:24 2007 +0000
-
- * poppler/Gfx.cc: Accept reals for width and height of images. Fixes
- KDE bug 143322
-
- ChangeLog | 5 +++++
- poppler/Gfx.cc | 14 ++++++++++----
- 2 files changed, 15 insertions(+), 4 deletions(-)
-
-commit ff8f8d44ef47a98f7dbdfaa4d27a720b1f37015f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Mar 15 20:16:13 2007 +0000
-
- * glib/Makefile.am: Make it build with BSD/Make. Patch by
- Henry Precheur <henry@precheur.org>
-
- ChangeLog | 5 +++++
- glib/Makefile.am | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-commit bbf7e78b6b2509ecdc476d7f55151ef327470d9d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Mar 7 19:15:32 2007 +0000
-
- 2007-03-07 Carlos Garcia Campos <carlosgc@gnome.org>
- reviewed by: Albert Astals Cid <aacid@kde.org>
-
- * poppler/Page.cc: Consider 0x0 boxes as invalid. Fixes
- http://bugzilla.gnome.org/show_bug.cgi?id=408682
-
- 2007-03-06 Pino Toscano <pino@kde.org>
- reviewed by: Albert Astals Cid <aacid@kde.org>
-
- * configure.ac:
- * qt/Makefile.am:
- * qt/poppler-link.cc:
- * qt/poppler-page.cc:
- * qt/poppler-private.h:
- * qt4/poppler-link.cc:
- Make the Qt4 frontend compilable again with no Splash.
- Make the Qt3 frontend compilable with no Splash.
-
- ChangeLog | 18 ++++++++++++++++++
- configure.ac | 12 +-----------
- poppler/Page.cc | 7 ++++++-
- qt/Makefile.am | 1 -
- qt/poppler-link.cc | 4 +++-
- qt/poppler-page.cc | 16 +++++++++++++++-
- qt/poppler-private.h | 11 ++++++++++-
- qt4/src/poppler-link.cc | 10 ++++++----
- 8 files changed, 59 insertions(+), 20 deletions(-)
-
-commit 08dcc7121450cbfa163254001e73bb6a2670e055
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Mar 6 22:27:18 2007 +0000
-
- * poppler/Annot.cc:
- * poppler/Form.cc:
- Fix uninitialized variables.
- Properly escape parenthesis and slash in text field
-
- ChangeLog | 9 ++++++++-
- poppler/Annot.cc | 3 +++
- poppler/Form.cc | 1 +
- 3 files changed, 12 insertions(+), 1 deletions(-)
-
-commit e8d3b21d08a59ec8b62503b48504fe046d746bfa
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sun Mar 4 07:30:31 2007 +0000
-
- Switch to using pkg-config to find Qt4.
-
- ChangeLog | 9 +++
- configure.ac | 36 +++++------
- m4/qt.m4 | 165 -------------------------------------------------
- poppler/Makefile.am | 2 +-
- qt4/src/Makefile.am | 3 +-
- qt4/tests/Makefile.am | 21 +++----
- 6 files changed, 36 insertions(+), 200 deletions(-)
-
-commit bd99616b9c06f96beadb68e015d2904b7fe2df1d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 25 00:34:21 2007 +0000
-
- 007-02-25 Julien Rebetez <julienr@svn.gnome.org>
-
- reviewed by: Albert Astals Cid <aacid@kde.org>
-
- * poppler/Annot.cc:
- * poppler/Annot.h:
- * poppler/Form.cc:
- * poppler/Form.h:
- Fix compilation warnings.
-
- ChangeLog | 10 ++++++++++
- poppler/Annot.cc | 30 +++++++++++++++++-------------
- poppler/Annot.h | 5 ++++-
- poppler/Form.cc | 37 ++++++++++++++-----------------------
- poppler/Form.h | 13 ++++++-------
- 5 files changed, 51 insertions(+), 44 deletions(-)
-
-commit d8d23b56332618d8c7d8198f55ec6efafd24187e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 25 00:00:20 2007 +0000
-
- forgot to commit these
-
- qt4/src/poppler-form.cc | 284 +++++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-form.h | 247 ++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 531 insertions(+), 0 deletions(-)
-
-commit 984ce7f919aec27d5f4225376550cd6b58d4ae52
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 24 23:58:31 2007 +0000
-
- 2007-02-25 Pino Toscano <pino@kde.org>
- reviewed by: Albert Astals Cid <aacid@kde.org>
-
- * qt4/src/Doxyfile:
- * qt4/src/Makefile.am:
- * qt4/src/poppler-annotation-helper.h:
- * qt4/src/poppler-form.cc:
- * qt4/src/poppler-form.h:
- * qt4/src/poppler-page.cc:
- * qt4/src/poppler-private.h:
- * qt4/src/poppler-qt4.h:
- Beginning of interactive forms support, first implementation in the
- Qt4 frontend. It supports text and choice fields in a basic way.
-
- ChangeLog | 14 +++++++++
- qt4/src/Doxyfile | 1 +
- qt4/src/Makefile.am | 2 +
- qt4/src/poppler-annotation-helper.h | 18 ++++++------
- qt4/src/poppler-page.cc | 36 ++++++++++++++++++++++++
- qt4/src/poppler-private.h | 52 ++++++++++++++++++++++++++++++++++-
- qt4/src/poppler-qt4.h | 7 +++++
- 7 files changed, 120 insertions(+), 10 deletions(-)
-
-commit de7a90fc724de14151ec994d18f860ada3be2ac8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 24 23:43:34 2007 +0000
-
- 2007-02-25 Albert Astals Cid <aacid@kde.org>
-
- * configure.ac:
- * glib/poppler-document.cc:
- * poppler/GlobalParams.cc:
- * poppler/GlobalParams.h:
- * poppler/PSOutputDev.cc:
- * qt/poppler-document.cc:
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-private.h:
- * qt4/src/poppler-qt4.h:
- * test/gtk-splash-test.cc:
- * test/pdf-inspector.cc:
- * utils/pdffonts.cc:
- * utils/pdfimages.cc:
- * utils/pdfinfo.cc:
- * utils/pdftohtml.cc:
- * utils/pdftoppm.cc:
- * utils/pdftops.cc:
- * utils/pdftotext.cc: Remove dependency on xpdfrc file and cleanup
- GlobalParams accordingly
-
- ChangeLog | 22 ++
- configure.ac | 1 -
- glib/poppler-document.cc | 4 +-
- poppler/GlobalParams.cc | 666 +------------------------------------------
- poppler/GlobalParams.h | 59 +----
- poppler/PSOutputDev.cc | 8 -
- qt/poppler-document.cc | 4 +-
- qt4/src/poppler-document.cc | 2 +-
- qt4/src/poppler-private.h | 2 +-
- qt4/src/poppler-qt4.h | 6 +-
- test/gtk-splash-test.cc | 2 +-
- test/pdf-inspector.cc | 2 +-
- utils/pdffonts.cc | 5 +-
- utils/pdfimages.cc | 5 +-
- utils/pdfinfo.cc | 5 +-
- utils/pdftohtml.cc | 2 +-
- utils/pdftoppm.cc | 15 +-
- utils/pdftops.cc | 50 ++--
- utils/pdftotext.cc | 5 +-
- 19 files changed, 72 insertions(+), 793 deletions(-)
-
-commit 74e70386b759a3cd9864d11eb4ca210010136aa5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 24 23:32:22 2007 +0000
-
- 2007-02-25 Julien Rebetez <julienr@svn.gnome.org>
- reviewed by: <aacid@kde.org>
-
- * glib/poppler-document.cc:
- * glib/poppler-document.h:
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler-private.h:
- * glib/poppler.h:
- * poppler/Annot.cc:
- * poppler/Annot.h:
- * poppler/Catalog.cc:
- * poppler/Catalog.h:
- * poppler/CharCodeToUnicode.cc:
- * poppler/CharCodeToUnicode.h:
- * poppler/Dict.cc:
- * poppler/Dict.h:
- * poppler/Form.cc:
- * poppler/Form.h:
- * poppler/GfxFont.cc:
- * poppler/GfxFont.h:
- * poppler/Makefile.am:
- * poppler/Object.h:
- * poppler/Page.cc:
- * poppler/Page.h:
- * poppler/XRef.cc:
- * poppler/XRef.h:
- Beginning of Interactive Form support:
- Add a bunch of new classes (FormWidget / FormField) to deal with form
- fields.
- Add support for object modification through XRef::setModifiedObject, as
- well as a function to write the Xref to a file, which will be used
- to implement PDF writing.
- Add some functions to glib wrapper to expose the new form features.
-
- ChangeLog | 35 ++
- glib/poppler-document.cc | 192 +++++++
- glib/poppler-document.h | 55 ++
- glib/poppler-page.cc | 120 +++++
- glib/poppler-page.h | 55 ++
- glib/poppler-private.h | 4 +
- glib/poppler.h | 15 +-
- poppler/Annot.cc | 344 ++++++++++---
- poppler/Annot.h | 21 +-
- poppler/Catalog.cc | 17 +-
- poppler/Catalog.h | 4 +
- poppler/CharCodeToUnicode.cc | 34 ++
- poppler/CharCodeToUnicode.h | 3 +
- poppler/Dict.cc | 32 ++
- poppler/Dict.h | 4 +
- poppler/Form.cc | 1187 ++++++++++++++++++++++++++++++++++++++++++
- poppler/Form.h | 470 +++++++++++++++++
- poppler/GfxFont.cc | 27 +
- poppler/GfxFont.h | 5 +
- poppler/Makefile.am | 2 +
- poppler/Object.h | 4 +
- poppler/Page.cc | 11 +-
- poppler/Page.h | 8 +-
- poppler/XRef.cc | 87 +++
- poppler/XRef.h | 9 +
- 25 files changed, 2666 insertions(+), 79 deletions(-)
-
-commit 5c4ea446f33248964431e79b14592b30362634fe
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 18 21:44:24 2007 +0000
-
- * configure.ac: Change {datadir}/poppler to {datarootdir}/poppler so
- that i get /usr/local/share/poppler in config.h instead of
- ${prefix}/poppler Better fixes are welcome.
-
- ChangeLog | 6 ++++++
- configure.ac | 2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit dd140dd63de661303b578863af4d515d82117cca
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 4 00:19:25 2007 +0000
-
- fix date
-
- ChangeLog | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 3c1ed68bf4ee49b27275f7f65d49f42933b1cfa0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 4 00:16:43 2007 +0000
-
- * poppler/Lexer.cc:
- * poppler/Lexer.h: Patch to fix regression introduced by optimizations
- in bugzilla issue 7808
-
- ChangeLog | 6 ++++++
- poppler/Lexer.cc | 30 ++++++++++++++++++++----------
- poppler/Lexer.h | 2 +-
- 3 files changed, 27 insertions(+), 11 deletions(-)
-
-commit 672408839de0deac4c6006b54df723336ee4be2d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 31 22:05:09 2007 +0000
-
- * qt4/src/poppler-page.cc:
- Patch by Pino Toscano <pino@kde.org> to remove a nonsense done by him.
-
- * qt4/tests/test-poppler-qt4.cpp:
- Simply a bit. Patch by Pino Toscano <pino@kde.org>.
-
- ChangeLog | 8 ++++++++
- qt4/src/poppler-page.cc | 2 --
- qt4/tests/test-poppler-qt4.cpp | 24 ++++++++++++------------
- 3 files changed, 20 insertions(+), 14 deletions(-)
-
-commit 9c64b8c754e09ff2858af56ce38ef013002bf8e4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 31 18:48:16 2007 +0000
-
- * m4/qt.m4: Fix Qt4 detection on Mac. Patch by Benjamin Reed <ranger@befunk.com>
-
- ChangeLog | 5 +++++
- m4/qt.m4 | 26 +++++++++++++++++++++++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-commit 1b81192ff2bb9fae4a7bbc685fafe1718f303a7b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 28 15:55:11 2007 +0000
-
- * glib/poppler-page.cc: Make link mapping coordinates follow page
- rotation. Patch by Carlos Garcia Campos <carlosgc@gnome.org>
- * glib/poppler-action.cc: Fix link destination coordinates. Patch by
- Carlos Garcia Campos <carlosgc@gnome.org>
-
- ChangeLog | 4 ++
- glib/poppler-action.cc | 15 +++++-
- glib/poppler-page.cc | 124 ++++++++++++++++++++++++++++++-----------------
- 3 files changed, 97 insertions(+), 46 deletions(-)
-
-commit 75dcf94f53c2d7241111f0d527ee4d3a2ef0b0cf
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 28 15:36:08 2007 +0000
-
- * glib/poppler-document.cc: Plug memory leak in poppler-document. Patch by Carlos Garcia Campos <carlosgc@gnome.org>
-
- ChangeLog | 5 +++++
- glib/poppler-document.cc | 30 ++++++++++++++----------------
- 2 files changed, 19 insertions(+), 16 deletions(-)
-
-commit 682a15fc38a2c569d9b1f9871e3e949b62b33cf8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 21 22:35:23 2007 +0000
-
- * poppler-document.cc:
- * poppler-page.cc:
- * poppler-private.h:
- * poppler-qt4.h:
- No need to destroy the Splash output device to change its paper color.
- Add the possibility to set flags that affect the rendering (some
- backends supports only some of them, though).
- Add a Page::label to get the label associated with a page.
- Patches by Pino Toscano <pino@kde.org>.
-
- ChangeLog | 12 ++++++++++++
- qt4/src/poppler-document.cc | 20 ++++++++++++++++++++
- qt4/src/poppler-page.cc | 14 +++++++++++++-
- qt4/src/poppler-private.h | 29 ++++++++++++++++++++++++-----
- qt4/src/poppler-qt4.h | 25 +++++++++++++++++++++++++
- 5 files changed, 94 insertions(+), 6 deletions(-)
-
-commit 7331bc46c1cb323316501f05ae1740bea5655596
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 17 20:06:29 2007 +0000
-
- * poppler/Sound.h:
- * poppler/Sound.cc:
- * qt4/src/poppler-sound.cc: Move most of the sound reading code
- into the Sound class, so frontends can use it easily.
- Patch by Pino Toscano <pino@kde.org>.
-
- ChangeLog | 10 +++-
- poppler/Sound.cc | 80 ++++++++++++++++++++++++-
- poppler/Sound.h | 32 ++++++++++-
- qt4/src/poppler-sound.cc | 144 ++++++++++++++++-----------------------------
- 4 files changed, 167 insertions(+), 99 deletions(-)
-
-commit 841bee94da7b6376d2e1fb3daaf8b727b90e42d8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jan 13 23:19:21 2007 +0000
-
- * poppler/Stream.h:
- * poppler/Stream.cc: Remove MemStream::setNeedFree method i really did
- not need it
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-link.cc:
- * qt4/src/poppler-page.cc:
- * qt4/src/poppler-private.h: Make Document::loadFromData work on
- documents with a password and don't need to do a malloc and a memcpy.
-
- ChangeLog | 11 ++++++
- poppler/Stream.cc | 5 ---
- poppler/Stream.h | 1 -
- qt4/src/poppler-document.cc | 74 ++++++++++++++++++++++--------------------
- qt4/src/poppler-link.cc | 4 +-
- qt4/src/poppler-page.cc | 34 ++++++++++----------
- qt4/src/poppler-private.h | 24 +++++++++-----
- 7 files changed, 84 insertions(+), 69 deletions(-)
-
-commit e1432fd7c4a6a2386789f450d39c6d954fd4e656
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jan 13 18:29:39 2007 +0000
-
- * configure.ac
- * poppler/Makefile.am
- * qt4/src/Makefile.am
- * qt4/src/poppler-document.cc
- * qt4/src/poppler-link.cc
- * qt4/src/poppler-page.cc
- * qt4/src/poppler-private.h
- * qt4/src/poppler-qt4.h: Make the Qt4 backend compilable even with
- no Splash backend. Patch by Pino Toscano <pino@kde.org>.
-
- ChangeLog | 12 ++++++++++++
- configure.ac | 5 -----
- poppler/Makefile.am | 5 +++--
- qt4/src/Makefile.am | 6 +++++-
- qt4/src/poppler-document.cc | 16 ++++++++++++++--
- qt4/src/poppler-link.cc | 1 +
- qt4/src/poppler-page.cc | 15 ++++++++++++---
- qt4/src/poppler-private.h | 8 +++++++-
- qt4/src/poppler-qt4.h | 6 ++++++
- 9 files changed, 60 insertions(+), 14 deletions(-)
-
-commit 457038e97325720615c4390ffa075dd8283966ee
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jan 13 17:56:07 2007 +0000
-
- * poppler/Stream.h:
- * poppler/Stream.cc: Add MemStream::setNeedFree method
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-private.h:
- * qt4/src/poppler-qt4.h: Add Document::loadFromData method
-
- ChangeLog | 8 ++++++++
- poppler/Stream.cc | 5 +++++
- poppler/Stream.h | 1 +
- qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++
- qt4/src/poppler-private.h | 17 +++++++++++++++--
- qt4/src/poppler-qt4.h | 16 ++++++++++++++++
- 6 files changed, 67 insertions(+), 2 deletions(-)
-
-commit 4e2a9c49ecab00b1f5d175570165cd490afdd31e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 11 22:28:03 2007 +0000
-
- goo/gmem.c: Merge change from xpdf-3.01pl2
-
- ChangeLog | 4 ++++
- goo/gmem.c | 13 +++++++++++--
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-commit bce14b274fd788d728116950d6464a85e33a9966
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 11 22:12:11 2007 +0000
-
- * poppler/Catalog.h:
- * poppler/Catalog.cc: Limit max depth of recursive calls on
- readPageTree to fix MOAB-06-01-2007
-
- ChangeLog | 6 ++++++
- poppler/Catalog.cc | 20 +++++++++++++++-----
- poppler/Catalog.h | 2 +-
- 3 files changed, 22 insertions(+), 6 deletions(-)
-
-commit 3f0679a336ffaf2aff149f8526fa11f8f8cbda59
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jan 6 21:53:08 2007 +0000
-
- Patch by Pino Toscano <pino@kde.org> to fix some memory leaks when dealing with sounds.
-
- ChangeLog | 9 +++++++++
- poppler/Sound.cc | 1 +
- qt4/src/poppler-link.cc | 5 +++++
- qt4/src/poppler-link.h | 1 +
- qt4/src/poppler-page.cc | 4 ++++
- qt4/src/poppler-sound.cc | 7 ++++++-
- 6 files changed, 26 insertions(+), 1 deletions(-)
-
-commit d41cd2f567a955031cb7498d9089e70e14df4a42
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 4 19:10:16 2007 +0000
-
- qt4/src/poppler-private.h: gmallocn -> new[]
-
- ChangeLog | 4 ++++
- qt4/src/poppler-private.h | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit f8edfb6832144cbbd1b234f6b35e33325269255c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 4 18:56:13 2007 +0000
-
- qt/poppler-page-transition.cc: Fix memory leak. Patch by Tobias Koenig <tokoe@kde.org>
-
- ChangeLog | 5 +++++
- qt/poppler-page-transition.cc | 1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 250a9f4b429344e0968c7bd0c0cebe7af373ae0a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Dec 30 14:50:25 2006 +0000
-
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-document.cc: Add const & to some parameters. Patch by Pino Toscano <pino@kde.org>
-
- ChangeLog | 6 ++++++
- qt4/src/poppler-document.cc | 4 ++--
- qt4/src/poppler-qt4.h | 4 ++--
- 3 files changed, 10 insertions(+), 4 deletions(-)
-
-commit 250c1f94cc9a53f980fd08364d6cce29db9fd067
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 29 14:08:35 2006 +0000
-
- * poppler/UGooString.cc: Patch by Pino Toscano <pino@kde.org> so that QStringToUGooString does not crash.
-
- ChangeLog | 5 +++++
- poppler/UGooString.cc | 1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 42770e5f07407b03dce31c73fd6956f9c8fc9a06
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Fri Dec 29 04:12:40 2006 +0000
-
- 2006-12-28 Brad Taylor <brad@getcoded.net>
-
- * poppler/glib/poppler-document.h:
- * poppler/glib/poppler-document.cc: Add poppler_document_new_from_data
- to allow loading PDFs out of memory.
-
- ChangeLog | 6 +++
- glib/poppler-document.cc | 113 +++++++++++++++++++++++++++++++++------------
- glib/poppler-document.h | 4 ++
- 3 files changed, 93 insertions(+), 30 deletions(-)
-
-commit 6fedd991b584e300b5710630fa7942d357fe7aaa
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Dec 28 17:22:36 2006 +0000
-
- * qt4/src/poppler-embeddedfile.cc:
- * qt4/src/poppler-document.cc:
- * qt/poppler-document.cc: Fix memory leaks
-
- ChangeLog | 6 ++++++
- qt/poppler-document.cc | 4 ++++
- qt4/src/poppler-document.cc | 4 +++-
- qt4/src/poppler-embeddedfile.cc | 4 +++-
- 4 files changed, 16 insertions(+), 2 deletions(-)
-
-commit 7da5885e45c33382060276c95d9a3bd117ae55c7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Dec 28 15:51:44 2006 +0000
-
- * goo/GooString.cc
- * goo/GooString.h
- * goo/gmem.c
- * goo/gmem.h
- * poppler/Lexer.cc
- * poppler/Lexer.h
- * poppler/PageLabelInfo.cc
- * poppler/Parser.cc
- * poppler/UGooString.cc
- * poppler/UGooString.h: Patch by Krzysztof Kowalczyk <kkowalczyk@gmail.com> to improve performance. See bug 7808 for details.
-
- ChangeLog | 15 ++++
- goo/GooString.cc | 186 +++++++++++++++++++++++-----------------------
- goo/GooString.h | 28 ++++++--
- goo/gmem.c | 3 +-
- goo/gmem.h | 2 +-
- poppler/Lexer.cc | 19 ++++-
- poppler/Lexer.h | 10 +++
- poppler/PageLabelInfo.cc | 1 +
- poppler/Parser.cc | 17 +++--
- poppler/UGooString.cc | 137 ++++++++++++++++++++++++++++------
- poppler/UGooString.h | 40 ++++++++--
- 11 files changed, 313 insertions(+), 145 deletions(-)
-
-commit fbc05a6791fc28ee26a9d9188722ea3453c65ddc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Dec 27 23:15:06 2006 +0000
-
- * poppler/Annot.cc:
- * poppler/Annot.h: Add type checking to processing of "Rect". Patch by Scott Turner <scotty1024@mac.com>
-
- ChangeLog | 6 ++++++
- poppler/Annot.cc | 48 +++++++++++++++++++++++++++++-------------------
- poppler/Annot.h | 1 +
- 3 files changed, 36 insertions(+), 19 deletions(-)
-
-commit dc6b372358ac629c43aa2faabd644942cb0ed98b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Dec 27 15:23:04 2006 +0000
-
- Remove , after last value of enum. Thanks to André Wöbbeking
-
- ChangeLog | 1 +
- poppler/Catalog.h | 2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-commit c7d19539a95927eb277966a521f13393c9e116bb
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Dec 27 12:38:58 2006 +0000
-
- qt4/src/poppler-qt4.h: Remove , after last value of enum. Thanks to André Wöbbeking
-
- ChangeLog | 5 +++++
- qt4/src/poppler-qt4.h | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-commit b29429c702e6540b9f35689b0a164f30e747d5d9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Dec 26 20:07:03 2006 +0000
-
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-page.cc: Add Page::duration() function to the qt4 frontend.
-
- ChangeLog | 6 ++++++
- qt4/src/poppler-page.cc | 8 ++++++++
- qt4/src/poppler-qt4.h | 9 ++++++++-
- 3 files changed, 22 insertions(+), 1 deletions(-)
-
-commit 62dfc58903b496c4cc720c8b2c759c6fb82fb443
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Dec 26 19:56:28 2006 +0000
-
- * glib/test-poppler-glib.c:
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * poppler/Page.cc:
- * poppler/Page.h: Implement /Dur entry in page object. Patch by Carlos
- Garcia Campos <carlosgc@gnome.org>
-
- ChangeLog | 9 +++++++++
- glib/poppler-page.cc | 16 ++++++++++++++++
- glib/poppler-page.h | 1 +
- glib/test-poppler-glib.c | 7 +++++++
- poppler/Page.cc | 13 +++++++++++++
- poppler/Page.h | 6 ++++++
- 6 files changed, 52 insertions(+), 0 deletions(-)
-
-commit 34e5aa62f4d3ba7a2d94a68a91c11a48277a4119
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Dec 23 13:12:13 2006 +0000
-
- * poppler/PSTokenizer.cc: Enhance PSTokenizer::getToken performance.
- Patch by Scott Turner <scotty1024@mac.com>. In a random pdf i tested
- the patchs improves PSTokenizer::getToken performance by 15%
-
- ChangeLog | 6 ++++++
- poppler/PSTokenizer.cc | 33 +++++++++++++++++++++------------
- poppler/PSTokenizer.h | 1 +
- 3 files changed, 28 insertions(+), 12 deletions(-)
-
-commit 1a5fa1d2ced62e7d027e085663e987cff625ce0b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 22 23:39:41 2006 +0000
-
- poppler/Page.cc: Fix memory leak when reading a wrong color map in a thumbnail. Patch by Scott Turner <scotty1024@mac.com>
-
- ChangeLog | 3 +++
- poppler/Page.cc | 1 +
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-commit dd1c134dcf085338a85188c7f205fc300396dc86
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 22 23:27:53 2006 +0000
-
- qt/poppler-page.cc: Fix memory leak in Page::textList. Patch by Jerry Epplin <jepplin@globalvelocity.com>
-
- ChangeLog | 5 +++++
- qt/poppler-page.cc | 4 +++-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-commit 87e474a018c4808d6251fd79f9e9640e0f733551
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Dec 21 01:01:30 2006 +0000
-
- 2006-12-20 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Fix scaling of maskedImage masks. They
- should be scaled to the size of the image not the size of the mask.
- Fixes #9403.
-
- ChangeLog | 6 ++++++
- poppler/CairoOutputDev.cc | 8 ++------
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-commit 769a89623c680f51690db1751522b016b02b83a8
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Dec 20 19:55:55 2006 +0000
-
- 2006-12-20 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/GlobalParams.cc: Try to make zero-width lines as close to
- one pixel wide as we can. Fixes #9393.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 10 ++++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-commit 5c4bca18373528f293bd5e080efca572977fc1ff
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Dec 19 20:27:55 2006 +0000
-
- poppler/SplashOutputDev.cc: Fix gray calculation. Patch by Scott Turner <scotty1024@mac.com>
-
- ChangeLog | 5 +++++
- poppler/SplashOutputDev.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit fba99578f6001ae0c0df0442bb73040b55109b1d
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Dec 12 05:23:59 2006 +0000
-
- 2006-12-12 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Change a cairo_set_matrix to
- cairo_transform so that we don't blindly clobber the existing matrix.
- Patch by Daniel Colascione.
- Fixes #9190.
-
- ChangeLog | 7 +++++++
- poppler/CairoOutputDev.cc | 2 +-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-commit 9a6ffa1c6e009f8606a055f873efdcd5829fcfa2
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Dec 10 05:24:56 2006 +0000
-
- 2006-12-09 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/Function.cc: Initialize PostScriptFunction::codeString to
- NULL so that it can safely deleted if initialization fails.
- Fixes #9263.
-
- ChangeLog | 6 ++++++
- poppler/Function.cc | 1 +
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-commit e92d63a179ae022270156da4e396c15ff9236d89
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Nov 23 19:01:44 2006 +0000
-
- * m4/libjpeg.m4: Make JPEG library header search work under MSYS. Patch by Alexis Wilke
-
- ChangeLog | 5 +++++
- m4/libjpeg.m4 | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 3913110f698fd006b394a395b5b0adfde30af31b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 22 21:55:27 2006 +0000
-
- there should not be any whitespace after the \
-
- qt4/src/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit c3ab7addec5a7990872949b813c2b727b1614d64
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Nov 19 18:51:23 2006 +0000
-
- Another leak fix on qt4/src/poppler-page.cc the previous changelog is enough for this one ;-)
-
- qt4/src/poppler-page.cc | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 9e9b82da91abacb916b05302d40bf822af6ac7f1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Nov 19 12:59:48 2006 +0000
-
- * qt4/src/poppler-link.cc:
- * qt4/src/poppler-page.cc:
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-textbox.cc: Fix memory leaks
- * splash/Splash.cc: Initialize the values of nClipRes
-
- ChangeLog | 8 ++++++++
- qt4/src/poppler-link.cc | 6 ++++++
- qt4/src/poppler-page.cc | 4 +++-
- qt4/src/poppler-qt4.h | 1 +
- qt4/src/poppler-textbox.cc | 5 +++++
- splash/Splash.cc | 2 +-
- 6 files changed, 24 insertions(+), 2 deletions(-)
-
-commit b9faacc62182efcbc84df2471e4c5dcf2b03bda8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Nov 18 17:08:04 2006 +0000
-
- * qt4/src/poppler-document.cc
- * qt4/src/poppler-qt4.h: Add int marginRight, int marginBottom, int
- marginLeft, int marginTop, bool strictMargins to Document::print()
-
- ChangeLog | 6 ++++++
- qt4/src/poppler-document.cc | 11 +++++++++--
- qt4/src/poppler-qt4.h | 6 +++++-
- 3 files changed, 20 insertions(+), 3 deletions(-)
-
-commit da8e6d4c3e0afdaa031413649ae20545c8a1f845
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Nov 16 21:03:27 2006 +0000
-
- really commit pino's patch :-S
-
- qt4/src/Doxyfile | 11 +++-
- qt4/src/Mainpage.dox | 26 ++++-----
- qt4/src/poppler-annotation.h | 33 +++++++-----
- qt4/src/poppler-link.h | 68 +++++++++++++++++++++----
- qt4/src/poppler-qt4.h | 115 ++++++++++++++++++++++++++---------------
- 5 files changed, 171 insertions(+), 82 deletions(-)
-
-commit 4f26e65096e3133a39fc0c9e82084c90cf77dda9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Nov 16 21:00:10 2006 +0000
-
- * qt4/src/Mainpage.dox:
- * qt4/src/Doxyfile:
- * qt4/src/poppler-annotation.h:
- * qt4/src/poppler-link.h:
- * qt4/src/poppler-qt4.h: Improve API documentation. Patch by
- Pino Toscano.
-
- Generated docu at http://people.freedesktop.org/~aacid/docs/qt4/
-
- ChangeLog | 9 +++++++++
- qt4/src/Mainpage.dox | 2 +-
- 2 files changed, 10 insertions(+), 1 deletions(-)
-
-commit e68b6f3f8fea1e4f036eba0f19bb7e0c423d408c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Nov 15 21:07:50 2006 +0000
-
- 2006-11-15 Albert Astals Cid <aacid@kde.org>
-
- * qt4/src/poppler-link.cc:
- * qt4/src/poppler-page.cc:
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-private.h: Generalize the way we render the pages:
- merge all the Page::renderTo* functions in only one that renders on
- a QImage, taking into account the currently chosen backend.
- It is possible to switch rendering backend using the Document.
- Patch by Pino Toscano.
-
- * qt4/tests/stress-poppler-qt4.cpp:
- * qt4/tests/test-password-qt4.cpp:
- * qt4/tests/test-poppler-qt4.cpp: Adapt the tests to the changes in
- the rendering API of Page. Patch by Pino Toscano.
-
- ChangeLog | 17 +++++
- qt4/src/poppler-document.cc | 14 ++++
- qt4/src/poppler-link.cc | 2 +-
- qt4/src/poppler-page.cc | 125 ++++++++++++++++++++------------------
- qt4/src/poppler-private.h | 32 +++++++---
- qt4/src/poppler-qt4.h | 75 ++++++-----------------
- qt4/tests/stress-poppler-qt4.cpp | 3 +-
- qt4/tests/test-password-qt4.cpp | 12 ++--
- qt4/tests/test-poppler-qt4.cpp | 17 ++---
- 9 files changed, 153 insertions(+), 144 deletions(-)
-
-commit 37088dd3335be6e7641c47bea9b1ddd689b07372
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Nov 13 19:16:44 2006 +0000
-
- * poppler/ArthurOutputDev.cc: Small fix to get colors right
-
- ChangeLog | 4 ++++
- poppler/ArthurOutputDev.cc | 8 ++++----
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-commit 302e2cab9fd626222c69ad40f7e40be2e65d34a9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Nov 11 15:41:27 2006 +0000
-
- Fix typo when outputing PS scale
-
- ChangeLog | 4 ++++
- poppler/PSOutputDev.cc | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit e3550fb286dae98992b30edbf4a9300fa58d2e77
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Nov 7 23:53:31 2006 +0000
-
- 2006-11-07 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: take horizontal scaling into account
- when updating the font. Also, cleanup some unused code. Fixes #8924.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 9 ++-------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-commit f020b64a72ad5c82c3e7bdcf15039bb0037b1f22
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Oct 18 18:43:59 2006 +0000
-
- 2006-10-18 Albert Astals Cid <aacid@kde.org>
-
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-private.h: Do not crash when opening a
- encrypted document. Do not crash when unlocking a locked
- document.
-
- ChangeLog | 7 +++++++
- qt4/src/poppler-document.cc | 41 ++++++++++++++++-------------------------
- qt4/src/poppler-private.h | 14 ++++++++++++++
- 3 files changed, 37 insertions(+), 25 deletions(-)
-
-commit 577330ee1d4d1021174cf1bd59557a83a017e06f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Oct 11 23:09:24 2006 +0000
-
- * splash/Splash.cc:
- * splash/SplashErrorCodes.h: Do not crash on documents that report a
- 0x0 mask for an image, like
- http://bugs.kde.org/attachment.cgi?id=18083&action=view
-
- ChangeLog | 7 +++++++
- splash/Splash.cc | 2 ++
- splash/SplashErrorCodes.h | 2 ++
- 3 files changed, 11 insertions(+), 0 deletions(-)
-
-commit 42c016c6d3c6de65fd92b51b9d6cc96d52404689
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 8 20:38:47 2006 +0000
-
- * poppler/Link.cc:
- * poppler/Link.h:
- * poppler/Makefile.am:
- * poppler/Page.cc:
- * poppler/Page.h:
- * poppler/Sound.cc:
- * poppler/Sound.h: Make poppler able to read Sound objects, Sound
- actions and Opening/Closing page actions. Patch by Pino Toscano.
-
- * qt4/src/Makefile.am:
- * qt4/src/poppler-link.cc:
- * qt4/src/poppler-link.h:
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-page.cc:
- * qt4/src/poppler-sound.cc: Support for sounds, sound links and page
- actions in the Qt4 backend. Patch by Pino Toscano.
-
- ChangeLog | 19 +++++
- poppler/Link.cc | 53 ++++++++++++++
- poppler/Link.h | 32 ++++++++
- poppler/Makefile.am | 2 +
- poppler/Page.cc | 8 ++
- poppler/Page.h | 4 +
- poppler/Sound.cc | 65 +++++++++++++++++
- poppler/Sound.h | 46 ++++++++++++
- qt4/src/Makefile.am | 1 +
- qt4/src/poppler-link.cc | 35 +++++++++
- qt4/src/poppler-link.h | 26 +++++++-
- qt4/src/poppler-page.cc | 32 ++++++++
- qt4/src/poppler-qt4.h | 87 ++++++++++++++++++++++
- qt4/src/poppler-sound.cc | 177 ++++++++++++++++++++++++++++++++++++++++++++++
- 14 files changed, 586 insertions(+), 1 deletions(-)
-
-commit 1da064d7e7403ec7111eecb2b9613e27a2c4bb5d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Sep 30 16:28:35 2006 +0000
-
- * qt4/src/poppler-page.cc: PA is optional, H is a name not a string
-
- ChangeLog | 4 ++++
- qt4/src/poppler-page.cc | 15 +++++++++------
- 2 files changed, 13 insertions(+), 6 deletions(-)
-
-commit 29366d8e470ab2207cdfdab115c2fa9618c4c74e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 25 20:43:18 2006 +0000
-
- * glib/Makefile.am
- * qt/Makefile.am
- * qt4/src/Makefile.am
- * qt4/tests/Makefile.am
- * test/Makefile.am
- * utils/Makefile.am: Add FONTCONFIG_CFLAGS FONTCONFIG_LIBS for people
- that need them. Patch by morfoh@opensde.org. Fixes bug #8415
-
- ChangeLog | 10 ++++++++++
- glib/Makefile.am | 2 ++
- qt/Makefile.am | 6 ++++--
- qt4/src/Makefile.am | 2 ++
- qt4/tests/Makefile.am | 2 ++
- test/Makefile.am | 6 ++++--
- utils/Makefile.am | 6 ++++--
- 7 files changed, 28 insertions(+), 6 deletions(-)
-
-commit 957c1e59df213a01ca87f03d067a8dab5dc09fb6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 25 20:05:28 2006 +0000
-
- ignore poppler-features.h
-
- glib/.cvsignore | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 3158b54375bdfdc82779362cc9442aade87f84f6
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Sep 22 00:55:54 2006 +0000
-
- 2006-09-21 Kristian Høgsberg <krh@redhat.com>
-
- * NEWS: Update list of bugs fixes, release 0.5.4.
-
- ChangeLog | 2 ++
- NEWS | 2 +-
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-commit 17dd1f60f9328ae68fbe262ae0745be976ff9f95
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Sep 21 23:28:14 2006 +0000
-
- 2006-09-21 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Check for gtk+ 2.8 for the gtk+ test case, invert
- help text for zlib option (#7788, #7661).
-
- ChangeLog | 3 +++
- configure.ac | 12 +++++-------
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-commit ddbbd697424b9122ce1f0541ddada3fe8bb38fb1
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Sep 21 22:58:31 2006 +0000
-
- 2006-09-21 Kristian Høgsberg <krh@redhat.com>
-
- * utils/pdftops.cc: Get duplex setting from GlobalParams.
-
- ChangeLog | 2 ++
- utils/pdftops.cc | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-commit 0d25592a1a5811ee8fffbd70307c7bcaaaacadf3
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Sep 21 22:40:52 2006 +0000
-
- 2006-09-21 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (_poppler_page_new): Make PopplerPage
- reference its document throughout the lifetime of the page (#7005).
-
- ChangeLog | 3 +++
- glib/poppler-page.cc | 5 ++++-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit b834755c7ae45eb4020e9cdbc3852eac0151fcdc
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Sep 21 22:37:00 2006 +0000
-
- 2006-09-21 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/Gfx.cc: Remove the right out->updateAll() call.
-
- ChangeLog | 4 ++++
- poppler/Gfx.cc | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit 181e2af1edf2cbc3c8edadad0dce215a64a990dd
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Sep 21 01:05:23 2006 +0000
-
- 2006-09-20 Kristian Høgsberg <krh@redhat.com>
-
- * NEWS: Sum up changes.
-
- * configure.ac: Bump release to 0.5.4.
-
- ChangeLog | 4 ++++
- NEWS | 10 ++++++++++
- configure.ac | 2 +-
- 3 files changed, 15 insertions(+), 1 deletions(-)
-
-commit cc9c17a6730422be99ebcd69991fcf5d7b569640
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Sep 21 00:56:33 2006 +0000
-
- 2006-09-20 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/Gfx.cc: Remove last remnant of erroneous type3 commit a
- while back, fixing #8182.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 1 -
- poppler/Gfx.cc | 1 -
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-commit 83be722b56d9266b89946fe994023351e47eb4fd
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Sep 20 20:22:19 2006 +0000
-
- 2006-09-20 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/TextOutputDev.cc: TextFontInfo stores a copy of a pointer
- to a GfxFont but does not increment the reference count. Fix the
- problem by calling incRefCnt and decRefCnt appropriately. Fixes #4649
-
- ChangeLog | 6 ++++++
- poppler/TextOutputDev.cc | 4 ++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-commit 1cf60015d7d78668c83737be6015dc880fd04ebf
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Sep 19 04:39:07 2006 +0000
-
- 2006-09-19 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/GlobalParams.cc: Add scanEncodingDirs() to automatically
- scan in any encodings found under ${datadir}/poppler.
-
- * m4/define-dir.m4: New file, adds AC_DEFINE_DIR macro.
-
- ChangeLog | 7 +++
- configure.ac | 16 +------
- goo/gfile.cc | 16 +++----
- goo/gfile.h | 2 +
- m4/define-dir.m4 | 34 ++++++++++++++
- poppler/GlobalParams.cc | 116 +++++++++++++++++++++++++++++++---------------
- poppler/GlobalParams.h | 7 +++-
- 7 files changed, 136 insertions(+), 62 deletions(-)
-
-commit 821c883f9df9cc0e5b81aa2e070727996cf3bc4e
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Sep 18 15:40:50 2006 +0000
-
- 2006-09-13 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/Makefile.am (libpoppler_la_LIBADD): Add cairo libs to
- link if configured.
-
- ChangeLog | 3 +++
- poppler/Makefile.am | 4 ++++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-commit d8ab8ebc94c32d32ad17ed54cede453de25d7dd5
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Sep 13 20:25:03 2006 +0000
-
- 2006-09-13 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Tighten glib check (#7906), add check for C++
- compiler (#8048).
-
- ChangeLog | 5 +++++
- configure.ac | 3 ++-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 7c748075e18cfe95be6a56adf09ce7f2f032b86f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 12 19:48:47 2006 +0000
-
- sorry Jeff
-
- ChangeLog | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-commit 6cdcfae0e1c6fbec07ee5273e6ad97ef04110868
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Sep 11 21:20:56 2006 +0000
-
- 2006-09-11 Albert Astals Cid <aacid@kde.org>
-
- * qt4/src/poppler-annotation.cc:
- * qt4/src/poppler-annotation.h:
- * qt4/src/poppler-page.cc: Add support for LinkAnnotation. Patch by
- Pino Toscano
-
- ChangeLog | 10 +-
- qt4/src/poppler-annotation.cc | 230 ++++++++++++++++++++++++++++++++++++++-
- qt4/src/poppler-annotation.h | 22 ++++-
- qt4/src/poppler-page.cc | 237 +++++++++++++++++++++++++----------------
- 4 files changed, 392 insertions(+), 107 deletions(-)
-
-commit 8335c7eea2aa62a580170f47323d8674bd89e412
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Fri Sep 8 23:28:22 2006 +0000
-
- 2006-09-08 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: The work-around for 1x1 imagemasks was not
- calling cairo_set_source causing the rectangles to be drawn the wrong
- colour occasionally. Fix by moving the existing call to
- cairo_set_source above the work-around. Fixes #7113.
-
- ChangeLog | 7 +++++++
- poppler/CairoOutputDev.cc | 8 ++++----
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-commit 02d505aa0176b6e5a54ee82426d8333a9ef8f000
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Sep 7 04:01:39 2006 +0000
-
- 2006-09-06 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Avoid crashing in CairoOutputDev if
- endString is called without a corresponding beginString. Fixes #4515.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 8 +++++++-
- 2 files changed, 12 insertions(+), 1 deletions(-)
-
-commit 3ea0aada0434c9f815814253dd9d1374ae6643cc
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Sep 6 23:54:30 2006 +0000
-
- 2006-09-06 Jeff Muizelaar <jeff@infidigm.net>
-
- * configure.ac:
- * poppler/FlateStream.cc:
- * poppler/FlateStream.h: Fix FlateStream to not read more than it
- needs. This has a performance impact because our input buffer is now
- only 1 byte large, however correctness is better than performance.
- This should fix #3948.
-
- ChangeLog | 9 +++++++++
- configure.ac | 2 +-
- poppler/FlateStream.cc | 35 +++++++++++++++++++++++++----------
- poppler/FlateStream.h | 3 ++-
- 4 files changed, 37 insertions(+), 12 deletions(-)
-
-commit 1d2e6aedca0b8fcce6ac84ae2576ab067912886b
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Sep 5 01:21:50 2006 +0000
-
- 2006-09-04 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Initialize currentFont to NULL before
- use. Found by Pascal Terjan. Fixes #7924.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 7905adaa21f2347346927fa567c64be60e2bc69c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Sep 3 09:27:21 2006 +0000
-
- * poppler/Dict.cc:
- * poppler/Dict.h:
- * poppler/Object.h:
- * poppler/Parser.cc: Patch by Krzysztof Kowalczyk to increase speed by
- means of doing less copies between objects. See bug 8112 for more
- information.
-
- ChangeLog | 9 +++++++++
- poppler/Dict.cc | 4 ++--
- poppler/Dict.h | 11 +++++++++--
- poppler/Object.h | 12 ++++++++++++
- poppler/Parser.cc | 15 +++++++++------
- 5 files changed, 41 insertions(+), 10 deletions(-)
-
-commit 4da7c90a619002e54f436c4efee723b5bc42a112
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Aug 24 22:32:31 2006 +0000
-
- * qt4/src/poppler-private.h: Init m_fontInfoScanner to NULL. Discovered by
- Rafael Rodríguez <rafael.rodriguez.tf@gmail.com>
-
- ChangeLog | 5 +++++
- qt4/src/poppler-private.h | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 469202e117910beb4e0ad906d5c154a3bae5c98b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Aug 16 14:35:14 2006 +0000
-
- * qt/poppler-page.cc: Report correct page size. Backport from Qt4
- frontend. Patch by Wilfried Huss
-
- ChangeLog | 5 +++++
- qt/poppler-page.cc | 10 ++++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-commit b881844e4d31009c5d54c9321a6daaf0f354cf6b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Aug 16 09:18:04 2006 +0000
-
- did not want to commit that, thanks Brad for noticing!
-
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit f52380e6d569280839d7c37362bd7cc59f2573c3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Aug 15 22:27:31 2006 +0000
-
- add a warning how nasty zlib can be, it can come and it your pdfs and make your readers crash when you are not looking at it, so be aware that if you enable it you are on your own ;-)
-
- ChangeLog | 4 ++++
- configure.ac | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-commit 1caba84b1024f1fa7865deebbf70379855ce078d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 11 13:12:11 2006 +0000
-
- 2006-08-11 Albert Astals Cid <aacid@kde.org>
-
- * poppler/Catalog.cc: Fix leak
-
- ChangeLog | 4 ++++
- poppler/Catalog.cc | 1 +
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 9b6455f6530e273afaa5f948b67ceeec8a06f976
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Aug 10 16:08:51 2006 +0000
-
- 2006-08-10 Albert Astals Cid <aacid@kde.org>
-
- * poppler/SplashOutputDev.cc: Try to fix refs to fonts yet again
-
- ChangeLog | 4 ++++
- poppler/SplashOutputDev.cc | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-commit 305f60e0437dcfc5babd449123a1fe4cd062a219
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 5 17:10:07 2006 +0000
-
- 2006-08-05 Albert Astals Cid <aacid@kde.org>
-
- * poppler/Catalog.cc: The name array can contain references to strings
- instead of stings themselves, or at least PDF of
- https://bugs.freedesktop.org/show_bug.cgi?id=7780 does. This makes it
- work with that file
- * qt4/src/poppler-embeddedfile.cc: Use UGooString for description
-
- ChangeLog | 8 ++++++++
- poppler/Catalog.cc | 12 ++++++++++--
- qt4/src/poppler-embeddedfile.cc | 3 ++-
- 3 files changed, 20 insertions(+), 3 deletions(-)
-
-commit dd8758ea3f0f44e9f8362343f15b2064f428ad64
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Aug 4 22:48:09 2006 +0000
-
- 2006-08-05 Albert Astals Cid <aacid@kde.org>
-
- * utils/pdftotext.cc:
- * utils/pdfinfo.cc:
- * utils/pdffonts.cc: Add the posibility of reading a file from stdin.
- Patch by Dom Lachowicz
-
- ChangeLog | 7 +++++++
- utils/pdffonts.cc | 11 ++++++++++-
- utils/pdfinfo.cc | 11 ++++++++++-
- utils/pdftotext.cc | 11 ++++++++++-
- 4 files changed, 37 insertions(+), 3 deletions(-)
-
-commit a418d844cf6baa797919796ceadaf21ef9b2e5b9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Aug 3 10:34:52 2006 +0000
-
- * configure.ac: Use the correct variable to output the utils status.
- Patch by Dom Lachowic
-
- ChangeLog | 5 +++++
- configure.ac | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 1673b895656143a8a1f1a45e07f777f39995940d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 30 20:31:31 2006 +0000
-
- * poppler/GfxState.cc: make nGfxBlendModeNames define return the
- correct size of the gfxBlendModeNames array so it does not access
- invalid memory areas when the blend mode is not found. Discovered by
- Krzysztof Kowalczyk
-
- ChangeLog | 7 +++++++
- poppler/GfxState.cc | 12 +++++++-----
- 2 files changed, 14 insertions(+), 5 deletions(-)
-
-commit e4561568d14e7b3b2aec6ecaf3cc09078bdf7a46
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 30 09:38:28 2006 +0000
-
- * splash/SplashFontEngine.cc:
- * poppler/SplashOutputDev.cc: Fix memory leak when using embedded
- fonts in the pdf file. Patch by Krzysztof Kowalczyk
-
- ChangeLog | 6 ++++++
- poppler/SplashOutputDev.cc | 8 ++++++--
- splash/SplashFontEngine.cc | 12 ++++++++----
- 3 files changed, 20 insertions(+), 6 deletions(-)
-
-commit 4a27502159a89992f54be2673b44bf7a8392b60d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jul 29 16:24:53 2006 +0000
-
- push back thing i did not want to commit, sorry
-
- configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit ba448afc0e97a9e779409ff228adcd4f627971f5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jul 29 16:22:52 2006 +0000
-
- * configure.ac: Disable qt and qt4 frontends if splash backend is
- disabled
-
- ChangeLog | 5 +++++
- configure.ac | 18 ++++++++++++++----
- 2 files changed, 19 insertions(+), 4 deletions(-)
-
-commit 1e32d3baa5e8296caf55bd5853216a96618c74ac
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Jul 28 18:17:45 2006 +0000
-
- 2006-07-28 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDev.cc: Don't set font matrix translation
- (fix from Behdad Esfahbod).
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-commit 0bc1b0f35c28cb80dd27d24110367348e52c143b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jul 27 18:21:28 2006 +0000
-
- fix date, i don't live in the past
-
- ChangeLog | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 2f27c3a0218608568f6cd1c718ef51b9879023a3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jul 27 18:17:50 2006 +0000
-
- * poppler/Stream.cc: If you are going to test a variable, better
- initialize it first ;-) Fixes bug 7646
-
- ChangeLog | 5 +++++
- poppler/Stream.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit f39ab43ca824cb7e5db73137c4545b3e85134425
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jul 26 18:16:01 2006 +0000
-
- 2006-07-26 Albert Astals Cid <aacid@kde.org>
-
- * qt/poppler-document.cc:
- * qt/poppler-private.h:
- * qt/poppler-qt.h: Port the QDomDocument *Document::toc() const method
- from the qt4 frontend to the qt frontend. Patch by Wilfried Huss
-
- ChangeLog | 7 +++++
- qt/poppler-document.cc | 18 +++++++++++++++
- qt/poppler-private.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-qt.h | 16 +++++++++++++
- 4 files changed, 99 insertions(+), 0 deletions(-)
-
-commit c3a9fd546b853c85b6be5fc8f4e5a78d8a7e7437
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 25 18:39:57 2006 +0000
-
- * qt4/src/poppler-document.cc: Obey kdeprint masters in that a library
- should output as much device independent PS as posible, so disabling
- duplex printing for default is a good idea.
-
- ChangeLog | 6 ++++++
- qt4/src/poppler-document.cc | 2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit edc0499644b8083600ced9a5087ec0b0189e615b
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jul 24 19:49:51 2006 +0000
-
- 2006-07-24 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac:
- * poppler/Makefile.am: Move fontconfig dependency to libpoppler.
-
- ChangeLog | 5 +++++
- configure.ac | 18 +++++++-----------
- poppler/Makefile.am | 6 ++++--
- 3 files changed, 16 insertions(+), 13 deletions(-)
-
-commit 24b5a68a3f4cdba63fbcd01dc178a330b5f604a7
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Jul 18 21:32:11 2006 +0000
-
- 2006-07-18 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/Gfx.cc: fix opCloseStroke to match the behaviour of
- a separate opClose and opStroke. Previously, opCloseStroke only
- closes if there is a path however opClose closes unconditionally.
-
- ChangeLog | 6 ++++++
- poppler/Gfx.cc | 2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit c57ebd40fcf85432b2e5045086d158a63af12525
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Jul 18 21:26:57 2006 +0000
-
- 2006-07-18 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/TextOutputDev.cc: call setDefaultCTM() after start page
- like in Gfx.cc. This fixes a regression caused by the fix to #6948.
-
- ChangeLog | 5 +++++
- poppler/TextOutputDev.cc | 1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 640d5d5a9d9e53f3f677eb05f3d18e6bfc74e95a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jul 16 18:22:23 2006 +0000
-
- 2006-07-16 Albert Astals Cid <aacid@kde.org>
-
- * poppler/GfxState.cc: Do not crash when we can not
- parse a GfxImageColorMap
- Fixes crash on pdf that can be found at
-
- ChangeLog | 7 +++++++
- poppler/GfxState.cc | 4 ++++
- qt4/src/Doxyfile | 4 ++--
- 3 files changed, 13 insertions(+), 2 deletions(-)
-
-commit c6926d1d8ab04468f56f4687cdd3f06af206226b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jun 28 19:23:52 2006 +0000
-
- * poppler/DCTStream.cc:
- * poppler/DCTStream.h: Reset jpeg structures on reset.
- Fixes crash while printing pdf at
- http://bugs.kde.org/attachment.cgi?id=16818&action=view
-
- ChangeLog | 7 +++++++
- poppler/DCTStream.cc | 25 ++++++++++++++++++-------
- poppler/DCTStream.h | 2 ++
- 3 files changed, 27 insertions(+), 7 deletions(-)
-
-commit 96ac8dec591a0325a822c1f7b7bc7e78b867e3a0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 25 16:59:31 2006 +0000
-
- Ask for paper size width and height to pass it to PSOutputDev in both qt frontends (qt got abi mantained, qt4 changed as you still have to define UNSTABLE_POPPLER_QT4 to be able of using it, one day we'll have to think of removing it)
-
- ChangeLog | 8 ++++++++
- qt/poppler-document.cc | 9 +++++++--
- qt/poppler-qt.h | 9 +++++++++
- qt4/src/poppler-document.cc | 4 ++--
- qt4/src/poppler-qt4.h | 10 +++++++++-
- 5 files changed, 35 insertions(+), 5 deletions(-)
-
-commit 965011f2001fb1ea36857995d5555266f82b8d96
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 25 16:20:50 2006 +0000
-
- put back a change that was not meant to be commited
-
- qt/poppler-qt.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 4995d09c91173d34a435112828aff21a63b147e9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 25 16:19:32 2006 +0000
-
- rename poppler-link.h to poppler-link-qt3.h to not get conflicts on install
-
- qt/Makefile.am | 2 +-
- qt/poppler-link-qt3.h | 188 +++++++++++++++++++++++++++++++++++
- qt/poppler-link.cc | 258 +++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-qt.h | 4 +-
- 4 files changed, 449 insertions(+), 3 deletions(-)
-
-commit 087921b134c2646e6d41960f471a1819c7c8790a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 25 10:29:22 2006 +0000
-
- add link support to qt3 frontend.
- Patch by Wilfried Huss based on Qt4 code
-
- ChangeLog | 11 ++++
- qt/Makefile.am | 4 +-
- qt/poppler-document.cc | 19 +++----
- qt/poppler-page.cc | 136 +++++++++++++++++++++++++++++++++++++++++++++--
- qt/poppler-private.h | 33 +++++++++++-
- qt/poppler-qt.h | 14 ++++-
- 6 files changed, 196 insertions(+), 21 deletions(-)
-
-commit 831bd8942ef3224354b128d5e14e68fdfc57168b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 11 16:14:32 2006 +0000
-
- optimization by Mario Teijeiro Otero
-
- poppler/UGooString.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 1223fd4b200f6c13996f8299f3563c818af0c21d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Jun 10 22:23:19 2006 +0000
-
- * poppler/UGooString.cc: When any of the chars that we
- are passing to the UGooString is not pdfencodable, do not
- encode the string, because we loose information if we do,
- this fixes rendering of
- http://publikationen.ub.uni-frankfurt.de/volltexte/2005/890/pdf/TR_abs_g.pdf
- and other docs with type3 fonts and ligatures
-
- ChangeLog | 9 +++++++++
- poppler/UGooString.cc | 8 ++++++++
- 2 files changed, 17 insertions(+), 0 deletions(-)
-
-commit b85a39ddfc7de8c0621e995c114885ecd08fcdc2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jun 1 21:03:38 2006 +0000
-
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-page.cc: Add Rotation parameter that is passed
- to the respective output devs
-
- ChangeLog | 6 ++++++
- qt4/src/poppler-page.cc | 22 ++++++++++++++--------
- qt4/src/poppler-qt4.h | 14 +++++++++-----
- 3 files changed, 29 insertions(+), 13 deletions(-)
-
-commit 2b5d3277f36864ff1ef44f1942f22de247d67ab6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jun 1 17:23:45 2006 +0000
-
- * qt/poppler-document.cc:
- * qt/poppler-qt.h: Add printing support, patch by
- Stefan Kebekus <stefan.kebekus@math.uni-koeln.de>
-
- ChangeLog | 6 ++++++
- qt/poppler-document.cc | 18 ++++++++++++++++++
- qt/poppler-qt.h | 2 ++
- 3 files changed, 26 insertions(+), 0 deletions(-)
-
-commit 5380d005b7b54cc6587ce6e8c3bbb358da5cd9a5
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Jun 1 06:42:25 2006 +0000
-
- 2006-06-01 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/PSOutputDev.cc:
- * poppler/PSOutputDev.h: Change filename parameter to PSOutputDev
- constructor from char * to const char *.
-
- ChangeLog | 6 ++++++
- poppler/PSOutputDev.cc | 2 +-
- poppler/PSOutputDev.h | 2 +-
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
-commit c2a81ea8b01f3943a2eb737cf957acc0d05f7eed
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed May 31 20:14:04 2006 +0000
-
- * poppler/SplashOutputDev.cc:
- * splash/Splash.cc: Fix no splashModeRGB8Qt mode, that is, make it
- show images
-
- I'm sorry, really, i'll try to do better
-
- ChangeLog | 6 ++++++
- poppler/SplashOutputDev.cc | 10 ++++++++++
- splash/Splash.cc | 3 +++
- 3 files changed, 19 insertions(+), 0 deletions(-)
-
-commit 643b310cf51474b6dfc077fe086ea121e807f6e1
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed May 31 19:18:28 2006 +0000
-
- 2006-05-31 Jeff Muizelaar <jeff@infidigm.net>
-
- * TODO: Remove items's from my list that are done.
-
- ChangeLog | 4 ++++
- TODO | 3 ---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-commit 96e582721dcb15ea258b989c7c500084bff9f56d
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed May 31 17:31:49 2006 +0000
-
- 2006-05-31 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Change the cairo backend to use the
- transformation in cairo instead of doing all of the transformations in
- the OutputDevice. Fixes #6948.
-
- ChangeLog | 7 ++
- poppler/CairoOutputDev.cc | 200 ++++++++++++++++++++-------------------------
- poppler/CairoOutputDev.h | 1 +
- 3 files changed, 96 insertions(+), 112 deletions(-)
-
-commit 00ffb9bf50b6b3b2e8eaa8af593aaa01d4a62a34
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed May 31 04:53:27 2006 +0000
-
- 2006-05-31 Kristian Høgsberg <krh@redhat.com>
-
- * NEWS: Sum up changes.
-
- * configure.ac: Bump release to 0.5.3.
-
- ChangeLog | 6 ++++++
- NEWS | 8 ++++++++
- configure.ac | 2 +-
- 3 files changed, 15 insertions(+), 1 deletions(-)
-
-commit 223a4bf3a679f666b6c963a8787cf5b5ac75c4b6
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed May 31 02:02:54 2006 +0000
-
- 2006-05-30 Kristian Høgsberg <krh@redhat.com>
-
- * poppler-glib.pc.in:
- * configure.ac: Add poppler as a private requires if pkg-config
- supports it.
-
- ChangeLog | 6 ++++++
- configure.ac | 11 +++++++++++
- poppler-glib.pc.in | 3 ++-
- 3 files changed, 19 insertions(+), 1 deletions(-)
-
-commit 7aaa4d3fbdb8ea2534d3cb80e68b2759b2e8fd2f
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue May 30 21:46:06 2006 +0000
-
- 2006-05-30 Kristian Høgsberg <krh@redhat.com>
-
- * test/gtk-cairo-test.cc: Add --page option to gtk-cairo-test.
-
- ChangeLog | 4 ++++
- test/gtk-cairo-test.cc | 21 ++++++++++++++++++---
- 2 files changed, 22 insertions(+), 3 deletions(-)
-
-commit f7c1d519b9695ad8adfdcf3af696de746cdcf375
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon May 29 18:44:17 2006 +0000
-
- 2006-05-29 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoFontEngine.cc:
- * poppler/CairoFontEngine.h:
- * poppler/CairoOutputDev.cc: Allow CairoFont creation to fail more
- gracefully. Fixes #4030.
-
- ChangeLog | 7 +++++++
- poppler/CairoFontEngine.cc | 27 +++++++++++++++++++++------
- poppler/CairoFontEngine.h | 4 +++-
- poppler/CairoOutputDev.cc | 5 +++++
- 4 files changed, 36 insertions(+), 7 deletions(-)
-
-commit 84861800dad3649d4757d5c5539b9e86e2b2c644
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat May 27 17:27:37 2006 +0000
-
- 2006-05-27 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Back out the rest of krh's type3
- font work. This fixes type3 fonts in CairoOutputDevice.
-
- ChangeLog | 6 ++++++
- poppler/CairoOutputDev.cc | 3 +++
- poppler/CairoOutputDev.h | 2 +-
- 3 files changed, 10 insertions(+), 1 deletions(-)
-
-commit 6f5a89a0a2cf17d45d1c31ce105829be8c7ac456
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue May 23 20:49:16 2006 +0000
-
- * poppler/SplashOutputDev.cc:
- * qt4/src/poppler-private.h:
- * splash/Splash.cc:
- * splash/SplashBitmap.cc:
- * splash/SplashTypes.h: bring splashModeRGB8 back to the old code
- (before Frank's patch), create splashModeRGB8Qt that has Frank's
- codepath and is used by Qt frontends. Fixes corruption on
- other programs expecting the old behaviour.
-
- Remember dude we are now a lib! you can not change behaviour from one day to another!
-
- /me hits himself
-
- ChangeLog | 11 +++
- poppler/SplashOutputDev.cc | 8 ++
- qt/poppler-private.h | 2 +-
- qt4/src/poppler-private.h | 2 +-
- splash/Splash.cc | 169 ++++++++++++++++++++++++++++++++++++++++++++
- splash/SplashBitmap.cc | 26 ++++++-
- splash/SplashTypes.h | 2 +
- 7 files changed, 216 insertions(+), 4 deletions(-)
-
-commit 495d592c3ba7fe81e03774f5b2ed677e5aa560c7
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue May 23 19:16:37 2006 +0000
-
- 2006-05-23 Kristian Høgsberg <krh@redhat.com>
-
- * qt4/src/Makefile.am (libpoppler_qt4_la_SOURCES): Add missing
-
- ChangeLog | 5 +++++
- qt4/src/Makefile.am | 1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit eecd06c86585bca05c99cd2e9a1b1ff3bbae3c72
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon May 22 20:19:35 2006 +0000
-
- 2006-05-22 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Bump release.
- * NEWS: Sum up changes.
-
- ChangeLog | 5 +++++
- NEWS | 11 ++++++++++-
- configure.ac | 2 +-
- 3 files changed, 16 insertions(+), 2 deletions(-)
-
-commit 680f20dfd1cf0342d49516b3848a2aef5d2a3883
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon May 22 19:58:41 2006 +0000
-
- 2006-05-22 Kristian Høgsberg <krh@redhat.com>
-
- Patch from Rainer Keller to fix the ImageOutputDev (#6984).
-
- * utils/ImageOutputDev.cc (drawImage): Upate to work with new
- 16-bit color representation.
-
- * utils/ImageOutputDev.h: Return gTrue for needNonText().
-
- ChangeLog | 9 +++++++++
- NEWS | 4 ++++
- utils/ImageOutputDev.cc | 6 +++---
- utils/ImageOutputDev.h | 2 +-
- 4 files changed, 17 insertions(+), 4 deletions(-)
-
-commit e43a06bf6e953fa9af18476e2c9f27106398c09c
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun May 21 23:26:45 2006 +0000
-
- 2006-05-21 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoFontEngine.cc:
- * poppler/CairoFontEngine.h: Back out type3 font work committed by
- accident.
-
- ChangeLog | 6 +
- poppler/CairoFontEngine.cc | 347 +++++---------------------------------------
- poppler/CairoFontEngine.h | 17 +--
- 3 files changed, 47 insertions(+), 323 deletions(-)
-
-commit 7d4bb0533f88f06449ebd64c1220d0b75001937d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 21 18:14:15 2006 +0000
-
- fix all is blue issue on ppc machines
-
- ChangeLog | 7 +++++++
- qt/poppler-page.cc | 17 +++++++++++++++++
- qt4/src/poppler-page.cc | 17 +++++++++++++++++
- 3 files changed, 41 insertions(+), 0 deletions(-)
-
-commit 655af1e0126ca96d75c9c718d7d8f928c898b1f6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 21 17:19:53 2006 +0000
-
- hope to fix really Kouhei's name now
-
- ChangeLog | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-commit cc783a1ebe868ff75db5472775dabe0020ae501f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 21 11:54:30 2006 +0000
-
- Fix Kouhei name
-
- ChangeLog | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit e4b6ad3bb873a6f334934921e6d56e9d26e06a9a
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 22:55:49 2006 +0000
-
- Add bug number to ChangeLog entry.
-
- ChangeLog | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 46f5f070cceb2c0f3b53537c8e33340b9f1bba38
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 22:26:03 2006 +0000
-
- 2006-05-19 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-action.h:
- * glib/poppler-action.cc: Add poppler_dest_get_type(), patch from
- Kouhei Souto (#6907).
-
- ChangeLog | 4 ++++
- glib/poppler-action.cc | 13 +++++++++++++
- glib/poppler-action.h | 4 ++++
- 3 files changed, 21 insertions(+), 0 deletions(-)
-
-commit 875dc5b112dfe2d4a48a7567b1ff79257447cc0d
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 22:21:35 2006 +0000
-
- 2006-05-19 Kristian Høgsberg <krh@redhat.com>
-
- * poppler-glib.pc.in (Requires): Add gdk-2.0 dependency, from
- Kouhei Souto (#6896).
-
- ChangeLog | 3 +++
- poppler-glib.pc.in | 2 +-
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-commit b66dda2640c088bbe205f698a0c4028144027922
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 22:19:21 2006 +0000
-
- 2006-05-19 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.h (POPPLER_TYPE_INDEX_ITER)
- (POPPLER_TYPE_FONTS_ITER): Add these macros, patch from Kouhei
- Souto (#6897).
-
- ChangeLog | 4 ++++
- glib/poppler-document.h | 2 ++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 095730456c0d8312067af10dd55a3b9165a83736
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 22:16:25 2006 +0000
-
- 2006-05-19 Kristian Høgsberg <krh@redhat.com>
-
- * glib/Makefile.am (INCLUDES): Add define for G_LOG_DOMAIN, from
- Kouhei Souto (#6899).
-
- ChangeLog | 3 +++
- glib/Makefile.am | 1 +
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-commit b8d77633899c1dec5f3b9c9a0f075f39afa98965
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 22:12:38 2006 +0000
-
- 2006-05-19 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc (poppler_document_save): Memleak patch
- from Paolo Borelli (#6908).
-
- ChangeLog | 5 +++++
- glib/poppler-document.cc | 2 ++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-commit 488f77298fee9eebbca5983c1c9fb186b3b67aa3
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 22:04:17 2006 +0000
-
- 2006-05-19 Kristian Høgsberg <krh@redhat.com>
-
- * TextOutputDev.h:
- * TextOutputDev.cc:
- * UnicodeTypeTable.h:
- * UnicodeTypeTable.cc:
- * UnicodeCClassTables.h:
- * UnicodeCompTables.h:
- * UnicodeDecompTables.h:
- * gen-unicode-tables.py: Patch from Ed Catmur (#2929) to convert
- search string and document text to unicode NFKC (compatibility
- composition) before matching so ligatures match correctly.
-
- ChangeLog | 13 +
- poppler/Makefile.am | 5 +
- poppler/TextOutputDev.cc | 41 +-
- poppler/TextOutputDev.h | 3 +
- poppler/UnicodeCClassTables.h | 1827 +++++++++
- poppler/UnicodeCompTables.h | 665 ++++
- poppler/UnicodeDecompTables.h | 8526 +++++++++++++++++++++++++++++++++++++++++
- poppler/UnicodeTypeTable.cc | 235 ++
- poppler/UnicodeTypeTable.h | 3 +
- 9 files changed, 11303 insertions(+), 15 deletions(-)
-
-commit ecb942e54a1ab0f7eded91b7d1278f0ac62e2071
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 21:42:54 2006 +0000
-
- 2006-05-19 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_prepare_output_dev): Fix the
- rotation bug for real.
-
- ChangeLog | 5 +++++
- glib/poppler-page.cc | 16 +++++++++-------
- 2 files changed, 14 insertions(+), 7 deletions(-)
-
-commit 28ae789afe0625a641525e4a0768d51fa8bd667c
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 20:54:13 2006 +0000
-
- 2006-05-19 Kristian Høgsberg <krh@redhat.com>
-
- Patch from Kouhei Sutou (#6905).
-
- * glib/poppler-document.cc:
- * glib/poppler-document.h:
- * glib/poppler-private.h:
- * glib/reference/tmpl/poppler-private.sgml:
- * glib/reference/tmpl/poppler.sgml: Make PopplerPSOutput a proper
- glib object.
-
- ChangeLog | 11 ++++++
- glib/poppler-document.cc | 51 ++++++++++++++++++++++++-----
- glib/poppler-document.h | 4 ++
- glib/poppler-private.h | 2 +
- glib/reference/tmpl/poppler-private.sgml | 1 +
- glib/reference/tmpl/poppler.sgml | 1 +
- 6 files changed, 61 insertions(+), 9 deletions(-)
-
-commit 02cf7fd7df0b2d8c2b1c6f108e581bc1c7a973b1
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 20:35:43 2006 +0000
-
- 2006-05-19 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_prepare_output_dev): Fix
- rotation bug (#6913, #6926).
-
- ChangeLog | 3 +++
- glib/poppler-page.cc | 12 +++++++++++-
- 2 files changed, 14 insertions(+), 1 deletions(-)
-
-commit 78ae3efd9541d7b63ff5a2c4de3fde300806688f
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 19 19:21:59 2006 +0000
-
- 2006-05-19 Kristian Høgsberg <krh@redhat.com>
-
- Memory leak patch from Carlos Garcia Campos (#6947).
-
- * glib/poppler-action.cc:
- * glib/poppler-document.cc:
- * glib/poppler-page.cc:
- * poppler/CairoFontEngine.cc:
- * poppler/CairoFontEngine.h:
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h:
- * poppler/Gfx.cc:
- * poppler/TextOutputDev.cc: Fix various memory leaks.
-
- ChangeLog | 14 ++
- glib/poppler-action.cc | 9 +-
- glib/poppler-document.cc | 31 +++-
- glib/poppler-page.cc | 2 +
- poppler/CairoFontEngine.cc | 347 +++++++++++++++++++++++++++++++++++++++-----
- poppler/CairoFontEngine.h | 17 ++-
- poppler/CairoOutputDev.cc | 5 +-
- poppler/CairoOutputDev.h | 2 +-
- poppler/Gfx.cc | 1 +
- poppler/TextOutputDev.cc | 9 +
- 10 files changed, 381 insertions(+), 56 deletions(-)
-
-commit 354c1926b7181fd668f221e1d672974e04fda747
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri May 19 17:24:19 2006 +0000
-
- * qt4/src/poppler-link.cc: Patch by Pino Toscano, ensure the
- splashoutput is created when parsing the TOC.
-
- ChangeLog | 5 +++++
- qt4/src/poppler-link.cc | 5 +++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-commit 3c9a5f37704781c9a51e72edd18451870452b9a7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun May 14 16:11:54 2006 +0000
-
- * poppler/FontInfo.cc: Fix possible crash, half patch
- by Kouhei Sutou <kou@cozmixng.org>
-
- ChangeLog | 5 +++++
- poppler/FontInfo.cc | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-commit 436f578fe762e8ceccce95a0f2003406527dde64
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat May 13 16:01:57 2006 +0000
-
- * poppler/GfxState.cc:
- * poppler/GfxState.h: Fix memleak, patch by
- Carlos Garcia Campos <carlosgc@gnome.org>
-
- ChangeLog | 6 ++++++
- poppler/GfxState.cc | 8 ++++++++
- poppler/GfxState.h | 3 +--
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-commit 906515769097f2e38f6b2c2aff598919b9d1ee0d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat May 13 15:58:37 2006 +0000
-
- * qt4/src/poppler-document.cc: leak--
- * qt4/src/poppler-private.h: Refcount globalparams
- * qt4/tests/test-poppler-qt4.cpp: Some leaks less
-
- ChangeLog | 6 ++++++
- qt4/src/poppler-document.cc | 10 +++++-----
- qt4/src/poppler-private.h | 8 ++++++++
- qt4/tests/test-poppler-qt4.cpp | 6 ++++--
- 4 files changed, 23 insertions(+), 7 deletions(-)
-
-commit 46fd63c44369c882d8dac473d4156001d9d4ed18
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat May 13 11:14:24 2006 +0000
-
- numbers for easier casting
-
- qt4/src/poppler-link.h | 14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
-commit 35500375e3f790c444ab7e7d0a687d270c5a66b1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri May 12 21:02:01 2006 +0000
-
- fixing compile problems for some people
-
- qt4/src/poppler-page.cc | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 181f09829cf4831965059e3064114d83348c51b5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri May 12 20:40:05 2006 +0000
-
- * qt4/src/Makefile.am
- * qt4/src/poppler-annotation-helper.h
- * qt4/src/poppler-annotation.cc
- * qt4/src/poppler-annotation.h
- * qt4/src/poppler-link.cc
- * qt4/src/poppler-link.h
- * qt4/src/poppler-page.cc
- * qt4/src/poppler-qt4.h: Code for annotations stripped from oKular,
- it's all based on Enrico's work, so ask him for details, the problem
- is that he left KDE development a while ago.
-
- ChangeLog | 14 +
- qt4/src/Makefile.am | 2 +
- qt4/src/poppler-annotation-helper.h | 213 ++++++++++
- qt4/src/poppler-annotation.cc | 792 +++++++++++++++++++++++++++++++++++
- qt4/src/poppler-annotation.h | 257 ++++++++++++
- qt4/src/poppler-link.cc | 4 +-
- qt4/src/poppler-link.h | 2 +-
- qt4/src/poppler-page.cc | 691 ++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 8 +-
- 9 files changed, 1980 insertions(+), 3 deletions(-)
-
-commit 3a48e89dfbe54af73a68ed8e917938f14ad17f01
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue May 9 20:07:06 2006 +0000
-
- * qt4/src/Makefile.am:
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-link.cc:
- * qt4/src/poppler-page.cc:
- * qt4/src/poppler-private.h:
- * qt4/src/poppler-qt4.h: Adding links extraction code, should work as
- it is basically stripped out from kpdf, but comments are obviously welcome as always
-
- ChangeLog | 10 +++
- qt4/src/Makefile.am | 1 +
- qt4/src/poppler-document.cc | 13 +--
- qt4/src/poppler-link.cc | 129 ++++++++++++++++++++++++++++++-
- qt4/src/poppler-link.h | 178 +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc | 139 ++++++++++++++++++++++++++++++----
- qt4/src/poppler-private.h | 9 +-
- qt4/src/poppler-qt4.h | 56 +++-----------
- 8 files changed, 456 insertions(+), 79 deletions(-)
-
-commit f628e1506e576a8553a9699c1d7f05ef55c24fa2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 8 19:03:51 2006 +0000
-
- memleak-- by carlos
-
- ChangeLog | 5 +++++
- poppler/Catalog.cc | 5 ++++-
- 2 files changed, 9 insertions(+), 1 deletions(-)
-
-commit 1fce6266564583d356817a21f43c6b1ad8ce3716
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat May 6 10:57:07 2006 +0000
-
- fix code, i suck
-
- qt4/src/poppler-page.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit be913b90d59da35a347498b86fdd3edb065aef23
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri May 5 20:51:01 2006 +0000
-
- * poppler/Function.cc: quick fix for KDE bug #126760
-
- Better solutions are of course accepted
-
- ChangeLog | 4 ++++
- poppler/Function.cc | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit 2b085293bd73b4e77da848b3fe63a7e82e9ba5e5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu May 4 19:10:55 2006 +0000
-
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-page.cc: Implement search functionality
-
- more code to make oKular qt4popplered possible, probably not most quickest code around, feel free to comment/optimize
-
- ChangeLog | 5 +++++
- qt4/src/poppler-page.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 16 ++++++++++++++++
- 3 files changed, 64 insertions(+), 0 deletions(-)
-
-commit a9b0c7977aba7bc85a8673c7f95187ff17ee4173
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue May 2 04:38:39 2006 +0000
-
- 2006-05-02 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc:
- * poppler/Gfx.cc:
- * poppler/GfxFont.cc:
- * poppler/GfxFont.h:
- * poppler/GfxState.cc:
- * poppler/TextOutputDev.cc: Patch from Gary Coady to add reference
- counting to GfxFont so we don't crash on text selection.
-
- ChangeLog | 10 ++++++++++
- glib/poppler-page.cc | 2 +-
- poppler/Gfx.cc | 2 ++
- poppler/GfxFont.cc | 14 +++++++++++++-
- poppler/GfxFont.h | 4 ++++
- poppler/GfxState.cc | 7 +++++++
- poppler/TextOutputDev.cc | 1 +
- 7 files changed, 38 insertions(+), 2 deletions(-)
-
-commit 57af0207334ff1a407899370281ebb90fe953a32
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 1 18:33:47 2006 +0000
-
- * qt4/src/poppler-page.cc:
- * qt4/src/poppler-private.h:
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-textbox.cc: Add nextWord(), hasSpaceAfter() and
- edge() to TextBox
-
- More things to make poppler-qt4Okular nearer
-
- ChangeLog | 8 ++++++++
- qt4/src/poppler-page.cc | 14 ++++++++++++++
- qt4/src/poppler-private.h | 11 +++++++++++
- qt4/src/poppler-qt4.h | 8 ++++++++
- qt4/src/poppler-textbox.cc | 23 ++++++++++++++++-------
- 5 files changed, 57 insertions(+), 7 deletions(-)
-
-commit 61b126390f764fd38c79b6a64160a7dc7870bd4a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 1 13:41:14 2006 +0000
-
- revert thing that should not have gone in
-
- poppler/PageLabelInfo.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
- poppler/PageLabelInfo.h | 44 --------------------------------------------
- 2 files changed, 43 insertions(+), 44 deletions(-)
-
-commit f2424ef63e86d82b2be277e2b268b48aae29601e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon May 1 13:32:31 2006 +0000
-
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-private.h:
- * qt4/src/poppler-qt4.h: Add the possibility of setting the paper
- color
-
- One step more to make oKular fully use the qt4 bindings
-
- ChangeLog | 7 ++++++
- poppler/PageLabelInfo.cc | 43 ------------------------------------------
- poppler/PageLabelInfo.h | 44 +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-document.cc | 10 +++++++++
- qt4/src/poppler-private.h | 22 ++++++++++++++++----
- qt4/src/poppler-qt4.h | 6 +++++
- 6 files changed, 84 insertions(+), 48 deletions(-)
-
-commit 4147400e2b692df7f70c3772e8a4b576d4d85294
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 29 15:23:41 2006 +0000
-
- Fix memory leak. Bug 6765
-
- ChangeLog | 5 +++++
- poppler/JBIG2Stream.cc | 1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 960d60467d62d28f20b127d07e8de1af42eec568
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Apr 27 17:26:36 2006 +0000
-
- 2006-04-27 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: delete imgStr if some of the cairo
- functions fail. Fixes coverty reports #2106, #2107, #2077 and
- bug #6764. Patch by Kjartan Maraas.
-
- ChangeLog | 6 ++++++
- poppler/CairoOutputDev.cc | 34 +++++++++++++++++++++++++---------
- 2 files changed, 31 insertions(+), 9 deletions(-)
-
-commit 155112131c6e25bfde752cf5daa80a6c9712cfed
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 23 15:50:52 2006 +0000
-
- qt4/src/poppler-private.h: Protect us against a link not having
- a destination or a namedDestination
-
- ChangeLog | 5 +++++
- qt4/src/poppler-private.h | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit c902a3a22bcceedc8ee8ca377064efcc8a9178ca
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Fri Apr 21 12:02:19 2006 +0000
-
- Add another path to search for Qt4 libs and includes.
-
- CCMAIL: montel@kde.org
-
- m4/qt.m4 | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit 18f8e1f1d213dbcda27cd0ec429273801f65e208
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 18 19:11:56 2006 +0000
-
- * goo/GooVector.h: Fix typo that was preventing build with MSVC8
- Discovered by Reece Dunn <msclrhd@hotmail.com>
-
- ChangeLog | 5 +++++
- goo/GooVector.h | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-commit cbbb28a5959343d20dffe945ea83272c0b2e287b
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun Apr 16 22:59:44 2006 +0000
-
- 2006-04-16 Carlos Garcia Campos <carlosgc@gnome.org>
-
- * glib/poppler-action.cc:
- * glib/poppler-action.h:
- * glib/poppler-private.h:
- * glib/poppler.h:
- Add support for named destinations and named actions.
-
- * glib/poppler-document.cc:
- * glib/poppler-document.h:
- Allow to find named destinations in document.
-
- ChangeLog | 12 +++
- glib/poppler-action.cc | 152 ++++++++++++++++++++++++-----
- glib/poppler-action.h | 7 +-
- glib/poppler-document.cc | 37 +++++++
- glib/poppler-document.h | 4 +-
- glib/poppler-private.h | 2 +
- glib/poppler.h | 1 +
- glib/reference/tmpl/poppler-action.sgml | 2 +
- glib/reference/tmpl/poppler-document.sgml | 4 -
- 9 files changed, 189 insertions(+), 32 deletions(-)
-
-commit 85687a1e0e4c6be2dbfb23ba00018b9c7c7454f5
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Apr 12 06:52:07 2006 +0000
-
- 2006-04-12 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Add support for masked images to the cairo
- backend. CairoOutputDevice really should have been refactored before
- committing this, but the results were so pretty I couldn't resist.
- Fixes #6174.
-
- ChangeLog | 8 +++
- poppler/CairoOutputDev.cc | 118 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h | 8 +++
- 3 files changed, 134 insertions(+), 0 deletions(-)
-
-commit 6039d4fc65cb25bef20efa29bc29d42086fc0854
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Apr 12 05:46:44 2006 +0000
-
- 2006-04-12 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Fix breakage by krh by only calling
- cairo_destroy on non-null.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 4 +++-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-commit d839a0bd78361930e5e2fe889df12e1e853ffed3
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Apr 12 02:07:07 2006 +0000
-
- 2006-04-11 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac:
- * poppler-glib.pc.in:
- * glib/Makefile.am:
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler.h:
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h:
- * glib/poppler-features.h.in:
- Make the CairoOutputDev render to a cairo_t instead of a
- cairo_surface_t and expose that functionality in the glib wrapper
- (poppler_page_render).
-
- * test/Makefile.am:
- * test/gtk-cairo-test.cc:
- Update gtk-cairo-test to use this new interface and add a spin
- button for changing page (#5951).
-
- * utils/Makefile.am (EXTRA_DIST): Fix warning where this was
- assigned twice.
-
- ChangeLog | 23 ++++
- configure.ac | 8 ++
- glib/Makefile.am | 10 +-
- glib/poppler-features.h.in | 24 ++++
- glib/poppler-page.cc | 63 +++++++---
- glib/poppler-page.h | 10 ++
- glib/poppler.h | 1 +
- poppler-glib.pc.in | 2 +-
- poppler/CairoOutputDev.cc | 23 ++--
- poppler/CairoOutputDev.h | 6 +-
- test/Makefile.am | 4 +-
- test/gtk-cairo-test.cc | 286 +++++++++++++-------------------------------
- utils/Makefile.am | 6 +-
- 13 files changed, 221 insertions(+), 245 deletions(-)
-
-commit b198c9801c668014c0979c57033a0637e7e046e2
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon Apr 10 18:12:44 2006 +0000
-
- 2006-04-10 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: take originX and originY into account in
- drawChar() to draw vertical text properly. Fixes #6551.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit fd251f52efc7748fda91cc77fb9d3966e0f02ac8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 9 11:05:51 2006 +0000
-
- m4/qt.m4: Improve for systems that need -pthread to be linked when linking Qt. Patch by Diego Pettenò
-
- ChangeLog | 5 +++++
- m4/qt.m4 | 28 +++++++++++++++++++++++++++-
- 2 files changed, 32 insertions(+), 1 deletions(-)
-
-commit 36de9747153a2ea9b3cf86c41e75a521441a2e06
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 8 10:44:43 2006 +0000
-
- * poppler/Makefile.am:
- * qt4/src/Makefile.am: Don't link Qt4 in libpoppler when using Qt4 frontend
- Patch by Stefan Schweizer
-
- ChangeLog | 6 ++++++
- poppler/Makefile.am | 11 +++++------
- qt4/src/Makefile.am | 1 +
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-commit bf7afe161d76c50fd1c480eb236607145782e59d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Apr 5 18:20:56 2006 +0000
-
- poppler/JBIG2Stream.cc: Fix for some buggy JBIG2 documents, patch by Raj Kumar and Paul Walmsley. Fixes bug 6500
-
- ChangeLog | 5 +++++
- poppler/JBIG2Stream.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 48 insertions(+), 0 deletions(-)
-
-commit 315f8e488d3db848f88a06c7568b6583bbf0e432
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Apr 5 17:20:56 2006 +0000
-
- 2006-04-05 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: use a separate matrix for the softmask.
- fixes #6492.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 11 ++++++++++-
- 2 files changed, 15 insertions(+), 1 deletions(-)
-
-commit 0d311518f678a479c1efeaec15011e0a34de80fc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 4 21:01:01 2006 +0000
-
- * splash/Splash.cc:
- * splash/SplashBitmap.cc: Make Splashbitmap RGB8 use 32bits internally
- * qt/poppler-page.cc:
- * qt4/src/poppler-page.cc: Adapt to splashbitmap change so copying to
- QImage is faster.
- Patch by Frank Meerkötter slightly modified by Albert Astals Cid
-
- I'll leave adapting the glib frontend for you guys, i tried to adapt it but i got lost at gdk_pixbuf_get_n_channels (pixbuf);
-
- ChangeLog | 9 +++++
- qt/poppler-page.cc | 18 +++-------
- qt4/src/poppler-page.cc | 15 +++-----
- splash/Splash.cc | 81 ++++++++++++++++++++++++-----------------------
- splash/SplashBitmap.cc | 10 +++---
- 5 files changed, 67 insertions(+), 66 deletions(-)
-
-commit 888bd41b42507f0a1af55c55495d31d802ce7706
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Apr 4 20:42:08 2006 +0000
-
- Fix crash when using fixedpoint math. Patch by Frank Meerkoetter
-
- ChangeLog | 5 +++++
- splash/SplashFTFont.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 56c98450160b639790931226a045ce4712e7d45e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Apr 2 18:07:59 2006 +0000
-
- Improvements to the Qt4 frontend, comments welcome
-
- ChangeLog | 7 ++
- m4/qt.m4 | 4 +-
- qt4/src/Makefile.am | 1 +
- qt4/src/poppler-document.cc | 85 +++++++++++++++++++++------
- qt4/src/poppler-link.cc | 138 +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc | 9 +++-
- qt4/src/poppler-private.h | 95 +++++++++++++++++++++++++++++-
- qt4/src/poppler-qt4.h | 86 ++++++++++++++++++++++++---
- 8 files changed, 395 insertions(+), 30 deletions(-)
-
-commit c80ebf237e9c6232a1d0567a2688a294acfd481b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Apr 1 11:25:57 2006 +0000
-
- Fix bug 6454
-
- ChangeLog | 5 +++++
- poppler/XRef.cc | 22 +++++++++++++---------
- 2 files changed, 18 insertions(+), 9 deletions(-)
-
-commit fe8142fbc12127682b8024673fe1af57b47bb5c9
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Mar 21 04:25:53 2006 +0000
-
- 2006-03-20 Jeff Muizelaar <jeff@infidigm.net>
-
- * glib/poppler-page.cc: Avoid strdup in poppler_page_get_property and
- make code cleaner. Combined with the memleak fix closes #6187.
- Patch by chpe.
-
- ChangeLog | 6 ++++++
- glib/poppler-page.cc | 5 +----
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-commit 4f961df2e6e91a0dc0a024ae5acdefa394179a05
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Mar 21 04:19:18 2006 +0000
-
- 2006-03-20 Jeff Muizelaar <jeff@infidigm.net>
-
- * glib/poppler-page.cc: Fix memory leak in poppler_page_get_text
- Patch by chpe.
-
- ChangeLog | 5 +++++
- glib/poppler-page.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit ff4febab0a519732972c21bf76d7693c98265e0f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Mar 20 20:07:36 2006 +0000
-
- Use UGooString for dates, fixes KDE bug 123938
-
- ChangeLog | 6 ++++++
- qt/poppler-document.cc | 2 +-
- qt4/src/poppler-document.cc | 2 +-
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
-commit 75ac6de8cd651b1cbe2d6a7ffa4574097088041f
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon Mar 20 19:12:29 2006 +0000
-
- 2006-03-20 Carlos Garcia Campos <calosgc@gnome.org>
-
- reviewed by: Jeff Muizelaar <jeff@infidigm.net>
-
- * glib/poppler-document.cc: Fix memory leak in poppler_font_info_free
-
- ChangeLog | 6 ++++++
- glib/poppler-document.cc | 2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 784f6d9a0888dab34c586ffe14db8e55b8a11f51
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon Mar 20 19:02:10 2006 +0000
-
- 2006-03-20 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoFontEngine.h: remove unused variables
-
- ChangeLog | 4 ++++
- poppler/CairoFontEngine.h | 1 -
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-commit 847436779d7c82b428acfd6339130228bfadca24
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Mar 19 19:19:42 2006 +0000
-
- fix date
-
- ChangeLog | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 401bae69cc7ade676cacd89b483f0a93a653c7a1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Mar 19 17:01:05 2006 +0000
-
- fix htmloutputdev
-
- ChangeLog | 4 ++++
- utils/HtmlOutputDev.cc | 2 +-
- utils/HtmlOutputDev.h | 2 +-
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-commit d56330e688c0a40b4e206ed3bbddd06d7f3ee66c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Mar 16 22:04:56 2006 +0000
-
- * poppler/Page.cc: Remove a #ifdef that was never defined (nice to
- have so sucky W args), probably came from gpdf (it's not on xpdf
- sources) and was causing bugs 6079 and 6167
-
- Might be worth backporting to the stable branch
-
- ChangeLog | 8 +++++++-
- poppler/Page.cc | 2 --
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-commit 7ed6737b00ece7ca00cee1d148752b11700370e6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Mar 16 19:21:11 2006 +0000
-
- poppler/FontInfo.cc: Embedded fonts don't have a font file
-
- ChangeLog | 4 ++++
- poppler/FontInfo.cc | 20 ++++++++++++--------
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-commit a34688ee29e1cdfcbaca232cf005af55af87f796
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Mar 14 19:34:10 2006 +0000
-
- * qt4/src/poppler-qt4.h: Fix compilation with gcc4.1, patch by Michael Olbrich
-
- ChangeLog | 5 +++++
- qt4/src/poppler-qt4.h | 10 +++++-----
- 2 files changed, 10 insertions(+), 5 deletions(-)
-
-commit 1a90b3aaf6be4ca3ebb47e904842b1e14a0e8dfc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Mar 11 15:19:02 2006 +0000
-
- * poppler/FontInfo.cc:
- * poppler/FontInfo.h: Add getFile() function that returns
- the path of the font that is beign used in the system to
- represent that font
- * qt4/src/poppler-document.cc:
- * qt4/src/poppler-fontinfo.cc:
- * qt4/src/poppler-private.h:
- * qt4/src/poppler-qt4.h: Add the file() function
- * qt4/tests/poppler-fonts.cpp: Show the path of the font
- used to represent each font
-
- May be interesting to have in the other frontends
-
- ChangeLog | 13 +++++++++++++
- poppler/FontInfo.cc | 10 ++++++++++
- poppler/FontInfo.h | 2 ++
- qt4/src/poppler-document.cc | 14 +-------------
- qt4/src/poppler-fontinfo.cc | 29 +++++++++--------------------
- qt4/src/poppler-private.h | 29 +++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 8 ++++++--
- qt4/tests/poppler-fonts.cpp | 5 +++--
- 8 files changed, 73 insertions(+), 37 deletions(-)
-
-commit 22b1618185ec70895ec644d9e590c266ff98c9db
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Mar 9 21:56:07 2006 +0000
-
- Build with cairo disabled, patch by Eduardo de Barros Lima
-
- ChangeLog | 5 +++++
- glib/Makefile.am | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 50ecfadab36a9769b09e4c2c1670d86448a0e1ee
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Feb 28 23:24:59 2006 +0000
-
- 2006-02-28 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Bump release to 0.5.1.
-
- * NEWS: Sum up 0.5.1 changes so far.
-
- * TextOutputDev.h: add getters for a couple of attributes.
-
- * glib/Makefile.am:
- * poppler/Makefile.am: Move cairo link dependency to glib bindings.
-
- ChangeLog | 11 +++++++++++
- NEWS | 10 ++++++++++
- configure.ac | 2 +-
- glib/Makefile.am | 11 ++++++-----
- poppler/Makefile.am | 19 ++++++++-----------
- poppler/TextOutputDev.h | 7 +++++--
- qt/Makefile.am | 1 +
- test/Makefile.am | 16 +++++++++-------
- utils/Makefile.am | 29 +++++++++++++++++------------
- 9 files changed, 68 insertions(+), 38 deletions(-)
-
-commit b9e951ac68b9977ab7217ad0346bcf46a3fa3dfe
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Feb 28 19:59:58 2006 +0000
-
- 2006-02-28 Kristian Høgsberg <krh@redhat.com>
-
- * goo/gmem.c: (gmalloc), (grealloc):
- * poppler/JBIG2Stream.cc:
- * poppler/Stream.cc:
- * poppler/Stream.h:
- * splash/SplashXPathScanner.cc:
-
- More integer overflow fixes from Derek Noonburg (#5922).
-
- ChangeLog | 10 ++++++++++
- goo/gmem.c | 9 +++++----
- poppler/JBIG2Stream.cc | 12 ++++++++++--
- poppler/Stream.cc | 7 +++++++
- poppler/Stream.h | 2 +-
- 5 files changed, 33 insertions(+), 7 deletions(-)
-
-commit 46db73a142d65a0c944910388d5971debc06ecbf
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Feb 28 18:31:59 2006 +0000
-
- 2006-02-28 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/PSOutputDev.cc: Make PSOutputDev constructor respect
- passed in paper size (#5946, #5749).
-
- ChangeLog | 5 +++++
- poppler/PSOutputDev.cc | 14 ++++++++------
- 2 files changed, 13 insertions(+), 6 deletions(-)
-
-commit 0f7f2182b2abe965b382937f5569b65a8828fc93
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Feb 28 18:25:00 2006 +0000
-
- 2006-02-28 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc (info_dict_get_string): Refactor
- _popper_goo_string_to_utf8() out into it's own function.
-
- * glib/poppler-page.cc (poppler_page_get_property): Use
- _popper_goo_string_to_utf8() here to convert ucs2 page labels.
-
- * glib/poppler-page.cc (poppler_page_get_selection_region): Add
- braces to fix warning.
-
- * poppler/PageLabelInfo.cc: If the label prefix string has a ucs2
- marker, append the number part of the label as ucs2 (#5952).
-
- ChangeLog | 14 +++
- glib/poppler-document.cc | 52 ++++++-----
- glib/poppler-page.cc | 23 +++--
- glib/poppler-private.h | 3 +
- glib/reference/tmpl/poppler-enums.sgml | 150 -------------------------------
- glib/reference/tmpl/poppler-unused.sgml | 130 ++++++++++++++++++++++++++
- glib/test-poppler-glib.c | 2 +-
- goo/GooString.cc | 5 +
- goo/GooString.h | 4 +
- poppler/PageLabelInfo.cc | 39 ++++++---
- poppler/PageLabelInfo.h | 2 +-
- 11 files changed, 228 insertions(+), 196 deletions(-)
-
-commit 1bf83cdc8b75e1c76956ae643ee273e0b558fd08
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 25 12:30:30 2006 +0000
-
- fix warning
-
- ChangeLog | 4 ++++
- poppler/Object.cc | 3 ++-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit eb5642f396c8772c83b2cf27da437413b692c952
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Feb 23 22:26:05 2006 +0000
-
- Don't build pdftoppm when splashoutput is disabled as it does not link
-
- ChangeLog | 5 +++++
- utils/Makefile.am | 13 +++++++++++--
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-commit 7c5c1361045429a429a6f40d936f8c7c01fe0d07
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Feb 18 20:17:00 2006 +0000
-
- 2006-02-18 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h:
- * poppler/GfxState.cc:
- * poppler/GfxState.h: Add support for drawSoftMaskedImage to
- CairoOutputDev. Ugly but works.
-
- ChangeLog | 8 ++++
- poppler/CairoOutputDev.cc | 101 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h | 6 +++
- poppler/GfxState.cc | 50 ++++++++++++++++++++++
- poppler/GfxState.h | 2 +
- 5 files changed, 167 insertions(+), 0 deletions(-)
-
-commit dcb748f68112bd5f99fea8a3da06666be6cff0c5
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Feb 16 19:41:17 2006 +0000
-
- 2006-02-16 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Work around cairo bug when scaling
- 1x1 bitmaps. Fixes #3387. Also gives a performance improvement.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 33 ++++++++++++++++++++++++---------
- 2 files changed, 29 insertions(+), 9 deletions(-)
-
-commit ef1070f6ca2d1e74c5f94728f3aaae22f0990c17
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Feb 16 19:28:54 2006 +0000
-
- Update soname
-
- ChangeLog | 8 ++++++++
- glib/Makefile.am | 2 ++
- poppler/Makefile.am | 2 ++
- qt/Makefile.am | 2 ++
- qt4/src/Makefile.am | 2 ++
- 5 files changed, 16 insertions(+), 0 deletions(-)
-
-commit 24b9f5c33fb00ff80a79b34444282a57288f636c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Feb 13 23:04:54 2006 +0000
-
- * poppler/ArthurOutputDev.cc: Make it compile after changing code so we did not pass files to freetype but buffers
-
- ChangeLog | 5 ++++
- poppler/ArthurOutputDev.cc | 53 +++++++++++++++----------------------------
- 2 files changed, 24 insertions(+), 34 deletions(-)
-
-commit 0bda90310b267d3a4963096293eb2bd29b120768
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Feb 13 22:38:44 2006 +0000
-
- Probably the last of inner patches missing from kpdf
- Everybody will we happy now, kpdf has been finally assimilated
-
- ChangeLog | 5 ++
- poppler/PSOutputDev.cc | 124 ++++++++++++++++++++++++++++++++++++++++++++----
- poppler/PSOutputDev.h | 4 +-
- 3 files changed, 123 insertions(+), 10 deletions(-)
-
-commit cf9867fbbee2468a955b5845016585eeedf2debe
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Feb 6 20:49:21 2006 +0000
-
- Various fixes from Frank Meerkötter to enable fixedpoint arithmetic
-
- ChangeLog | 8 ++++++++
- configure.ac | 2 +-
- goo/FixedPoint.h | 2 +-
- splash/Splash.cc | 4 ++--
- splash/SplashTypes.h | 2 +-
- 5 files changed, 13 insertions(+), 5 deletions(-)
-
-commit f04e2c4f20f821ff8cb9465a715ccbb22091d449
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Feb 6 18:50:10 2006 +0000
-
- Jeff Muizelaar's improvements to my yesterday's small patches
-
- ChangeLog | 6 ++++++
- poppler/Annot.cc | 9 ++++-----
- poppler/JBIG2Stream.cc | 2 +-
- 3 files changed, 11 insertions(+), 6 deletions(-)
-
-commit 33e98f81cdfda0935ac7ea79a691976465ec790b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Feb 5 15:46:10 2006 +0000
-
- Some small fixes from kpdf
-
- ChangeLog | 8 ++++++++
- poppler/Gfx.cc | 1 +
- poppler/GfxFont.cc | 1 +
- poppler/JBIG2Stream.cc | 2 +-
- poppler/SplashOutputDev.cc | 1 -
- 5 files changed, 11 insertions(+), 2 deletions(-)
-
-commit 6d9e6489d24b3105204ff4233f6493136e9b5715
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Feb 4 21:10:41 2006 +0000
-
- 2006-02-04 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/Gfx.cc:
- * poppler/OutputDev.cc:
- * poppler/OutputDev.h: Let output devices know about pdf grouping
- operators.
- Patch by Thorkild Stray.
-
- ChangeLog | 8 ++++++++
- poppler/Gfx.cc | 14 ++++++++++++++
- poppler/OutputDev.cc | 16 ++++++++++++++++
- poppler/OutputDev.h | 10 ++++++++++
- 4 files changed, 48 insertions(+), 0 deletions(-)
-
-commit b4e34d905cd0ca5815a450de35b4c2774f4887c9
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Feb 4 20:48:25 2006 +0000
-
- 2006-02-04 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/GlobalParams.cc: Check all fonts returned by fontconfig.
- Discard the ones that are not truetype or type1. Fixes #5758.
- Patch by Ed Catmur.
-
- ChangeLog | 6 +++++
- poppler/GlobalParams.cc | 51 +++++++++++++++++++++++++---------------------
- 2 files changed, 34 insertions(+), 23 deletions(-)
-
-commit fd85a0afdd7b4cafc68df400d4f94fccaea18c76
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 4 20:34:13 2006 +0000
-
- Remove bug from "do not use an external file to pass fonts to Freetype" patch, patch by Stefan Schweizer
-
- ChangeLog | 3 +++
- poppler/SplashOutputDev.cc | 14 ++++++++++----
- 2 files changed, 13 insertions(+), 4 deletions(-)
-
-commit 67ca9d01f8badcf542f60b23521c384c9840ca1b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 4 20:31:00 2006 +0000
-
- Added a DTD of the xml pdftohtml creates patch by Stefan Schweizer
-
- ChangeLog | 2 ++
- utils/Makefile.am | 2 ++
- utils/pdf2xml.dtd | 28 ++++++++++++++++++++++++++++
- 3 files changed, 32 insertions(+), 0 deletions(-)
-
-commit f4df23ca7f396883a906f16dfc8db1ebd528e04a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 4 20:24:03 2006 +0000
-
- ignore++
-
- utils/.cvsignore | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 93ad488679f594e45547a67e2a7397f4c8bd2820
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Feb 4 20:07:07 2006 +0000
-
- Actually create pdftoppm patch by Stefan Schweizer
-
- ChangeLog | 44 +++++++++++++++++++++++++-------------------
- utils/Makefile.am | 10 ++++++++--
- utils/pdftoppm.cc | 9 +++++----
- 3 files changed, 38 insertions(+), 25 deletions(-)
-
-commit 7d2be955e6345a052590b06b29a6d2fb2111e2e6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Feb 2 23:06:20 2006 +0000
-
- CVE-2006-0301 fix by Derek though KDE security team
-
- ChangeLog | 5 +++++
- splash/SplashXPathScanner.cc | 32 ++++++++++++++++++++------------
- 2 files changed, 25 insertions(+), 12 deletions(-)
-
-commit c191e7d0f13ea429017e4d4f79ce803e84c72e40
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Feb 2 22:54:27 2006 +0000
-
- i should learn on which day i live
-
- ChangeLog | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 1ddeed60d07c3a7e011f3f594fa9299379d0b000
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Feb 2 22:50:01 2006 +0000
-
- don't use files to pass fonts to freetype
-
- ChangeLog | 26 ++++++++++++
- fofi/FoFiTrueType.cc | 43 ++++++++++++++++---
- fofi/FoFiTrueType.h | 7 ++-
- fofi/FoFiType1C.h | 2 +-
- goo/gfile.cc | 8 ++++
- poppler/GfxFont.cc | 49 +++++++++++++++++++++-
- poppler/GfxFont.h | 2 +
- poppler/GlobalParams.cc | 1 +
- poppler/GlobalParams.h | 1 +
- poppler/SplashOutputDev.cc | 94 +++++++++++++++++++++---------------------
- splash/SplashFTFontEngine.cc | 44 ++++++++++++-------
- splash/SplashFTFontEngine.h | 16 +++----
- splash/SplashFTFontFile.cc | 47 +++++++++++++--------
- splash/SplashFTFontFile.h | 18 ++++----
- splash/SplashFontEngine.cc | 46 ++++++++------------
- splash/SplashFontEngine.h | 16 +++----
- splash/SplashFontFile.cc | 70 +++++++++++++++++++++++++++----
- splash/SplashFontFile.h | 25 +++++++++--
- splash/SplashT1FontEngine.cc | 29 ++++++-------
- splash/SplashT1FontFile.cc | 30 +++++++++++--
- splash/SplashT1FontFile.h | 4 +-
- 21 files changed, 396 insertions(+), 182 deletions(-)
-
-commit 34df4cfa5cd8788ccf2ea698cbedd05b209041f5
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Feb 1 03:52:12 2006 +0000
-
- 2006-01-31 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/GlobalParams.cc (GlobalParams::getDisplayFont):
- Allow ttc fonts to be used.
-
- ChangeLog | 5 +++++
- poppler/GlobalParams.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 0184e7c928ec60c0aa3f8634d96ae0cf0ad6d157
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Jan 29 05:16:31 2006 +0000
-
- 2006-01-28 Jeff Muizelaar <jeff@infidigm.net>
-
- * glib/poppler-attachment.h: fix compile by adding <time.h> include.
- Acked-by: Jonathan Blanford <jrb@redhat.com>
-
- ChangeLog | 5 +++++
- glib/poppler-attachment.h | 1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit c805e25f2f074640e4345f8b71eef8d7de677109
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Jan 26 19:25:07 2006 +0000
-
- 2006-01-26 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDev.cc: Patch from Christian Krause; handle
- 0-width lines (#5545).
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDev.cc | 6 +++++-
- 2 files changed, 10 insertions(+), 1 deletions(-)
-
-commit 4f48abcd4c21460d4c5b718a7ba18cdceb30c2d1
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Tue Jan 24 06:21:39 2006 +0000
-
- Tue Jan 24 01:19:40 2006 Jonathan Blandford <jrb@redhat.com>
-
- * glib/Makefile.am:
- * glib/poppler-attachment.cc:
- * glib/poppler-attachment.h:
- * glib/poppler-document.cc:
- * glib/poppler-document.h:
- * glib/poppler-page.cc:
- * glib/poppler-private.h:
- * glib/poppler.h:
- * glib/test-poppler-glib.c:
- * glib/reference/tmpl/poppler-enums.sgml:
- * glib/reference/tmpl/poppler-unused.sgml: glib bindings for the
- embedded file support. It doesn't support mtime and ctime yet,
- but the rest works.
-
- ChangeLog | 16 +++
- glib/Makefile.am | 2 +
- glib/poppler-attachment.cc | 223 +++++++++++++++++++++++++++++++
- glib/poppler-attachment.h | 67 +++++++++
- glib/poppler-document.cc | 63 +++++++++
- glib/poppler-document.h | 6 +
- glib/poppler-page.cc | 2 +-
- glib/poppler-private.h | 6 +-
- glib/poppler.h | 1 +
- glib/reference/tmpl/poppler-enums.sgml | 150 +++++++++++++++++++++
- glib/reference/tmpl/poppler-unused.sgml | 130 ------------------
- glib/test-poppler-glib.c | 26 ++++-
- 12 files changed, 559 insertions(+), 133 deletions(-)
-
-commit 052bf4b80c8a0dc45f6222617bfd8ae1b9c40410
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jan 23 18:52:48 2006 +0000
-
- 2006-01-23 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac:
- * poppler/GlobalParams.cc:
- * poppler/poppler-config.h.in:
- * utils/pdftohtml.cc:
- * utils/pdftops.cc: Respect command line paper size settings (#5641).
- Drop the built-in paper sizes.
-
- ChangeLog | 9 +++++++++
- configure.ac | 1 -
- poppler/GlobalParams.cc | 23 ++---------------------
- poppler/poppler-config.h.in | 5 -----
- utils/pdftohtml.cc | 4 +---
- utils/pdftops.cc | 4 +++-
- 6 files changed, 15 insertions(+), 31 deletions(-)
-
-commit fb2054a5031d60aac3ccc9a36b3ed88a32188e33
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jan 23 15:40:54 2006 +0000
-
- 2006-01-23 Kristian Høgsberg <krh@redhat.com>
-
- * glib/test-poppler-glib.c (print_document_info, print_index):
- Move variable declarations to top (#5692).
-
- * utils/*.cc: Move config.h #include to top of #include's (#5693).
-
- ChangeLog | 5 +++++
- glib/test-poppler-glib.c | 5 +++--
- poppler/FontInfo.cc | 2 +-
- utils/HtmlOutputDev.cc | 2 +-
- utils/ImageOutputDev.cc | 2 +-
- utils/pdffonts.cc | 2 +-
- utils/pdfimages.cc | 2 +-
- utils/pdfinfo.cc | 2 +-
- utils/pdftohtml.cc | 4 ++--
- utils/pdftoppm.cc | 2 +-
- utils/pdftops.cc | 2 +-
- utils/pdftotext.cc | 2 +-
- 12 files changed, 19 insertions(+), 13 deletions(-)
-
-commit 836af3529e827e25f20cb4710cbbf9ed0371a42c
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jan 23 14:45:30 2006 +0000
-
- 2006-01-23 Kristian Høgsberg <krh@redhat.com>
-
- * splash/SplashFTFont.cc: Don't use deprecated freetype include
- files.
-
- ChangeLog | 5 +++++
- splash/SplashFTFont.cc | 3 ++-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 60e13bf84e4f020a264811e4a5bf85d67e15d6df
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Jan 21 21:56:40 2006 +0000
-
- 2006-01-21 Jeff Muizelaar <jeff@infidigm.net>
-
- * TODO: Add my todo list.
-
- ChangeLog | 4 ++++
- TODO | 10 ++++++++++
- 2 files changed, 14 insertions(+), 0 deletions(-)
-
-commit cebba06563d1b691a8bbb83828e47c9cc91e231a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 18 22:40:26 2006 +0000
-
- ok, ok, lasts files, i promise :-/
-
- qt4/tests/check_attachments.cpp | 151 +++++++++++++++++++++++++++++++++++++
- qt4/tests/poppler-attachments.cpp | 37 +++++++++
- 2 files changed, 188 insertions(+), 0 deletions(-)
-
-commit 0b12e7cce6c6633b1d07e2902a9fa13ff52079e7
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 18 22:38:59 2006 +0000
-
- YAMF = Yet Another Missing File
-
- qt4/src/poppler-embeddedfile.cc | 106 +++++++++++++++++++++++++++++++++++++++
- 1 files changed, 106 insertions(+), 0 deletions(-)
-
-commit 38c8f3a53b3eb2be1fbfa360f77285037d89b719
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 18 22:36:01 2006 +0000
-
- as usual i foget some files
-
- poppler/UGooString.cc | 86 +++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/UGooString.h | 55 +++++++++++++++++++++++++++++++
- 2 files changed, 141 insertions(+), 0 deletions(-)
-
-commit ad6e7d862c8fa6e10a7dbbb3391cbb0b6c922375
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 18 22:32:13 2006 +0000
-
- Brad patch for embedded document extraction, only has Qt4 bindings for now, needs Qt3 and glib work
-
- ChangeLog | 42 +++++++++++++
- glib/poppler-action.cc | 2 +-
- glib/poppler-document.cc | 1 +
- poppler/Annot.cc | 1 +
- poppler/Catalog.cc | 133 ++++++++++++++++++++++++++++++++++++++---
- poppler/Catalog.h | 60 +++++++++++++++++--
- poppler/Dict.cc | 17 +++---
- poppler/Dict.h | 15 +++--
- poppler/FontInfo.cc | 1 +
- poppler/Function.cc | 1 +
- poppler/Gfx.cc | 1 +
- poppler/GfxFont.cc | 5 +-
- poppler/GfxState.cc | 1 +
- poppler/Link.cc | 9 ++-
- poppler/Link.h | 9 ++-
- poppler/Makefile.am | 2 +
- poppler/Object.h | 17 +++---
- poppler/Outline.cc | 1 +
- poppler/PDFDoc.cc | 1 +
- poppler/PDFDoc.h | 2 +-
- poppler/PSOutputDev.cc | 5 +-
- poppler/Page.cc | 1 +
- poppler/PageLabelInfo.cc | 1 +
- poppler/Parser.cc | 2 +
- poppler/SecurityHandler.cc | 1 +
- poppler/Stream.cc | 1 +
- poppler/XRef.cc | 1 +
- qt/poppler-document.cc | 1 +
- qt/poppler-page-transition.cc | 1 +
- qt4/src/Makefile.am | 1 +
- qt4/src/poppler-document.cc | 26 +++++++-
- qt4/src/poppler-private.h | 2 +
- qt4/src/poppler-qt4.h | 68 +++++++++++++++++++++
- qt4/tests/.cvsignore | 2 +
- qt4/tests/Makefile.am | 16 ++++-
- utils/HtmlOutputDev.cc | 1 +
- utils/pdffonts.cc | 1 +
- utils/pdfinfo.cc | 1 +
- utils/pdftohtml.cc | 1 +
- utils/pdftotext.cc | 1 +
- 40 files changed, 401 insertions(+), 54 deletions(-)
-
-commit 550fb0b617ece7951ec39aec5fa5504cc90022fc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 18 21:22:12 2006 +0000
-
- Add some more documentation to PageTransition, patch by Stefan Kebekus
-
- ChangeLog | 6 ++++++
- qt/poppler-page-transition.h | 40 +++++++++++++++++++++++++++++++++-------
- qt4/src/Doxyfile | 2 +-
- 3 files changed, 40 insertions(+), 8 deletions(-)
-
-commit d66f3647ff1c38318d4cd056cb4d4c7a32eb6603
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jan 18 18:54:12 2006 +0000
-
- poppler/CharCodeToUnicode.cc: Fix check for length that was not
- having into account that there could be \n or \r in tokens an that
- those do not have to be took into account. Fixes
- http://bugs.kde.org/show_bug.cgi?id=120310
-
- ChangeLog | 9 ++++++++-
- poppler/CharCodeToUnicode.cc | 31 +++++++++++++++++++++++++++----
- 2 files changed, 35 insertions(+), 5 deletions(-)
-
-commit d78b670339c8f92a32ab5f0a574d0e21690806f8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jan 17 21:35:31 2006 +0000
-
- When doing the parsing check with XREF we did not grow too much. Fixes serialata10a.pdf
-
- ChangeLog | 10 ++++++++++
- poppler/Lexer.cc | 22 +++++++++++++++++++---
- poppler/Lexer.h | 8 +++++---
- poppler/Parser.cc | 6 +++---
- poppler/Parser.h | 2 +-
- poppler/XRef.cc | 17 +++++++++++++++++
- poppler/XRef.h | 3 +++
- 7 files changed, 58 insertions(+), 10 deletions(-)
-
-commit f5db636af0cd6e05cd7ede37a8585001d51192a1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jan 17 20:33:08 2006 +0000
-
- i suck
- i suck
- i suck
- i suck
- i suck
- A file i forgot to add to make it compile :-/
-
- qt/poppler-page-transition-private.h | 28 ++++++++++++++++++++++++++++
- 1 files changed, 28 insertions(+), 0 deletions(-)
-
-commit 9cc97908ea67ab431e58129f589e00f41f40a143
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Jan 12 23:54:08 2006 +0000
-
- 2006-01-12 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/GlobalParams.cc: Make buildFcPattern() static.
-
- ChangeLog | 4 ++++
- poppler/GlobalParams.cc | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit c7ce134fb1dadb46e2b3773d0976ea31da0a046f
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Jan 11 16:52:58 2006 +0000
-
- 2006-01-11 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/JBIG2Stream.cc:
- * poppler/Stream.cc: Merge patch to fix CVE-2005-3624,
- CVE-2005-3625 and CVE-2005-3627 issues.
-
- ChangeLog | 6 ++++++
- poppler/JBIG2Stream.cc | 32 +++++++++++++++++++++++++++++++-
- poppler/Stream.cc | 8 +++++---
- 3 files changed, 42 insertions(+), 4 deletions(-)
-
-commit ec7fb41725c19bc7f2aad1073fe6397ea0a8da0d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jan 10 21:57:28 2006 +0000
-
- * configure.ac:
- * m4/qt.m4: Fix bugs created when splitting the code from
- configure.ac, take QTDIR into account when looking for QtTestLib and
- do not die if it is not found as it is not mandatory
- * qt/poppler-page-transition.cc:
- * qt/poppler-page.cc:
- * qt/poppler-private.h:
- * qt4/tests/Makefile.am:
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-page.cc:
- * qt4/src/Makefile.am: Fix mess created my the moving and renaming of
- PageTransition.cc
-
- ChangeLog | 15 +++++++++++++++
- configure.ac | 14 ++++----------
- m4/qt.m4 | 5 +++++
- qt/poppler-page-transition.cc | 2 +-
- qt/poppler-page.cc | 1 +
- qt/poppler-private.h | 5 -----
- qt4/src/Makefile.am | 1 +
- qt4/src/poppler-page.cc | 2 +-
- qt4/src/poppler-qt4.h | 2 +-
- qt4/tests/Makefile.am | 1 +
- 10 files changed, 30 insertions(+), 18 deletions(-)
-
-commit d9bc53a741b3bbd2a202662c66fe70f49ac72a49
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Jan 10 17:59:51 2006 +0000
-
- 2006-01-10 Kristian Høgsberg <krh@redhat.com>
-
- * splash/Makefile.am: Only install splash headers if
- --enable-xpdf-headers is given.
-
- * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Set this here.
-
- ChangeLog | 7 +++++++
- Makefile.am | 1 +
- splash/Makefile.am | 4 ++++
- 3 files changed, 12 insertions(+), 0 deletions(-)
-
-commit ea6d9b97cec6fabf8a5005c565bbdb378bed7f54
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Tue Jan 10 17:55:59 2006 +0000
-
- 2006-01-10 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h:
- Fix the following fixme in CairoOutputDevice.
-
- // FIXME: This is quite right yet, we need to accumulate all
- // glyphs within one text object before we clip. Right now this
- // just add this one string.
-
- The fix uses a strategy similar to the one the Splash backend.
- textClipPath is used to store the appended path from each call to
- endString(). The accumulated path is clipped in endTextObject.
-
- ChangeLog | 14 ++++++++++++++
- poppler/CairoOutputDev.cc | 27 +++++++++++++++++++++++----
- poppler/CairoOutputDev.h | 1 +
- 3 files changed, 38 insertions(+), 4 deletions(-)
-
-commit 9e8a655a2bd3ca8cff1a150dce0dd378aeca047b
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Jan 8 22:59:48 2006 +0000
-
- 2006-01-08 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Don't try and load type3 fonts (#4030).
-
- ChangeLog | 6 +++++-
- poppler/CairoOutputDev.cc | 5 ++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-commit 25fd8e1ea87c41855a4ee702fbe47f5661a54c22
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Jan 8 22:51:17 2006 +0000
-
- 2006-01-08 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/Page.cc: use colToByte for reading thumbnails (#5420).
-
- Patch by Nickolay V. Shmyrev.
-
- ChangeLog | 6 ++++++
- poppler/Page.cc | 6 +++---
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-commit df73ee2ec4b65ccf611f0fd76fb456cc797693d4
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Jan 7 06:10:15 2006 +0000
-
- 2006-01-07 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/CairoOutputDev.cc: Initialize (fill|stroke)_opacity.
-
- ChangeLog | 4 ++++
- poppler/CairoOutputDev.cc | 2 ++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 18eb8de66749082e4aa65cc6d369a533826fab33
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Jan 6 10:05:58 2006 +0000
-
- 2006-01-06 Kristian Høgsberg <krh@redhat.com>
-
- * qt/poppler-page.cc:
- * qt/poppler-private.h:
- * qt/poppler-qt.h:
- * qt4/src/Makefile.am:
- * qt/Makefile.am:
- * poppler/Makefile.am: Move PageTransition to qt bindings, move
- contents from Private.h to qt/poppler-private.h.
-
- * poppler/TextOutputDev.cc (visitWord): Remove #warning.
-
- * utils/Makefile.am (pdfimages_SOURCES): Add ImageOutputDev.h, use
- dist_man1_MANS so we actually dist the man pages.
-
- * goo/Makefile.am (poppler_goo_include_HEADERS): Add GooVector.h.
-
- * glib/reference/Makefile.am: DOC_SOURCE_DIR must be relative to
- $(srcdir), fix this to make distchek run.
-
- * m4/qt.m4:
- * m4/libjpeg.m4:
- * acinclude.m4:
- * configure.ac: Split out Qt and libjpeg checks from configure.ac
- and acinclude.m4 to m4/qt.m4 and m4/libjpeg.m4.
-
- ChangeLog | 26 ++++
- acinclude.m4 | 112 ----------------
- configure.ac | 223 +++----------------------------
- glib/reference/Makefile.am | 2 +-
- glib/reference/tmpl/poppler-enums.sgml | 150 ---------------------
- glib/reference/tmpl/poppler-unused.sgml | 130 ++++++++++++++++++
- goo/Makefile.am | 1 +
- m4/libjpeg.m4 | 109 +++++++++++++++
- m4/qt.m4 | 206 ++++++++++++++++++++++++++++
- poppler/Makefile.am | 1 -
- poppler/PageTransition.h | 118 ----------------
- poppler/Private.h | 30 ----
- poppler/TextOutputDev.cc | 2 -
- qt/Makefile.am | 8 +-
- qt/poppler-page-transition.cc | 187 ++++++++++++++++++++++++++
- qt/poppler-page-transition.h | 117 ++++++++++++++++
- qt/poppler-page.cc | 1 -
- qt/poppler-private.h | 9 +-
- qt/poppler-qt.h | 2 +-
- qt4/src/Makefile.am | 8 +-
- utils/Makefile.am | 54 ++++++--
- 21 files changed, 857 insertions(+), 639 deletions(-)
-
-commit 93921e77115ebe4d527f98675e438de485e84507
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 5 23:53:33 2006 +0000
-
- * poppler/DCTStream.cc: Fix handling of malformed jpeg streams like
- the one at http://bugs.kde.org/show_bug.cgi?id=119569
-
- Might be worth backporting to 0.4.x
-
- ChangeLog | 5 +++++
- poppler/DCTStream.cc | 26 ++++++++++++++++----------
- 2 files changed, 21 insertions(+), 10 deletions(-)
-
-commit 0dc16af02071350a0dc11af4106799378c99cdad
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jan 5 13:53:58 2006 +0000
-
- Introduce variants of renderTo that return a QImage and do not use a QPixmap so threading is possible.
-
- ChangeLog | 8 ++++++
- qt/poppler-page.cc | 18 +++++++++----
- qt/poppler-qt.h | 30 ++++++++++++++++++++----
- qt4/src/poppler-page.cc | 9 ++++++-
- qt4/src/poppler-qt4.h | 59 +++++++++++++++++++++++++---------------------
- 5 files changed, 85 insertions(+), 39 deletions(-)
-
-commit 5c2cbf5d327c6cc75c073b56c3ab1748c0d24387
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jan 2 14:24:31 2006 +0000
-
- Use error() instead std::cerr in PageTranstion.cc
-
- ChangeLog | 4 ++++
- poppler/PageTransition.cc | 5 +++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-commit da5a4233498b56df611e1c7bca0090306cb5dbe0
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Mon Jan 2 00:06:45 2006 +0000
-
- Sun Jan 1 18:50:51 2006 Jonathan Blandford <jrb@redhat.com>
-
- * Makefile.am:
- * autogen.sh:
- * configure.ac:
- * gtk-doc.make:
- * glib/Makefile.am: enable gtk-doc support.
-
- ChangeLog | 8 +++
- Makefile.am | 2 +
- autogen.sh | 14 +++++
- configure.ac | 4 ++
- glib/Makefile.am | 1 +
- gtk-doc.make | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- m4/gtk-doc.m4 | 53 +++++++++++++++++++
- 7 files changed, 235 insertions(+), 0 deletions(-)
-
-commit 372c34cc9728d7041bc4f6893c0bae50c9501c50
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 1 22:35:48 2006 +0000
-
- * qt4/src/poppler-private.h:
- * qt4/src/poppler-page.cc:
- * qt4/src/poppler-document.cc: Don't create a SplashOutputDev for
- every splashRenderToPixmap
-
- ChangeLog | 4 ++++
- qt4/src/poppler-document.cc | 1 -
- qt4/src/poppler-page.cc | 18 +++++-------------
- qt4/src/poppler-private.h | 24 +++++++++++++++++++++++-
- 4 files changed, 32 insertions(+), 15 deletions(-)
-
-commit 6ff83474ac594368015334db9c6b33d3a552079f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jan 1 22:18:47 2006 +0000
-
- * qt/poppler-page.cc:
- * qt/poppler-private.h: Don't create a SplashOutputDev for every
- renderToPixmap.
-
- ChangeLog | 6 ++++++
- qt/poppler-page.cc | 8 +-------
- qt/poppler-private.h | 24 +++++++++++++++++++++++-
- 3 files changed, 30 insertions(+), 8 deletions(-)
-
-commit 6942646d4c82327a80b021838a38aa55c1026883
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Sun Jan 1 20:34:36 2006 +0000
-
- Sun Jan 1 15:32:08 2006 Jonathan Blandford <jrb@redhat.com>
-
- * glib/reference/*: More gtk-doc work. Not enabled for building
- by default, but filled in.
-
- .cvsignore | 1 +
- ChangeLog | 5 +
- glib/reference/.cvsignore | 18 ++
- glib/reference/Makefile.am | 87 +++++++
- glib/reference/poppler-docs.sgml | 17 ++
- glib/reference/poppler-sections.txt | 151 +++++++++++
- glib/reference/poppler.types | 4 +
- glib/reference/tmpl/poppler-action.sgml | 172 +++++++++++++
- glib/reference/tmpl/poppler-document.sgml | 354 ++++++++++++++++++++++++++
- glib/reference/tmpl/poppler-enums.sgml | 169 ++++++++++++
- glib/reference/tmpl/poppler-page.sgml | 243 ++++++++++++++++++
- glib/reference/tmpl/poppler-private.sgml | 128 +++++++++
- glib/reference/tmpl/poppler.sgml | 216 ++++++++++++++++
- glib/reference/tmpl/stamp-poppler-enums.sgml | 19 ++
- 14 files changed, 1584 insertions(+), 0 deletions(-)
-
-commit 0fab1b711f153859e113cb3b6d734ddcb58fb87a
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Sat Dec 31 02:10:33 2005 +0000
-
- Fri Dec 30 21:08:33 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/*{cc,h}: Update inline doc comments. This is in
- preparation for gtk-doc support.
-
- ChangeLog | 5 ++
- glib/poppler-action.cc | 14 ++++
- glib/poppler-action.h | 2 -
- glib/poppler-document.cc | 151 +++++++++++++++++++++++++++++++++++++++++++++-
- glib/poppler-document.h | 4 +-
- glib/poppler-page.cc | 28 +++++++++
- glib/poppler.cc | 16 +++++
- glib/test-poppler-glib.c | 29 +++++++++
- 8 files changed, 243 insertions(+), 6 deletions(-)
-
-commit 313530036b204eaa5ddfa150730302e855560d6a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 30 22:54:46 2005 +0000
-
- A delete that slipped from the last patch-commit
-
- qt4/src/poppler-page.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit cf6f8123af19aca4200b58a454652f68ce8132e2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 30 22:31:32 2005 +0000
-
- Puting PageTransition implementation into poppler "core", both Qt and Qt4 frontends use it.
-
- poppler/Makefile.am | 1 +
- poppler/PageTransition.cc | 188 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/PageTransition.h | 118 ++++++++++++++++++++++++++++
- poppler/Private.h | 30 +++++++
- qt/Makefile.am | 2 +-
- qt/poppler-page.cc | 111 +-------------------------
- qt/poppler-qt.h | 72 +-----------------
- qt4/src/Makefile.am | 2 +-
- qt4/src/poppler-page.cc | 17 ++++-
- qt4/src/poppler-qt4.h | 14 +++-
- 10 files changed, 374 insertions(+), 181 deletions(-)
-
-commit 56035ab199ac6deb5c1e07e745d120d1121a5960
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Dec 30 21:59:58 2005 +0000
-
- * utils/HtmlOutputDev.cc:
- * utils/ImageOutputDev.cc: Fix build when using --disable-libjpeg
-
- ChangeLog | 5 +++++
- utils/HtmlOutputDev.cc | 2 ++
- utils/ImageOutputDev.cc | 2 ++
- 3 files changed, 9 insertions(+), 0 deletions(-)
-
-commit 8b64dafc7f1d198fb0052c0d6f0da6de97bbb48d
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Wed Dec 28 09:23:43 2005 +0000
-
- Plug a few memory leaks in the Qt4 bindings.
-
- ChangeLog | 25 +++++++++++++++++++
- qt4/src/poppler-document.cc | 3 ++
- qt4/src/poppler-private.h | 7 ++++-
- qt4/src/poppler-qt4.h | 3 ++
- qt4/tests/check_fonts.cpp | 8 ++++++
- qt4/tests/check_metadata.cpp | 50 +++++++++++++++++++++++++++++++++----
- qt4/tests/check_pagelayout.cpp | 6 ++++
- qt4/tests/check_pagemode.cpp | 10 +++++++
- qt4/tests/check_permissions.cpp | 2 +
- qt4/tests/check_version.cpp | 22 ----------------
- qt4/tests/poppler-fonts.cpp | 1 +
- qt4/tests/stress-poppler-qt4.cpp | 2 +
- 12 files changed, 110 insertions(+), 29 deletions(-)
-
-commit 64c07a20a4ed844f3b3dd26e974f58d5877cf9fd
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Tue Dec 27 06:10:01 2005 +0000
-
- qt4/src/poppler-qt4.h and qt4/src/poppler-document.cc: add convertDate() function that
- turns char* PDF date strings into QDateTime. This version handles
- the timezone conversions. Refactored the existing date() method
- to use it.
-
- qt4/tests/check_dateConversion.cpp: unit tests for convertDate()
- qt4/tests/check_metadata.cpp: update to reflect UTC.
- qt4/tests/.cvsignore: suppress check_dateConversion
-
- ChangeLog | 9 +++
- qt4/src/poppler-document.cc | 89 ++++++++++++++++++++-----------
- qt4/src/poppler-qt4.h | 5 ++
- qt4/tests/.cvsignore | 1 +
- qt4/tests/Makefile.am | 11 +++-
- qt4/tests/check_dateConversion.cpp | 105 ++++++++++++++++++++++++++++++++++++
- qt4/tests/check_metadata.cpp | 4 +-
- 7 files changed, 188 insertions(+), 36 deletions(-)
-
-commit 4b2e3b5106b75f23c830837a886cd29beb1d1d1b
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Tue Dec 27 05:08:34 2005 +0000
-
- * qt4/src/Doxyfile (JAVADOC_AUTOBRIEF): Turned on automatic
- \brief mode.
-
- * qt4/src/poppler-qt4.h: Update API documentation. Patch from
- Stefan Kebekus, with some changes. Removed \brief entries.
-
- ChangeLog | 8 +++++
- qt4/src/Doxyfile | 2 +-
- qt4/src/poppler-qt4.h | 81 ++++++++++++++++++++++++++++++++++++++----------
- 3 files changed, 73 insertions(+), 18 deletions(-)
-
-commit 8d9cf43aaa73d5012428a6a4c5d7e2cccbd3036e
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Dec 21 22:09:47 2005 +0000
-
- 2005-12-21 Kristian Høgsberg <krh@redhat.com>
-
- * NEWS: Sum up 0.5 changes so far.
-
- * acinclude.m4: Split jpeg macros out into this file.
-
- * poppler/Stream.cc: Apply latest CVE-2005-3191 updates.
-
- ChangeLog | 8 ++++
- NEWS | 8 ++++
- acinclude.m4 | 112 +++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac | 114 --------------------------------------------------
- poppler/JPXStream.cc | 1 +
- poppler/Stream.cc | 11 ++++-
- 6 files changed, 137 insertions(+), 117 deletions(-)
-
-commit 97243286560cb4f264b875185c8768a6af09d554
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Dec 21 17:30:33 2005 +0000
-
- 2005-12-21 Kristian Høgsberg <krh@redhat.com>
-
- * utils/Makefile.am: Add parseargs.h to sources and add
- -I$(top_srcdir)/poppler to INCLUDES.
-
- * poppler/CairoFontEngine.cc: Apply patch from Hiroyuki Ikezoe to
- man non-embedded CJK fonts work.
-
- ChangeLog | 14 +++++++++--
- configure.ac | 2 +-
- poppler/CairoFontEngine.cc | 52 +++++++++++++++++++++++++++++++++++++++----
- utils/Makefile.am | 15 +++++++-----
- 4 files changed, 68 insertions(+), 15 deletions(-)
-
-commit cf887a9a9fae7272165d3aae05c85444ff5ca604
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 18 22:03:30 2005 +0000
-
- * poppler/Page.cc: Only discard cropbox sizes one by one and not
- completely. Jeff and Martin were right
-
- ChangeLog | 2 ++
- poppler/Page.cc | 13 ++++++++++---
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-commit 495890b9cef9d5d61bb47e789add1cf2c3b8f83d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 18 21:56:15 2005 +0000
-
- + .cvsignore
-
- utils/.cvsignore | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-commit 5dca860bba6918e06fab3aa56a2c75f0ac9ecdfb
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 18 21:08:48 2005 +0000
-
- Fix utils building on Slackware
-
- ChangeLog | 3 +++
- configure.ac | 3 +++
- utils/Makefile.am | 3 ++-
- 3 files changed, 8 insertions(+), 1 deletions(-)
-
-commit 03e3d9164ffd71f03136b57a9941ea14fadb21aa
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 18 17:12:28 2005 +0000
-
- 2005-12-18 Albert Astals Cid <aacid@kde.org>
-
- * configure.ac: Better jpeg detection, refer to ml PCbsd problem
-
- ChangeLog | 4 ++
- configure.ac | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
- 2 files changed, 118 insertions(+), 17 deletions(-)
-
-commit 888d76a29c9c5ea6c90cc4299b230ca0c2c2944f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Dec 12 20:21:08 2005 +0000
-
- * poppler/Page.cc: Ignore cropBox if it seems incorrect
-
- ChangeLog | 4 ++++
- poppler/Page.cc | 7 +++++++
- 2 files changed, 11 insertions(+), 0 deletions(-)
-
-commit bcc5e3afe27c8787ce7022a0701997c96eddb4fe
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Dec 12 20:15:11 2005 +0000
-
- 2005-12-12 Kristian Høgsberg <krh@redhat.com>
-
- * Makefile.am:
- * configure.ac:
- * goo/GooVector.h:
- * utils/HtmlFonts.cc:
- * utils/HtmlFonts.h:
- * utils/HtmlLinks.cc:
- * utils/HtmlLinks.h:
- * utils/HtmlOutputDev.cc:
- * utils/HtmlOutputDev.h:
- * utils/ImageOutputDev.cc:
- * utils/ImageOutputDev.h:
- * utils/Makefile.am:
- * utils/parseargs.c:
- * utils/parseargs.h:
- * utils/pdffonts.1:
- * utils/pdffonts.cc:
- * utils/pdfimages.1:
- * utils/pdfimages.cc:
- * utils/pdfinfo.1:
- * utils/pdfinfo.cc:
- * utils/pdftohtml.1:
- * utils/pdftohtml.cc:
- * utils/pdftoppm.1:
- * utils/pdftoppm.cc:
- * utils/pdftops.1:
- * utils/pdftops.cc:
- * utils/pdftotext.1:
- * utils/pdftotext.cc: Add command line utilities from xpdf.
-
- ChangeLog | 31 +
- Makefile.am | 6 +-
- configure.ac | 25 +-
- goo/GooVector.h | 101 +++
- utils/HtmlFonts.cc | 326 ++++++++++
- utils/HtmlFonts.h | 85 +++
- utils/HtmlLinks.cc | 101 +++
- utils/HtmlLinks.h | 49 ++
- utils/HtmlOutputDev.cc | 1569 +++++++++++++++++++++++++++++++++++++++++++++++
- utils/HtmlOutputDev.h | 302 +++++++++
- utils/ImageOutputDev.cc | 195 ++++++
- utils/ImageOutputDev.h | 76 +++
- utils/Makefile.am | 18 +
- utils/parseargs.c | 190 ++++++
- utils/parseargs.h | 71 +++
- utils/pdffonts.1 | 128 ++++
- utils/pdffonts.cc | 294 +++++++++
- utils/pdfimages.1 | 96 +++
- utils/pdfimages.cc | 159 +++++
- utils/pdfinfo.1 | 157 +++++
- utils/pdfinfo.cc | 376 ++++++++++++
- utils/pdftohtml.1 | 85 +++
- utils/pdftohtml.cc | 429 +++++++++++++
- utils/pdftoppm.1 | 113 ++++
- utils/pdftoppm.cc | 189 ++++++
- utils/pdftops.1 | 224 +++++++
- utils/pdftops.cc | 336 ++++++++++
- utils/pdftotext.1 | 135 ++++
- utils/pdftotext.cc | 337 ++++++++++
- 29 files changed, 6194 insertions(+), 9 deletions(-)
-
-commit 5fbded32741acb5fac411189f80cb57aa11df517
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Dec 10 10:52:15 2005 +0000
-
- * qt4/src/poppler-page.cc:
- * qt4/src/poppler-qt4.h:
- * qt4/src/tests/test-poppler-qt4.cpp: The parameters x,y,w,h to the
- method splashRenderToPixmap are now used. Convenient
- defaults are provided. The test has been changed accordingly. Some
- added documentation. Patch by Stefan Kebekus
-
- ChangeLog | 9 +++++++++
- qt4/src/poppler-page.cc | 4 ++--
- qt4/src/poppler-qt4.h | 31 +++++++++++++++++++++++--------
- qt4/tests/test-poppler-qt4.cpp | 2 +-
- 4 files changed, 35 insertions(+), 11 deletions(-)
-
-commit bc6df8c41081c0c0107655cbf70ddb8b0c493c34
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Dec 9 20:49:59 2005 +0000
-
- 2005-12-09 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/GfxState.cc: Use colToByte() for converting GxfColorComp
- to bytes (really fix #5117).
-
- * poppler/Stream.cc: Remove duplicated check (#5243).
-
- ChangeLog | 5 +++++
- poppler/GfxState.cc | 6 +++---
- poppler/Stream.cc | 4 ----
- 3 files changed, 8 insertions(+), 7 deletions(-)
-
-commit 8a2464122455311c6d16ae62bb9ac9a0ae365a28
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Dec 9 19:40:40 2005 +0000
-
- 2005-12-09 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac:
- * poppler/Makefile.am (poppler_includedir):
- * goo/Makefile.am (poppler_goo_include_HEADERS): Make installation
- of xpdf header files optional.
-
- ChangeLog | 10 +++++++++-
- configure.ac | 8 ++++++++
- goo/Makefile.am | 4 ++++
- poppler/Makefile.am | 4 ++++
- 4 files changed, 25 insertions(+), 1 deletions(-)
-
-commit 830b61bfd1c985fe14ec4d0f6724c8f70e924fc1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Dec 8 18:17:42 2005 +0000
-
- * configure.ac: Detect if gettimeofday is available, fixes for correct
- linking to Qt4 on windows
- * goo/GooTimer.[cc|h]: Only build if gettimeofday is available
- * poppler/Gfx.cc: Only use the timer for profiling if gettimeofday is
- available
- * poppler/GlobalParams.cc: Remove extra unlockGlobalParams that was
- making windows hang
- * splash/SplashFTFontEngine.cc: i need unistd.h on windows also
- * splash/SplashFontFile.cc: i need unistd.h on windows also
-
- ChangeLog | 12 ++++++++++++
- configure.ac | 14 +++++++++++++-
- goo/GooTimer.cc | 3 +++
- goo/GooTimer.h | 4 ++++
- poppler/Gfx.cc | 6 ++++++
- poppler/GlobalParams.cc | 1 -
- splash/SplashFTFontEngine.cc | 4 +---
- splash/SplashFontFile.cc | 4 +---
- 8 files changed, 40 insertions(+), 8 deletions(-)
-
-commit 0a1c33ed17fd7053ed455da3444856a5dab3c9b4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Dec 8 12:42:50 2005 +0000
-
- Remove -DDATADIR we are not using if for anything and it shadows a windows typedef
-
- ChangeLog | 8 ++++++++
- glib/Makefile.am | 3 +--
- poppler/Makefile.am | 3 +--
- qt/Makefile.am | 3 +--
- test/Makefile.am | 3 +--
- 5 files changed, 12 insertions(+), 8 deletions(-)
-
-commit adca042e666fd932f16213d0a4daba08b5021901
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Wed Dec 7 08:42:21 2005 +0000
-
- Remove the version check. OK'd by krh.
-
- ChangeLog | 2 ++
- poppler/PDFDoc.cc | 6 +-----
- 2 files changed, 3 insertions(+), 5 deletions(-)
-
-commit bc57f8dd73eef9a74e4a6e248ed6985c360db838
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Wed Dec 7 08:31:09 2005 +0000
-
- Add infoKeys() - allows you to get a list of all the string names (keys)
- for the metadata.
-
- ChangeLog | 7 +++++++
- qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 7 +++++++
- qt4/tests/check_metadata.cpp | 18 ++++++++++++++++++
- 4 files changed, 54 insertions(+), 0 deletions(-)
-
-commit 7ec41df91e6dbf792e11676d929acc2f634bd382
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Tue Dec 6 09:58:04 2005 +0000
-
- Add more unit tests for better coverage.
-
- ChangeLog | 6 ++++
- qt4/tests/check_fonts.cpp | 24 +++++++++++++++
- qt4/tests/check_metadata.cpp | 66 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 96 insertions(+), 0 deletions(-)
-
-commit a92b10016306ac46775c9b95b52d249b233ff950
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Dec 5 20:46:22 2005 +0000
-
- * poppler/CairoFontEngine.cc: Correct fix for #5149, i broke it when merging xpdf 3.01 patches
-
- ChangeLog | 5 +++++
- poppler/CairoFontEngine.cc | 4 +---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-commit 66096477d1a86f13fcb07ae25caff1cc02b1e7cd
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sun Dec 4 19:48:25 2005 +0000
-
- Add checking for Type3 fonts in the unit test.
-
- ChangeLog | 5 +++++
- qt4/tests/check_fonts.cpp | 24 ++++++++++++++++++++++++
- 2 files changed, 29 insertions(+), 0 deletions(-)
-
-commit 62345b0affed8e2e37728fca7f2b750879192c43
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 4 18:53:40 2005 +0000
-
- Fix error in merging CAN-2005-3193 fix. Thanks Daniel Gryniewicz for notifying
-
- ChangeLog | 5 +++++
- poppler/JPXStream.cc | 2 --
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-commit ba4b3f88271892f197aa2ec076c80ff63a175887
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Dec 4 11:30:00 2005 +0000
-
- * qt/poppler-qt.h:
- * qt/poppler-fontinfo.h:
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-fontinfo.cc: Implement copy constructor of FontInfo needed
- as Q[Value]List<FontInfo> uses it when appending
-
- ChangeLog | 8 ++++++++
- qt/poppler-fontinfo.cc | 9 +++++++++
- qt/poppler-qt.h | 2 ++
- qt4/src/poppler-fontinfo.cc | 9 +++++++++
- qt4/src/poppler-qt4.h | 2 ++
- 5 files changed, 30 insertions(+), 0 deletions(-)
-
-commit e091231d98d12c19b0098ffbaec6ecda28097dff
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sun Dec 4 10:45:25 2005 +0000
-
- Add new unit test to .cvsignore suppressions.
-
- ChangeLog | 2 ++
- qt4/tests/.cvsignore | 1 +
- 2 files changed, 3 insertions(+), 0 deletions(-)
-
-commit 6a7b1eaaedbfdd3a8e6b4d899477350f2b485641
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sun Dec 4 10:05:21 2005 +0000
-
- * qt4/src/poppler-qt4.h:
- qt4/src/fontinfo.cc: add implementation for FontInfo::typeName()
-
- * qt4/tests/check_fonts.cpp:
- * qt4/tests/Makefile.am: add unit test for fonts
-
- * qt4/src/Mainpage.dox: Minor typo fixes.
-
- ChangeLog | 11 +++++++++++
- qt4/src/Mainpage.dox | 5 +++--
- qt4/src/poppler-fontinfo.cc | 24 ++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 14 +++++++++++++-
- qt4/tests/Makefile.am | 5 +++++
- qt4/tests/check_fonts.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++
- 6 files changed, 98 insertions(+), 3 deletions(-)
-
-commit 31b28b4c59f7820901e9cf893197f381acbae8ce
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun Dec 4 02:24:25 2005 +0000
-
- 2005-12-03 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_set_selection_alpha): Use
- Nickolays original fix instead of trying to be clever with
- gdk_pixbuf_fill().
-
- * poppler/CairoFontEngine.cc: Fix text corruption bug (#5149),
- a rerun of an old classic (#3340).
-
- ChangeLog | 7 +++++++
- glib/poppler-page.cc | 8 +++++++-
- poppler/CairoFontEngine.cc | 2 ++
- 3 files changed, 16 insertions(+), 1 deletions(-)
-
-commit 4d169c5c345cdac84a39026e759b928977643417
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun Dec 4 01:42:29 2005 +0000
-
- 2005-12-03 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/GfxState.cc: Fixing another problem with new GfxRGB
- representation causing images to show up as random pixels (#5117).
-
- ChangeLog | 5 +++++
- poppler/GfxState.cc | 6 +++---
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-commit 58de0458e17b1639ce0bcae45a4b09b2c0a56618
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sat Dec 3 23:23:53 2005 +0000
-
- 2005-12-03 Kristian Høgsberg <krh@redhat.com>
-
- * qt/Makefile.am (noinst_PROGRAMS): Only build qt test program if
- splash is enabled.
-
- * poppler/CairoOutputDev.cc: Remove unused grid snapping code,
- sidestepping #4507.
-
- * glib/poppler-document.h (PopplerPermissions): Breaking enum
- definition over multiple lines confuses glib-mkenums (#4600).
-
- * poppler/Makefile.am (libpoppler_la_LIBADD): Add FREETYPE_LIBS
- (#4515).
-
- * poppler/TextOutputDev.cc:
- * qt/poppler-qt.h: GCC-4.1 fixes (#5031).
-
- ChangeLog | 17 +++++++++++++++++
- glib/poppler-document.h | 5 +----
- poppler/CairoOutputDev.cc | 35 +++++++++--------------------------
- poppler/CairoOutputDev.h | 2 +-
- poppler/Makefile.am | 3 ++-
- poppler/TextOutputDev.cc | 2 +-
- qt/Makefile.am | 4 ++++
- qt/poppler-qt.h | 6 +++---
- 8 files changed, 38 insertions(+), 36 deletions(-)
-
-commit df45483f1437d8a96519e1428d1f4b3ffc08c2cd
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Dec 3 22:39:06 2005 +0000
-
- remove another chagne should not have gone in
-
- test/pdf-inspector.cc | 9 ++-------
- 1 files changed, 2 insertions(+), 7 deletions(-)
-
-commit 7dfe02ee112dee51346525b62d877e6591135761
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Dec 3 22:28:46 2005 +0000
-
- Add the font retrieveing on the qt3 backend also, based on a patch by Wilfried Huss
-
- ChangeLog | 3 ++
- qt/poppler-fontinfo.cc | 75 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 78 insertions(+), 0 deletions(-)
-
-commit 655b9dd195ac9faf2f7ea0255880b8c83b249a06
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Dec 3 22:26:07 2005 +0000
-
- this should have not went in
-
- poppler/TextOutputDev.h | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-commit ab45eb562159d5b006e658ec66723a0a47908f65
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Dec 3 22:20:54 2005 +0000
-
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-fontinfo.cc:
- * qt4/src/poppler-textbox.cc: Remove implementation of that classes from the header, use pimpl
-
- ChangeLog | 9 ++++-
- poppler/TextOutputDev.h | 10 +++---
- qt/Makefile.am | 1 +
- qt/poppler-document.cc | 29 +++++++++++++++
- qt/poppler-private.h | 2 +
- qt/poppler-qt.h | 80 ++++++++++++++++++++++++++++++++++++++++++-
- qt4/src/Makefile.am | 2 +
- qt4/src/poppler-fontinfo.cc | 69 +++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 43 +++++++++--------------
- qt4/src/poppler-textbox.cc | 49 ++++++++++++++++++++++++++
- test/pdf-inspector.cc | 9 ++++-
- 11 files changed, 268 insertions(+), 35 deletions(-)
-
-commit 64079ad81caf6d2cf66b1f3a3de9454146e15c6c
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sat Dec 3 21:55:36 2005 +0000
-
- 2005-12-03 Kristian Høgsberg <krh@redhat.com>
-
- Fixes from Nickolay V. Shmyrev:
-
- * poppler/TextOutputDev.cc (TextLine::visitSelection,
- TextBlock::visitSelection): Fix selection crash with zero-width
- word boxes or zero-height line boxes (#4402).
-
- * poppler/CairoOutputDev.h: Fix wrong cairo-ft.h include (#4413).
-
- * poppler/CairoOutputDev.cc (eoFill, fill):
- * glib/poppler-page.cc (poppler_page_render_selection): Update to
- work with new GfxColor definition and use
- cairo_pattern_create_rgba() to cache cairo_pattern_t's for the
- fill and stroke colors.
-
- * glib/poppler-page.cc (poppler_page_set_selection_alpha): Zero
- out pixbuf first.
-
- ChangeLog | 21 ++++++++++++++++
- glib/poppler-page.cc | 18 ++++++++-----
- poppler/CairoOutputDev.cc | 59 ++++++++++++++++++++++++++++++++------------
- poppler/CairoOutputDev.h | 6 ++--
- poppler/TextOutputDev.cc | 8 +++---
- 5 files changed, 82 insertions(+), 30 deletions(-)
-
-commit f3da21a3ecdd2694290e64af86c8e35fcb61371b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Dec 3 21:35:45 2005 +0000
-
- More docs for the Qt4 frontend, patch by Stefan Kebekus
-
- ChangeLog | 8 ++++
- qt4/src/.cvsignore | 3 +-
- qt4/src/Doxyfile | 4 +-
- qt4/src/Mainpage.dox | 91 ++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc | 20 ++-------
- qt4/src/poppler-qt4.h | 57 +++++++++++++++++-------
- qt4/tests/test-poppler-qt4.cpp | 5 +-
- 7 files changed, 151 insertions(+), 37 deletions(-)
-
-commit 7b2c6e92611db9350ca5dcaf3fd730fe5e69afea
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Dec 1 22:45:10 2005 +0000
-
- Fix CAN-2005-3193 related bugs
- Thanks Leonard for reporting
-
- ChangeLog | 6 ++++++
- poppler/JPXStream.cc | 9 ++++++++-
- poppler/Stream.cc | 33 ++++++++++++++++++++++++++++++++-
- poppler/Stream.h | 3 +++
- 4 files changed, 49 insertions(+), 2 deletions(-)
-
-commit a90f076af9ebb188895e7b223bcb7e5c3f4309c4
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Nov 28 22:50:19 2005 +0000
-
- Fix QPixmap contents generation messed when doing the xpdf 3.01 transition in qt4 frontend
- Use Splash backend by default in the qt4 test, added -arthur option to use the Arthur backend
-
- ChangeLog | 12 +++++++-
- qt4/src/poppler-page.cc | 45 ++++++++++++++++++++++++++-------
- qt4/src/poppler-qt4.h | 17 +++++++++----
- qt4/tests/test-poppler-qt4.cpp | 53 +++++++++++++++++++++++++---------------
- 4 files changed, 90 insertions(+), 37 deletions(-)
-
-commit b7e4f0e7d175abde7fafb1fcc7ba129468bc8c1a
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sun Nov 27 01:33:51 2005 +0000
-
- Convert Qt4 unit tests to use the new Qt4.1 QTestlib framework.
- Add a little more API documentation
-
- ChangeLog | 7 +++++
- qt4/src/poppler-qt4.h | 11 +++++---
- qt4/tests/Makefile.am | 12 +++++---
- qt4/tests/check_metadata.cpp | 58 +++++++++++++++++++-------------------
- qt4/tests/check_pagelayout.cpp | 14 +++++-----
- qt4/tests/check_pagemode.cpp | 22 +++++++-------
- qt4/tests/check_permissions.cpp | 18 ++++++------
- 7 files changed, 78 insertions(+), 64 deletions(-)
-
-commit d036fa022dbb6f4421ccc8b12b8f9e4f0c8d7406
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Nov 25 22:52:56 2005 +0000
-
- patch from kebekus to add to the qt4 binding the same functions we added to the qt3 one
-
- ChangeLog | 5 +++++
- qt4/src/poppler-page.cc | 44 ++++++++++++++++++++++++++++++++++++++++++--
- qt4/src/poppler-qt4.h | 22 ++++++++++++++++++++++
- 3 files changed, 69 insertions(+), 2 deletions(-)
-
-commit 3c9f09d76dc70e4ba766930facee8b6f30bcd2da
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Nov 22 21:50:44 2005 +0000
-
- Fix page range in the inspector
-
- ChangeLog | 4 ++++
- test/pdf-inspector.cc | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit e64f63416dbce497cb2167272b95491664f213e8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Nov 21 22:12:15 2005 +0000
-
- PAtch to add some more functions to the qt binding by Stefan Kebekus
-
- ChangeLog | 5 ++++
- qt/poppler-page.cc | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++-
- qt/poppler-qt.h | 41 +++++++++++++++++++++++++++++++
- 3 files changed, 114 insertions(+), 1 deletions(-)
-
-commit 8bd8cb4160b73da69d058783750352fbface66dc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Nov 21 19:44:09 2005 +0000
-
- Fix a possible build problem
-
- ChangeLog | 4 ++++
- qt/Makefile.am | 1 +
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-commit fc59b79dc375544681032a1618e96c458515d724
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun Nov 20 23:17:32 2005 +0000
-
- 2005-11-20 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/GfxState.cc: Fix the byte_lookup initialization broken
- by the merges (#4350). Modify GfxColorSpace::getRGBLine() to work
- with new GfXColor type.
-
- ChangeLog | 13 ++++++++++-
- poppler/GfxState.cc | 59 ++++++++++++++++++++++++++++++--------------------
- 2 files changed, 47 insertions(+), 25 deletions(-)
-
-commit 6fe2cb0fcd53211143dcd0c47bf8c8c7a8c11a39
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Nov 17 21:37:34 2005 +0000
-
- make it compile with freetype 2.2.0 preversions
-
- ChangeLog | 4 ++++
- splash/SplashFTFont.cc | 42 +++++++++++++++++++++++++++++++++++++-----
- 2 files changed, 41 insertions(+), 5 deletions(-)
-
-commit 429d3521d788be702a3944bc290569f90ae04892
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Nov 4 19:03:55 2005 +0000
-
- Make it compile using --disable-cairo-output
-
- ChangeLog | 4 ++++
- glib/poppler-document.cc | 6 ++++--
- glib/poppler-page.cc | 27 +++++++++++++--------------
- 3 files changed, 21 insertions(+), 16 deletions(-)
-
-commit b96c118eb08d478914c2981204d749a95957cbb3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Nov 1 15:29:32 2005 +0000
-
- Comment some unused parameters to calm down compiler warnings when using these heders on external projects with higher warning verbosity
-
- ChangeLog | 5 ++
- poppler/OutputDev.h | 125 ++++++++++++++++++++++++++-------------------------
- poppler/Stream.h | 24 +++++-----
- 3 files changed, 80 insertions(+), 74 deletions(-)
-
-commit 51670972777510a3ec64a56649716b31167b9d0e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 30 20:29:05 2005 +0000
-
- Last xpdf 3.01 merge (at least from my side)
- It's very big, but noone has opposed in the 2 weeks time i gave on the ml so either poppler is dead or people agree with the patch
-
- ChangeLog | 39 +
- glib/poppler-page.cc | 32 +-
- poppler/ArthurOutputDev.cc | 2 +-
- poppler/ArthurOutputDev.h | 2 +-
- poppler/CairoOutputDev.cc | 2 +-
- poppler/CairoOutputDev.h | 2 +-
- poppler/Gfx.cc | 645 ++++++++++--
- poppler/Gfx.h | 17 +-
- poppler/GfxState.cc | 1410 ++++++++++++++++++++++---
- poppler/GfxState.h | 196 +++-
- poppler/OutputDev.cc | 25 +
- poppler/OutputDev.h | 46 +-
- poppler/PDFDoc.cc | 98 ++-
- poppler/PDFDoc.h | 24 +-
- poppler/PSOutputDev.cc | 1461 +++++++++++++++++++++----
- poppler/PSOutputDev.h | 48 +-
- poppler/Page.cc | 115 ++-
- poppler/Page.h | 23 +-
- poppler/SplashOutputDev.cc | 1525 ++++++++++++++++++++++++---
- poppler/SplashOutputDev.h | 59 +-
- poppler/TextOutputDev.cc | 230 +++--
- poppler/TextOutputDev.h | 16 +-
- qt/poppler-page.cc | 34 +-
- qt4/src/poppler-page.cc | 31 +-
- splash/Splash.cc | 2598 ++++++++++++++++++++++++++++++++++----------
- splash/Splash.h | 75 +-
- splash/SplashBitmap.cc | 216 +++--
- splash/SplashBitmap.h | 13 +-
- splash/SplashPattern.cc | 22 +-
- splash/SplashPattern.h | 19 +-
- splash/SplashState.cc | 11 +
- splash/SplashState.h | 3 +
- splash/SplashTypes.h | 145 ++-
- test/gtk-cairo-test.cc | 2 +-
- test/gtk-splash-test.cc | 23 +-
- test/pdf-inspector.cc | 2 +-
- 36 files changed, 7656 insertions(+), 1555 deletions(-)
-
-commit 10dfa2254dafb9de93692def2bfb3133d9a39989
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Oct 17 02:17:51 2005 +0000
-
- 2005-10-05 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_render_to_ps): Fix another
- off-by-one page number error (#4555).
-
- ChangeLog | 6 +++++-
- poppler/poppler-config.h.in | 2 +-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-commit 9830f0ea41f09fefada740e9429c491e067a5082
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 16 15:11:32 2005 +0000
-
- GfxFont merges from xpdf 3.01
-
- ChangeLog | 1 +
- poppler/GfxFont.cc | 109 +++++++++++++++++++++++++++++++++++-----------------
- 2 files changed, 75 insertions(+), 35 deletions(-)
-
-commit 62b5ba221aca8c320e964916b0c0329efc8da572
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 16 15:04:39 2005 +0000
-
- Stream[cc|h] merges from xpdf 3.01
-
- ChangeLog | 1 +
- poppler/Stream.cc | 714 ++++++++++++++++++++++++++++++++++++++++++++++++-----
- poppler/Stream.h | 19 +-
- 3 files changed, 658 insertions(+), 76 deletions(-)
-
-commit b9fab51179f38e9798b10366be672f0432c874da
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 16 14:58:14 2005 +0000
-
- Function.cc|h merges from xpdf 3.01
-
- ChangeLog | 1 +
- poppler/Function.cc | 76 +++++++++++++++++++++++++++++----------------------
- poppler/Function.h | 42 ++++++++++++++++++++++++++++
- 3 files changed, 86 insertions(+), 33 deletions(-)
-
-commit c6e0242200f818c67508041763ff317e79daadd6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 16 14:54:17 2005 +0000
-
- Annot.[cc|h] and related merges from xpdf 3.01
-
- ChangeLog | 7 ++-
- poppler/Annot.cc | 234 ++++++++++++++++++++++++++++++++++++++++++------
- poppler/Annot.h | 20 ++---
- poppler/FontInfo.cc | 2 +-
- poppler/PSOutputDev.cc | 2 +-
- poppler/Page.cc | 2 +-
- 6 files changed, 221 insertions(+), 46 deletions(-)
-
-commit 65d574fdc009e45ad66d1d402d5e805e4e94f427
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 16 14:30:16 2005 +0000
-
- Merge SplashFTFont.cc with xpdf 3.01 changes
-
- ChangeLog | 1 +
- splash/SplashFTFont.cc | 64 +++++++++++++++++++++++++++++++++---------------
- 2 files changed, 45 insertions(+), 20 deletions(-)
-
-commit f9d208e86433b213b21a75089f82fd00dcd746fc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 16 14:25:32 2005 +0000
-
- Merge SplashScreen.[cc|h] from xpdf 3.01
-
- ChangeLog | 4 ++
- splash/SplashScreen.cc | 110 +++++++++++++++++++++++++++++++----------------
- splash/SplashScreen.h | 12 +++++-
- 3 files changed, 87 insertions(+), 39 deletions(-)
-
-commit 7d46ac000316566503a27b5e5c68621be9c081d0
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Oct 16 14:19:47 2005 +0000
-
- Merging SplashXPathScanner.cc changes from xpdf 3.01
-
- splash/SplashXPathScanner.cc | 80 ++++++++++++++++++++++-------------------
- 1 files changed, 43 insertions(+), 37 deletions(-)
-
-commit e34713a2187e05358f98e749ec2923210a40a862
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Oct 5 15:57:17 2005 +0000
-
- 2005-10-05 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_render_to_ps): Fix another
- off-by-one page number error (#4555).
-
- ChangeLog | 5 +++++
- glib/poppler-page.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit fdd0934430ed251f9aeb45158b6ec95684b3e7b4
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Mon Sep 26 19:29:45 2005 +0000
-
- 2005-09-26 Marco Pesenti Gritti <mpg@redhat.com>
-
- * glib/poppler-action.cc:
-
- Initialize window title even if the action is unknown
-
- ChangeLog | 6 ++++++
- glib/poppler-action.cc | 5 +++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-commit e9753049ddfbdf28df7a222d35eccdbcbcbc848d
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Mon Sep 26 10:42:38 2005 +0000
-
- 2005-09-26 Marco Pesenti Gritti <mpg@redhat.com>
-
- * glib/poppler-action.cc:
- * glib/poppler-action.h:
-
- Implement launch action
-
- ChangeLog | 7 +++++++
- glib/poppler-action.cc | 11 ++++++++---
- glib/poppler-action.h | 1 +
- 3 files changed, 16 insertions(+), 3 deletions(-)
-
-commit ab18b2cb6d1c62bb91173d105e8631fe4ef1bcfb
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 20 15:27:31 2005 +0000
-
- Parser.cc merges from xpdf 3.01
-
- ChangeLog | 1 +
- poppler/Parser.cc | 19 +++++++++++--------
- 2 files changed, 12 insertions(+), 8 deletions(-)
-
-commit cf6723caaed24615c3b8965cee9c433007f80d77
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 20 15:08:52 2005 +0000
-
- TextPage *TextOutpudDev::takeText() from xpdf 3.01
-
- ChangeLog | 1 +
- poppler/TextOutputDev.cc | 8 ++++++++
- poppler/TextOutputDev.h | 4 ++++
- 3 files changed, 13 insertions(+), 0 deletions(-)
-
-commit e0cbb0ca2c611ad5ac0267e46279c9d61450902a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 20 14:59:43 2005 +0000
-
- more 3.00 -> 3.01 merging
-
- ChangeLog | 1 +
- poppler/XRef.cc | 1 -
- 2 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 9c7adb318d395ff674c6febf6406a8d47e9e5bf6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 20 14:43:15 2005 +0000
-
- * poppler/UnicodeMap.cc: More grealloc -> greallocn
- * poppler/UnicodeTypeTable.cc: Merge from xpdf 3.01
-
- ChangeLog | 2 ++
- poppler/UnicodeMap.cc | 4 ++--
- poppler/UnicodeTypeTable.cc | 4 ++--
- 3 files changed, 6 insertions(+), 4 deletions(-)
-
-commit 2c4c9b855b0df1dc0836d4f44e9471215a419ea6
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 20 14:34:31 2005 +0000
-
- Merge link.cc changes from xpdf 3.00 -> 3.01
-
- ChangeLog | 1 +
- poppler/Link.cc | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 2 files changed, 62 insertions(+), 3 deletions(-)
-
-commit 4e9490c0219dd9c99ba0e5533c96663b8570a87b
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Sep 20 14:00:43 2005 +0000
-
- Merge GlobalParam.* changes, they are worthless for us as poppler but this way we are nearer to have the 3.01 sources merged, then we can remove them if we decide we don't need this options.
- Remove a setEncryption from the Xref.h marco probably forgot to remove when merging
-
- ChangeLog | 3 +++
- poppler/GlobalParams.cc | 41 +++++++++++++++++++++++++++++++++++++++++
- poppler/GlobalParams.h | 22 ++++++++++++++++------
- poppler/XRef.h | 4 ----
- 4 files changed, 60 insertions(+), 10 deletions(-)
-
-commit 22da021bf69d83d641e3f30cc0e1bd62394e56a4
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Tue Sep 20 13:23:08 2005 +0000
-
- 2005-09-20 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/XRef.cc:
-
- Remove duplicated initialization
-
- ChangeLog | 6 ++++++
- poppler/XRef.cc | 4 ----
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-commit 2a8778147938e3ed2af177226a9c35655f898c95
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Tue Sep 20 10:18:57 2005 +0000
-
- 2005-09-20 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/GlobalParams.cc:
-
- s/G/Goo in not yet compiled plugins code
-
- ChangeLog | 6 ++++++
- poppler/GlobalParams.cc | 8 ++++----
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-commit 16f720b87cfc491db585dbdc99236cf492ffe85b
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Tue Sep 20 09:57:41 2005 +0000
-
- 2005-09-20 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/Makefile.am:
-
- Add XPDFPlugin*. Thanks to TSDgeos that noticed this.
-
- * poppler/XpdfPluginAPI.cc:
-
- Fixup
-
- ChangeLog | 10 ++++++++++
- poppler/Makefile.am | 4 +++-
- poppler/XpdfPluginAPI.cc | 2 +-
- 3 files changed, 14 insertions(+), 2 deletions(-)
-
-commit 5f30791c3d87315ad1f742de64d2c1351ca70cb7
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 19:33:28 2005 +0000
-
- *** empty log message ***
-
- ChangeLog | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-commit db62e07fcf57f45951b21f8aab44b0d943efe5d0
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 19:33:05 2005 +0000
-
- 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/PDFDoc.cc:
- * poppler/PDFDoc.h:
- * poppler/XRef.cc:
- * poppler/XRef.h:
-
- Merge more from 3.01
-
- poppler/PDFDoc.cc | 20 ++++++++++++++++----
- poppler/PDFDoc.h | 19 +++++++++----------
- poppler/XRef.cc | 13 +++++++++++--
- poppler/XRef.h | 7 +++++--
- 4 files changed, 41 insertions(+), 18 deletions(-)
-
-commit 3acc7be594712fd0ce7ac07b7188d5b38b382782
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 19:05:00 2005 +0000
-
- 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/XRef.cc:
-
- Merge some initialization that I lost before
-
- ChangeLog | 6 ++++++
- poppler/XRef.cc | 4 ++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-commit 3badd82b72b2768be27e309b048cd8dcb1c80038
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 18:46:37 2005 +0000
-
- 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/XRef.cc:
-
- Merge change from 3.01
-
- ChangeLog | 6 ++++++
- poppler/XRef.cc | 8 --------
- 2 files changed, 6 insertions(+), 8 deletions(-)
-
-commit 5474583e20ca773befa17242d4ad7b8f81d5bf99
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 18:38:58 2005 +0000
-
- 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/CharCodeToUnicode.cc:
- * poppler/CharCodeToUnicode.h:
-
- Improvements from xpdf 3.01
-
- ChangeLog | 7 +++++++
- poppler/CharCodeToUnicode.cc | 31 +++++++++++++++++++------------
- poppler/CharCodeToUnicode.h | 4 ++++
- 3 files changed, 30 insertions(+), 12 deletions(-)
-
-commit b2a6eab113fecd3823885c64f3302bea4f372a9f
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 18:37:29 2005 +0000
-
- 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/CMap.cc:
-
- Improvements from xpdf 3.01
-
- ChangeLog | 6 ++++++
- poppler/CMap.cc | 30 +++++++++++++++++++++++++++---
- 2 files changed, 33 insertions(+), 3 deletions(-)
-
-commit 3f69f2158453b9dab9efc280ed1578ac3d0cebe8
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 18:35:29 2005 +0000
-
- 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/NameToUnicodeTable.h:
- * poppler/UnicodeTypeTable.cc:
- * poppler/UnicodeTypeTable.h:
-
- Merge some unicode table changes from xpdf 3.01
-
- ChangeLog | 8 +
- poppler/NameToUnicodeTable.h | 168 +++++-----
- poppler/UnicodeTypeTable.cc | 690 ++++++++++++++++++++++++++++++++++++++++--
- poppler/UnicodeTypeTable.h | 2 +
- 4 files changed, 764 insertions(+), 104 deletions(-)
-
-commit 6cbe76bc55d557fe5fca0f8f1b33bda95acdc0e9
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 18:32:29 2005 +0000
-
- 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/SplashOutputDev.h:
- * splash/Splash.cc:
- * splash/Splash.h:
-
- Modified region support from xpdf 3.01
-
- ChangeLog | 8 ++++++++
- poppler/SplashOutputDev.h | 5 +++++
- splash/Splash.cc | 31 +++++++++++++++++++++++++++++++
- splash/Splash.h | 11 +++++++++++
- 4 files changed, 55 insertions(+), 0 deletions(-)
-
-commit a9df3f3203c14161e5d6bc6048ec7e123536e6d3
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 18:29:18 2005 +0000
-
- 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
-
- * goo/Makefile.am:
- * poppler/DCTStream.h:
- * poppler/Decrypt.cc:
- * poppler/Decrypt.h:
- * poppler/FlateStream.h:
- * poppler/GlobalParams.cc:
- * poppler/GlobalParams.h:
- * poppler/Makefile.am:
- * poppler/PDFDoc.cc:
- * poppler/PDFDoc.h:
- * poppler/Parser.cc:
- * poppler/Parser.h:
- * poppler/Stream.cc:
- * poppler/Stream.h:
- * poppler/XRef.cc:
- * poppler/XRef.h:
- * poppler/poppler-config.h.in:
-
- Merge security plugins support from xpdf 3.01
-
- ChangeLog | 24 +++
- goo/FixedPoint.cc | 95 +++++++++++
- goo/FixedPoint.h | 150 +++++++++++++++++
- goo/Makefile.am | 6 +-
- poppler/DCTStream.h | 2 -
- poppler/Decrypt.cc | 23 ++-
- poppler/Decrypt.h | 6 +-
- poppler/FlateStream.h | 2 -
- poppler/GlobalParams.cc | 229 ++++++++++++++++++++++++++
- poppler/GlobalParams.h | 16 ++
- poppler/Makefile.am | 5 +-
- poppler/PDFDoc.cc | 36 ++++
- poppler/PDFDoc.h | 1 +
- poppler/Parser.cc | 20 ---
- poppler/Parser.h | 4 -
- poppler/SecurityHandler.cc | 376 +++++++++++++++++++++++++++++++++++++++++++
- poppler/SecurityHandler.h | 157 ++++++++++++++++++
- poppler/Stream.cc | 18 --
- poppler/Stream.h | 8 -
- poppler/XRef.cc | 162 ++-----------------
- poppler/XRef.h | 13 +-
- poppler/XpdfPluginAPI.cc | 262 ++++++++++++++++++++++++++++++
- poppler/XpdfPluginAPI.h | 341 +++++++++++++++++++++++++++++++++++++++
- poppler/poppler-config.h.in | 2 -
- 24 files changed, 1737 insertions(+), 221 deletions(-)
-
-commit a777e5c26483b90d0910e85c2be666640835d0bf
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 18:21:38 2005 +0000
-
- 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
-
- * configure.ac:
- * goo/Makefile.am:
- * splash/Makefile.am:
- * splash/SplashFTFont.cc:
- * splash/SplashMath.h:
- * splash/SplashTypes.h:
-
- Merge support for fixed point
-
- ChangeLog | 11 +++++++++++
- configure.ac | 4 ++++
- splash/Makefile.am | 1 +
- splash/SplashFTFont.cc | 7 +++++++
- splash/SplashMath.h | 34 +++++++++++++++++++++++++++++++++-
- splash/SplashTypes.h | 5 +++++
- 6 files changed, 61 insertions(+), 1 deletions(-)
-
-commit 00457c5f44a246c9f867a114a72be9f7b2dc1cf5
-Author: Marco Pesenti Gritti <mpg@redhat.com>
-Date: Fri Sep 16 18:11:14 2005 +0000
-
- 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
-
- * poppler/ArthurOutputDev.cc:
- * poppler/CairoFontEngine.cc:
- * poppler/TextOutputDev.cc:
- * poppler/UnicodeMap.cc:
-
- Use mallocn when possible
-
- ChangeLog | 9 +++++++++
- poppler/ArthurOutputDev.cc | 2 +-
- poppler/CairoFontEngine.cc | 4 ++--
- poppler/TextOutputDev.cc | 2 +-
- poppler/UnicodeMap.cc | 2 +-
- 5 files changed, 14 insertions(+), 5 deletions(-)
-
-commit 09c9ff67ceae5753811a2f625e3ad810628c782e
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Sep 16 18:00:43 2005 +0000
-
- SplashXPath.cc merges from xpdf 3.00 -> 3.01
-
- ChangeLog | 3 ++
- splash/SplashXPath.cc | 81 +++++++++++++++++++++++-------------------------
- 2 files changed, 42 insertions(+), 42 deletions(-)
-
-commit 0555ba861d3b84d88c80da4fa247274338ff7817
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Sep 16 17:42:56 2005 +0000
-
- SplashFontEngine.cc merge from xpdf 3.00 -> 3.01
-
- splash/SplashFontEngine.cc | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-commit ddc72bd8354168d992631d1ef8cd0939b428966c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Sep 15 22:24:55 2005 +0000
-
- Merge xpdf 3.00 -> 3.01 changes in SplashT1Font.* files
-
- splash/SplashT1Font.cc | 23 ++++++++++++++++++-----
- splash/SplashT1Font.h | 2 ++
- 2 files changed, 20 insertions(+), 5 deletions(-)
-
-commit ba409db3157105f326b4bbc342ca7af859a44ce9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Sep 15 22:20:37 2005 +0000
-
- Merge xpdf 3.00 -> 3.01 changes in SplashPath.* files
-
- splash/SplashPath.cc | 3 ++-
- splash/SplashPath.h | 5 +++++
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 3ea00e853049d8c26ee88aaef8ea6c47c8d46956
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Sep 15 22:15:47 2005 +0000
-
- Merge xpdf 3.00 -> 3.01 changes in SplashFont.* files
-
- splash/SplashFont.cc | 6 ++++++
- splash/SplashFont.h | 10 +++++++++-
- 2 files changed, 15 insertions(+), 1 deletions(-)
-
-commit e571dcbfd0c77a28e41710577859f632cc989de5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Sep 15 22:09:50 2005 +0000
-
- Merge the xpdf 3.01 change that uses runtime detection of freetype version
-
- ChangeLog | 6 ++++++
- configure.ac | 14 +++-----------
- poppler/CairoFontEngine.cc | 21 ++++++++++++++-------
- poppler/CairoFontEngine.h | 3 ++-
- splash/SplashFTFontEngine.cc | 19 +++++++++++--------
- splash/SplashFTFontEngine.h | 1 +
- 6 files changed, 37 insertions(+), 27 deletions(-)
-
-commit 59fe2937db192dc7b59bf28c3f29909faf11aae3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Sep 15 21:51:16 2005 +0000
-
- Merge xpdf 3.00 -> 3.01 changes for that file
-
- splash/SplashClip.h | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-commit b2f94635249f2c5f0c876a1005826fe4c6eb6025
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Sep 15 12:52:36 2005 +0000
-
- Merge xpdf 3.00 -> xpdf 3.01 changes for Catalog.[cc|h]
-
- poppler/Catalog.cc | 5 ++++-
- poppler/Catalog.h | 3 +++
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 0fc2e70576b1c48cf47a686e8aa7e202a802bc9d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Sep 15 12:32:25 2005 +0000
-
- Another small merge from xpdf 3.01
-
- ChangeLog | 3 +++
- poppler/Outline.cc | 6 +++---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-commit f8983ceb3c55df72c94870806d71db139c11bdeb
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Sep 15 12:28:34 2005 +0000
-
- Another small xpdf 3.00 -> xpdf 3.01 merge
-
- poppler/Object.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 52efe9845cf3eb1dd836f90bfa203760baa2f87c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Sep 15 11:46:56 2005 +0000
-
- bradh forgot to remove the two returns when merging xpdf 3.00 -> xpdf 3.01 changes of this file
-
- poppler/JPXStream.cc | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-commit 4b4fc5c017bf147c9069bbce32fc14467bd2a81a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Sep 14 21:20:36 2005 +0000
-
- Merge all the fofi/ changes from xpdf 3.01, there is only one api change that affects PSOutputDev (also has been updated the part that uses this api not the whole file). All our fixes in that dir are included in the upgrade.
-
- ChangeLog | 4 +
- fofi/FoFiTrueType.cc | 406 ++++++++++++++++++++++++++++++++++++++++++------
- fofi/FoFiTrueType.h | 15 ++-
- fofi/FoFiType1.cc | 25 ++--
- fofi/FoFiType1C.cc | 134 ++++++++++++++---
- fofi/FoFiType1C.h | 6 +
- poppler/PSOutputDev.cc | 7 +-
- poppler/PSOutputDev.h | 3 +-
- 8 files changed, 515 insertions(+), 85 deletions(-)
-
-commit a68e8e6330418b1f623867973b9c128a9a139c0c
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Sep 7 03:00:36 2005 +0000
-
- 2005-09-06 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Enable A4_PAPER and OPI_SUPPORT by default. There
- is no reason to not enable OPI and the paper size should be
- controlled by the application.
-
- * test/Makefile.am (EXTRA_DIST): Add pdf-operators.c
-
- ChangeLog | 8 ++++++++
- configure.ac | 17 ++---------------
- test/Makefile.am | 3 +++
- 3 files changed, 13 insertions(+), 15 deletions(-)
-
-commit b6490944c081ff53f623acea7ab7a600c3e54816
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sat Sep 3 11:53:44 2005 +0000
-
- Switch the qt4/tests unittests to use QtTestLib.
-
- ChangeLog | 6 ++
- configure.ac | 66 ++++++++++++++++++++
- qt4/tests/.cvsignore | 17 ++----
- qt4/tests/Makefile.am | 71 +++++++---------------
- qt4/tests/README.unittest | 23 +++++++
- qt4/tests/check_author.cpp | 25 --------
- qt4/tests/check_linearised.cpp | 23 -------
- qt4/tests/check_metadata.cpp | 101 +++++++++++++++++++++++++++++++
- qt4/tests/check_orientation.cpp | 40 ------------
- qt4/tests/check_pagelayout.cpp | 44 +++++++++++++
- qt4/tests/check_pagelayout_facing.cpp | 22 -------
- qt4/tests/check_pagelayout_none.cpp | 22 -------
- qt4/tests/check_pagelayout_single.cpp | 22 -------
- qt4/tests/check_pagemode.cpp | 64 +++++++++++++++++++
- qt4/tests/check_pagemode_attach.cpp | 22 -------
- qt4/tests/check_pagemode_fullscreen.cpp | 22 -------
- qt4/tests/check_pagemode_none.cpp | 22 -------
- qt4/tests/check_pagemode_oc.cpp | 22 -------
- qt4/tests/check_pagemode_thumbs.cpp | 22 -------
- qt4/tests/check_permissions.cpp | 60 +++++++------------
- 20 files changed, 354 insertions(+), 362 deletions(-)
-
-commit 3725841417871d1051772068833dc908ca70b7ce
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Sep 2 14:47:24 2005 +0000
-
- 2005-09-02 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc: Apply Marcos rotation fix.
-
- ChangeLog | 4 ++++
- glib/poppler-page.cc | 5 ++++-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-commit ecf3dcadb948013cbc987e464952933daf78e4bf
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Wed Aug 31 15:28:46 2005 +0000
-
- Merge some missing parts of previous patches, and some other minor
- cleanups from xpdf 3.0.1
-
- poppler/Catalog.cc | 16 +--
- poppler/JPXStream.cc | 380 ++++++++++++++++++++++++++++++++----------------
- poppler/JPXStream.h | 25 ++-
- poppler/Lexer.cc | 11 ++
- poppler/Lexer.h | 3 +
- poppler/PSOutputDev.cc | 31 ++--
- poppler/Stream.h | 7 +
- 7 files changed, 309 insertions(+), 164 deletions(-)
-
-commit de78738164319b733e54a9abfb5957870facd6cd
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Wed Aug 31 09:51:41 2005 +0000
-
- poppler/JArithmeticDecoder.cc
- poppler/JArithmeticDecoder.h
- poppler/JBIG2Stream.cc
- poppler/JBIG2Stream.h: merge in some of the JBIG2 changes from xpdf 3.0.1.
-
- ChangeLog | 9 ++
- poppler/JArithmeticDecoder.cc | 42 ++++++--
- poppler/JArithmeticDecoder.h | 22 ++++-
- poppler/JBIG2Stream.cc | 227 +++++++++++++++++++++++++----------------
- poppler/JBIG2Stream.h | 4 +-
- 5 files changed, 201 insertions(+), 103 deletions(-)
-
-commit 55952feb637e300b073691ae95d68e766521a769
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Aug 29 15:24:32 2005 +0000
-
- 2005-08-29 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac (HAVE_FREETYPE_H): Patch from Hiroyuki Ikezoe: Set
- HAVE_FREETYPE_217_OR_OLDER to 0 if we found freetype using
- pkg-config (#4223).
-
- ChangeLog | 6 ++++++
- configure.ac | 2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 244e5c1f8f65da41ba6314028766dfe5973f6132
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sun Aug 28 09:43:18 2005 +0000
-
- Merge the Goo* improvements from xpdf 3.0.1. This change is based on
- martink's work (7-xpdf-3.01-goo-improvements.patch), with some tweaking
- by me.
-
- ChangeLog | 13 ++++++++
- fofi/FoFiTrueType.cc | 1 +
- goo/GooHash.cc | 24 ++++++++++++++
- goo/GooHash.h | 2 +
- goo/GooList.cc | 5 +++
- goo/GooList.h | 5 +++
- goo/GooString.cc | 85 +++++++++++++++++++++++++++++++++++++++++++++++++-
- goo/GooString.h | 11 ++----
- goo/gmem.c | 3 ++
- poppler/Decrypt.cc | 1 +
- 10 files changed, 142 insertions(+), 8 deletions(-)
-
-commit eb91b274245b4f5f5389bc9ddfde2c2806557665
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sun Aug 28 09:31:53 2005 +0000
-
- This part of my previous gmallocn merge patch was missing.
-
- goo/GooHash.cc | 4 ++--
- goo/GooList.cc | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-commit b3474fd5e0efc96b5814d86e0cdedf39387e7ae3
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Aug 28 03:26:53 2005 +0000
-
- add note about related bug
-
- ChangeLog | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit ace2eb6ba518b970b96f30f61c4795c161e0cb79
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Aug 28 03:22:04 2005 +0000
-
- 2005-08-27 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/FlateStream.cc: Fix predictor leak.
-
- ChangeLog | 4 ++++
- poppler/FlateStream.cc | 1 +
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 96657c5480bf2ecf445ad5a105b8e7393ae53c8b
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Aug 28 03:19:55 2005 +0000
-
- 2005-08-27 Jeff Muizelaar <jeff@infidigm.net>
-
- * configure.ac: Disable the zlib-based decoder by default.
-
- ChangeLog | 4 ++++
- configure.ac | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit d1d715158223c7ca3ae279cea420a948cfdb0428
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sat Aug 27 08:43:42 2005 +0000
-
- Merge the gmalloc -> gmallocn changes from xpdf 3.0.1. This change is
- based on martink's work (13-xpdf-3.01-goo-allocn.patch) with some
- tweaking by me. There may be some residual gmallocn changes still to
- be merged.
-
- ChangeLog | 7 +++++
- fofi/FoFiTrueType.cc | 12 ++++----
- fofi/FoFiType1.cc | 2 +-
- fofi/FoFiType1C.cc | 14 +++++-----
- goo/gmem.c | 22 ++++++++++++++++
- goo/gmem.h | 9 +++++++
- poppler/Annot.cc | 2 +-
- poppler/Array.cc | 2 +-
- poppler/BuiltinFont.cc | 2 +-
- poppler/CMap.cc | 6 ++--
- poppler/Catalog.cc | 8 +++---
- poppler/CharCodeToUnicode.cc | 22 ++++++++--------
- poppler/Dict.cc | 2 +-
- poppler/Function.cc | 20 +++++++-------
- poppler/Gfx.cc | 2 +-
- poppler/GfxFont.cc | 24 +++++++++---------
- poppler/GfxState.cc | 54 ++++++++++++++++++++--------------------
- poppler/JArithmeticDecoder.cc | 2 +-
- poppler/JBIG2Stream.cc | 30 +++++++++++-----------
- poppler/Link.cc | 6 ++--
- poppler/NameToCharCode.cc | 4 +-
- poppler/Outline.cc | 4 +-
- poppler/SplashOutputDev.cc | 8 +++---
- poppler/Stream.cc | 12 ++++----
- poppler/TextOutputDev.cc | 48 ++++++++++++++++++------------------
- poppler/XRef.cc | 18 +++++++-------
- splash/SplashClip.cc | 12 ++++----
- splash/SplashFTFontFile.cc | 2 +-
- splash/SplashFont.cc | 6 ++--
- splash/SplashPath.cc | 8 +++---
- splash/SplashScreen.cc | 4 +-
- splash/SplashState.cc | 4 +-
- splash/SplashT1FontFile.cc | 4 +-
- splash/SplashXPath.cc | 4 +-
- splash/SplashXPathScanner.cc | 4 +-
- 35 files changed, 214 insertions(+), 176 deletions(-)
-
-commit feb82c60b1f86a9d1260db57534d98c54ee615c4
-Author: Martin Kretzschmar <martink@gnome.org>
-Date: Wed Aug 24 19:41:27 2005 +0000
-
- * configure.ac: add /usr/include/qt4 to qt4_incdirs. That's what
- Debian and Ubuntu use. Maybe we should just use pkg-config. If
- it's usable with qt4.
-
- * test/.cvsignore: ignore pdf_inspector binary.
-
- ChangeLog | 8 ++++++++
- configure.ac | 2 +-
- test/.cvsignore | 7 ++++---
- 3 files changed, 13 insertions(+), 4 deletions(-)
-
-commit 8dce80eb74f24f07ac7668905f1631e04a9c5841
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Aug 24 18:57:46 2005 +0000
-
- 2005-08-24 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/TextOutputDev.cc: Push rotation argument down to
- GfxState constructor. This is still not completely functional yet.
-
- * glib/poppler-page.cc (poppler_page_render_selection): Add
- rotation argument so API is useful. Not yet implemented.
- (poppler_page_prepare_output_dev): Patch from Marco to fix
- rotation using the cairo backend.
-
- ChangeLog | 10 ++++++++++
- glib/poppler-page.cc | 22 ++++++++++++++++------
- glib/poppler-page.h | 1 +
- poppler/TextOutputDev.cc | 11 ++++++++---
- poppler/TextOutputDev.h | 4 +++-
- 5 files changed, 38 insertions(+), 10 deletions(-)
-
-commit b909b5ae98bc3e557ef6e658e2b9120e82951259
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Wed Aug 24 03:21:20 2005 +0000
-
- Tue Aug 23 17:21:02 2005 Jonathan Blandford <jrb@redhat.com>
-
- * test/Makefile.am (gtk_cairo_test_LDADD): add
- FREETYPE_{CFLAGS,LIBS} to the cairo deps
-
- ChangeLog | 5 +++++
- test/Makefile.am | 4 +++-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-commit da3aac379f07ffedd6078707ec9923800fc0c0a5
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Tue Aug 23 18:20:45 2005 +0000
-
- Tue Aug 23 13:38:01 2005 Jonathan Blandford <jrb@redhat.com>
-
- * configure.ac:
- * poppler/Gfx.cc:
- * poppler/Gfx.h:
- * poppler/GlobalParams.cc:
- * poppler/GlobalParams.h:
- * poppler/Makefile.am:
- * poppler/OutputDev.cc:
- * poppler/OutputDev.h:
- * poppler/ProfileData.cc:
- * poppler/ProfileData.h:
- * test/Makefile.am:
- * test/pdf-inspector.cc:
- * test/pdf-inspector.glade:
- * test/pdf-operators.c: Initial cut at a pdf inspector. This
- should help us look at PDF files.
-
- ChangeLog | 18 ++
- configure.ac | 4 +-
- poppler/Gfx.cc | 30 ++++
- poppler/Gfx.h | 1 +
- poppler/GlobalParams.cc | 16 ++
- poppler/GlobalParams.h | 3 +
- poppler/Makefile.am | 2 +
- poppler/OutputDev.cc | 17 ++
- poppler/OutputDev.h | 10 +-
- poppler/ProfileData.cc | 44 +++++
- poppler/ProfileData.h | 41 +++++
- test/Makefile.am | 13 ++-
- test/pdf-inspector.cc | 358 ++++++++++++++++++++++++++++++++++++++
- test/pdf-inspector.glade | 434 ++++++++++++++++++++++++++++++++++++++++++++++
- test/pdf-operators.c | 81 +++++++++
- 15 files changed, 1068 insertions(+), 4 deletions(-)
-
-commit 1aad886c6c19a964a3fc9e18f31acc8e115478e0
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Aug 22 18:20:12 2005 +0000
-
- 2005-08-22 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler-private.h:
- * glib/test-poppler-glib.c: Patch from Marco to simplify the glib
- rotation API.
-
- ChangeLog | 8 +++
- glib/poppler-page.cc | 136 ++++++----------------------------------------
- glib/poppler-page.h | 4 +-
- glib/poppler-private.h | 1 -
- glib/test-poppler-glib.c | 2 +-
- 5 files changed, 28 insertions(+), 123 deletions(-)
-
-commit 6070b1dc4b76c236f3100fbd255c2d906e61c3c2
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun Aug 21 23:14:04 2005 +0000
-
- 2005-08-21 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/Makefile.am (INCLUDES): Add FREETYPE_CFLAGS.
-
- * configure.ac: Make freetype check use pkg-config if possible.
-
- ChangeLog | 6 ++++++
- configure.ac | 34 ++++++++++++++++++++++++----------
- poppler/Makefile.am | 1 +
- 3 files changed, 31 insertions(+), 10 deletions(-)
-
-commit 2698ca6fa107ea91dc01eb8cfb0c93383fbca125
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Aug 17 16:54:01 2005 +0000
-
- 2005-08-17 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/GfxFont.cc: Add fix discussed in #3131 to only use the
- MacRoman char map if the font has one or the font dicts specifies
- /MacRoman.
-
- ChangeLog | 6 ++++++
- poppler/GfxFont.cc | 1 -
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 5dc9b14b99f2efa2fe018e9267dd363d1bcd78b1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Aug 7 23:58:12 2005 +0000
-
- Fix EOF checking
-
- ChangeLog | 4 ++++
- poppler/PDFDoc.cc | 10 +++++++++-
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
-commit 155d019d7b474f244a3e4bf64d192015f6a266c4
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sat Aug 6 18:09:51 2005 +0000
-
- 2005-08-06 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h: Use GdkColor for specifying selection
- colors, we alreay depend on GDK anyway.
-
- ChangeLog | 6 ++++++
- glib/poppler-page.cc | 20 +++++++++-----------
- glib/poppler-page.h | 5 +++--
- 3 files changed, 18 insertions(+), 13 deletions(-)
-
-commit c710b645c8297d356c101b13a9889bcaba691176
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 6 11:58:59 2005 +0000
-
- Update comment
-
- poppler/PDFDoc.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit de7953c8a8360d8bfc99298906c5fc1094684fc3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sat Aug 6 11:47:37 2005 +0000
-
- Increase EOF searching up to last 1024 characters
-
- ChangeLog | 7 +++++++
- poppler/PDFDoc.cc | 23 +++++++++++++----------
- 2 files changed, 20 insertions(+), 10 deletions(-)
-
-commit 5dd72618688763b50d5f5738d857c9294ef1b1c2
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sat Aug 6 02:15:58 2005 +0000
-
- Add password arguments to document constructor.
-
- ChangeLog | 4 ++++
- qt4/src/poppler-document.cc | 8 ++++++--
- qt4/src/poppler-qt4.h | 4 +++-
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-commit edbd7957b393eb63f48df7db6b220b355d4fc461
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sat Aug 6 02:07:55 2005 +0000
-
- Make API extraction work again.
-
- ChangeLog | 3 +++
- qt4/src/Doxyfile | 2 +-
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-commit f43a6f1d1c27c042f5736746c94430083baa4c1d
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sat Aug 6 01:53:06 2005 +0000
-
- Add new test code for encrypted files.
-
- ChangeLog | 5 ++
- qt4/tests/.cvsignore | 1 +
- qt4/tests/Makefile.am | 7 ++-
- qt4/tests/test-password-qt4.cpp | 135 +++++++++++++++++++++++++++++++++++++++
- 4 files changed, 147 insertions(+), 1 deletions(-)
-
-commit 2ec26afaf80864b023899b890b8e229448da9bed
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Aug 5 22:30:20 2005 +0000
-
- 2005-08-05 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/TextOutputDev.cc (visitLine): Round selection
- coordinates in device space, so selection isn't fuzzy.
-
- * poppler/GfxState.cc:
- * poppler/GfxState.h: Add simple Matrix class.
-
- ChangeLog | 8 ++++++++
- poppler/CairoOutputDev.cc | 6 +++---
- poppler/GfxState.cc | 26 ++++++++++++++++++++++++++
- poppler/GfxState.h | 10 ++++++++++
- poppler/TextOutputDev.cc | 14 ++++++++++++++
- 5 files changed, 61 insertions(+), 3 deletions(-)
-
-commit ccba4f0773047eea5e4ad0ac736450160dd97664
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Aug 5 19:04:36 2005 +0000
-
- 2005-08-05 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * poppler/TextOutputDev.cc:
- * poppler/TextOutputDev.h: Propagate selection colors to the glib API.
-
- ChangeLog | 7 +++++
- glib/poppler-page.cc | 63 ++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h | 4 ++-
- poppler/TextOutputDev.cc | 25 ++++++++---------
- poppler/TextOutputDev.h | 7 +++-
- 5 files changed, 82 insertions(+), 24 deletions(-)
-
-commit 43e97129393f403c41f191ceae9a54793ece005f
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Thu Aug 4 10:15:23 2005 +0000
-
- Fix problem with drawing filled objects that was introduced in Rev 1.4.
-
- ChangeLog | 5 +++++
- poppler/ArthurOutputDev.cc | 13 +++++++++++--
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-commit a75d80333a70d2e1ac7c9032d316034eebed9dd6
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Wed Aug 3 11:44:55 2005 +0000
-
- Implement paging ability for Qt4, more than a little based
- on Albert's work for Qt3.
- Up arrow -> previous page
- Down arrow -> next page
- q -> quit.
-
- What more could you want from a PDF viewer :-)
-
- ChangeLog | 6 +++++
- qt4/tests/test-poppler-qt4.cpp | 47 +++++++++++++++++++++++++++++++--------
- 2 files changed, 43 insertions(+), 10 deletions(-)
-
-commit f3e0a163b098da1cc389c2c4f47e28358b1bec77
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Aug 1 19:15:40 2005 +0000
-
- Fix problem in the patch to fix #3299
-
- ChangeLog | 4 ++++
- poppler/DCTStream.cc | 15 ++++++++++-----
- poppler/DCTStream.h | 1 +
- 3 files changed, 15 insertions(+), 5 deletions(-)
-
-commit 5f7bd81bedd8c90e3312190256488ff0c15502e1
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Aug 1 15:21:19 2005 +0000
-
- 2005-08-01 Kristian Høgsberg <krh@redhat.com>
-
- Patch from Dan Winship <danw@novell.com>
-
- * glib/poppler-page.cc (poppler_page_copy_to_pixbuf): Set alpha to
- 0xff (opaque), not 0x00.
-
- ChangeLog | 7 +++++++
- glib/poppler-page.cc | 2 +-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-commit 22f509e60f60ccaea1f91d9ec1ef7ba8200bee8a
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Mon Aug 1 08:09:00 2005 +0000
-
- Fix up the fill problem with drawing text, where the "middle" of glyphs
- with a "hole" (like d, o, p, b, g) got filled. Also remove some debugging
- code. The glyphs are still ugly though.
-
- ChangeLog | 7 +++++++
- poppler/ArthurOutputDev.cc | 13 +------------
- 2 files changed, 8 insertions(+), 12 deletions(-)
-
-commit 7bf5d10c1f6edd538769c3a83a3b3d5df56d604b
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sun Jul 31 09:54:04 2005 +0000
-
- An initial version of proper font handling, heavily based on work by
- Albert Astals Cid. I changed it to stroke the glyphs based on the
- SplashPath. In the longer term, Arthur should use FreeType paths
- directly - hopefully that will be less ugly, and not fill everything.
-
- ChangeLog | 8 +
- poppler/ArthurOutputDev.cc | 407 +++++++++++++++++++++++++++++++------------
- poppler/ArthurOutputDev.h | 15 ++-
- qt4/src/poppler-page.cc | 2 +-
- splash/SplashPath.h | 2 +
- 5 files changed, 317 insertions(+), 117 deletions(-)
-
-commit 8567b794628786b82e8db2a7daf75e4ad2398960
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Fri Jul 29 12:15:19 2005 +0000
-
- Add some more test cases.
-
- ChangeLog | 4 ++++
- qt4/tests/.cvsignore | 4 ++++
- qt4/tests/Makefile.am | 10 +++++++++-
- qt4/tests/check_pagelayout_facing.cpp | 22 ++++++++++++++++++++++
- qt4/tests/check_version.cpp | 22 ++++++++++++++++++++++
- 5 files changed, 61 insertions(+), 1 deletions(-)
-
-commit 59d660cf4d614fdea09d6a62b8889f7682c2b4f9
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Fri Jul 29 11:41:14 2005 +0000
-
- Compile fix associated with last change.
-
- poppler/ArthurOutputDev.cc | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-commit 88c57c73f57820d6a57e26825093fbc688845e67
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Fri Jul 29 11:24:42 2005 +0000
-
- A couple of minor changes to the Arthur backend.
-
- ChangeLog | 9 +++++++++
- poppler/ArthurOutputDev.cc | 18 ++++++++++++++----
- 2 files changed, 23 insertions(+), 4 deletions(-)
-
-commit 481db9d9eae5ea16e5b382f4ad21e6e624a70dcf
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Jul 29 05:48:33 2005 +0000
-
- 2005-07-29 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/TextOutputDev.cc: Finish TextSelectionDumper class for
- extracting the text from a selection. Add
- TextPage::getSelectionText() and TextOutputDev::getSelectionText()
- methods to expose the new functionality.
-
- * glib/poppler-page.cc (poppler_page_get_text): Use
- TextOutputDev::getSelectionText() to get the text from the
- selection.
-
- * glib/poppler-document.cc (poppler_document_new_from_file):
- * glib/poppler-page.cc (_poppler_page_new): Add extra NULL to
- g_object_new() constructor to silence gcc warning about missing
- sentinel.
-
- ChangeLog | 16 +++++
- glib/poppler-document.cc | 2 +-
- glib/poppler-page.cc | 31 ++++-----
- poppler/TextOutputDev.cc | 164 ++++++++++++++++++++++++++++++++++-----------
- poppler/TextOutputDev.h | 8 ++
- 5 files changed, 164 insertions(+), 57 deletions(-)
-
-commit ad312dbded4e8f70c3a2eac9a0964fa00ecb6b2c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jul 28 22:56:17 2005 +0000
-
- Fix memory leaks in PageLabelInfo.cc
-
- ChangeLog | 4 ++++
- poppler/PageLabelInfo.cc | 11 +++++++++++
- poppler/PageLabelInfo.h | 2 ++
- 3 files changed, 17 insertions(+), 0 deletions(-)
-
-commit b45ad9f3409d7b1ed147135a70553e5255913c61
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jul 28 20:53:36 2005 +0000
-
- - delete family;
- + delete[] family;
- as family is new[]'ed
-
- When assigning family if the font had "the proper info" and family had to be deleted, do it.
-
- poppler/GlobalParams.cc | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-commit f93dfc5c5133e0b1bd9f4786cfe18bd796cbac2a
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jul 28 18:51:17 2005 +0000
-
- Remove the debugging
-
- poppler/GlobalParams.cc | 5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-commit 8022315004e1623c0be320f7671fcd72c15c0de3
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jul 28 18:37:17 2005 +0000
-
- Wonder how that slipped here
-
- poppler/GlobalParams.cc | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-commit 82638babe89e402c0348619ec3205059b977c7e9
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Thu Jul 28 17:34:19 2005 +0000
-
- Fontconfig patch is here, rejoice
-
- ChangeLog | 15 ++-
- glib/poppler-document.cc | 1 -
- poppler/CairoFontEngine.cc | 95 +---------
- poppler/CairoFontEngine.h | 2 -
- poppler/CairoOutputDev.cc | 4 -
- poppler/GlobalParams.cc | 473 ++++++++++++++++++++-----------------------
- poppler/GlobalParams.h | 17 +--
- poppler/SplashOutputDev.cc | 132 +------------
- poppler/SplashOutputDev.h | 3 -
- qt/poppler-document.cc | 1 -
- qt4/src/poppler-document.cc | 1 -
- test/gtk-cairo-test.cc | 1 -
- test/gtk-splash-test.cc | 1 -
- 13 files changed, 241 insertions(+), 505 deletions(-)
-
-commit e9015531b1d0e5f2c8d8ca2bc50d5f14aaf954bc
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Jul 28 06:31:57 2005 +0000
-
- 2005-07-28 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/poppler-config.h.in: Add GCC_PRINTF_FORMAT macro to
- annotate printf-like functions (#3638).
-
- * poppler/Error.h: Add GCC_PRINTF_FORMAT to error().
-
- * poppler/PSOutputDev.h: Add GCC_PRINTF_FORMAT to
- PSOutputDev::writePSFmt().
-
- * poppler/PSOutputDev.cc, poppler/GlobalParams.cc: Quiet new
- printf warnings.
-
- ChangeLog | 11 +++++++++++
- poppler/Error.h | 2 +-
- poppler/GlobalParams.cc | 3 ++-
- poppler/PSOutputDev.cc | 3 +--
- poppler/PSOutputDev.h | 2 +-
- poppler/TextOutputDev.cc | 13 ++++++++++++-
- poppler/poppler-config.h.in | 12 ++++++++++++
- 7 files changed, 40 insertions(+), 6 deletions(-)
-
-commit 9df89c495683e229b771b3d008ed25d478465c35
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Jul 28 05:52:43 2005 +0000
-
- 2005-07-28 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/TextOutputDev.cc (TextBlock::visitSelection): Assign
- start and stop coordinates in one place so we don't assign the
- same point to both in some corner cases.
- (TextWord::visitSelection): Initialize begin to len, not len + 1
- to fix crash.
-
- (TextWord::visitSelection, TextLine::visitSelection): Change
- selection trigger; now midpoint of glyph must be included in
- selection area for glyph to be in selection.
-
- ChangeLog | 12 +++++
- poppler/CairoOutputDev.cc | 2 +-
- poppler/TextOutputDev.cc | 113 +++++++++++++++++++++-----------------------
- 3 files changed, 67 insertions(+), 60 deletions(-)
-
-commit a3d9b5849cedf1316c6fc5859872e957f3f7b593
-Author: Martin Kretzschmar <martink@gnome.org>
-Date: Wed Jul 27 19:21:08 2005 +0000
-
- * poppler/PSOutputDev.cc (PSOutputDev): change the constructor to
- take paper size and duplex setting parameters.
- (init): add paper size and duplex parameters.
- (writeDocSetup): add duplex parameter.
-
- * poppler/PSOutputDev.h: update declarations.
-
- * glib/poppler-private.h (struct _PopplerPSFile): store necessary
- information to eventually construct a PSOutputDev.
-
- * glib/poppler-page.cc (poppler_page_render_to_ps): initialize the
- output dev if it doesn't exist yet.
-
- * glib/poppler-document.cc (poppler_ps_file_new): don't create the
- PSOutputDev here, just store filename and page range.
- (poppler_ps_file_set_paper_size, poppler_ps_file_set_duplex): new
- functions.
- (poppler_ps_file_free): free the filename which we strdup now.
-
- * glib/poppler-document.h: add prototypes.
-
- ChangeLog | 23 +++++++++++++++++++++
- glib/poppler-document.cc | 49 +++++++++++++++++++++++++++++++++++++++------
- glib/poppler-document.h | 15 +++++++++----
- glib/poppler-page.cc | 10 +++++++++
- glib/poppler-private.h | 6 +++++
- poppler/PSOutputDev.cc | 23 +++++++++++++--------
- poppler/PSOutputDev.h | 9 ++++++-
- 7 files changed, 112 insertions(+), 23 deletions(-)
-
-commit 7be920ecf13698c3cf4ab8df09c8c67f1a04bfa2
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 26 21:52:09 2005 +0000
-
- Fix mem leak in qt test app
-
- ChangeLog | 4 ++++
- qt/test-poppler-qt.cpp | 2 ++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 2bc26dffd9f296799617d319055648c20f748c8a
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Jul 26 20:34:13 2005 +0000
-
- 2005-07-26 Kristian Høgsberg <krh@redhat.com>
-
- * fofi/FoFiType1.cc: Make check for end of encoding array a bit
- more liberal so we don't crash on complex encoding arrays (#3344).
-
- ChangeLog | 5 +++++
- fofi/FoFiType1.cc | 21 +++++++--------------
- 2 files changed, 12 insertions(+), 14 deletions(-)
-
-commit 07911274e4e850a628b1e587cafc2a73c05f93fe
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Mon Jul 25 20:40:37 2005 +0000
-
- Work on bad jpeg data that have garbage before the start marker. Fixes bug #3299
-
- ChangeLog | 5 +++++
- poppler/DCTStream.cc | 38 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 43 insertions(+), 0 deletions(-)
-
-commit a1869eca39172fcb42f036a5846b19548be53568
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 22 11:01:25 2005 +0000
-
- Fix bug #3586
-
- ChangeLog | 5 +++++
- poppler/CairoFontEngine.cc | 2 ++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-commit 95529b41272484f08fb54393e1886bf7ff3e02c8
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 22 10:45:19 2005 +0000
-
- Make it possible to browse pages in test-poppler-qt
-
- ChangeLog | 13 ++++++++---
- qt/test-poppler-qt.cpp | 49 +++++++++++++++++++++++++++++++++++++++--------
- 2 files changed, 49 insertions(+), 13 deletions(-)
-
-commit 2d52650864eab0e9385ed1fe8fb594daac9d8322
-Author: Martin Kretzschmar <martink@gnome.org>
-Date: Fri Jul 22 10:35:56 2005 +0000
-
- * glib/poppler-document.cc (poppler_fonts_iter_get_name): if the
- font is a subset, strip the ABCDEF+ tag.
- (poppler_fonts_iter_get_full_name): does what the old get_name did.
- (poppler_fonts_iter_get_font_type, poppler_fonts_iter_is_embedded)
- (poppler_fonts_iter_is_subset): new wrappers.
-
- * glib/poppler-document.h (PopplerFontType): new enum.
- Update prototypes.
-
- ChangeLog | 11 +++++++++
- glib/poppler-document.cc | 54 +++++++++++++++++++++++++++++++++++++++++++++-
- glib/poppler-document.h | 38 +++++++++++++++++++++++---------
- 3 files changed, 91 insertions(+), 12 deletions(-)
-
-commit 43bed4aafcf1d291dc96fa5070efbd7936a6122f
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Fri Jul 22 10:33:54 2005 +0000
-
- Fix bugs #3728 and #3750
-
- ChangeLog | 4 ++++
- splash/Splash.cc | 10 ++++++++++
- 2 files changed, 14 insertions(+), 0 deletions(-)
-
-commit c7bcef87493d354a077dd223d76f86640acc0ce3
-Author: Martin Kretzschmar <martink@gnome.org>
-Date: Fri Jul 15 19:55:30 2005 +0000
-
- update for 2005-06-27 change to actually display something again.
-
- ChangeLog | 5 +++++
- test/gtk-cairo-test.cc | 10 ++++++----
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-commit 6623711d2d50dc52454904ee16b25337f0aab130
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Sun Jul 10 09:34:03 2005 +0000
-
- A general cleanup of the Arthur output renderer.
-
- ChangeLog | 5 ++
- poppler/ArthurOutputDev.cc | 105 +++++++++++++++-----------------------------
- 2 files changed, 41 insertions(+), 69 deletions(-)
-
-commit ea1cc9a7b12db9c44b89896c41d07e3ba932d054
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Jul 8 04:59:41 2005 +0000
-
- 2005-07-08 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_set_selection_alpha): Add
- this function to initialize the alpha channel when using the
- splash backend.
-
- * poppler/TextOutputDev.cc (visitLine): Add missing scaling of
- intra-line selection edges.
-
- ChangeLog | 9 +++++++
- glib/poppler-page.cc | 59 +++++++++++++++++++++++++++++++++++++++++++++-
- poppler/TextOutputDev.cc | 17 +++++++-----
- 3 files changed, 77 insertions(+), 8 deletions(-)
-
-commit 1cd915397c9532ed80b4f905b6ed9c0126aa38f2
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Thu Jul 7 21:15:09 2005 +0000
-
- Add support for page layout to the Qt4 bindings, plus
- test cases.
-
- ChangeLog | 8 ++++++++
- qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++
- qt4/src/poppler-qt4.h | 26 ++++++++++++++++++++++++--
- qt4/tests/Makefile.am | 10 +++++++++-
- qt4/tests/check_pagelayout_none.cpp | 22 ++++++++++++++++++++++
- qt4/tests/check_pagelayout_single.cpp | 22 ++++++++++++++++++++++
- 6 files changed, 107 insertions(+), 3 deletions(-)
-
-commit 4e050aef7ba132900f84205be221fd48808848c3
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Jul 7 17:19:36 2005 +0000
-
- 2005-07-07 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_prepare_output_dev): Account
- for page rotation when creating the cairo surface.
-
- ChangeLog | 5 +++++
- glib/poppler-page.cc | 17 +++++++++++++++--
- 2 files changed, 20 insertions(+), 2 deletions(-)
-
-commit 2eeab0b8afeb4897806df2de6e496889c25dda5e
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Jul 7 15:58:43 2005 +0000
-
- 2005-07-06 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_copy_to_pixbuf): Add out of
- bounds checking (from Marco).
-
- ChangeLog | 6 +++++-
- glib/poppler-page.cc | 5 +++++
- 2 files changed, 10 insertions(+), 1 deletions(-)
-
-commit b1015f6bdbd93b2a2574a9f0e0e1cd7dbae9af78
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Thu Jul 7 11:13:24 2005 +0000
-
- At least try to fix glib issues. If you care about glib,
- then you should review this.
-
- ChangeLog | 4 ++++
- glib/poppler-document.cc | 2 ++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 8bf787031e7a2e93b4e1202918bd1aee86675082
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Thu Jul 7 11:04:08 2005 +0000
-
- Update for page mode - new mode from PDF-1.6, API docs fixes
- and some tests.
-
- ChangeLog | 15 +++++++++++++++
- poppler/Catalog.cc | 2 ++
- poppler/Catalog.h | 3 ++-
- qt4/src/poppler-document.cc | 2 ++
- qt4/src/poppler-qt4.h | 14 +++++++++-----
- qt4/tests/Makefile.am | 22 +++++++++++++++++++++-
- qt4/tests/check_pagemode_attach.cpp | 22 ++++++++++++++++++++++
- qt4/tests/check_pagemode_fullscreen.cpp | 22 ++++++++++++++++++++++
- qt4/tests/check_pagemode_none.cpp | 22 ++++++++++++++++++++++
- qt4/tests/check_pagemode_oc.cpp | 22 ++++++++++++++++++++++
- qt4/tests/check_pagemode_thumbs.cpp | 22 ++++++++++++++++++++++
- 11 files changed, 161 insertions(+), 7 deletions(-)
-
-commit 695e27fb4d6fcc3466e2c9c95b4f02821b07e823
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Thu Jul 7 11:01:27 2005 +0000
-
- Suppress noise from new test files.
-
- qt4/tests/.cvsignore | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit 8a8d57bdcf11ed2903913d938b9711053b9bb9f1
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jul 6 17:12:36 2005 +0000
-
- Extract family, stretch and weight from the font descriptor
-
- ChangeLog | 2 ++
- poppler/GfxFont.cc | 41 +++++++++++++++++++++++++++++++++++++++++
- poppler/GfxFont.h | 36 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 79 insertions(+), 0 deletions(-)
-
-commit 3a1646c2f776f5a07b0e830fcb8e1b0a80efb41c
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Wed Jul 6 13:29:00 2005 +0000
-
- Add checkFooter to check the document ends with %%EOF
-
- ChangeLog | 5 +++++
- poppler/PDFDoc.cc | 28 ++++++++++++++++++++++++++++
- poppler/PDFDoc.h | 1 +
- 3 files changed, 34 insertions(+), 0 deletions(-)
-
-commit 377c023d31cf74d8240aa5be9dba8e3838459a8c
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Wed Jul 6 11:15:16 2005 +0000
-
- Add unit tests for the isLinearized() property.
-
- ChangeLog | 4 ++++
- qt4/tests/Makefile.am | 6 +++++-
- qt4/tests/check_linearised.cpp | 23 +++++++++++++++++++++++
- 3 files changed, 32 insertions(+), 1 deletions(-)
-
-commit 5fa869887a840a585340993718df0841010666cf
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Wed Jul 6 09:52:30 2005 +0000
-
- Remove boolean for unicode table lookup from Font
-
- ChangeLog | 14 ++++++++++++++
- qt4/src/poppler-document.cc | 2 --
- qt4/src/poppler-qt4.h | 14 +-------------
- qt4/tests/poppler-fonts.cpp | 16 +++++++---------
- 4 files changed, 22 insertions(+), 24 deletions(-)
-
-commit 40469c5883e17e734f3d54872c59e76b95bc0f95
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Wed Jul 6 09:00:39 2005 +0000
-
- Update to reflect recent changes.
-
- qt4/tests/.cvsignore | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 6cea437208f913085a6a8c7183b0826a107cefb5
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jul 5 21:15:48 2005 +0000
-
- Don't crash with files that have fonts with no name
-
- ChangeLog | 7 +++++++
- qt4/src/poppler-document.cc | 13 ++++++++++---
- qt4/src/poppler-qt4.h | 2 +-
- 3 files changed, 18 insertions(+), 4 deletions(-)
-
-commit 1323c74479848f5b87a3a13fa26e8b9e096e9f6a
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Tue Jul 5 12:31:59 2005 +0000
-
- Check in a couple more test apps
-
- qt4/tests/Makefile.am | 10 ++++++-
- qt4/tests/check_author.cpp | 25 ++++++++++++++++
- qt4/tests/check_permissions.cpp | 59 +++++++++++++++++++++++++++++++++++++++
- 3 files changed, 93 insertions(+), 1 deletions(-)
-
-commit 839a798ec3725427185de5a48c58ac448596b25d
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Tue Jul 5 12:25:00 2005 +0000
-
- Add Qt4 bindings for new user permission properties.
-
- ChangeLog | 4 +++
- qt4/src/poppler-document.cc | 25 +++++++++++++++++++++
- qt4/src/poppler-qt4.h | 51 ++++++++++++++++++++++++++++++++++++++----
- 3 files changed, 75 insertions(+), 5 deletions(-)
-
-commit e10f6990d3339e3a7adeaa50b1754cf7ecf82f87
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Tue Jul 5 12:15:04 2005 +0000
-
- Add some more user permissions properties - high resolution
- printing, document assembly, extraction for accessibility
- and form completion.
-
- ChangeLog | 8 +++++++
- poppler/PDFDoc.h | 9 ++++++++
- poppler/XRef.cc | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++---
- poppler/XRef.h | 4 +++
- 4 files changed, 72 insertions(+), 4 deletions(-)
-
-commit 3a8e1ba03cdec6412dd0b79f0cc59a4cd97dd4e7
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Mon Jul 4 11:38:22 2005 +0000
-
- A couple more little changes.
-
- ChangeLog | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-commit a44bd0b45bb89f29ddca5d0e8986a8de50f9db39
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Mon Jul 4 11:37:21 2005 +0000
-
- Change path to sample file to point to test module
-
- qt4/tests/check_orientation.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 2a7079087c35651c242d3843c94703a3199e61ca
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Mon Jul 4 11:36:13 2005 +0000
-
- Fix typo causing failure to pick up upside down pages.
-
- qt4/src/poppler-page.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 529a548044ae721a414c5b8e768c0498b1e6830b
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Mon Jul 4 08:30:29 2005 +0000
-
- Update to reflect recent changes
-
- ChangeLog | 30 +++++++++++++++++++++++++++++-
- qt4/tests/.cvsignore | 2 ++
- 2 files changed, 31 insertions(+), 1 deletions(-)
-
-commit 08cca4670f8ae65333beacda85834112e76489d1
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Mon Jul 4 08:21:27 2005 +0000
-
- Add in a simple demo/test application, similar to the pdffonts
- application in xpdf.
-
- qt4/tests/Makefile.am | 9 ++++-
- qt4/tests/poppler-fonts.cpp | 76 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 84 insertions(+), 1 deletions(-)
-
-commit 52af89d8303b50c45d5e4584d19ec8b7d7ebcf9b
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Mon Jul 4 08:18:52 2005 +0000
-
- Update to reflect changes to rendering API.
-
- qt4/tests/stress-poppler-qt4.cpp | 4 ++--
- qt4/tests/test-poppler-qt4.cpp | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-commit d42998d0fc32b1e21a2aeef1311e0baf508ade3f
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Mon Jul 4 08:16:17 2005 +0000
-
- Qt4 update.
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-document.cc complete Qt4 font metadata handling
-
- * qt4/src/poppler-qt4.h:
- * qt4/src/poppler-page.cc: change the render API to make it more
- Qt-like.
-
- qt4/src/poppler-document.cc | 7 +++-
- qt4/src/poppler-page.cc | 5 +--
- qt4/src/poppler-qt4.h | 73 ++++++++++++++++++++++++++++++++++++++++--
- 3 files changed, 77 insertions(+), 8 deletions(-)
-
-commit 5d194b926d1ed642ed4bbd3304befa073d389cd4
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Mon Jul 4 08:10:16 2005 +0000
-
- Change FontInfo::type() to return an enumerated value,
- rather than a GooString.
-
- poppler/FontInfo.cc | 16 ++--------------
- poppler/FontInfo.h | 16 +++++++++++++---
- 2 files changed, 15 insertions(+), 17 deletions(-)
-
-commit 1303020b2e97bc110ccf045cd2811daf59ec72ce
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Mon Jul 4 07:42:32 2005 +0000
-
- Fix up the unit test, now that I have a real sample
- file.
-
- qt4/tests/check_orientation.cpp | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-commit 96fc0ea3fc6c9c7d933e9e0c02a622b2aeef7617
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Jul 1 04:57:49 2005 +0000
-
- 2005-07-01 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/TextOutputDev.cc: Make selection also work when dragging
- backwards in the text flow. Currently this is a big pile of
- if-statements, and there is certainly room for improvement.
-
- ChangeLog | 6 ++
- poppler/TextOutputDev.cc | 129 +++++++++++++++++++++++++++++++++++++---------
- 2 files changed, 111 insertions(+), 24 deletions(-)
-
-commit 06c49c496f28aba608101adcecd8cec34937ac78
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Jun 30 19:44:33 2005 +0000
-
- 2005-06-30 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.h: * glib/poppler-page.cc
- (poppler_page_copy_to_pixbuf): Fix splash compilation (patch from
- Marco).
- (poppler_page_render_to_pixbuf): Drop dest_x and dest_y
- coordinates from this function. This functionality can be
- achieved using a sub-GdkPixbuf.
-
- * glib/test-poppler-glib.c (main): Update test case.
-
- ChangeLog | 11 +++++++++++
- NEWS | 6 ++++++
- glib/poppler-page.cc | 27 ++++++++++-----------------
- glib/poppler-page.h | 4 +---
- glib/test-poppler-glib.c | 2 +-
- 5 files changed, 29 insertions(+), 21 deletions(-)
-
-commit b126785aeda6b5576a13fc3f3853b027bd7dd306
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Jun 30 00:36:01 2005 +0000
-
- 2005-06-29 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-private.h: Move TextOutputDev.h include here from
- poppler-page.cc
-
- ChangeLog | 5 +++++
- glib/poppler-page.cc | 1 -
- glib/poppler-private.h | 1 +
- 3 files changed, 6 insertions(+), 1 deletions(-)
-
-commit b15a8caf003d7d0631d4f78db5ab54e55a5a000a
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Jun 29 21:24:48 2005 +0000
-
- 2005-06-29 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac:
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler-private.h:
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h:
- * poppler/Page.cc:
- * poppler/Page.h:
- * poppler/TextOutputDev.cc:
- * poppler/TextOutputDev.h: Add support for rendering real
- selection (based on text flow).
-
- ChangeLog | 20 ++-
- configure.ac | 4 +-
- glib/poppler-page.cc | 224 +++++++++++++++++++------
- glib/poppler-page.h | 65 ++++---
- glib/poppler-private.h | 3 +
- poppler/CairoOutputDev.cc | 13 +-
- poppler/CairoOutputDev.h | 2 +-
- poppler/Page.cc | 59 +++++--
- poppler/Page.h | 12 ++
- poppler/TextOutputDev.cc | 414 ++++++++++++++++++++++++++++++++++++++++++++-
- poppler/TextOutputDev.h | 38 ++++-
- 11 files changed, 743 insertions(+), 111 deletions(-)
-
-commit 3b5e20465e482eb0e75a106697ee94d60aea2fdc
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jun 28 22:51:29 2005 +0000
-
- Forgot assigning type on copy constructor
-
- poppler/FontInfo.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit e512cd1832a0e6d15149e12e8e67a39d335efc86
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jun 28 22:49:14 2005 +0000
-
- Add FontInfo::getType()
-
- ChangeLog | 3 +++
- poppler/FontInfo.cc | 4 ++++
- poppler/FontInfo.h | 2 ++
- 3 files changed, 9 insertions(+), 0 deletions(-)
-
-commit 8aeb5205f2876a9dc36eb1dc1e361bb87adf4e31
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Tue Jun 28 22:00:05 2005 +0000
-
- use transformation matrix for image rendering in Arthur backend
-
- ChangeLog | 4 ++++
- poppler/ArthurOutputDev.cc | 12 +++++++-----
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
-commit a221d06fdc7b0688ca0744a1d6ad49d472c7f12c
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Tue Jun 28 10:59:14 2005 +0000
-
- Reduce cvs up noise
-
- .cvsignore | 1 +
- ChangeLog | 7 +++++++
- qt4/.cvsignore | 3 +++
- qt4/src/.cvsignore | 7 +++++++
- qt4/tests/.cvsignore | 8 ++++++++
- 5 files changed, 26 insertions(+), 0 deletions(-)
-
-commit ea58a20bbcf450a1ecb8fe00e8162cfdf76105f1
-Author: Brad Hards <bradh@frogmouth.net>
-Date: Tue Jun 28 10:00:09 2005 +0000
-
- Initial import of Qt4 bindings, and for a Qt4 "Arthur" (QPainter)
- backend renderer.
-
- The bindings are currently unstable - you can expect substantial change
- in both source and binary interfaces.
-
- The Arthur renderer currently does a reasonable job of rendering path
- and fill, but the image rendering doesn't work (for reasons that aren't
- clear to me) and text rendering doesn't use the right glyphs - it just
- draws with the current font. There is a lot of work to do on this
- too. Help is, of coure, welcome.
-
- ChangeLog | 12 +
- Makefile.am | 10 +-
- configure.ac | 94 +++-
- poppler-qt4.pc.in | 12 +
- poppler/ArthurOutputDev.cc | 604 +++++++++++++++++++
- poppler/ArthurOutputDev.h | 133 +++++
- poppler/Makefile.am | 20 +
- qt4/Makefile.am | 1 +
- qt4/src/Doxyfile | 1212 ++++++++++++++++++++++++++++++++++++++
- qt4/src/Makefile.am | 22 +
- qt4/src/poppler-document.cc | 309 ++++++++++
- qt4/src/poppler-page.cc | 170 ++++++
- qt4/src/poppler-private.h | 36 ++
- qt4/src/poppler-qt4.h | 286 +++++++++
- qt4/tests/Makefile.am | 34 ++
- qt4/tests/check_orientation.cpp | 40 ++
- qt4/tests/stress-poppler-qt4.cpp | 70 +++
- qt4/tests/test-poppler-qt4.cpp | 121 ++++
- 18 files changed, 3183 insertions(+), 3 deletions(-)
-
-commit 61e9bc76eb2fcb0b4b899ebfad1cc71c59fc8274
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Jun 28 03:44:12 2005 +0000
-
- 2005-06-27 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Change CairoOutputDev to render to a
- given surface and let the user create that surface.
-
- * glib/poppler-document.cc:
- * glib/poppler-page.cc:
- * glib/poppler-private.h: Create the cairo image surface here
- instead and pass it to the CairoOutputDev for rendering.
-
- * poppler/CairoOutputDevImage.cc:
- * poppler/CairoOutputDevImage.h:
- * poppler/CairoOutputDevX.cc:
- * poppler/CairoOutputDevX.h:
- * poppler/Makefile.am: Remove specialized cairo output devices.
-
- ChangeLog | 17 +++
- glib/poppler-document.cc | 2 +-
- glib/poppler-page.cc | 21 +++-
- glib/poppler-private.h | 4 +-
- poppler/CairoOutputDev.cc | 24 ++---
- poppler/CairoOutputDev.h | 8 +-
- poppler/CairoOutputDevImage.cc | 80 ---------------
- poppler/CairoOutputDevImage.h | 44 --------
- poppler/CairoOutputDevX.cc | 216 ----------------------------------------
- poppler/CairoOutputDevX.h | 117 ----------------------
- poppler/Makefile.am | 8 +-
- 11 files changed, 54 insertions(+), 487 deletions(-)
-
-commit 8079dce3f0ed91dd531465f45c6d3c568ab4ecd1
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jun 27 01:04:32 2005 +0000
-
- 2005-06-26 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDev.h: Switch back to using drawChar() for
- text, but utilize the beginString() and endString() hooks so we
- can use cairo_show_glyphs() efficiently.
-
- ChangeLog | 7 +++
- poppler/CairoOutputDev.cc | 107 +++++++++++++--------------------------------
- poppler/CairoOutputDev.h | 12 ++++-
- 3 files changed, 48 insertions(+), 78 deletions(-)
-
-commit 1aa48d6b7907a1d53830f0cf28085041f685368d
-Author: Albert Astals Cid <aacid@kde.org>
-Date: Sun Jun 26 23:35:26 2005 +0000
-
- Add PageTransition class and PageTransition* Page::getTransition() const; to the qt frontend. Code almost 100% copied from xpdf code inside kpdf
-
- ChangeLog | 5 ++
- qt/poppler-page.cc | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-qt.h | 78 +++++++++++++++++++++++++++++++++
- 3 files changed, 204 insertions(+), 0 deletions(-)
-
-commit 9d4327eecd94299a3629b0814e84f981a4be1dfb
-Author: Martin Kretzschmar <martink@gnome.org>
-Date: Sun Jun 26 15:54:16 2005 +0000
-
- add poppler-enums.[ch].
-
- ChangeLog | 2 ++
- glib/.cvsignore | 8 +++++---
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-commit 768186514b9fc175cf330344408bb89ab4c909f3
-Author: Martin Kretzschmar <martink@gnome.org>
-Date: Sun Jun 26 11:40:35 2005 +0000
-
- require glib 2.4+ for g_value_take_string and G_DEFINE_TYPE.
-
- ChangeLog | 5 +++++
- configure.ac | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-commit 5d40e34a367212c39af06332879f26824d6d62d2
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Jun 26 00:01:39 2005 +0000
-
- 2005-06-25 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/Error.h: Maybe fix build on Solaris.
-
- ChangeLog | 4 ++++
- poppler/Error.h | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit c2780a3b3f4615bb28bfe394d649b388db4ccf4d
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jun 20 21:33:09 2005 +0000
-
- 2005-06-20 Kristian Høgsberg <krh@redhat.com>
-
- * NEWS:
- * configure.ac: Bump version to 0.3.3 and sum up changes since
- last release.
-
- * glib/poppler-page.cc (poppler_page_find_text): Initialize xMin
- and yMin to avoid referencing unintialized memory (#3582).
-
- ChangeLog | 9 +++++++++
- NEWS | 10 ++++++++++
- configure.ac | 2 +-
- glib/poppler-page.cc | 2 ++
- 4 files changed, 22 insertions(+), 1 deletions(-)
-
-commit 9023891f314ac37811b5c973be2e36b6de353cf2
-Author: Martin Kretzschmar <martink@gnome.org>
-Date: Mon Jun 20 18:45:41 2005 +0000
-
- (info_dict_get_string): convert from PDFDocEncoding to UTF-8.
-
- ChangeLog | 5 +++++
- glib/poppler-document.cc | 16 +++++++++++++++-
- 2 files changed, 20 insertions(+), 1 deletions(-)
-
-commit bbf2fe757f0fd08d0e90e3810709ab7152c779c0
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jun 20 17:58:38 2005 +0000
-
- 2005-06-20 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler.h: Clean up glib rotation implementation and add a
- getter for rotation. Patch from Marco.
-
- ChangeLog | 7 +++++
- glib/poppler-page.cc | 69 ++++++++++++++++++++++++++++---------------------
- glib/poppler-page.h | 57 +++++++++++++++++++++--------------------
- glib/poppler.h | 1 -
- 4 files changed, 75 insertions(+), 59 deletions(-)
-
-commit c264d8a9f84587cd0f2ef67683a01fc8dd9395af
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jun 20 17:38:27 2005 +0000
-
- 2005-06-20 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc:
- * poppler/FontInfo.cc: Fixes from Marco to handle fonts without
- name (typically type 3 fonts) and fix an iterator bug.
-
- ChangeLog | 6 ++++++
- glib/poppler-document.cc | 8 +++++++-
- poppler/FontInfo.cc | 13 ++++++++++---
- 3 files changed, 23 insertions(+), 4 deletions(-)
-
-commit 4746e63a793a2881e904ac54d58b7d3e48b07dcf
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jun 20 17:22:35 2005 +0000
-
- 2005-06-20 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_get_link_mapping): Adjust
- link coordinates so they're relative to bounding box lower left
- corner (#3396).
-
- ChangeLog | 6 ++++++
- glib/poppler-page.cc | 6 ++++++
- 2 files changed, 12 insertions(+), 0 deletions(-)
-
-commit bada3d03583ef6ed34d2aa743de8fd9ca4a5c748
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Jun 17 05:30:56 2005 +0000
-
- 2005-06-17 Kristian Høgsberg <krh@redhat.com>
-
- * autogen.sh: Patch from Emil Soleyman-Zomalan to enable checks
- for automake >= 1.7 (#3554).
-
- ChangeLog | 5 +++
- autogen.sh | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 109 insertions(+), 0 deletions(-)
-
-commit 25db42831ddde500697126352458e092a9b0ab9b
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Jun 15 15:02:46 2005 +0000
-
- 2005-06-15 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc:
- * glib/poppler-document.h: Patch from Marco to get initial status
- (open or closed) for bookmark subtrees.
- -----------------------------------------------------------
-
- ChangeLog | 6 ++++++
- glib/poppler-document.cc | 9 +++++++++
- glib/poppler-document.h | 1 +
- 3 files changed, 16 insertions(+), 0 deletions(-)
-
-commit e54e306ac5d603001fefda3b9ecd81821e4bd09e
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jun 13 17:18:32 2005 +0000
-
- Forgot to add new files.
-
- poppler/FontInfo.cc | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/FontInfo.h | 51 +++++++++++++
- 2 files changed, 248 insertions(+), 0 deletions(-)
-
-commit 23e8ed5cbf4d7d999a8a1dcf714aaddaf339ceff
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Jun 13 16:09:33 2005 +0000
-
- 2005-06-13 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc:
- * glib/poppler-document.h:
- * glib/poppler-private.h:
- * glib/poppler.h:
- * glib/test-poppler-glib.c:
- * poppler/Makefile.am: Patch from Marco to extract font info from
- document.
-
- ChangeLog | 10 ++++
- glib/poppler-document.cc | 131 ++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-document.h | 13 +++++
- glib/poppler-private.h | 7 +++
- glib/poppler.h | 2 +
- glib/test-poppler-glib.c | 14 +++++
- poppler/Makefile.am | 2 +
- 7 files changed, 179 insertions(+), 0 deletions(-)
-
-commit fbb86d2983a28ad2c46b8c5d475a2df1f0f0e4b9
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Jun 8 14:35:46 2005 +0000
-
- 2005-06-08 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoFontEngine.cc: Remember to delete tmpFileName.
- Patch from Nikolai Weibull (#3491).
-
- ChangeLog | 5 +++++
- poppler/CairoFontEngine.cc | 37 +++++++++++++++++++------------------
- 2 files changed, 24 insertions(+), 18 deletions(-)
-
-commit 699b03025c1d38a42a49e39017097c5d0315fd6f
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Jun 7 20:25:48 2005 +0000
-
- 2005-06-07 Kristian Høgsberg <krh@redhat.com>
-
- * qt/test-poppler-qt.cpp: Add stdlib.h include for exit().
-
- ChangeLog | 4 ++++
- qt/test-poppler-qt.cpp | 1 +
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 0017b1a72c58e2d016d22451079c466abdfff15c
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Jun 2 19:14:45 2005 +0000
-
- 2005-06-02 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/TextOutputDev.h:
- * qt/poppler-qt.h: Patch from Stanislav Brabec <sbrabec@suse.cz>
- to fix gcc 4.0.1 warnings on undeclared friend classes.
-
- * test/gtk-splash-test.cc: Fix from Martin Kretzschmar
- <martink@gnome.org> to compile with OPI enabled (#2911).
-
- ChangeLog | 9 +++++++++
- poppler/TextOutputDev.h | 3 +++
- qt/poppler-qt.h | 2 ++
- test/gtk-splash-test.cc | 2 +-
- 4 files changed, 15 insertions(+), 1 deletions(-)
-
-commit 47c3b4ec2c7691e44f5100b1f5956df0005467c8
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Jun 2 18:49:55 2005 +0000
-
- 2005-06-02 Kristian Høgsberg <krh@redhat.com>
-
- Patch from Stanislav Brabec <sbrabec@suse.cz>:
-
- * configure.ac:
- * poppler-cairo.pc.in:
- * poppler-glib.pc.in:
- * poppler-qt.pc.in:
- * poppler-splash.pc.in: Misc fixes to pkg-config files.
-
- ChangeLog | 10 ++++++++++
- configure.ac | 6 ++++--
- poppler-cairo.pc.in | 3 +--
- poppler-glib.pc.in | 4 ++--
- poppler-qt.pc.in | 1 +
- poppler-splash.pc.in | 3 +--
- 6 files changed, 19 insertions(+), 8 deletions(-)
-
-commit 9f0da96dd005defd5d82dd05b627ff1925430215
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Jun 2 00:35:44 2005 +0000
-
- 2005-06-01 Jeff Muizelaar <jeff@infidigm.net>
-
- * poppler/Error.cc:
- * poppler/Error.h: Make error handling function setable through
- setErrorFunction.
-
- Based on a patch by Albert Astals Cid.
-
- ChangeLog | 8 ++++++++
- poppler/Error.cc | 29 ++++++++++++++++++++---------
- poppler/Error.h | 2 ++
- 3 files changed, 30 insertions(+), 9 deletions(-)
-
-commit f688aa11d066f1c6f4115cbdb604ac61fb8b5146
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun May 29 14:59:34 2005 +0000
-
- 2005-05-29 Kristian Høgsberg <krh@redhat.com>
-
- * glib/*: Add more meta data properties to poppler document.
- Patch by Emil Soleyman-Zomalan (#3359).
-
- ChangeLog | 5 ++
- glib/poppler-document.cc | 155 +++++++++++++++++++++++++++++++++++++++++++++-
- glib/poppler.gidl | 5 ++
- glib/test-poppler-glib.c | 46 ++++++++++----
- 4 files changed, 194 insertions(+), 17 deletions(-)
-
-commit 9e6eeec574d48d2341ee620e16360d3b21c40103
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu May 26 13:03:35 2005 +0000
-
- 2005-05-26 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDev.cc (clip): Remove snapToGrid so clip()
- prototype matches what Gfx actually calls (fixes clipping).
-
- * poppler/CairoOutputDev.cc: Update fill color, stroke color, fill
- opacity and stroke opacity from GfxState on restore, since they
- aren't handled by cairo_restore() (#3362).
-
- * poppler/CairoOutputDev.cc: Comment out tolerance setting until
- we figure out how cairo settings relate to pdf settings.
-
- * poppler/CairoOutputDev.cc: Support fill and stroke opacity.
-
- ChangeLog | 12 ++++++++++++
- poppler/CairoOutputDev.cc | 41 ++++++++++++++++++++++++++++++-----------
- poppler/CairoOutputDev.h | 6 +++++-
- 3 files changed, 47 insertions(+), 12 deletions(-)
-
-commit 89a633edd860e3c6ded1e468edf6f28cfcb43d0e
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu May 26 12:52:38 2005 +0000
-
- 2005-05-26 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/GfxState.cc:
- * poppler/GfxState.h: Add GfxColorSpace::getRGBLine here and
- implement in subclasses.
-
- * poppler/CairoOutputDev.cc (drawImage): Use getRGBLine here.
-
- ChangeLog | 8 ++
- poppler/CairoOutputDev.cc | 66 +++++++++----------
- poppler/GfxState.cc | 160 ++++++++++++++++++++++++++++++++++++++++++++-
- poppler/GfxState.h | 14 ++++
- 4 files changed, 212 insertions(+), 36 deletions(-)
-
-commit 4d8224819da7a85e4d99f96c9bbb047ece58130a
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Mon May 23 04:23:53 2005 +0000
-
- Mon May 23 00:22:41 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/poppler-document.h: Add a permissions flag to the glib
- bindings.
-
- ChangeLog | 5 +++++
- glib/poppler-document.cc | 24 ++++++++++++++++++++++++
- glib/poppler-document.h | 16 +++++++++-------
- 3 files changed, 38 insertions(+), 7 deletions(-)
-
-commit 1f677e2f60634a7d0c5e0e0d2125ab15c2722979
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sat May 21 21:33:06 2005 +0000
-
- 2005-05-21 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc (poppler_ps_file_new): Fix off-by-one
- error spotted by Jürg Billeter.
- -----------------------------------------------------
-
- ChangeLog | 5 +++++
- glib/poppler-document.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 0bbf2f08173866cde9b097eeeb1f4218a396588d
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 20 20:48:52 2005 +0000
-
- 2005-05-20 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDev.cc: Account for different row vs. column
- vector conventions between cairo and poppler.
-
- ChangeLog | 3 +++
- poppler/CairoOutputDev.cc | 18 +++++++++---------
- 2 files changed, 12 insertions(+), 9 deletions(-)
-
-commit da44ec7e8de58e55e55b1f780bc3f4bc8307874f
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 20 18:38:10 2005 +0000
-
- 2005-05-20 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoFontEngine.cc: Only get the code to gid map if
- we're using freetype 2.1.7 or older (#3340).
-
- ChangeLog | 5 +++++
- poppler/CairoFontEngine.cc | 13 ++++++++-----
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-commit 6fe29cf0a7e54b8d294471a0f94eb9e989ad1d7f
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu May 19 05:18:04 2005 +0000
-
- Add bugzilla number.
-
- ChangeLog | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 42de1348622cf86a87bc22941bd48bffa943dac9
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu May 19 05:16:22 2005 +0000
-
- 2005-05-19 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoFontEngine.cc: Only cast to Gfx8BitFont when we
- know for sure we have a truetype font.
- GfxCIDFont::getCIDToGIDLen() can return 0 in which case codeToGID
- will be NULL, and we end up casting it to a Gfx8BitFont.
-
- ChangeLog | 7 +++++++
- poppler/CairoFontEngine.cc | 2 +-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-commit afc05387c94a76ff0ed69b3f5d9a69ddd1448e83
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed May 18 17:39:59 2005 +0000
-
- 2005-05-18 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Require cairo 0.5.0, bump release to 0.3.2.
-
- * NEWS: Sum up latest changes.
-
- * glib/poppler-document.cc (poppler_ps_file_new): Take a page
- range here instead of just number of pages.
-
- ChangeLog | 9 +++++++++
- NEWS | 7 +++++++
- configure.ac | 6 +++---
- glib/poppler-document.cc | 15 ++++++++++-----
- glib/poppler-document.h | 1 +
- 5 files changed, 30 insertions(+), 8 deletions(-)
-
-commit 420134a194af9161282ccfe329d17adef8d325f2
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue May 17 23:38:27 2005 +0000
-
- 2005-05-17 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDevX.cc:
- * test/gtk-cairo-test.cc: Chase the cairo xlib constructor again.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDevX.cc | 5 +++--
- test/gtk-cairo-test.cc | 5 +++--
- 3 files changed, 11 insertions(+), 4 deletions(-)
-
-commit 6fd62953a910dcfb4abd9de5ea18285b8fa5d202
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon May 16 23:16:15 2005 +0000
-
- Add bug number and attribution to ChangeLog entry.
-
- ChangeLog | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-commit 6d7f624c13e8a9a8251ac97388cd80e418c70250
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon May 16 21:56:31 2005 +0000
-
- 2005-05-16 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Check for glib-mkenums.
-
- * glib/Makefile.am (poppler-enums.h): Generate glib enums at
- compile time.
-
- * glib/poppler-enums.c:
- * glib/poppler-enums.h: Removed.
-
- ChangeLog | 8 ++
- configure.ac | 3 +
- glib/.cvsignore | 1 +
- glib/Makefile.am | 67 ++++++++++++------
- glib/poppler-enums.c | 189 --------------------------------------------------
- glib/poppler-enums.h | 49 -------------
- 6 files changed, 57 insertions(+), 260 deletions(-)
-
-commit 2801b54a944fc9e1072c5dcb9f1153a0c9f42de5
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon May 16 20:27:51 2005 +0000
-
- 2005-05-16 Kristian Høgsberg <krh@redhat.com>
-
- * test/gtk-cairo-test.cc: Update this test case also.
-
- ChangeLog | 2 ++
- test/gtk-cairo-test.cc | 5 +++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-commit 8753ae8ba20fcceaef3ef1dda89129f0456fccf6
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon May 16 19:06:00 2005 +0000
-
- 2005-05-16 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDevX.cc: Track changes to cairo Xlib surface
- constructors.
-
- * poppler/CairoFontEngine.cc (cairo_font_face_destroy): Make this
- static.
-
- ChangeLog | 8 ++++++++
- poppler/CairoFontEngine.cc | 2 +-
- poppler/CairoOutputDevX.cc | 5 +++--
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-commit 2e17106ef4711097104a561d5be49980f8b2f5ab
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Fri May 13 03:47:36 2005 +0000
-
- whoops! commit the right file.
-
- glib/poppler.gidl | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- glib/test.gidl | 23 ------
- 2 files changed, 212 insertions(+), 23 deletions(-)
-
-commit 19b62e1c8ea8ce042ac089defe94f756dcaf194e
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Fri May 13 03:25:32 2005 +0000
-
- Thu May 12 23:10:45 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/poppler.gidl: add metadata file.
-
- ChangeLog | 4 ++++
- glib/test.gidl | 23 +++++++++++++++++++++++
- 2 files changed, 27 insertions(+), 0 deletions(-)
-
-commit bef5a548f3b21e7220079155e9b5054fb0c6c3c7
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu May 12 21:26:25 2005 +0000
-
- 2005-05-12 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDev.cc:
- * poppler/CairoOutputDevX.cc:
- * poppler/CairoOutputDevImage.cc:
- * test/gtk-cairo-test.cc: Update to latest cairo changes, patch
- from Jens Taprogge (#3281)
-
- ChangeLog | 8 ++++++++
- poppler/CairoOutputDev.cc | 22 +++++++++++-----------
- poppler/CairoOutputDevImage.cc | 11 ++++++-----
- poppler/CairoOutputDevX.cc | 7 +++++--
- test/gtk-cairo-test.cc | 8 +++++---
- 5 files changed, 35 insertions(+), 21 deletions(-)
-
-commit c10ea2dd9bffaf9af023612ef196bab2b204d3e1
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed May 11 20:01:43 2005 +0000
-
- 2005-05-11 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler.cc (poppler_get_backend, poppler_get_version): Add
- these functions so it's easy to tell if poppler is using cairo or
- splash and what version.
-
- * glib/test-poppler-glib.c (main): Print out version and backend.
-
- ChangeLog | 8 ++++++++
- glib/poppler-enums.c | 26 ++++++++++++++++++++++++++
- glib/poppler-enums.h | 15 +++++++++++++++
- glib/poppler.cc | 21 +++++++++++++++++++++
- glib/poppler.h | 11 +++++++++++
- glib/test-poppler-glib.c | 9 ++++++++-
- 6 files changed, 89 insertions(+), 1 deletions(-)
-
-commit 7d189e33cfa68e722561e9398ad85a77b538ab14
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri May 6 16:38:57 2005 +0000
-
- 2005-05-06 Kristian Høgsberg <krh@redhat.com>
-
- * glib/Makefile.am (libpoppler_glib_la_LIBADD): Link poppler-glib
- against poppler.
-
- * qt/Makefile.am (libpoppler_qt_la_LIBADD): Ditto for qt.
-
- * poppler-glib.pc (Libs): Drop -lpoppler from link.
-
- * poppler-qt.pc (Libs): Ditto for qt.
-
- * configure.ac: Test for both libqt-mt.la and libqt-mt.so in that
- order.
-
- ChangeLog | 14 ++++++++++++++
- configure.ac | 8 +++++++-
- glib/Makefile.am | 1 +
- poppler-glib.pc.in | 2 +-
- poppler-qt.pc.in | 2 +-
- qt/Makefile.am | 1 +
- qt/test-poppler-qt.cpp | 1 +
- 7 files changed, 26 insertions(+), 3 deletions(-)
-
-commit c937e63f17a096b94a554103476ecb9ab1b71b90
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed May 4 20:08:41 2005 +0000
-
- 2005-05-04 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask,
- CairoOutputDev::drawImage): Track cairo cvs API changes; use
- cairo_mask() and cairo_paint() for drawing image masks and images.
-
- ChangeLog | 6 +++
- poppler/CairoOutputDev.cc | 98 +++++++++++++++++++++++---------------------
- 2 files changed, 57 insertions(+), 47 deletions(-)
-
-commit c142773ad30b409d8169a53921e731305de46e50
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed May 4 19:28:07 2005 +0000
-
- 2005-05-04 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoOutputDev.cc: Fix matrix convention confusion.
-
- ChangeLog | 4 ++++
- poppler/CairoOutputDev.cc | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-commit 28760927d724231d0137ca7ecc66c6c2250dff0d
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed May 4 19:11:11 2005 +0000
-
- 2005-05-04 Kristian Høgsberg <krh@redhat.com>
-
- Patches from Albert Astals Cid:
-
- * qt/poppler-page.cc (getText): Use QString::fromUtf8() instead of
- implicit latin1 cast constructor.
-
- * qt/test-poppler-qt.cpp (main): Use a QLabel for showing text
- instead of qDebug.
-
- ChangeLog | 10 ++++++++++
- qt/poppler-page.cc | 5 ++---
- qt/test-poppler-qt.cpp | 6 +++++-
- 3 files changed, 17 insertions(+), 4 deletions(-)
-
-commit fd36522375bcf436639b8731acb3ad22c03c03f4
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Wed May 4 06:32:38 2005 +0000
-
- Wed May 4 02:31:05 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/poppler-document.cc:
- * glib/poppler-document.h:
- * glib/poppler-enums.c: (poppler_permissions_get_type):
- * glib/poppler-enums.h:
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler.h:
-
- Register a bunch of boxed types to test introspection, and for
- LBs. Also, remove unused 'popper_document_save()' (-:
-
- ChangeLog | 13 +++++++
- glib/poppler-document.cc | 48 +++++++++++++++-----------
- glib/poppler-document.h | 18 +++++++++-
- glib/poppler-enums.c | 19 ++++++++++
- glib/poppler-enums.h | 2 +
- glib/poppler-page.cc | 83 ++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h | 36 ++++++++++++++------
- glib/poppler.h | 12 ++++---
- 8 files changed, 193 insertions(+), 38 deletions(-)
-
-commit 132647f8311c07b1f95ee4fca185e9774aae4913
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon May 2 05:39:11 2005 +0000
-
- 2005-05-01 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoFontEngine.cc:
- * poppler/CairoFontEngine.h:
- * poppler/CairoOutputDev.cc: Back out workaround for cairo 0.4.0
- font API and port to new cairo head.
-
- ChangeLog | 7 ++++
- configure.ac | 4 +-
- poppler/CairoFontEngine.cc | 67 ++++++++++++++++------------------------
- poppler/CairoFontEngine.h | 12 +++----
- poppler/CairoOutputDev.cc | 39 ++++++++++++++---------
- poppler/CairoOutputDevImage.cc | 2 +-
- 6 files changed, 66 insertions(+), 65 deletions(-)
-
-commit 595c18c038f8dcef73fe58612fc8b93f891e65a1
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Mon May 2 00:44:26 2005 +0000
-
- 2005-05-01 Jeff Muizelaar <jeff@infidigm.net>
-
- * splash/SplashFTFont.cc (SplashFTFont::getGlyphPath):
- Use FT_LOAD_NO_BITMAP to make sure we get outlines loaded instead
- of bitmaps for use in FT_Outline_Decompose.
-
- Patch from Albert Astals Cid.
-
- ChangeLog | 8 ++++++++
- splash/SplashFTFont.cc | 2 +-
- 2 files changed, 9 insertions(+), 1 deletions(-)
-
-commit 49d89ca0ed3986bec7468f6c0ed295e84ba67239
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun May 1 21:54:55 2005 +0000
-
- 2005-05-01 Jeff Muizelaar <jeff@infidigm.net>
-
- * goo/gmem.c: (gmalloc), (grealloc), (gfree):
- * goo/gmem.h: make memory functions use size_t instead of int.
-
- Patch from Takashi Iwai through Albert Astals Cid.
-
- ChangeLog | 7 +++++++
- goo/gmem.c | 10 +++++-----
- goo/gmem.h | 4 ++--
- 3 files changed, 14 insertions(+), 7 deletions(-)
-
-commit 14d618bece894e4c6bed0f179a8fda4db5a67c9d
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Apr 30 19:53:57 2005 +0000
-
- 2005-04-30 Jeff Muizelaar <jeff@infidigm.net>
-
- * qt/poppler-document.cc (Document::unlock) :
- * qt/poppler-qt.h (Document::unlock):
- Add const to the password argument.
-
- Patch from Albert Astals Cid.
-
- ChangeLog | 8 ++++++++
- qt/poppler-document.cc | 2 +-
- qt/poppler-qt.h | 2 +-
- 3 files changed, 10 insertions(+), 2 deletions(-)
-
-commit 1e66da32964cc76c6ed3773574f422b4608cb0e1
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Apr 30 17:31:47 2005 +0000
-
- 2005-04-30 Jeff Muizelaar <jeff@infidigm.net>
-
- * fofi/FoFiType1.cc (FoFiType1::parse):
- Don't assume Encoding array of Type1 fonts end in "foo def".
- http://partners.adobe.com/public/developer/en/font/T1_SPEC.PDF says
- "This sequence of assignments must be followed by an instance of the
- token def or readonly; such a token may not occur within the sequence
- of assignments." so it must end with "readonly" "def" "readonly def"
- (That is what most fonts are using and this is why it was not
- crashing)
-
- Patch from Albert Astals Cid.
-
- ChangeLog | 13 +++++++++++++
- fofi/FoFiType1.cc | 14 +++++++++++---
- 2 files changed, 24 insertions(+), 3 deletions(-)
-
-commit 0b532db77ef41937dd5be30d15c96557d81eceb2
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Fri Apr 29 19:37:07 2005 +0000
-
- Fri Apr 29 14:54:44 2005 Jonathan Blandford <jrb@redhat.com>
-
- * goo/GooTimer.h: New class to do simple timing checks.
-
- * glib/poppler-document.c: Patch from Martin Kretzschmar to really
- set the PDF version correct. Third time's the charm.
-
- ChangeLog | 7 +++++
- glib/poppler-document.cc | 4 ++-
- goo/GooTimer.cc | 63 ++++++++++++++++++++++++++++++++++++++++++++++
- goo/GooTimer.h | 40 +++++++++++++++++++++++++++++
- goo/Makefile.am | 2 +
- 5 files changed, 115 insertions(+), 1 deletions(-)
-
-commit 38948ea6f9ef76dae9b8a7156fe1ef32a0457380
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Apr 29 03:57:16 2005 +0000
-
- 2005-04-29 Kristian Høgsberg <krh@bitplanet.net>
-
- * configure.ac: Bump release to 0.3.1.
-
- * NEWS: Write up news for 0.3.1 release.
-
- ChangeLog | 6 ++++++
- NEWS | 6 ++++++
- configure.ac | 2 +-
- 3 files changed, 13 insertions(+), 1 deletions(-)
-
-commit af65146c92682a3af06e9d3147426445c78309de
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Apr 28 23:03:06 2005 +0000
-
- 2005-04-28 Kristian Høgsberg <krh@redhat.com>
-
- Patch from Martin Kretzschmar:
-
- * poppler/GlobalParams.cc: use UTF-8 as the default text encoding.
- Fixes Bug 2934.
-
- ChangeLog | 7 +++++++
- poppler/GlobalParams.cc | 2 +-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-commit c2db3e1b297a9dc0accd0d8a1366970d45705c8f
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Apr 27 20:56:18 2005 +0000
-
- 2005-04-27 Jeff Muizelaar <jeff@infidigm.net>
-
- * configure.ac:
- * poppler/FlateStream.cc:
- * poppler/FlateStream.h:
- * poppler/Makefile.am:
- * poppler/Stream.cc:
- * poppler/Stream.h: Add a reimplementation of FlateStream using
- zlib.
-
- ChangeLog | 10 ++++
- configure.ac | 29 +++++++++++++
- poppler/FlateStream.cc | 107 ++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/FlateStream.h | 68 ++++++++++++++++++++++++++++++
- poppler/Makefile.am | 17 +++++++-
- poppler/Stream.cc | 6 +++
- poppler/Stream.h | 2 +
- 7 files changed, 237 insertions(+), 2 deletions(-)
-
-commit bc0afe524c2b87af191d83fc9e9bcdc8a6ce4042
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Apr 27 18:53:20 2005 +0000
-
- 2005-04-27 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/Catalog.cc (NameTree::lookup): Fix bsearch return value
- NULL check. Found by Albert Astals Cid.
-
- ChangeLog | 5 +++++
- poppler/Catalog.cc | 8 ++++----
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
-commit 3c37dc350d54e5a1035aecfba5bfa394f931cf51
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Tue Apr 26 17:17:05 2005 +0000
-
- Tue Apr 26 13:13:42 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/test-poppler-glib.c (main): add a quick dump-to-text test.
-
- ChangeLog | 4 ++++
- glib/test-poppler-glib.c | 20 ++++++++++++++++++++
- 2 files changed, 24 insertions(+), 0 deletions(-)
-
-commit 44b800d520f90ffd143255d2c23835ea357c195b
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Apr 25 18:04:32 2005 +0000
-
- Actually commit the qt/Makefile.am change advertised in the ChangeLog.
-
- qt/Makefile.am | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-commit 437bec03dd2ab3cdf6215f9ad443b7f21ce84e18
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun Apr 24 19:56:17 2005 +0000
-
- 2005-04-24 Kristian Høgsberg <krh@redhat.com>
-
- * qt/Makefile.am (libpoppler_qt_la_SOURCES): Add poppler-private.h
- to SOURCES.
-
- ChangeLog | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-commit 9b2b1244ed5f30a99120aaee49c72f7cb6a4f556
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sat Apr 23 20:16:02 2005 +0000
-
- 2005-04-23 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoFontEngine.cc: Use the right fileName for loading
- CID fonts (#3114).
-
- ChangeLog | 5 +++++
- poppler/CairoFontEngine.cc | 11 +++++++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-commit e4516d728a4d1bc85831d5d00b6d6b8d49c79308
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sat Apr 23 00:09:05 2005 +0000
-
- 2005-04-22 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Actually commit version number bump.
-
- ChangeLog | 4 ++++
- NEWS | 2 +-
- configure.ac | 2 +-
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-commit c20448cb26fa1c309d726f272ddf1227f5a0e6ea
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Apr 22 17:29:49 2005 +0000
-
- 2005-04-22 Martin Kretzschmar <martink@gnome.org>
-
- * poppler/CairoFontEngine.cc: declare matrix variable before the
- first goto. Fixes build with gcc 3.3.
-
- ChangeLog | 5 +++++
- poppler/CairoFontEngine.cc | 3 ++-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-commit 42ecccf9b454893797e3d62f0f1c0a3276689e51
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Apr 22 04:09:23 2005 +0000
-
- Fri Apr 22 00:01:40 2005 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoFontEngine.cc: Hack around semi-broken cairo-0.4.0
- font API to fix the problem where some glyphs would show up at the
- wrong sizes. We now create an FT_Face for each size and font
- combination we encounter, since an FT_Face can't be shared between
- several cairo_font_t.
-
- ChangeLog | 8 ++++
- poppler/CairoFontEngine.cc | 79 +++++++++++++++++++------------------------
- poppler/CairoFontEngine.h | 23 +++++--------
- poppler/CairoOutputDev.cc | 18 +++++-----
- 4 files changed, 61 insertions(+), 67 deletions(-)
-
-commit 7a703616d9497eba4d7d318da9918dae9cbe8f12
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Apr 21 19:50:45 2005 +0000
-
- Thu Apr 21 15:43:52 2005 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/Outline.cc:
- * poppler/Outline.h: Implement the documented behaviour for
- Outline::getItems() and OutlineItem::getKids() and make
- documentation more precise (Patch from Marco).
-
- ChangeLog | 7 +++++++
- poppler/Outline.cc | 6 ++++++
- poppler/Outline.h | 7 ++++---
- 3 files changed, 17 insertions(+), 3 deletions(-)
-
-commit 5c89902c5ee2cf13536225c141768b29505815ce
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Apr 21 06:35:33 2005 +0000
-
- Thu Apr 21 02:25:20 2005 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/CairoFontEngine.cc (CairoFont::getFont): Cache
- cairo_font_t's for a given CairoFont. With this patch cairo will
- recognize glyphs coming from the same font as such and the glyph
- cache will actually work.
-
- * glib/poppler-document.cc (poppler_document_new_from_file): Add
- output device (cairo or splash) to PopplerDocument and initialize
- it in the constructor.
-
- * glib/poppler-page.cc (splash_render_to_pixbuf,
- cairo_render_to_pixbuf): Use output device from associated poppler
- document instead of creating a new one.
-
- * poppler-glib.pc.in (Requires): Add Requires: field.
-
- * poppler/Page.cc (loadThumb): Remove unecessary and buggy call to
- Stream::addFilters(), reported by Ryan Lortie (#3046).
-
- ChangeLog | 7 +++++-
- NEWS | 12 ++--------
- poppler/CairoFontEngine.cc | 45 ++++++++++++++++++++++++++++++++++++++-----
- poppler/CairoFontEngine.h | 9 +++++++-
- poppler/CairoOutputDev.cc | 9 +-------
- 5 files changed, 57 insertions(+), 25 deletions(-)
-
-commit 71c1563bb0462154cb7caa4356d8f8d049073ac4
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Apr 21 05:20:24 2005 +0000
-
- Thu Apr 21 00:15:30 2005 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc (poppler_document_new_from_file): Add
- output device (cairo or splash) to PopplerDocument and initialize
- it in the constructor.
-
- * glib/poppler-page.cc (splash_render_to_pixbuf,
- cairo_render_to_pixbuf): Use output device from associated poppler
- document instead of creating a new one.
-
- * poppler-glib.pc.in (Requires): Add Requires: field.
-
- * poppler/Page.cc (loadThumb): Remove unecessary and buggy call to
- Stream::addFilters(), reported by Ryan Lortie (#3046).
-
- ChangeLog | 15 +++++++++++++++
- NEWS | 15 +++++++++++++++
- glib/poppler-document.cc | 10 ++++++++++
- glib/poppler-page.cc | 22 ++--------------------
- glib/poppler-private.h | 13 +++++++++++++
- poppler-glib.pc.in | 1 +
- poppler/CairoFontEngine.cc | 2 +-
- poppler/Page.cc | 2 --
- 8 files changed, 57 insertions(+), 23 deletions(-)
-
-commit c6328cbc6cea05890b52a8302f8deba443959c03
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Apr 20 22:48:52 2005 +0000
-
- 2005-04-13 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * qt/poppler-page.cc (Page::getText):
- * qt/poppler-qt.h: add a getText method for getting
- the text on a page
-
- * qt/test-poppler-qt.c (PDFDisplay::PDFDisplay):
- add the option to display the text on a page
-
- Patch from Albert Astals Cid.
-
- ChangeLog | 11 +++++++++++
- qt/poppler-page.cc | 37 +++++++++++++++++++++++++++++++++++++
- qt/poppler-qt.h | 20 ++++++++++++++++++++
- qt/test-poppler-qt.cpp | 40 ++++++++++++++++++++++++++++++----------
- 4 files changed, 98 insertions(+), 10 deletions(-)
-
-commit 86a32b65100a5baedd18ce0135703289839a317c
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Tue Apr 19 21:22:26 2005 +0000
-
- Tue Apr 19 17:21:19 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/poppler-document.cc (poppler_document_get_property): Use
- %.2g instead.
-
- ChangeLog | 5 +++++
- glib/poppler-document.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 4e81624dcc2d5218f2f8bb4eaa992e724014a853
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Tue Apr 19 21:13:22 2005 +0000
-
- Tue Apr 19 17:11:52 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/poppler-document.cc (poppler_document_get_property): Use %g
- instead of %f to avoid versioning like PDF-1.50000
-
- ChangeLog | 5 +++++
- glib/poppler-document.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 6ef9d30f06be2bd8a9e1470d70f49843a7e432ac
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Apr 19 19:48:49 2005 +0000
-
- Tue Apr 19 15:43:35 2005 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-action.cc (_poppler_action_new): Handle NULL links
- gracefully (fix from Jeff).
-
- ChangeLog | 5 +++++
- glib/poppler-action.cc | 7 ++++++-
- 2 files changed, 11 insertions(+), 1 deletions(-)
-
-commit 770b7310ce8b07f95960c2014bf3f6040c060ac4
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Apr 19 04:28:15 2005 +0000
-
- Tue Apr 19 00:20:08 2005 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/Catalog.cc: Fix from Marco to make sure we always
- initialize Catalog::pageLabelInfo.
-
- ChangeLog | 5 +++++
- poppler/Catalog.cc | 3 +--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-commit 49c10d9f2c4e0cef031f96929e38a14d7ce5af19
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Sat Apr 16 18:57:43 2005 +0000
-
- Sat Apr 16 14:53:15 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/Makefile.am: Create poppler-enums.[ch]
-
- * glib/poppler.h:
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler-action.h: Try to clean up the headers a bit
-
- * glib/poppler-document.cc:
- * glib/poppler-document.h: Add support for document data.
- Implemented as a lot of GObject properties.
-
- * glib/poppler-enums.c:
- * glib/poppler-enums.h: New autogenerated files.
-
- * glib/test-poppler-glib.c: Test the new document metadata. Seems
- to work nicely, other than the PDF string and View Prefs.
-
- * poppler/Catalog.cc:
- * poppler/Catalog.h: Extend to support PageLayout.
-
- ChangeLog | 22 +++++
- glib/Makefile.am | 32 +++++++-
- glib/poppler-action.h | 15 ++--
- glib/poppler-document.cc | 196 +++++++++++++++++++++++++++++++++++++++++-----
- glib/poppler-document.h | 43 +++++++++--
- glib/poppler-enums.c | 144 ++++++++++++++++++++++++++++++++++
- glib/poppler-enums.h | 32 ++++++++
- glib/poppler-page.cc | 3 -
- glib/poppler-page.h | 1 +
- glib/poppler.h | 7 ++
- glib/test-poppler-glib.c | 48 ++++++++++-
- poppler/Catalog.cc | 17 ++++
- poppler/Catalog.h | 11 +++
- 13 files changed, 529 insertions(+), 42 deletions(-)
-
-commit f35c76cd3528f1e1de594e85e734ca23624b3a62
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Apr 15 02:25:10 2005 +0000
-
- 2005-04-14 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler-private.h:
- * glib/poppler.h: Patch from Marco Pesenti Gritti to set page
- orientaton.
-
- ChangeLog | 8 ++++
- glib/poppler-page.cc | 109 ++++++++++++++++++++++++++++++++++++++++++++----
- glib/poppler-page.h | 45 ++++++++++----------
- glib/poppler-private.h | 1 +
- glib/poppler.h | 9 ++++
- 5 files changed, 142 insertions(+), 30 deletions(-)
-
-commit 538408a8845e167cc2d796ac8b8129d0a2e6a894
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Apr 14 01:34:38 2005 +0000
-
- 2005-04-13 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * poppler/CairoOutputDevImage.cc (getBitmap): remove unused
- SplashBitmap. Patch from Albert Astals Cid.
-
- ChangeLog | 5 +++++
- poppler/CairoOutputDevImage.cc | 2 --
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-commit 2903530492c24f3c7cb3bf3b993500694aaa27a8
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Apr 12 15:37:39 2005 +0000
-
- 2005-04-12 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Add fontconfig to PKG_CHECK_MODULES for the cairo
- backend too, since we shouldn't depend on cairo.pc to pull that in
- for us.
-
- * poppler/Makefile.am (INCLUDES): Add $(splash_includes) to
- INCLUDES to make sure the fontconfig include path is added when
- using the splash backend.
-
- ChangeLog | 10 ++++++++++
- configure.ac | 4 ++--
- poppler/Makefile.am | 1 +
- 3 files changed, 13 insertions(+), 2 deletions(-)
-
-commit 0f7dd9a0512ff97293ee3f8a762b0049393b3cc1
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Apr 9 18:14:39 2005 +0000
-
- 2005-04-09 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * poppler-qt.h:
- * poppler-document.cc (okToPrint, okToChange, okToCopy):
- Patch from Albert Astals Cid adding more metadata exports
-
- ChangeLog | 6 ++++++
- qt/poppler-document.cc | 20 ++++++++++++++++++++
- qt/poppler-qt.h | 4 ++++
- 3 files changed, 30 insertions(+), 0 deletions(-)
-
-commit dee72b531dab83a29c7675ae06ffe376e4498a4e
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Apr 8 21:09:27 2005 +0000
-
- 2005-04-08 Kristian Høgsberg <krh@redhat.com>
-
- * poppler-qt.pc.in (Libs): Add -lpoppler to Libs.
-
- ChangeLog | 4 ++++
- poppler-qt.pc.in | 2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-commit df59ce3b1d5ca8cd46aaf5f189bc78953e21e1a9
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Fri Apr 8 03:30:33 2005 +0000
-
- 2005-04-07 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * configure.ac: redo the qt tests from Albert Astals Cid
-
- ChangeLog | 4 +++
- configure.ac | 78 +++++++++++++++++++++++++++++++++++-----------------------
- 2 files changed, 51 insertions(+), 31 deletions(-)
-
-commit 3f9dde10e4778255c468895942e45d1a2637af3a
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Fri Apr 8 03:11:00 2005 +0000
-
- 2005-04-07 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * qt/poppler-document.cc:
- * qt/poppler-page.cc:
- * qt/poppler-qt.h:
- Patch from Albert Astals Cid adding consts and exporting some more
- metadata.
-
- ChangeLog | 8 ++++++++
- qt/poppler-document.cc | 21 ++++++++++++++++++---
- qt/poppler-page.cc | 6 +++---
- qt/poppler-qt.h | 15 +++++++++------
- 4 files changed, 38 insertions(+), 12 deletions(-)
-
-commit e79a8b946e0d04b32da0b4ceea1649efd203cb07
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Apr 7 22:01:51 2005 +0000
-
- 2005-04-07 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc:
- * glib/poppler-document.h:
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler-private.h: Print to PS support from Marco Pesenti
- Gritti.
-
- ChangeLog | 9 +++++++++
- glib/poppler-document.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-document.h | 8 ++++++--
- glib/poppler-page.cc | 19 +++++++++++++++++++
- glib/poppler-page.h | 40 +++++++++++++++++++++-------------------
- glib/poppler-private.h | 7 +++++++
- 6 files changed, 107 insertions(+), 21 deletions(-)
-
-commit 7319b66eb64e735ae8b811306eb76755f088385b
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Thu Apr 7 16:26:15 2005 +0000
-
- Thu Apr 7 12:25:39 2005 Jonathan Blandford <jrb@redhat.com>
-
- * configure.ac: check for qt, not glib, when enabling the qt
- subdir
-
- ChangeLog | 5 +++++
- configure.ac | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit e258ed0cb42d524ee39451f680ad4c067e7721da
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Apr 6 20:49:19 2005 +0000
-
- 2005-04-06 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * .cvsignore, glib/.cvsignore, qt/.cvsignore:
- Add more things to .cvsignore.
- Patch from Martin Kretzschmar.
-
- .cvsignore | 2 ++
- ChangeLog | 6 ++++++
- glib/.cvsignore | 7 +++++++
- qt/.cvsignore | 7 +++++++
- 4 files changed, 22 insertions(+), 0 deletions(-)
-
-commit 2a5624a81aa84677a57e098d7d4045f44e3b6f3a
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Apr 6 20:35:03 2005 +0000
-
- 2005-04-06 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * poppler-page.cc (Page::Page, Page::~Page):
- Construct and deconstruct the PageData object.
- Patch from Albert Astals Cid.
-
- ChangeLog | 6 ++++++
- qt/poppler-page.cc | 6 ++++++
- qt/poppler-qt.h | 1 +
- 3 files changed, 13 insertions(+), 0 deletions(-)
-
-commit f983e3d317660653f2bfc56f9b06e2cec675beca
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Apr 6 14:39:40 2005 +0000
-
- 2005-04-06 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * Makefile.am, configure.ac: Add configuration for qt wrapper.
-
- * poppler-qt.pc.in:
- * qt/Makefile.am:
- * qt/poppler-document.cc:
- * qt/poppler-page.cc:
- * qt/poppler-private.h:
- * qt/poppler-qt.h:
- * qt/test-poppler-qt.cpp:
- New files.
-
- ChangeLog | 13 +++
- Makefile.am | 13 ++-
- configure.ac | 64 +++++++++++++-
- poppler-qt.pc.in | 11 +++
- qt/Makefile.am | 32 +++++++
- qt/poppler-document.cc | 232 ++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-page.cc | 66 ++++++++++++++
- qt/poppler-private.h | 32 +++++++
- qt/poppler-qt.h | 75 ++++++++++++++++
- qt/test-poppler-qt.cpp | 63 +++++++++++++
- 10 files changed, 597 insertions(+), 4 deletions(-)
-
-commit d91dd69a7a0dd581c26728d2640e4d36a7ffe75f
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Apr 5 17:46:44 2005 +0000
-
- 2005-04-05 Kristian Høgsberg <krh@redhat.com>
-
- * NEWS: Attempt to sum up changes since 0.1.2.
-
- * configure.ac: Bump release to 0.2.0, add AC_DEFINEs for cairo
- and splash availability.
-
- * poppler/CairoFontEngine.cc: Disable hinting.
-
- * glib/poppler-page.cc (poppler_page_render_to_pixbuf): Choose
- either splash or cairo rendering, based on configure choice.
- (cairo_render_to_pixbuf): New function to render using the cairo
- backend.
- (splash_render_to_pixbuf): Split out the splash code to this
- function.
-
- ChangeLog | 16 ++++
- NEWS | 6 +-
- configure.ac | 16 +++-
- glib/Makefile.am | 17 ++++-
- glib/poppler-page.cc | 152 ++++++++++++++++++++++++++++++++--------
- poppler/CairoFontEngine.cc | 2 +-
- poppler/CairoOutputDevImage.cc | 20 ++----
- poppler/CairoOutputDevImage.h | 3 +-
- 8 files changed, 179 insertions(+), 53 deletions(-)
-
-commit b62b0cec2335d987b31fbb0043cb33db29cc6a13
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Apr 5 02:56:32 2005 +0000
-
- 2005-04-04 Kristian Høgsberg <krh@redhat.com>
-
- * ChangeLog: Add this entry to test commit mailer script.
-
- ChangeLog | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-commit 50b494266ce197fe88468ca2917b9910d77e5f98
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Apr 5 02:49:18 2005 +0000
-
- 2005-04-04 Kristian Høgsberg <krh@redhat.com>
-
- * TODO: Add reminder about using PDF font descriptors with
- fontconfig.
-
- ChangeLog | 3 +++
- TODO | 2 ++
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-commit d3d12235bf4de48363571b3d992ea3bfc29e6529
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Apr 4 21:50:56 2005 +0000
-
- 2005-04-04 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Add checks for mkstemp() and mkstemps().
-
- * glib/poppler-page.cc (poppler_page_find_text): Reverse
- y-coordinates so we return PDF style coordinates.
-
- From Maro Pesenti Gritti <mpgritti@gmail.com>:
-
- * configure.ac, poppler/Makefile.am: Check for fontconfig when
- we're building the splash backend.
-
- * glib/poppler-page.cc (poppler_page_get_text): New function to
- select text on page.
-
- ChangeLog | 15 +++++++++++++++
- configure.ac | 5 ++++-
- glib/poppler-page.cc | 48 +++++++++++++++++++++++++++++++++++++++++++++---
- glib/poppler-page.h | 3 +++
- poppler/Makefile.am | 4 ++++
- 5 files changed, 71 insertions(+), 4 deletions(-)
-
-commit 2cb9d70678e33504246cbfbe0525c33f5e3b7736
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Apr 4 05:56:29 2005 +0000
-
- 2005-04-04 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_find_text): Reverse list of
- matches so we get them in the right order.
-
- ChangeLog | 5 +++++
- glib/poppler-page.cc | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit 8c2a5ffb73c0f2d84adebcfbd43f8347ae8c8bbc
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sun Apr 3 18:17:55 2005 +0000
-
- 2005-04-03 Martin Kretzschmar <martink@gnome.org>
-
- * poppler/DCTStream.h: Wrap #include <jpeglib.h> in extern "C"
- Fixes build with unpatched libjpeg.
-
- ChangeLog | 5 +++++
- poppler/DCTStream.h | 2 ++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-commit 1879d82d9088aa36ef5e677f4bae44c84f90caa6
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Sat Apr 2 22:16:38 2005 +0000
-
- 2005-04-02 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * poppler/Page.h:
- * poppler/Page.cc (Page::Page):
- Some initial infrastructure for supporting transitions.
-
- ChangeLog | 6 ++++++
- poppler/Page.cc | 10 ++++++++++
- poppler/Page.h | 4 ++++
- 3 files changed, 20 insertions(+), 0 deletions(-)
-
-commit fa4efbed51e12811070798a7cfb6b1f9e8d57abc
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Apr 1 00:32:34 2005 +0000
-
- 2005-03-31 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_render_to_pixbuf): Clip
- output to destination pixbuf and fix RGB order.
-
- ChangeLog | 5 +++++
- glib/poppler-page.cc | 38 +++++++++++++++++++++++---------------
- 2 files changed, 28 insertions(+), 15 deletions(-)
-
-commit bb508ded0b8c5806a9db1ec73e57b14268896911
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Mar 31 22:45:05 2005 +0000
-
- 2005-03-31 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc (poppler_page_find_text): New function to
- seach a page for occurrences of a given text string.
-
- * glib/poppler-page.cc: Add g_return_if_fail() checks to a couple
- of functions.
-
- ChangeLog | 8 ++++
- glib/poppler-page.cc | 82 ++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h | 18 +++++++---
- glib/test-poppler-glib.c | 19 +++++++++--
- 4 files changed, 109 insertions(+), 18 deletions(-)
-
-commit 0b4d481e9c79cb18cf41b503970801bbf4b95b3c
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Thu Mar 31 05:29:42 2005 +0000
-
- Thu Mar 31 00:26:20 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h (poppler_page_get_link_mapping,
- poppler_page_free_link_mapping): New functions to get a mapping of
- links to locations on the current document.
- :s
-
- ChangeLog | 7 ++++
- glib/poppler-page.cc | 85 +++++++++++++++++++++++++++++++++++++++++++++++---
- glib/poppler-page.h | 15 +++++++++
- 3 files changed, 102 insertions(+), 5 deletions(-)
-
-commit c4e18f5a454794bd5e226f1106a54ccf807c6c3d
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Thu Mar 31 02:28:46 2005 +0000
-
- 2005-03-30 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * poppler/DCTStream.h: change x to unsigned int to eliminate
- comparision warning
-
- ChangeLog | 5 +++++
- poppler/DCTStream.h | 2 +-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-commit e6a2a588305b4797af901599eb6854028f2be476
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Mar 30 18:43:44 2005 +0000
-
- 2005-03-30 Jeff Muizelaar <jrmuizel@nit.ca>
-
- * poppler/Catalog.cc: delete pageLabelInfo on deconstruction
-
- ChangeLog | 4 ++++
- poppler/Catalog.cc | 1 +
- 2 files changed, 5 insertions(+), 0 deletions(-)
-
-commit a52905c0f0bf4d10d2103b80924a4de204d03836
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Wed Mar 30 04:08:26 2005 +0000
-
- add this
-
- glib/poppler-action.cc | 285 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 285 insertions(+), 0 deletions(-)
-
-commit 9542860a74076020b5727d4b761c08cdab42d69e
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Wed Mar 30 04:07:57 2005 +0000
-
- add these
-
- glib/poppler-action.h | 157 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 157 insertions(+), 0 deletions(-)
-
-commit 07720f98eca8736695f7d0d8e98465d301e6b7cf
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Wed Mar 30 04:07:39 2005 +0000
-
- Tue Mar 29 23:07:17 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/poppler-page.h: Reformat.
-
- ChangeLog | 4 ++++
- glib/poppler-page.h | 34 +++++++++++++++++-----------------
- 2 files changed, 21 insertions(+), 17 deletions(-)
-
-commit 3437b9e122aa05f4ede24664ee5a9b2d423ef9c4
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Wed Mar 30 04:04:53 2005 +0000
-
- Tue Mar 29 22:49:15 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/poppler-action.[ch]: New item to encapsulate links.
- * glib/poppler-document.[ch] (poppler_index_iter_get_action): New
- function to get the action. Also, fix some warnings.
- * glib/poppler-private.h (_poppler_action_new): New function.
- * glib/test-poppler-glib.c: Fix warnings.
-
- ChangeLog | 8 ++++++
- glib/Makefile.am | 2 +
- glib/poppler-document.cc | 57 ++++++++++-----------------------------------
- glib/poppler-document.h | 7 +----
- glib/poppler-private.h | 12 ++++++++-
- glib/poppler.h | 1 +
- glib/test-poppler-glib.c | 4 ++-
- 7 files changed, 39 insertions(+), 52 deletions(-)
-
-commit cab0ec4d011c34b571050a446c6e3286cc8749c8
-Author: Jonathan Blandford <jrb@redhat.com>
-Date: Tue Mar 29 18:49:26 2005 +0000
-
- Tue Mar 29 02:36:00 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/poppler-document.[ch] (PopplerIndexIter): Add an iter to
- extract the index from the doc. Includes a bad hack, for now.
-
- Mon Mar 28 22:02:07 2005 Jonathan Blandford <jrb@redhat.com>
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h (poppler_page_get_thumbnail_size): New
- function.
- * poppler-glib.pc.in: add -lpoppler-glib to the libs line.
-
- ChangeLog | 12 ++++
- glib/poppler-document.cc | 160 +++++++++++++++++++++++++++++++++++++++++++++-
- glib/poppler-document.h | 15 ++++
- glib/poppler-page.cc | 48 ++++++++++++++-
- glib/poppler-page.h | 3 +
- poppler-glib.pc.in | 2 +-
- 6 files changed, 236 insertions(+), 4 deletions(-)
-
-commit 2de98f3871bc4ea3e361ca4fe37f5b6561918c77
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Mar 28 07:49:54 2005 +0000
-
- 2005-03-28 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/Page.cc (loadThumb): Backend agnostic method for
- extracting an embedded thumbnail iamge.
-
- * poppler/Dict.cc (lookupInt): New convenience method.
-
- * glib/poppler-page.cc (poppler_page_get_thumbnail): New glib
- function for getting the embedded thumbnail image for a page.
-
- ChangeLog | 10 ++++
- glib/poppler-page.cc | 23 ++++++++++
- glib/poppler-page.h | 32 ++++++-------
- glib/test-poppler-glib.c | 24 +++++++---
- poppler/Dict.cc | 20 ++++++++
- poppler/Dict.h | 1 +
- poppler/Page.cc | 109 ++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Page.h | 1 +
- 8 files changed, 196 insertions(+), 24 deletions(-)
-
-commit 591055d1fbcd0b9c2bb11f14040568051c5976d1
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sat Mar 26 00:34:21 2005 +0000
-
- 2005-03-25 Kristian Høgsberg <krh@redhat.com>
-
- * glib/Makefile.am (libpoppler_glib_la_SOURCES): Add
-
- * configure.ac: Check for fontconfig for glib bindings.
-
- ChangeLog | 4 ++++
- configure.ac | 4 ++--
- glib/Makefile.am | 7 +++++--
- 3 files changed, 11 insertions(+), 4 deletions(-)
-
-commit 1e30abe94a96b91df05716ea079c58782d767951
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Mar 24 22:24:41 2005 +0000
-
- 2005-03-24 Kristian Høgsberg <krh@redhat.com>
-
- * glib/Makefile.am: Use POPPLER_GLIB_CFLAGS and POPPLER_GLIB_LIBS
- instead of GTK_TEST_*. Reported by Adam Jackson <ajax@nwnk.net>.
-
- ChangeLog | 5 +++++
- glib/Makefile.am | 7 +++----
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-commit 1d9fcaa34222b2ccd53280148561917dbb8d95d9
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Mar 23 05:53:08 2005 +0000
-
- File Edit Options Buffers Tools Help
- 2005-03-23 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/Catalog.cc (indexToLabel, labelToIndex): Add stricter
- checking of incoming labels and indices.
-
- * glib/test-poppler-glib.c (main): Change test program to take the
- page label from the command line.
-
- ChangeLog | 6 ++++++
- glib/test-poppler-glib.c | 5 ++++-
- poppler/Catalog.cc | 31 +++++++++++++++++++++++++++++--
- 3 files changed, 39 insertions(+), 3 deletions(-)
-
-commit a9bbb465a0ee6ab320f76d322a3f575327ad1148
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Mar 23 05:38:34 2005 +0000
-
- 2005-03-23 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-page.cc:
- * glib/poppler-page.h: Add poppler_page_get_index() and rename
- popper_page_get_dimension() to popper_page_get_size()
-
- ChangeLog | 6 ++++++
- glib/poppler-page.cc | 12 +++++++++---
- glib/poppler-page.h | 32 +++++++++++++++++---------------
- glib/test-poppler-glib.c | 5 ++---
- 4 files changed, 34 insertions(+), 21 deletions(-)
-
-commit 178bff27d09d1e18d1fc00c975fa235b0e9f93d3
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Mar 23 04:14:28 2005 +0000
-
- 2005-03-22 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc: Implement poppler_document_save().
-
- * glib/poppler-document.h: Add prototype and format headers
- properly.
-
- ChangeLog | 7 +++++++
- glib/poppler-document.cc | 20 ++++++++++++++++++++
- glib/poppler-document.h | 30 +++++++++++++-----------------
- 3 files changed, 40 insertions(+), 17 deletions(-)
-
-commit e40c6f69c9466df4cc70840b959f72cb0809c777
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Mar 23 01:30:04 2005 +0000
-
- 2005-03-22 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Fix --disable-popper typo reported by Albert.
- Require exactly cairo 0.4 since CVS cairo has API changes.
-
- ChangeLog | 5 +++++
- configure.ac | 6 +++---
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-commit 2a1e4f6f6dd87dc59b3579175a87215fd7350ee0
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Mar 22 22:46:37 2005 +0000
-
- 2005-03-22 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/Array.cc:
- * poppler/Array.h: Add getString() convenience method.
-
- * poppler/Catalog.cc:
- * poppler/Catalog.h: Optimize lookup of named destinations.
-
- ChangeLog | 8 +++
- poppler/Array.cc | 15 ++++++
- poppler/Array.h | 1 +
- poppler/Catalog.cc | 142 +++++++++++++++++++++++++++++++++-------------------
- poppler/Catalog.h | 32 +++++++++++-
- 5 files changed, 146 insertions(+), 52 deletions(-)
-
-commit 4dfe0ce4a1ca09d632943f0f6315e31135957ada
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Tue Mar 22 01:50:05 2005 +0000
-
- 2005-03-21 Kristian Høgsberg <krh@redhat.com>
-
- * NEWS, TODO: Update these.
-
- ChangeLog | 4 ++++
- NEWS | 1 +
- TODO | 29 ++++++++++++++++++++---------
- 3 files changed, 25 insertions(+), 9 deletions(-)
-
-commit c158de90a5a8c6514d8aa22efa0b891a1801e822
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Mar 21 07:53:19 2005 +0000
-
- 2005-03-21 Kristian Høgsberg <krh@redhat.com>
-
- From Albert Astals Cid <tsdgeos@yahoo.es>:
-
- * poppler/Catalog.cc, poppler/Catalog.h: Parse PageMode setting
- from the Catalog dict and expose it through getPageMode() method.
-
- ChangeLog | 10 ++++++++--
- poppler/Catalog.cc | 16 ++++++++++++++++
- poppler/Catalog.h | 12 ++++++++++++
- 3 files changed, 36 insertions(+), 2 deletions(-)
-
-commit 9887679ca195714d71cbedde9297e9dcea04eb13
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Mon Mar 21 07:36:11 2005 +0000
-
- 2005-03-21 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc:
-
- * glib/poppler-document.h: Expose the documenttitle as a GObject
- property.
-
- * glib/poppler-page.cc: Expose the page label as a GObject
- property.
-
- * glib/poppler-private.h: Add the page index to PopplerPage.
-
- * glib/test-poppler-glib.c: Print out page label and document
- title.
-
- * poppler/Catalog.cc:
- * poppler/Catalog.h: Add page label accessors.
-
- * poppler/PageLabelInfo.cc:
- * poppler/PageLabelInfo.h: New files.
-
- * poppler/Makefile.am: Add new files to sources.
-
- ChangeLog | 23 +++
- glib/poppler-document.cc | 95 ++++++++++++-
- glib/poppler-document.h | 3 +
- glib/poppler-page.cc | 37 +++++-
- glib/poppler-private.h | 3 +-
- glib/test-poppler-glib.c | 13 ++-
- poppler/Catalog.cc | 15 ++
- poppler/Catalog.h | 6 +
- poppler/Makefile.am | 4 +-
- poppler/PageLabelInfo.cc | 346 ++++++++++++++++++++++++++++++++++++++++++++++
- poppler/PageLabelInfo.h | 37 +++++
- 11 files changed, 573 insertions(+), 9 deletions(-)
-
-commit 2cfe917de909254bc3a114a6add68a14b5885fd0
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun Mar 20 05:44:06 2005 +0000
-
- 2005-03-20 Kristian Høgsberg <krh@redhat.com>
-
- * glib/poppler-document.cc:
- * glib/poppler-page.h:
- * glib/poppler.cc:
- * poppler/Array.cc:
- * poppler/Array.h:
- * poppler/Catalog.cc: Fix up filenames in #include statements and
- comments.
-
- ChangeLog | 10 ++++++++++
- glib/poppler-document.cc | 2 +-
- glib/poppler-document.h | 2 +-
- glib/poppler-page.cc | 2 +-
- glib/poppler-page.h | 2 +-
- glib/poppler.cc | 2 +-
- glib/poppler.h | 2 +-
- 7 files changed, 16 insertions(+), 6 deletions(-)
-
-commit f9b6017cfaf8f814ae2fc027927477c29f24af71
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sun Mar 20 00:35:21 2005 +0000
-
- 2005-03-19 Kristian Høgsberg <krh@redhat.com>
-
- Land the first bits of the glib wrapper.
-
- * Makefile.am:
- * configure.ac: Add new glib subdirectory and configure options
- for glib wrapper.
-
- * glib/Makefile.am:
- * glib/poppler-document.cc:
- * glib/poppler-document.h:
- * glib/poppler-page.cc:
- * glib/poppler-page.h:
- * glib/poppler-private.h:
- * glib/poppler.cc:
- * glib/poppler.h:
- * glib/test-poppler-glib.c:
- * poppler-glib.pc.in: New files.
-
- ChangeLog | 19 +++++
- Makefile.am | 27 ++++----
- NEWS | 4 +
- configure.ac | 25 ++++++-
- glib/Makefile.am | 33 +++++++++
- glib/poppler-document.cc | 165 ++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-document.h | 52 ++++++++++++++
- glib/poppler-page.cc | 158 ++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h | 50 ++++++++++++++
- glib/poppler-private.h | 20 ++++++
- glib/poppler.cc | 29 ++++++++
- glib/poppler.h | 42 ++++++++++++
- glib/test-poppler-glib.c | 43 ++++++++++++
- poppler-glib.pc.in | 11 +++
- 14 files changed, 661 insertions(+), 17 deletions(-)
-
-commit 2a31446b227b5cdc8334e672a71835b6ea14713a
-Author: Jeff Muizelaar <jeff@infidigm.net>
-Date: Wed Mar 16 15:51:36 2005 +0000
-
- 2005-03-16 Jeff Muizelaar <jrmuizel@nit.ca>
-
- From Dan Sheridan <dan.sheridan@postman.org.uk>
-
- * poppler/XRef.cc (XRef::checkEncrypted):
- The key length should be 5 for revision 2 documents.
-
- ChangeLog | 7 +++++++
- poppler/XRef.cc | 6 ++++++
- 2 files changed, 13 insertions(+), 0 deletions(-)
-
-commit e632a1d4b2f685993bda407458c34ef8e6b74136
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Mar 11 22:43:29 2005 +0000
-
- 2005-03-11 Kristian Høgsberg <krh@redhat.com>
-
- From Jeff Muizelaar <jrmuizel@nit.ca>:
-
- * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask): Use
- getLine instead of getPixel.
-
- ChangeLog | 3 +++
- poppler/CairoOutputDev.cc | 18 ++++++++----------
- 2 files changed, 11 insertions(+), 10 deletions(-)
-
-commit 83e904452f205a2c0cd2723cb12b7fd4640ce342
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Mar 11 21:42:52 2005 +0000
-
- 2005-03-11 Kristian Høgsberg <krh@redhat.com>
-
- From Jeff Muizelaar <jrmuizel@nit.ca>:
-
- * configure.ac: Add checks for libjpeg.
-
- * DCTStream.cc, DCTStream.h, Stream.cc, Stream.h, Makefile.am:
- Conditionally use libjpeg instead of xpdf jpeg decoder.
-
- ChangeLog | 9 ++++
- configure.ac | 34 +++++++++++++++-
- poppler/DCTStream.cc | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/DCTStream.h | 70 ++++++++++++++++++++++++++++++++
- poppler/Makefile.am | 14 ++++++-
- poppler/Stream.cc | 8 ++++
- poppler/Stream.h | 2 +
- 7 files changed, 245 insertions(+), 2 deletions(-)
-
-commit e2af71338fd89760c4ac76999985efc5eb92817f
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Mar 11 16:42:20 2005 +0000
-
- 2005-03-10 Kristian Høgsberg <krh@redhat.com>
-
- From Jeff Muizelaar <jrmuizel@nit.ca>:
-
- * poppler/CairoFontEngine.cc (CairoFontEngine::getFont):
- Don't print "Type 3 font!" message.
-
- * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask):
- Enable image mask drawing and do it properly, albeit slowly.
-
- * poppler/CairoOutputDev.h
- (CairoOutputDev::interpretType3Chars): Return true so that
- Gfx.cc turns type3 characters into calls to drawImageMask
-
- ChangeLog | 14 ++++++++++++++
- poppler/CairoFontEngine.cc | 1 -
- poppler/CairoOutputDev.cc | 25 ++++++++++---------------
- poppler/CairoOutputDev.h | 2 +-
- 4 files changed, 25 insertions(+), 17 deletions(-)
-
-commit 3dc52373346e448077d2539163e873eef6406ed7
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Mar 9 15:47:00 2005 +0000
-
- 2005-03-09 Kristian Høgsberg <krh@redhat.com>
-
- * NEWS: Describe 0.1.2 (and 0.1.1) release.
-
- * configure.ac: Bump poppler version to 0.1.2
-
- ChangeLog | 6 ++++++
- NEWS | 12 ++++++++++++
- configure.ac | 2 +-
- 3 files changed, 19 insertions(+), 1 deletions(-)
-
-commit 5c6a2d34fc25df28ca5326e6910d7cf664f0c3d7
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Wed Mar 9 15:35:31 2005 +0000
-
- 2005-03-09 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Bump cairo requirement to 0.4.
-
- ChangeLog | 4 ++++
- configure.ac | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-commit 5b2d9a61e79cefd819888c8c89231a5fafccd114
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sat Mar 5 04:57:49 2005 +0000
-
- 2005-03-04 Kristian Høgsberg <krh@redhat.com>
-
- Patch from Jeff Muizelaar <jrmuizel@nit.ca>. Changed to allocate
- glyphs using gmalloc.
-
- * poppler/CairoOutputDev.cc (CairoOutputDev::drawString):
- Implement drawString instead of drawChar. This change should
- make clipping to a text path work and has a performance
- improvement. Currently the code is a little ugly because we
- can't concat matrices to cairo without losing our current font.
-
- * poppler/CairoOutputDev.h (CairoOutputDev::useDrawChar):
- Tell Gfx.cc that it should use drawString instead of drawChar.
-
- ChangeLog | 14 ++++++
- TODO | 3 +
- poppler/CairoOutputDev.cc | 110 ++++++++++++++++++++++++++++++++++-----------
- poppler/CairoOutputDev.h | 7 +--
- 4 files changed, 102 insertions(+), 32 deletions(-)
-
-commit 60d190ef80a0dcd9cc3a67306e2c65c5dd482f24
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sat Mar 5 04:37:14 2005 +0000
-
- 2005-03-04 Kristian Høgsberg <krh@redhat.com>
-
- * test/gtk-cairo-test.cc (view_load):
- * test/gtk-splash-test.cc (view_load): Fix missing return
- statement, and remove unused variables.
-
- * configure.ac: Add configure option to enable the default KDE
- flags as described by Albert Astals Cid <tsdgeos@yahoo.es>.
-
- * TODO: Update with Jeff's items.
-
- * .cvsignore:
- * */.cvsignore: Add these to silence CVS.
-
- ChangeLog | 9 +++++++++
- TODO | 15 +++++++++++----
- configure.ac | 21 +++++++++++++++++++++
- test/gtk-cairo-test.cc | 6 ++----
- test/gtk-splash-test.cc | 5 ++---
- 5 files changed, 45 insertions(+), 11 deletions(-)
-
-commit e6706e505c1675724c8870f7c58079932661db5f
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Sat Mar 5 02:19:50 2005 +0000
-
- 2005-03-04 Kristian Høgsberg <krh@redhat.com>
-
- * .cvsignore:
- * */.cvsignore: Add these to silence CVS.
-
- .cvsignore | 21 +++++++++++++++++++++
- ChangeLog | 3 +++
- fofi/.cvsignore | 8 ++++++++
- goo/.cvsignore | 8 ++++++++
- poppler/.cvsignore | 10 ++++++++++
- splash/.cvsignore | 8 ++++++++
- test/.cvsignore | 10 ++++++++++
- 7 files changed, 68 insertions(+), 0 deletions(-)
-
-commit 932edfc3c5c61e3b3e98957b717abbf8055e1c5e
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Mar 4 19:47:13 2005 +0000
-
- 2005-03-04 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Implement same check for gtk+-2.0 tests as for
- cairo.
-
- ChangeLog | 5 +++++
- configure.ac | 11 ++++++++---
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-commit c632b35ad9345f280d78c268f84ae3fd5a3921b9
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Mar 4 16:33:43 2005 +0000
-
- 2005-03-04 Kristian Høgsberg <krh@redhat.com>
-
- * configure.ac: Only fail hard in check for cairo if the user
- specified --enable-cairo-output (from Brad Hards
- <bradh@frogmouth.net>). Print summary of configure results at the
- end of configure script.
-
- * poppler/poppler-config.h: Remove this file (noticed by Brad
- Hards <bradh@frogmouth.net>).
-
- ChangeLog | 5 +++++
- configure.ac | 17 ++++++++++++++---
- 2 files changed, 19 insertions(+), 3 deletions(-)
-
-commit 80f9c90273eb31ac349c46bf86dedff7daf21db4
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Mar 4 15:32:32 2005 +0000
-
- 2005-03-04 Kristian Høgsberg <krh@redhat.com>
-
- * poppler/poppler-config.h: Remove this file (noticed by Brad
- Hards <bradh@frogmouth.net>).
-
- ChangeLog | 5 ++
- poppler/poppler-config.h | 146 ----------------------------------------------
- 2 files changed, 5 insertions(+), 146 deletions(-)
-
-commit 338b83b6f08a7212fdde2bbce94385e9a71a3d23
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Fri Mar 4 02:46:44 2005 +0000
-
- 2005-03-03 Kristian Høgsberg <krh@redhat.com>
-
- Patch from Jeff Muizelaar <jrmuizel@nit.ca>:
-
- * poppler/CairoOutputDev.cc (CairoOutputDev::drawImage,
- CairoOutputDev::drawImageMask): destroy the image surface and
- free the image buffer.
-
- ChangeLog | 10 ++++++++++
- autogen.sh | 2 +-
- poppler/CairoOutputDev.cc | 8 +++++---
- 3 files changed, 16 insertions(+), 4 deletions(-)
-
-commit 062aa51487f539406b54458885b4c9501da3c44d
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Mar 3 20:01:14 2005 +0000
-
- 2005-03-03 Kristian Høgsberg <krh@redhat.com>
-
- * autogen.sh: Add to CVS.
-
- ChangeLog | 4 ++++
- autogen.sh | 4 ++++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-commit cb02d5d0e770e2a8cbe5a8ac810820a2ce5fec0c
-Author: Kristian Høgsberg <krh@redhat.com>
-Date: Thu Mar 3 19:45:58 2005 +0000
-
- Initial revision
-
- AUTHORS | 3 +
- COPYING | 340 ++++
- ChangeLog | 33 +
- INSTALL | 236 +++
- Makefile.am | 29 +
- NEWS | 4 +
- README | 37 +
- README-XPDF | 376 ++++
- TODO | 21 +
- configure.ac | 139 ++
- fofi/FoFiBase.cc | 156 ++
- fofi/FoFiBase.h | 55 +
- fofi/FoFiEncodings.cc | 994 ++++++++++
- fofi/FoFiEncodings.h | 34 +
- fofi/FoFiTrueType.cc | 1438 ++++++++++++++
- fofi/FoFiTrueType.h | 131 ++
- fofi/FoFiType1.cc | 207 ++
- fofi/FoFiType1.h | 57 +
- fofi/FoFiType1C.cc | 2385 ++++++++++++++++++++++
- fofi/FoFiType1C.h | 224 +++
- fofi/Makefile.am | 16 +
- goo/GooHash.cc | 356 ++++
- goo/GooHash.h | 74 +
- goo/GooList.cc | 92 +
- goo/GooList.h | 89 +
- goo/GooMutex.h | 49 +
- goo/GooString.cc | 236 +++
- goo/GooString.h | 98 +
- goo/Makefile.am | 20 +
- goo/gfile.cc | 705 +++++++
- goo/gfile.h | 140 ++
- goo/gmem.c | 204 ++
- goo/gmem.h | 53 +
- goo/gmempp.cc | 32 +
- goo/gtypes.h | 29 +
- poppler-cairo.pc.in | 10 +
- poppler-splash.pc.in | 10 +
- poppler.pc.in | 11 +
- poppler/Annot.cc | 137 ++
- poppler/Annot.h | 79 +
- poppler/Array.cc | 73 +
- poppler/Array.h | 56 +
- poppler/BaseFile.h | 82 +
- poppler/BuiltinFont.cc | 65 +
- poppler/BuiltinFont.h | 55 +
- poppler/BuiltinFontTables.cc | 4284 ++++++++++++++++++++++++++++++++++++++++
- poppler/BuiltinFontTables.h | 23 +
- poppler/CMap.cc | 384 ++++
- poppler/CMap.h | 101 +
- poppler/CairoFontEngine.cc | 367 ++++
- poppler/CairoFontEngine.h | 61 +
- poppler/CairoOutputDev.cc | 569 ++++++
- poppler/CairoOutputDev.h | 146 ++
- poppler/CairoOutputDevImage.cc | 87 +
- poppler/CairoOutputDevImage.h | 43 +
- poppler/CairoOutputDevX.cc | 211 ++
- poppler/CairoOutputDevX.h | 117 ++
- poppler/Catalog.cc | 364 ++++
- poppler/Catalog.h | 87 +
- poppler/CharCodeToUnicode.cc | 533 +++++
- poppler/CharCodeToUnicode.h | 112 ++
- poppler/CharTypes.h | 24 +
- poppler/CompactFontTables.h | 464 +++++
- poppler/Decrypt.cc | 399 ++++
- poppler/Decrypt.h | 59 +
- poppler/Dict.cc | 95 +
- poppler/Dict.h | 75 +
- poppler/Error.cc | 38 +
- poppler/Error.h | 21 +
- poppler/ErrorCodes.h | 36 +
- poppler/FontEncodingTables.cc | 1824 +++++++++++++++++
- poppler/FontEncodingTables.h | 20 +
- poppler/Function.cc | 1525 ++++++++++++++
- poppler/Function.h | 181 ++
- poppler/Gfx.cc | 3079 +++++++++++++++++++++++++++++
- poppler/Gfx.h | 279 +++
- poppler/GfxFont.cc | 1508 ++++++++++++++
- poppler/GfxFont.h | 313 +++
- poppler/GfxState.cc | 2782 ++++++++++++++++++++++++++
- poppler/GfxState.h | 1053 ++++++++++
- poppler/GlobalParams.cc | 1764 +++++++++++++++++
- poppler/GlobalParams.h | 312 +++
- poppler/JArithmeticDecoder.cc | 300 +++
- poppler/JArithmeticDecoder.h | 89 +
- poppler/JBIG2Stream.cc | 3337 +++++++++++++++++++++++++++++++
- poppler/JBIG2Stream.h | 141 ++
- poppler/JPXStream.cc | 2822 ++++++++++++++++++++++++++
- poppler/JPXStream.h | 338 ++++
- poppler/Lexer.cc | 474 +++++
- poppler/Lexer.h | 75 +
- poppler/Link.cc | 851 ++++++++
- poppler/Link.h | 407 ++++
- poppler/Makefile.am | 140 ++
- poppler/NameToCharCode.cc | 116 ++
- poppler/NameToCharCode.h | 40 +
- poppler/NameToUnicodeTable.h | 1097 ++++++++++
- poppler/Object.cc | 231 +++
- poppler/Object.h | 301 +++
- poppler/Outline.cc | 151 ++
- poppler/Outline.h | 74 +
- poppler/OutputDev.cc | 104 +
- poppler/OutputDev.h | 162 ++
- poppler/PDFDoc.cc | 322 +++
- poppler/PDFDoc.h | 176 ++
- poppler/PDFDocEncoding.cc | 44 +
- poppler/PDFDocEncoding.h | 16 +
- poppler/PSOutputDev.cc | 3803 +++++++++++++++++++++++++++++++++++
- poppler/PSOutputDev.h | 312 +++
- poppler/PSTokenizer.cc | 135 ++
- poppler/PSTokenizer.h | 39 +
- poppler/Page.cc | 370 ++++
- poppler/Page.h | 176 ++
- poppler/Parser.cc | 231 +++
- poppler/Parser.h | 58 +
- poppler/SplashOutputDev.cc | 1348 +++++++++++++
- poppler/SplashOutputDev.h | 194 ++
- poppler/Stream-CCITT.h | 459 +++++
- poppler/Stream.cc | 3979 +++++++++++++++++++++++++++++++++++++
- poppler/Stream.h | 841 ++++++++
- poppler/TextOutputDev.cc | 3529 +++++++++++++++++++++++++++++++++
- poppler/TextOutputDev.h | 569 ++++++
- poppler/UTF8.h | 56 +
- poppler/UnicodeMap.cc | 293 +++
- poppler/UnicodeMap.h | 122 ++
- poppler/UnicodeMapTables.h | 361 ++++
- poppler/UnicodeTypeTable.cc | 299 +++
- poppler/UnicodeTypeTable.h | 18 +
- poppler/XRef.cc | 1026 ++++++++++
- poppler/XRef.h | 133 ++
- poppler/poppler-config.h | 146 ++
- poppler/poppler-config.h.in | 145 ++
- splash/Makefile.am | 52 +
- splash/Splash.cc | 1732 ++++++++++++++++
- splash/Splash.h | 174 ++
- splash/SplashBitmap.cc | 157 ++
- splash/SplashBitmap.h | 46 +
- splash/SplashClip.cc | 270 +++
- splash/SplashClip.h | 86 +
- splash/SplashErrorCodes.h | 30 +
- splash/SplashFTFont.cc | 289 +++
- splash/SplashFTFont.h | 53 +
- splash/SplashFTFontEngine.cc | 141 ++
- splash/SplashFTFontEngine.h | 58 +
- splash/SplashFTFontFile.cc | 111 ++
- splash/SplashFTFontFile.h | 68 +
- splash/SplashFont.cc | 166 ++
- splash/SplashFont.h | 87 +
- splash/SplashFontEngine.cc | 245 +++
- splash/SplashFontEngine.h | 83 +
- splash/SplashFontFile.cc | 55 +
- splash/SplashFontFile.h | 58 +
- splash/SplashFontFileID.cc | 23 +
- splash/SplashFontFileID.h | 28 +
- splash/SplashGlyphBitmap.h | 24 +
- splash/SplashMath.h | 45 +
- splash/SplashPath.cc | 177 ++
- splash/SplashPath.h | 105 +
- splash/SplashPattern.cc | 64 +
- splash/SplashPattern.h | 79 +
- splash/SplashScreen.cc | 107 +
- splash/SplashScreen.h | 38 +
- splash/SplashState.cc | 99 +
- splash/SplashState.h | 86 +
- splash/SplashT1Font.cc | 251 +++
- splash/SplashT1Font.h | 49 +
- splash/SplashT1FontEngine.cc | 124 ++
- splash/SplashT1FontEngine.h | 51 +
- splash/SplashT1FontFile.cc | 96 +
- splash/SplashT1FontFile.h | 55 +
- splash/SplashTypes.h | 80 +
- splash/SplashXPath.cc | 417 ++++
- splash/SplashXPath.h | 90 +
- splash/SplashXPathScanner.cc | 271 +++
- splash/SplashXPathScanner.h | 72 +
- test/Makefile.am | 48 +
- test/gtk-cairo-test.cc | 298 +++
- test/gtk-splash-test.cc | 314 +++
- 177 files changed, 70512 insertions(+), 0 deletions(-)
diff --git a/Build/source/libs/poppler/poppler-0.12.4/aclocal.m4 b/Build/source/libs/poppler/poppler-0.12.4/aclocal.m4
deleted file mode 100644
index b0838c29290..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/aclocal.m4
+++ /dev/null
@@ -1,1159 +0,0 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-#
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
- ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
- [AC_MSG_RESULT([no])
- $4])
-elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
- [$4])
-else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 10
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- am__universal=false
- m4_case([$1], [CC],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac],
- [CXX],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac])
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 16
-
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
- [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
- *)
- install_sh="\${SHELL} $am_aux_dir/install-sh"
- esac
-fi
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name. Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
- *[[\\\"\#\$\&\'\`$am_lf]]*)
- AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[ --enable-silent-rules less verbose build output (undo: `make V=1')
- --disable-silent-rules verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball. -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([m4/acx_pthread.m4])
-m4_include([m4/define-dir.m4])
-m4_include([m4/gtk-doc.m4])
-m4_include([m4/libjpeg.m4])
-m4_include([m4/libpng.m4])
-m4_include([m4/libtool.m4])
-m4_include([m4/ltoptions.m4])
-m4_include([m4/ltsugar.m4])
-m4_include([m4/ltversion.m4])
-m4_include([m4/lt~obsolete.m4])
-m4_include([m4/qt.m4])
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/GooVector.h b/Build/source/libs/poppler/poppler-0.12.4/goo/GooVector.h
deleted file mode 100644
index 31a72e9bbe5..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/GooVector.h
+++ /dev/null
@@ -1,113 +0,0 @@
-//========================================================================
-//
-// This file comes from pdftohtml project
-// http://pdftohtml.sourceforge.net
-//
-// Copyright from:
-// Gueorgui Ovtcharov
-// Rainer Dorsch <http://www.ra.informatik.uni-stuttgart.de/~rainer/>
-// Mikhail Kruk <meshko@cs.brandeis.edu>
-//
-//========================================================================
-
-#ifndef GOO_VECTOR_H
-#define GOO_VECTOR_H
-#include "goo/gtypes.h"
-
-
-template<class T>
-class GooVector{
-private:
-
- int _size;
- T* last;
- T* storage;
-
- void resize(){
- if (_size==0) _size=2;else _size=2*_size;
- T *tmp=new T[_size];
- if (storage){
- last=copy(storage,last,tmp);
- delete [] storage;
- }
- else last=tmp;
- storage=tmp;
- }
-
- T* copy(T* src1,T* src2,T* dest){
- T* tmp=src1;
- T* d=dest;
- while(tmp!=src2){
- *d=*tmp;
- d++;tmp++;
- }
- return d;
- }
-
-public:
- typedef T* iterator;
-
- GooVector(){
- _size=0;
- last=0;
- storage=0;
-}
-
-
-
-virtual ~GooVector(){
- delete[] storage ;
-}
-
-void reset(){
- last=storage;
-}
-
-int size(){
- return (last-storage);
-}
-void push_back(const T& elem){
- if (!storage||(size() >=_size)) resize();
- *last=elem;
- last++;
-
-
-}
-
-
-T pop_back() {
- if (last!=storage) last--;
-
- return *last;
-}
-
-
-T operator[](unsigned int i){
- return *(storage+i);
-}
-
-
-GBool isEmpty() const{
- return !_size || (last==storage) ;
-}
-
-
-
-iterator begin() const{
- return storage;
-}
-
-iterator end() const {
- return last;
-}
-};
-#endif
-
-
-
-
-
-
-
-
-
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.12.4/goo/PNGWriter.h
deleted file mode 100644
index b65c19ed9a5..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/PNGWriter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//========================================================================
-//
-// PNGWriter.h
-//
-// This file is licensed under the GPLv2 or later
-//
-// Copyright (C) 2009 Warren Toomey <wkt@tuhs.org>
-// Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com>
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
-//
-//========================================================================
-
-#ifndef PNGWRITER_H
-#define PNGWRITER_H
-
-#include <config.h>
-
-#ifdef ENABLE_LIBPNG
-
-#include <cstdio>
-#include <png.h>
-
-class PNGWriter
-{
- public:
- PNGWriter();
- ~PNGWriter();
-
- bool init(FILE *f, int width, int height);
-
- bool writePointers(png_bytep *rowPointers);
- bool writeRow(png_bytep *row);
-
- bool close();
-
- private:
- png_structp png_ptr;
- png_infop info_ptr;
-};
-
-#endif
-
-#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.12.4/goo/gtypes.h
deleted file mode 100644
index 9f64f57d4a1..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/gtypes.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * gtypes.h
- *
- * Some useful simple types.
- *
- * Copyright 1996-2003 Glyph & Cog, LLC
- */
-
-#ifndef GTYPES_H
-#define GTYPES_H
-
-/*
- * These have stupid names to avoid conflicts with some (but not all)
- * C++ compilers which define them.
- */
-typedef int GBool;
-#define gTrue 1
-#define gFalse 0
-
-/*
- * These have stupid names to avoid conflicts with <sys/types.h>,
- * which on various systems defines some random subset of these.
- */
-typedef unsigned char Guchar;
-typedef unsigned short Gushort;
-typedef unsigned int Guint;
-typedef unsigned long Gulong;
-
-#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/gtk-doc.make b/Build/source/libs/poppler/poppler-0.12.4/gtk-doc.make
deleted file mode 100644
index 0f87cc797f7..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/gtk-doc.make
+++ /dev/null
@@ -1,196 +0,0 @@
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = $(LIBTOOL) --mode=execute
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-GTKDOC_RUN = sh -c
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = \
- $(content_files) \
- $(HTML_IMAGES) \
- $(DOC_MAIN_SGML_FILE) \
- $(DOC_MODULE)-sections.txt \
- $(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = \
- $(DOC_MODULE).args \
- $(DOC_MODULE).hierarchy \
- $(DOC_MODULE).interfaces \
- $(DOC_MODULE).prerequisites \
- $(DOC_MODULE).signals
-
-REPORT_FILES = \
- $(DOC_MODULE)-undocumented.txt \
- $(DOC_MODULE)-undeclared.txt \
- $(DOC_MODULE)-unused.txt
-
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-else
-all-local:
-endif
-
-docs: html-build.stamp
-
-$(REPORT_FILES): sgml-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo 'gtk-doc: Scanning header files'
- @-chmod -R u+w $(srcdir)
- cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
- else \
- cd $(srcdir) ; \
- for i in $(SCANOBJ_FILES) ; do \
- test -f $$i || touch $$i ; \
- done \
- fi
- touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
- @true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
- @echo 'gtk-doc: Rebuilding template files'
- @-chmod -R u+w $(srcdir)
- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
- touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
- @true
-
-tmpl/*.sgml:
- @true
-
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
- @echo 'gtk-doc: Building XML'
- @-chmod -R u+w $(srcdir)
- cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
- touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
- @true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo 'gtk-doc: Building HTML'
- @-chmod -R u+w $(srcdir)
- rm -rf $(srcdir)/html
- mkdir $(srcdir)/html
- mkhtml_options=""; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
- if test "$(?)" = "0"; then \
- mkhtml_options=--path="$(srcdir)"; \
- fi
- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
- @echo 'gtk-doc: Fixing cross-references'
- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
- touch html-build.stamp
-
-##############
-
-clean-local:
- rm -f *~ *.bak
- rm -rf .libs
-
-distclean-local:
- cd $(srcdir) && \
- rm -rf xml $(REPORT_FILES) \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-maintainer-clean-local: clean
- cd $(srcdir) && rm -rf xml html
-
-install-data-local:
- installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
- else \
- if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
- fi; \
- $(mkinstalldirs) $${installdir} ; \
- for i in $$installfiles; do \
- echo '-- Installing '$$i ; \
- $(INSTALL_DATA) $$i $${installdir}; \
- done; \
- if test -n "$(DOC_MODULE_VERSION)"; then \
- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
- mv -f $${installdir}/$(DOC_MODULE).devhelp \
- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
- fi; \
- ! which gtkdoc-rebase >/dev/null 2>&1 || \
- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
- fi
-
-uninstall-local:
- if test -n "$(DOC_MODULE_VERSION)"; then \
- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
- else \
- installdir="$(DESTDIR)$(TARGET_DIR)"; \
- fi; \
- rm -rf $${installdir}
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
- @echo "*** gtk-doc must be installed and enabled in order to make dist"
- @false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/tmpl
- mkdir $(distdir)/xml
- mkdir $(distdir)/html
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- -cp $(srcdir)/xml/*.xml $(distdir)/xml
- cp $(srcdir)/html/* $(distdir)/html
- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
- ! which gtkdoc-rebase >/dev/null 2>&1 || \
- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
-.PHONY : dist-hook-local docs
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.12.4/poppler-config.h.cmake
deleted file mode 100644
index 5122a4e629f..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-config.h.cmake
+++ /dev/null
@@ -1,90 +0,0 @@
-//================================================= -*- mode: c++ -*- ====
-//
-// poppler-config.h
-//
-// Copyright 1996-2004 Glyph & Cog, LLC
-//
-//========================================================================
-
-#ifndef POPPLER_CONFIG_H
-#define POPPLER_CONFIG_H
-
-// We duplicate some of the config.h #define's here since they are
-// used in some of the header files we install. The #ifndef/#endif
-// around #undef look odd, but it's to silence warnings about
-// redefining those symbols.
-
-/* Enable multithreading support. */
-#ifndef MULTITHREADED
-#cmakedefine MULTITHREADED 1
-#endif
-
-/* Enable exceptions. */
-#ifndef USE_EXCEPTIONS
-#cmakedefine USE_EXCEPTIONS 1
-#endif
-
-/* Use fixedpoint. */
-#ifndef USE_FIXEDPOINT
-#cmakedefine USE_FIXEDPOINT 1
-#endif
-
-/* Include support for OPI comments. */
-#ifndef OPI_SUPPORT
-#cmakedefine OPI_SUPPORT 1
-#endif
-
-/* Enable word list support. */
-#ifndef TEXTOUT_WORD_LIST
-#cmakedefine TEXTOUT_WORD_LIST 1
-#endif
-
-// Also, there's a couple of preprocessor symbols in the header files
-// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and
-
-//------------------------------------------------------------------------
-// version
-//------------------------------------------------------------------------
-
-// copyright notice
-#define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org"
-#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
-
-//------------------------------------------------------------------------
-// popen
-//------------------------------------------------------------------------
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define popen _popen
-#define pclose _pclose
-#endif
-
-#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS)
-#define POPEN_READ_MODE "rb"
-#else
-#define POPEN_READ_MODE "r"
-#endif
-
-//------------------------------------------------------------------------
-// Win32 stuff
-//------------------------------------------------------------------------
-
-#if defined(_WIN32) && !defined(_MSC_VER)
-#include <windef.h>
-#else
-#define CDECL
-#endif
-
-//------------------------------------------------------------------------
-// Compiler
-//------------------------------------------------------------------------
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define GCC_PRINTF_FORMAT(fmt_index, va_index) \
- __attribute__((__format__(__printf__, fmt_index, va_index)))
-#else
-#define GCC_PRINTF_FORMAT(fmt_index, va_index)
-#endif
-
-
-#endif /* POPPLER_CONFIG_H */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/ABWOutputDev.cc b/Build/source/libs/poppler/poppler-0.12.4/poppler/ABWOutputDev.cc
deleted file mode 100644
index 3a8e7391ddb..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/ABWOutputDev.cc
+++ /dev/null
@@ -1,1179 +0,0 @@
-//========================================================================
-//
-// ABWOutputDev.cc
-//
-// Copyright 2006-2007 Jauco Noordzij <jauco@jauco.nl>
-// Copyright 2007 Dominic Lachowicz <cinamod@hotmail.com>
-// Copyright 2008 Hib Eris <hib@hiberis.nl>
-//
-// Based somewhat on HtmlOutputDev.cc
-//
-//========================================================================
-
-#ifdef __GNUC__
-#pragma implementation
-#endif
-
-#include "config.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <math.h>
-#include "goo/GooString.h"
-#include "goo/GooList.h"
-#include "UnicodeMap.h"
-#include "goo/gmem.h"
-#include "Error.h"
-#include "GfxState.h"
-#include "GlobalParams.h"
-#include "ABWOutputDev.h"
-#include "PDFDoc.h"
-
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xpath.h>
-#include <libxml/xpathInternals.h>
-
-
-// Inter-character space width which will cause addChar to start a new
-// word.
-#define minWordBreakSpace 0.1
-
-// Maximum inter-word spacing, as a fraction of the font size.
-#define maxWordSpacing 1.5
-
-// Max distance between baselines of two lines within a block, as a
-// fraction of the font size.
-#define maxLineSpacingDelta 1.5
-
-#define C_maxVCutValue 4
-#define C_maxHCutValue 5
-//------------------------------------------------------------------------
-// ABWOutputDev
-//------------------------------------------------------------------------
-
-ABWOutputDev::ABWOutputDev(xmlDocPtr ext_doc)
-{
- pdfdoc = NULL;
- N_page = N_style = N_text = N_styleset = N_Block = N_word = NULL;
- doc = ext_doc;
- N_root = xmlNewNode(NULL, BAD_CAST "abiword");
- xmlDocSetRootElement(doc, N_root);
- N_styleset = xmlNewChild(N_root, NULL, BAD_CAST "styles", NULL);
- N_content = xmlNewChild(N_root, NULL, BAD_CAST "content", NULL);
- uMap = globalParams->getTextEncoding();
- maxStyle = Style = 1;
-}
-
-ABWOutputDev::~ABWOutputDev() {
- xmlCleanupParser();
-}
-
-void ABWOutputDev::startPage(int pageNum, GfxState *state) {
- /*While reading a pdf page this node acts as a placeholder parent.
- when conversion is finished and the page is structured as we like it
- all text fragments are moved from N_page to N_content.*/
- N_page = xmlNewNode(NULL, BAD_CAST "page");
- G_pageNum = pageNum;
-}
-
-/*Callback to denote that poppler reached the end of a page
-here I insert most of the interesting processing stuff*/
-void ABWOutputDev::endPage() {
- //make sure all words are closed
- endTextBlock();
- cleanUpNode(N_page, true);
- //xmlAddChild(N_content, N_page);
- //xmlSaveFormatFileEnc("pre-cut.xml", doc, "UTF-8", 1);
- //xmlUnlinkNode(N_page);
- //call the top down cutting mechanism
- recursiveXYC(N_page);
- //by stopping to worry about creating empty nodes I made the code quite a
- //bit more robust. This function makes sure we have a nice'n'clean tree
- cleanUpNode(N_page, true);
- //xmlAddChild(N_content, N_page);
- //xmlSaveFormatFileEnc("raw.xml", doc, "UTF-8", 1);
- //xmlUnlinkNode(N_page);
-
- //Interpret the XY tree and infer text blocks and columns
- interpretXYTree();
- cleanUpNode(N_page, true);
- //xmlAddChild(N_content, N_page);
- //xmlSaveFormatFileEnc("interpreted.xml", doc, "UTF-8", 1);
- //xmlUnlinkNode(N_page);
-
- //I have blocks and columns, this function will turn that into paragraphs and
- //columns
- generateParagraphs();
- cleanUpNode(N_page, true);
- xmlAddChild(N_content, N_page);
- N_page = NULL;
-}
-
-void ABWOutputDev::recursiveXYC(xmlNodePtr nodeset) {
- /*This function implements the recursive XY Cut. basically, it gets
- the largest piece of whitespace (using getBiggestSeperator()) and then
- splits the page using splitNodes on that whitespace. It calls itself again
- with both the halves*/
- float bhs, bvs, X1, X2, Y1, Y2;
-
- bvs = getBiggestSeperator(nodeset, VERTICAL, &X1, &X2);
- bhs = getBiggestSeperator(nodeset, HORIZONTAL, &Y1, &Y2);
-
- if (bvs == -1){
- if (bhs == -1){//both -1
- //FIXME: add assertions that bvs and bhs are >=-1
- printf("No seperators\n");
- return;
- }
- else { //only bhs > -1
- splitNodes(Y1, HORIZONTAL, nodeset, bhs);
- }
- }
- else {
- if (bhs == -1){//only bvs > -1
- splitNodes(X1, VERTICAL, nodeset, bvs);
- }
- else {//both > -1
- if (bvs >= (bhs/1.7)){
- //When people read a text they prefer vertical cuts over horizontal
- //ones. I'm not that sure about the 1.7 value, but it seems to work.
- splitNodes(X1, VERTICAL, nodeset, bvs);
- }
- else {
- splitNodes(Y1, HORIZONTAL, nodeset, bhs);
- }
- }
- }
- recursiveXYC(nodeset->children);
- recursiveXYC(nodeset->children->next);
-}
-
-void ABWOutputDev::splitNodes(float splitValue, unsigned int direction, xmlNodePtr N_parent, double seperator){
- //This function takes a nodeset and splits it based on a cut value. It returns
- //the nodePtr with two childnodes, the both chunks.
- xmlNodePtr N_move, N_cur, N_newH, N_newL;
- char * propName;
- const char *nodeName;
- char buf[20];
- if (direction == HORIZONTAL) {
- propName = "Y1";
- nodeName = "horizontal";
- }
- else {
- propName = "X1";
- nodeName = "vertical";
- }
- N_newH = xmlNewNode(NULL, BAD_CAST nodeName);
- N_newL = xmlNewNode(NULL, BAD_CAST nodeName);
- sprintf(buf, "%f", seperator);
- xmlNewProp(N_newH, BAD_CAST "diff", BAD_CAST buf);
- sprintf(buf, "%f", seperator);
- xmlNewProp(N_newL, BAD_CAST "diff", BAD_CAST buf);
- N_cur = N_parent->children;
- while (N_cur){
- N_move = N_cur->next;
- xmlUnlinkNode(N_cur);
- if (xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST propName)) > splitValue){
- xmlAddChild(N_newH, N_cur);
- }
- else {
- xmlAddChild(N_newL, N_cur);
- }
- N_cur = N_move;
- }
- xmlAddChild(N_parent, N_newL);
- xmlAddChild(N_parent, N_newH);
-}
-
-float ABWOutputDev::getBiggestSeperator(xmlNodePtr N_set, unsigned int direction, float * C1, float * C2)
-{
- int i = 0;
- int nodeCount = xmlLsCountNode(N_set);
- float store;
- int min;
- float gap, endV;
- float * stt;
- float * end;
- if (nodeCount == 0){
- //Add assertion that this shouldn't happen
- fprintf(stderr,"No child nodes");
- return -1;
- }
- stt = new float[nodeCount];
- end = new float[nodeCount];
- //store all variables in two arrays (one for start, one for end coordinates)
- if (direction == VERTICAL) {
- for (xmlNodePtr N_cur = N_set->children; N_cur != NULL; N_cur = N_cur->next){
- stt[i] = xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "X1"));
- end[i] = xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "X2"));
- i++;
- }
- }
- else {
- for (xmlNodePtr N_cur = N_set->children; N_cur != NULL; N_cur = N_cur->next){
- stt[i] = xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "Y1"));
- end[i] = xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "Y2"));
- i++;
- }
- }
- //Sort them
- for (i = 0; i < nodeCount - 1; i++){
- min = i;
- for (int j = i + 1; j < nodeCount; j++)
- if (stt[j] < stt[i])
- min = j;
- store = stt[i];
- stt[i] = stt[min];
- stt[min] = store;
- store = end[i];
- end[i] = end[min];
- end[min] = store;
- }
- //find the largest gap
- gap = -1;
- endV = end[0];
- *C1 = 0;
- *C2 = 0;
- for (int inspect = 1; inspect < nodeCount; inspect++){
- //no gap
- if (((stt[inspect] - endV) - gap) < 0.5){ //FIXME:This is copied almost directly from the previous function, needs checking out
- //partial overlap instead of complete one
- if (end[inspect] > endV)
- endV = end[inspect];
- }
- //gap
- else{
- //gap is larger than any previous gap
- if (gap < (stt[inspect] - endV)){
- gap = stt[inspect] - endV;
- *C1 = endV;
- *C2 = stt[inspect];
- }
- endV = end[inspect];
- }
- }
- delete[] stt;
- delete[] end;
- return gap;
-}
-
-void ABWOutputDev::updateFont(GfxState *state) {
- char buf[160];
- xmlNodePtr N_cur;
- GfxFont *font;
- bool found = false;
- bool isBold, isItalic, S_isBold, S_isItalic;
- isBold = isItalic = S_isBold = S_isItalic = false;
- font = state->getFont();
- GooString *ftName;
- char *fnEnd, *fnName;
- int fnStart, ftSize;
- //the first time this function is called there is no funt.
- //Fixme: find out if that isn'y a bug
- if (font){
- isBold = (font->isBold() || font->getWeight() >6 || (strstr(font->getOrigName()->getCString(), "Bold")-font->getOrigName()->getCString() == (font->getOrigName()->getLength()-4)));
- isItalic = (font->isItalic() || (strstr(font->getOrigName()->getCString(), "Italic")-font->getOrigName()->getCString() == (font->getOrigName()->getLength()-6)));
- ftSize = int(state->getTransformedFontSize())-1;
- ftName = new GooString(font->getOrigName());
- fnStart = strcspn(ftName->getCString(), "+");
- if (fnStart < ftName->getLength())
- ftName->del(0,fnStart+1);
- fnEnd = strrchr(ftName->getCString(), 44);
- if (fnEnd == 0)
- fnEnd = strrchr(ftName->getCString(), 45);
- if (fnEnd != 0)
- ftName->del(fnEnd-ftName->getCString(),ftName->getLength()-1);
-
-/* fnName = ftName;
- if (isBold or isItalic){
- fnStart = strcspn(fnName, "+");
- if (fnStart == font->getOrigName()->getLength())
- fnStart = 0;
- else fnStart++;
-
- fnEnd = strstr(fnName, ",");
- if (fnEnd == 0)
- fnEnd = strstr(fnName, "-");
- if (fnEnd != 0)
- fnName[fnEnd-fnName] = 0;
-// char fntName[fnLength];
-// strncpy (fntName,fnName+fnStart+1,fnLength);
- fnName+=fnStart;
-// fnName = fntName;
- }
- else {*/
- fnName = ftName->getCString();
-// }
- for (N_cur = N_styleset->children; N_cur; N_cur = N_cur ->next){
- if (
- isBold == (xmlStrcasecmp(xmlGetProp(N_cur,BAD_CAST "bold"),BAD_CAST "bold;") == 0)
- &&
- isItalic == (xmlStrcasecmp(xmlGetProp(N_cur,BAD_CAST "italic"),BAD_CAST "italic") == 0)
- &&
- xmlStrcasecmp(xmlGetProp(N_cur,BAD_CAST "font"),BAD_CAST fnName) == 0
- &&
- xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "size")) == ftSize
- ) {
- found = true;
- Style = int(xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "id")));
- }
- }
- if (!found){
- N_cur = xmlNewChild(N_styleset, NULL, BAD_CAST "s", NULL);
- xmlSetProp(N_cur, BAD_CAST "type", BAD_CAST "P");
- sprintf(buf, "%d", maxStyle++);
- xmlSetProp(N_cur, BAD_CAST "name", BAD_CAST buf);
- xmlSetProp(N_cur, BAD_CAST "id", BAD_CAST buf);
- Style = maxStyle;
- sprintf(buf, "%d", ftSize); xmlSetProp(N_cur, BAD_CAST "size", BAD_CAST buf);
- isBold ? xmlSetProp(N_cur, BAD_CAST "bold", BAD_CAST "bold;") : xmlSetProp(N_cur, BAD_CAST "bold", BAD_CAST "normal;");
- isItalic ? xmlSetProp(N_cur, BAD_CAST "italic", BAD_CAST "italic"): xmlSetProp(N_cur, BAD_CAST "italic", BAD_CAST "normal");
- xmlSetProp(N_cur, BAD_CAST "font", BAD_CAST fnName);
- }
- }
-}
-
-void ABWOutputDev::drawChar(GfxState *state, double x, double y,
- double dx, double dy,
- double originX, double originY,
- CharCode code, int nBytes, Unicode *u, int uLen)
-{
- //I wouldn't know what size this should safely be. I guess 64 bytes should be
- //enough for any unicode character
- char buf[64];
- int charLen;
- x = dx;
- y = dy;
- //state->textTransformDelta(dx * state->getHorizScaling(), dy, &dx, &dy);
- //state->transformDelta(dx, dy, &dx, &dy);
- if (uLen == 1 && code == 0x20) {
- //If we break a text sequence on space, then the X1 should be increased
- //but the Y1 and Y2 should remain the same.
- beginWord(state,X2+dx,Y2);
- }
- else {
- X2 += dx;
- Y2 += dy;
- charLen = uMap->mapUnicode(*u,buf,sizeof(buf));
- //Getting Unicode to libxml is something I need to fix.
- //simply passing it using a bad-cast isn't working.
- //I assume that CharCode code it the U+value of the unicode character
- //But for a ligature code gives me DF which is the ringel-s, I guess
- //code should be two bytes wide?
- xmlNodeAddContentLen(N_word, BAD_CAST buf, charLen);
- }
-}
-
-void ABWOutputDev::beginString(GfxState *state, GooString *s) {
- double x,y;
- //state->textTransform(x, y, &x, &y);
- state->transform(state->getCurX(), state->getCurY(), &x, &y);
- if (N_word) {
- verDist = y-Y2;
- horDist = x-X2;
- //TEST:changed fabs(horDist) to horDist
- //FIXME: this if statement seems awkward to me.
- if (horDist > (state->getTransformedFontSize()*maxWordSpacing) || (fabs(verDist) > (state->getTransformedFontSize()/maxLineSpacingDelta))) {
- beginTextBlock(state,x,y);
- }
- else {
- if ((horDist > (state->getTransformedFontSize()*minWordBreakSpace)) || (fabs(verDist) > (state->getTransformedFontSize()/maxLineSpacingDelta))) {
- beginWord(state,x,y);
- }
- }
- }
- else {
- //This is the first word. Clear all values and call beginWord;
- X2 = x;
- Y2 = y;
- horDist = 0;
- verDist = 0;
- height = 0;
- beginTextBlock(state,x,y);
- }
-}
-
-void ABWOutputDev::endString(GfxState *state) {
-
-}
-
-void ABWOutputDev::beginWord(GfxState *state, double x, double y){
- char buf[20];
-// printf("***BREAK!***\n");
- endWord();
- X1 = x;
- Y2 = y;
-
- horDist = X1-X2;
- verDist = Y1-Y2;
-
- X2 = X1;
- height = state->getFont()->getAscent() * state->getTransformedFontSize();
- Y1 = Y2-height;
-
- N_word = xmlNewChild(N_Block, NULL, BAD_CAST "word", NULL);
- sprintf(buf, "%f", X1); xmlNewProp(N_word, BAD_CAST "X1", BAD_CAST buf);
- sprintf(buf, "%f", Y1); xmlNewProp(N_word, BAD_CAST "Y1", BAD_CAST buf);
- sprintf(buf, "%d", Style); xmlNewProp(N_word, BAD_CAST "style", BAD_CAST buf);
-}
-
-void ABWOutputDev::endWord(){
- char buf[20];
- if (N_word) {
- sprintf(buf, "%f", X2); xmlNewProp(N_word, BAD_CAST "X2", BAD_CAST buf);
- sprintf(buf, "%f", Y2); xmlNewProp(N_word, BAD_CAST "Y2", BAD_CAST buf);
- sprintf(buf, "%f", X2-X1); xmlNewProp(N_word, BAD_CAST "width", BAD_CAST buf);
- sprintf(buf, "%f", Y2-Y1); xmlNewProp(N_word, BAD_CAST "height", BAD_CAST buf);
- N_word = NULL;
- }
-}
-
-void ABWOutputDev::beginTextBlock(GfxState *state, double x, double y){
- endTextBlock();
- N_Block = xmlNewChild(N_page, NULL, BAD_CAST "Textblock", NULL);
- beginWord(state,x,y);
-}
-
-void ABWOutputDev::endTextBlock(){
- if (N_Block) {
- endWord();
- N_Block = NULL;
- }
-}
-/*
-This will be a function to retrieve coherent text blocks from the chunk tree.*/
-void ABWOutputDev::interpretXYTree(){
- xmlNodePtr N_oldPage;
- N_oldPage = N_page;
- N_page = xmlNewNode(NULL, BAD_CAST "page");
- N_column = N_page;
- //xmlAddChild(N_content, N_page);
- N_Block = xmlNewChild(N_column, NULL, BAD_CAST "chunk", NULL);
- ATP_recursive(N_oldPage);
-}
-
-void ABWOutputDev::ATP_recursive(xmlNodePtr N_parent){
- xmlNodePtr N_first, N_second, N_line, N_tempCol, N_tempColset = NULL;
-
- N_first = N_parent->children;
- if (!N_first)
- return;
-
- N_second = N_first->next;
-/*
- Possibilities:
- there is one child node
- Because we cleaned up before the only case where we allow one childnode is
- within Textblocks and textBlocks within 'vertical' nodes.
- basically one text node means: add it to the current block.
- There are two childnodes
- This can be two verticals, two horizontals or one horizontal and a text node.
- verticals:
- If the first is vertical, the second is as well.
- verticals mean: create a new Block, add a column per vertical make the
- vertical the block and recurse inside.
- then make the second vertical the block and recurse inside
- then finish the block (ie. create a new one)
- horizontal and or Textblocks
- if first is textnode
- add first to block
- if second is textnode
- at to block
- else
- call again
- else
- begin new block
- call again
- begin new block
- if second is text node
- add to block
- else
- call again
- there are more then two child nodes
- this can be a number of Textblocks and horizontals
- add the textNodes to the current Block
- if a horizontal is encountered enter it and generate a new block afterwards
- */
- //fprintf(stderr,"**********************************************************************\n");
- //xmlSaveFormatFileEnc("-", doc, "UTF-8", 1);
- switch (xmlLsCountNode(N_parent)) {
- case 1:
- //fprintf(stderr,"case 1\n");
- N_line = xmlNewChild(N_Block, NULL, BAD_CAST "line", NULL);
- xmlUnlinkNode(N_first);
- xmlAddChild(N_line, N_first);
- break;
- case 2:
- //fprintf(stderr,"case 2\n");
- if (xmlStrcasecmp(N_first->name,BAD_CAST "vertical") == 0){
- //store the column for the moment
- N_tempCol = N_column;
- /*If we have three columns they will turn up in the tree as:
- <vertical>
- <vertical/>
- <vertical/>
- </vertical>
- <vertical/>
- */
- //if the parent is a vertical as well, we can skip the colset generation
- //thing here we can also remove the just added column and block, because
- //these are going to replace them
- if (xmlStrcasecmp(N_parent->name,BAD_CAST "vertical") != 0){
- //fprintf(stderr,"first time column\n");
- N_tempColset = N_colset;
- N_colset = xmlNewChild(N_column, NULL, BAD_CAST "colset", NULL);
- N_column = xmlNewChild(N_colset, NULL, BAD_CAST "column", NULL);
- N_Block = xmlNewChild(N_column, NULL, BAD_CAST "chunk", NULL);
- }
- else {
- //fprintf(stderr,"second time column\n");
- xmlUnlinkNode(N_column);
- N_column = xmlNewChild(N_colset, NULL, BAD_CAST "column", NULL);
- N_Block = xmlNewChild(N_column, NULL, BAD_CAST "chunk", NULL);
- }
- //fprintf(stderr,"Building first column...\n");
- ATP_recursive(N_first);
- N_column = xmlNewChild(N_colset, NULL, BAD_CAST "column", NULL);
- N_Block = xmlNewChild(N_column, NULL, BAD_CAST "chunk", NULL);
- //fprintf(stderr,"Building second column...\n");
- ATP_recursive(N_second);
- //make sure we end the column by continuing in the master column and
- //setting the block and line to it
- N_column = N_tempCol;
- if (xmlStrcasecmp(N_parent->name,BAD_CAST "vertical") != 0){
- if (N_tempColset != NULL)
- N_colset = N_tempColset;
- else
- fprintf(stderr,"N_templColset should not! be empty (line 823)");//FIXME: add assert
- }
- }
- else {
- if (xmlStrcasecmp(N_first->name,BAD_CAST "Textblock") == 0) {
- //fprintf(stderr,"add first as textblock\n");
- N_line = xmlNewChild(N_Block, NULL, BAD_CAST "line", NULL);
- xmlUnlinkNode(N_first);
- xmlAddChild(N_line, N_first);
- if (xmlStrcasecmp(N_second->name,BAD_CAST "Textblock") == 0) {
- //fprintf(stderr,"add second as textblock\n");
- //FIXME: this is not neat. We should ignore the cut ignoring when there are only two elements above
- //line aggregation doesn't work anyway atm.
- xmlUnlinkNode(N_second);
- xmlAddChild(N_line, N_second);
- //We have two textChunks that are going to be added to the line.
- //the following statements make the line wrap around both textblocks
- //if the firstX1 is smaller then the second X1 use the first, else use the second etc.
- }
- else {
- //fprintf(stderr,"recursing into second\n");
- ATP_recursive(N_second);
- }
- }
- else {
- N_Block = xmlNewChild(N_column, NULL, BAD_CAST "chunk", NULL);
- //fprintf(stderr,"recursing into first\n");
- ATP_recursive(N_first);
- N_Block = xmlNewChild(N_column, NULL, BAD_CAST "chunk", NULL);
- if (xmlStrcasecmp(N_second->name,BAD_CAST "Textblock") == 0) {
- //fprintf(stderr,"add second as textblock\n");
- N_line = xmlNewChild(N_Block, NULL, BAD_CAST "line", NULL);
- xmlUnlinkNode(N_second);
- xmlAddChild(N_line, N_second);
- }
- else {
- //fprintf(stderr,"recursing into second\n");
- ATP_recursive(N_second);
- }
- }
- }
- break;
- default:
- //double tX1=0, tX2=0, tY1=0, tY2=0;
- //fprintf(stderr,"case default\n");
- N_line = xmlNewChild(N_Block, NULL, BAD_CAST "line", NULL);
- while (N_first){
- //xmlXPathCastStringToNumber(xmlGetProp(N_first,BAD_CAST "X1")) < tX1 ? tX1 = xmlXPathCastStringToNumber(xmlGetProp(N_first,BAD_CAST "X1")) : tX1 = tX1;
- //xmlXPathCastStringToNumber(xmlGetProp(N_first,BAD_CAST "X2")) > tX2 ? tX2 = xmlXPathCastStringToNumber(xmlGetProp(N_first,BAD_CAST "X2")) : tX2 = tX2;
- //xmlXPathCastStringToNumber(xmlGetProp(N_first,BAD_CAST "Y1")) < tY1 ? tY1 = xmlXPathCastStringToNumber(xmlGetProp(N_first,BAD_CAST "Y1")) : tY1 = tY1;
- //xmlXPathCastStringToNumber(xmlGetProp(N_first,BAD_CAST "Y2")) > tY2 ? tY2 = xmlXPathCastStringToNumber(xmlGetProp(N_first,BAD_CAST "Y2")) : tY1 = tY2;
- N_second = N_first->next;
- if (xmlStrcasecmp(N_first->name,BAD_CAST "Textblock") == 0){
- xmlUnlinkNode(N_first);
- xmlAddChild(N_line, N_first);
- }
- else { //fprintf(stderr,"This shouldn't happen! (line 700)\n");
- }
- N_first = N_second;
- }
- break;
- }
-}
-
-/*The cleanup function. It started out as a simple function to remove empty nodes
-so that I could call xmladdnewchildnode as often as I liked so that I wouldn't get seg-faults
-It is now a bit more advanced, makes sure the tree is as it's supposed to be and adds information too*/
-void ABWOutputDev::cleanUpNode(xmlNodePtr N_parent, bool aggregateInfo){
- double tX1=-1, tX2=-1, tY1=-1, tY2=-1;
- xmlNodePtr N_cur, N_next;
- N_cur = N_parent->children;
- char buf[20];
- int prevStyle = -1;
- xmlChar *val;
- int styleLength = xmlLsCountNode(N_styleset)+1;
- float stylePos;
- int *styles = new int[styleLength];
- for (int i=1; i< styleLength; i++) { styles[i] = 0;}
- /*
- ignore two horizontal nodes with textBlocks right underneath them. They
- signal the end of a chunk, and the horizontal seperation needs to be
- preserved, because it means they are different lines. The second horizontal
- therefore needs to be kept.
- */
- if ((xmlLsCountNode(N_parent) == 2)
- &&
- xmlStrcasecmp(N_parent->name,BAD_CAST "horizontal") == 0
- &&
- N_cur
- &&
- N_cur->next
- &&
- xmlStrcasecmp(N_cur->name,BAD_CAST "horizontal") == 0 && xmlStrcasecmp(N_cur->next->name,BAD_CAST "horizontal") == 0
- &&
- xmlLsCountNode(N_cur) == 1 && xmlLsCountNode(N_cur->next) == 1
- &&
- xmlStrcasecmp(N_cur->children->name,BAD_CAST "Textblock") == 0 && xmlStrcasecmp(N_cur->next->children->name,BAD_CAST "Textblock") == 0
- ) {
- xmlAddPrevSibling(N_cur->next,N_cur->children);
- xmlUnlinkNode(N_cur);
- }
- /*
- This removes columns if one of the parts is actually a single letter.
- I found out I liked the columns better, so I have the code commented out.
- */
-/* else if ((xmlLsCountNode(N_parent) == 2)
- &&
- N_cur
- &&
- N_cur->next
- &&
- xmlStrcasecmp(N_cur->name,BAD_CAST "vertical") == 0
- &&
- xmlStrcasecmp(N_cur->next->name,BAD_CAST "vertical") == 0
- &&
- (N_cur->children)
- &&
- (N_cur->children->children)
- &&
- (N_cur->children->children->children)
- &&
- xmlStrlen(N_cur->children->children->children->content) == 1) {
- N_next = N_cur->next;
- xmlAddChild(N_parent, N_next->children);
- xmlAddPrevSibling(N_next->children->children, N_cur->children);
- xmlUnlinkNode(N_cur);
- xmlUnlinkNode(N_next);
- } */else {
- while (N_cur){
- N_next = N_cur->next;
- cleanUpNode(N_cur, aggregateInfo);
- if (xmlLsCountNode(N_cur) == 0 && (xmlStrcasecmp(N_cur->name,BAD_CAST "cbr") != 0) && (xmlStrcasecmp(N_cur->name,BAD_CAST "s") != 0))
- xmlUnlinkNode(N_cur);
- //If the node is still around
- N_cur = N_next;
- }
- }
- //If a countainer element has only one child, it can be removed except for vertical
- //cuts with only one textElement;
- //the main reason for this code is to remove the crumbs after cleaning up in the loop above
- if ((xmlLsCountNode(N_parent) == 1) && ((xmlStrcasecmp(N_parent->name,BAD_CAST "horizontal") == 0) || ((xmlStrcasecmp(N_parent->name,BAD_CAST "vertical") == 0) && (xmlStrcasecmp(N_parent->children->name,BAD_CAST "Textblock") != 0)))){
- N_cur = N_parent->children;
- xmlAddPrevSibling(N_parent,N_cur);
- xmlUnlinkNode(N_parent);
- }
- //We cannot remove the page element so if it has only one childnode, we remove that childnode instead
- if ((xmlStrcasecmp(N_parent->name,BAD_CAST "page") == 0) && (xmlLsCountNode(N_parent) == 1)) {
- N_cur = N_parent->children->children;
- while (N_cur){
- N_next = N_cur->next;
- xmlUnlinkNode(N_cur);
- xmlAddChild(N_parent, N_cur);
- N_cur = N_next;
- }
- xmlUnlinkNode(N_parent->children);
- }
- //Ok, so by this time the N_parent and his children are guaranteed to be clean
- //this for loop gets information from the 'word' elements and propagates it up
- //the tree.
- if (aggregateInfo && xmlStrcasecmp(N_parent->name,BAD_CAST "word") != 0) {
- for (N_cur = N_parent->children; N_cur; N_cur = N_cur->next){
- val = xmlGetProp(N_cur,BAD_CAST "style");
- stylePos = xmlXPathCastStringToNumber(val);
- //fprintf(stderr,"1: %f, %d\n",stylePos,int(stylePos));
- styles[int(stylePos)]=styles[int(stylePos)]+1;
- //fprintf(stderr,"2: styles[%d] = %d\n",int(stylePos),styles[int(stylePos)]);
- (xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "X1")) < tX1 || tX1 == -1)? tX1 = xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "X1")) : tX1 = tX1;
- (xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "X2")) > tX2) ? tX2 = xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "X2")) : tX2 = tX2;
- (xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "Y1")) < tY1 || tY1 == -1)? tY1 = xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "Y1")) : tY1 = tY1;
- (xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "Y2")) > tY2) ? tY2 = xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "Y2")) : tY2 = tY2;
- }
- sprintf(buf, "%f", tX1); xmlSetProp(N_parent, BAD_CAST "X1", BAD_CAST buf);
- sprintf(buf, "%f", tX2); xmlSetProp(N_parent, BAD_CAST "X2", BAD_CAST buf);
- sprintf(buf, "%f", tY1); xmlSetProp(N_parent, BAD_CAST "Y1", BAD_CAST buf);
- sprintf(buf, "%f", tY2); xmlSetProp(N_parent, BAD_CAST "Y2", BAD_CAST buf);
- sprintf(buf, "%f", tX2-tX1); xmlSetProp(N_parent, BAD_CAST "width", BAD_CAST buf);
- sprintf(buf, "%f", tY2-tY1); xmlSetProp(N_parent, BAD_CAST "height", BAD_CAST buf);
- prevStyle = 0;
- styles[0] = -1;
- for (int i=1; i< styleLength; i++) { if (styles[i] > styles[prevStyle]) prevStyle = i; }
- //fprintf(stderr,"%d\n", prevStyle);
- if (prevStyle > 0){
- sprintf(buf, "%d", prevStyle); xmlSetProp(N_parent, BAD_CAST "style", BAD_CAST buf);
- }
- }
- if (N_parent->children && xmlStrcasecmp(N_parent->children->name,BAD_CAST "line") == 0 && xmlGetProp(N_parent->children,BAD_CAST "alignment") != NULL)
- xmlSetProp(N_parent, BAD_CAST "alignment", xmlGetProp(N_parent->children,BAD_CAST "alignment"));
-
- delete[] styles;
-}
-
-void ABWOutputDev::generateParagraphs() {
- xmlNodePtr N_cur, N_parent, N_p, N_line, N_next;
- int lvl;
- //basically I first detect the text-alignment within blocks.
- //ASSUMPTION: my block seperation thing is good enough so I don't need to
- //worry about two alignments in one paragraph
-
- X1 = 0;
- X2 = pdfdoc->getPageCropWidth(G_pageNum);
- Y1 = 0;
- Y2 = pdfdoc->getPageCropHeight(G_pageNum);
- addAlignment(N_page);
-
- //then it's a switch per alignement
- N_cur = N_page->children;
- N_parent = N_page;
- lvl = 1;
- while (N_cur) {
- if (xmlStrcasecmp(N_cur->name,BAD_CAST "chunk") == 0){
- N_p = xmlNewNode(NULL, BAD_CAST "chunk");
- xmlAddPrevSibling(N_cur,N_p);
- //N_p = xmlNewChild(N_parent, NULL, BAD_CAST "chunk", NULL);
- //A new paragraph is created when:
- switch (int(xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "alignment")))){
- //left
- case 1: //the distance between the texblock X2 and the last word X2 is more than
- //the following first word width.
- N_line = N_cur->children;
- while (N_line){
- N_next = N_line->next;
- xmlUnlinkNode(N_line);
- xmlAddChild(N_p,N_line);
- xmlSetProp(N_line, BAD_CAST "alignment", BAD_CAST "1");
- if (N_next && xmlStrcasecmp(N_next->name,BAD_CAST "line") == 0){
- if (xmlXPathCastStringToNumber(xmlGetProp(N_next->children->children,BAD_CAST "width")) < (xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "width")) - xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "width")))){
- N_p = xmlNewNode(NULL, BAD_CAST "chunk");
- xmlAddPrevSibling(N_cur,N_p);
- }
- }
- N_line = N_next;
- }
- break;
- //right
- case 2: //the same but now with X1 and first word and following last word
- N_line = N_cur->children;
- while (N_line){
- N_next = N_line->next;
- xmlUnlinkNode(N_line);
- xmlAddChild(N_p,N_line);
- xmlSetProp(N_line, BAD_CAST "alignment", BAD_CAST "2");
- if (N_next && xmlStrcasecmp(N_next->name,BAD_CAST "line") == 0){
- //fprintf(stderr,"width_next=%f, X2_bl=%f, X2_w=%f\n",xmlXPathCastStringToNumber(xmlGetProp(N_next->children->children,BAD_CAST "width")),xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "width")),xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "width")));
- if (xmlXPathCastStringToNumber(xmlGetProp(N_next->children->children,BAD_CAST "width")) < (xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "width")) - xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "width")))){
- N_p = xmlNewNode(NULL, BAD_CAST "chunk");
- xmlAddPrevSibling(N_cur,N_p);
- }
- }
- N_line = N_next;
- }
- break;
- //centered
- case 3: //the combined left and right space is more than the following first word
- N_line = N_cur->children;
- while (N_line){
- N_next = N_line->next;
- xmlUnlinkNode(N_line);
- xmlAddChild(N_p,N_line);
- xmlSetProp(N_line, BAD_CAST "alignment", BAD_CAST "3");
- if (N_next && xmlStrcasecmp(N_next->name,BAD_CAST "line") == 0){
- //fprintf(stderr,"width_next=%f, X2_bl=%f, X2_w=%f\n",xmlXPathCastStringToNumber(xmlGetProp(N_next->children->children,BAD_CAST "width")),xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "width")),xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "width")));
- if (xmlXPathCastStringToNumber(xmlGetProp(N_next->children->children,BAD_CAST "width")) < (xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "width")) - xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "width")))){
- N_p = xmlNewNode(NULL, BAD_CAST "chunk");
- xmlAddPrevSibling(N_cur,N_p);
- }
- }
- N_line = N_next;
- }
- break;
- //justified
- case 4:
- //we break on all alignment=1 lines. A line with alignment=1 that is the first of a block will
- //also initiate a paragraph break before.
- N_line = N_cur->children;
- if (xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "alignment")) == 1){
- N_p = xmlNewNode(NULL, BAD_CAST "chunk");
- xmlAddPrevSibling(N_cur,N_p);
- }
- while (N_line){
- N_next = N_line->next;
- xmlUnlinkNode(N_line);
- xmlAddChild(N_p,N_line);
- if (xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "alignment")) == 1){
- N_p = xmlNewNode(NULL, BAD_CAST "chunk");
- xmlAddPrevSibling(N_cur,N_p);
- }
- xmlSetProp(N_line, BAD_CAST "alignment", BAD_CAST "4");
- N_line = N_next;
- }
- break;
- }
- }
- else if (xmlStrcasecmp(N_cur->name,BAD_CAST "colset") == 0 || xmlStrcasecmp(N_cur->name,BAD_CAST "column") == 0){
- N_parent = N_cur;
- N_cur = N_cur->children;
- lvl++;
- N_p = xmlNewNode(NULL, BAD_CAST "chunk");
- xmlAddPrevSibling(N_cur,N_p);
- continue;
- }
- if (N_cur->next)
- N_cur = N_cur->next;
- else while (lvl > 0){
- N_cur = N_parent;
- N_parent = N_cur->parent;
- lvl--;
- if (N_cur->next){
- N_cur = N_cur->next;
- break;
- }
- }
- if (lvl==0)
- N_cur = NULL;
- }
-}
-
-//function that adds an 'alignment=' property to the <chunk>s
-void ABWOutputDev::addAlignment(xmlNodePtr N_parent) {
- xmlNodePtr N_chunk, N_line;
- double tX1, tX2;
- bool leftMatch, rightMatch, centerMatch;
- int leftCnt = 0, rightCnt = 0, cntrCnt = 0, justCnt = 0;
- //fprintf(stderr,"Entering addAlignment\n");
- for (N_chunk = N_parent->children; N_chunk; N_chunk = N_chunk->next) {
- if (xmlStrcasecmp(N_chunk->name,BAD_CAST "chunk") == 0){
- X1 = xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X1"));
- X2 = xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X2"));
- //fprintf(stderr,"Found chunk\n");
- //if the chunk contains only one line, we don't need to loop through it.
- if (xmlLsCountNode(N_chunk) == 1){
- //fprintf(stderr,"Processing line\n");
- //fprintf(stderr,"X1=%f, X2=%f, cX1=%f, cX2=%f\n",X1,X2,xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X1")), xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X2")));
- //fprintf(stderr,"%f\n",(xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X1")) - X1)-(X2 - xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X2"))));
- //fprintf(stderr,"cX1-X1=%f, X2-cX2=%f\n",(xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X1")) - X1),(X2 - xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X2"))));
- // a one line chunk, is either centered or left or right-aligned.
- if ((xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X1"))-X1)-(X2-xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X2"))) > 1) {
- xmlNewProp(N_chunk, BAD_CAST "alignment", BAD_CAST "2");
- xmlNewProp(N_chunk->children, BAD_CAST "alignment", BAD_CAST "2");
- //fprintf(stderr,"alignment = right\n");
- }
- else {
- if ((xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X1"))-X1)-(X2 - xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X2")))< -1) {
- xmlNewProp(N_chunk, BAD_CAST "alignment", BAD_CAST "1");
- xmlNewProp(N_chunk->children, BAD_CAST "alignment", BAD_CAST "1");
- //fprintf(stderr,"alignment = left\n");
- }
- else {
- xmlNewProp(N_chunk, BAD_CAST "alignment", BAD_CAST "3");
- xmlNewProp(N_chunk->children, BAD_CAST "alignment", BAD_CAST "3");
- //fprintf(stderr,"alignment = center\n");
- }
- }
- }
- else {
- leftCnt = 0;
- rightCnt = 0;
- cntrCnt = 0;
- justCnt = 0;
- for (N_line = N_chunk->children; N_line; N_line = N_line->next) {
- //fprintf(stderr,"Processing line\n");
- /*
- |X1 - cX1| == 1
- |X2 - cX2| == 1
- |(cX1-X1)-(X2-cX2)| == 1
- ok, each line can be just as wide as the current set,
- it can be smaller and moved to the right
- it can be smaller and moved to the left.
- it can
- */
- //fprintf(stderr,"X1=%f, X2=%f, cX1=%f, cX2=%f\n",X1,X2,xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "X1")), xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "X2")));
- //fprintf(stderr,"cX1-X1=%f, X2-cX2=%f\n",(xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "X1")) - X1),(X2 - xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "X2"))));
- leftMatch = fabs(xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "X1"))-X1) < 2;
- rightMatch = fabs(X2-xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "X2"))) < 2;
- centerMatch = fabs((xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "X1"))-X1)-(X2-xmlXPathCastStringToNumber(xmlGetProp(N_line,BAD_CAST "X2")))) < 2;
- if (leftMatch && rightMatch) {
- xmlNewProp(N_line, BAD_CAST "alignment", BAD_CAST "4");
- justCnt++;
- }
- else if (centerMatch) {
- xmlNewProp(N_line, BAD_CAST "alignment", BAD_CAST "3");
- cntrCnt++;
- }
- else if (rightMatch) {
- xmlNewProp(N_line, BAD_CAST "alignment", BAD_CAST "2");
- rightCnt++;
- }
- else {
- xmlNewProp(N_line, BAD_CAST "alignment", BAD_CAST "1");
- leftCnt++;
- }
- }
- //there is almost always one justified line in a centered text
- //and most justified blocks have at least one left aligned line
- //fprintf(stderr,"1:%d ,2:%d ,3:%d ,4:%d\n",leftCnt,justCnt,cntrCnt,rightCnt);
- if ((leftCnt-1 >= justCnt) && (leftCnt >= rightCnt) && (leftCnt >= cntrCnt))
- xmlNewProp(N_chunk, BAD_CAST "alignment", BAD_CAST "1");
- else if ((justCnt >= leftCnt-1) && (justCnt >= rightCnt) && (justCnt >= cntrCnt))
- xmlNewProp(N_chunk, BAD_CAST "alignment", BAD_CAST "4");
- else if ((cntrCnt >= justCnt-1) && (cntrCnt >= rightCnt) && (cntrCnt >= leftCnt))
- xmlNewProp(N_chunk, BAD_CAST "alignment", BAD_CAST "3");
- else
- xmlNewProp(N_chunk, BAD_CAST "alignment", BAD_CAST "2");
- }
- }
- else {
- if (xmlStrcasecmp(N_chunk->name,BAD_CAST "colset") == 0){
- //fprintf(stderr,"Found a colset\n");
- addAlignment(N_chunk);
- }
- else {
- if (xmlStrcasecmp(N_chunk->name,BAD_CAST "column") == 0){
- //fprintf(stderr,"Found a column\n");
- tX1 = X1;
- tX2 = X2;
- X1 = xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X1"));
- X2 = xmlXPathCastStringToNumber(xmlGetProp(N_chunk,BAD_CAST "X2"));
- addAlignment(N_chunk);
- X1 = tX1;
- X2 = tX2;
- }
- else { //fprintf(stderr,"Found something else\n");
- }
- }
- }
- }
-//parse all blocks, and all lines within all blocks
-//do a set of checks and tick a flag if the check fails
-//check for line X1 is textBlock X1
-//check for line X2 is textblock X2
-//check if line is centered in textBock (LX1 != TX1 && LX2 != TX2 && LX1-TX1 == TX2=LX2)
-//if the LX1 != TX1 then how much is the difference?
-//a line isn't left aligned if all lines have a different X1 <= not so strong assumption.
-
-//justified if both are straight except for a couple of (same factor sized) indents at the left
-//else centered if above calculation is correct
-//else left aligned if left side is more straight than right (more lines in the same X1 or common factor
-//else right
-}
-
-void ABWOutputDev::setPDFDoc(PDFDoc *priv_pdfdoc) {
- pdfdoc = priv_pdfdoc;
-}
-
-void ABWOutputDev::createABW() {
- //*************************************************************
- //change styles to abiword format
- xmlNodePtr N_cur, N_next;
- xmlAttrPtr N_prop;
- char buf[500];
- for (N_cur = N_styleset->children; N_cur; N_cur = N_cur->next){
- sprintf(buf,"margin-top:0pt; color:000000; margin-left:0pt; text-position:normal; widows:2; text-indent:0in; font-variant:normal; margin-right:0pt; lang:nl-NL; line-height:1.0; font-size:%dpt; text-decoration:none; margin-bottom:0pt; bgcolor:transparent; text-align:left; font-stretch:normal;",int(xmlXPathCastStringToNumber(xmlGetProp(N_cur,BAD_CAST "size"))));
- strncat(buf,"font-family:",12);
- strncat(buf,(char *)xmlGetProp(N_cur,BAD_CAST "font"),strlen((char *)xmlGetProp(N_cur,BAD_CAST "font")));
- strncat(buf,";",1);
- strncat(buf,"font-weight:",12);
- strncat(buf,(char *)xmlGetProp(N_cur,BAD_CAST "bold"),strlen((char *)xmlGetProp(N_cur,BAD_CAST "bold")));
- strncat(buf,"font-style:",12);
- strncat(buf,(char *)xmlGetProp(N_cur,BAD_CAST "italic"),strlen((char *)xmlGetProp(N_cur,BAD_CAST "italic")));
- xmlSetProp(N_cur, BAD_CAST "props", BAD_CAST buf);
- N_prop = xmlHasProp(N_cur, BAD_CAST "id");
- if (N_prop != NULL) xmlRemoveProp(N_prop);
- N_prop = xmlHasProp(N_cur, BAD_CAST "size");
- if (N_prop != NULL) xmlRemoveProp(N_prop);
- N_prop = xmlHasProp(N_cur, BAD_CAST "bold");
- if (N_prop != NULL) xmlRemoveProp(N_prop);
- N_prop = xmlHasProp(N_cur, BAD_CAST "italic");
- if (N_prop != NULL) xmlRemoveProp(N_prop);
- N_prop = xmlHasProp(N_cur, BAD_CAST "font");
- if (N_prop != NULL) xmlRemoveProp(N_prop);
- }
- //*************************************************************
- //Change the rest of the document
- //each child of N_content is a page
- N_cur = N_content->children;
- while (N_cur){
- //we creat a section node and attach it to the root, it will com after all
- //the page nodes. Then we transform the page, and finally remove it
- N_next = N_cur->next;
- //fprintf(stderr,"***Transforming page\n");
- N_Block = xmlNewChild(N_root, NULL, BAD_CAST "section", NULL);
- transformPage(N_cur);
- xmlUnlinkNode(N_cur);
- //fprintf(stderr,"***Finished transforming page\n");
- N_cur = N_next;
- }
- cleanUpNode(N_root, false);
-}
-
-void ABWOutputDev::transformPage(xmlNodePtr N_parent){
- char buf[60];
- xmlNodePtr N_cur, N_curLine, N_curText, N_curWord, text, space;
- //translate the nodes into abiword nodes
- if (xmlStrcasecmp(N_parent->name,BAD_CAST "page") == 0){
- for (N_cur = N_parent->children; N_cur; N_cur = N_cur->next){
- //fprintf(stderr,"**pass a page child\n");
- transformPage(N_cur);
- }
- }
- if (xmlStrcasecmp(N_parent->name,BAD_CAST "chunk") == 0){
- //fprintf(stderr,"Found a chunk\n");
- //I start a <p> on each chunk and add all word containment
- N_text = xmlNewChild(N_Block, NULL, BAD_CAST "p", NULL);
- if (int(xmlXPathCastStringToNumber(xmlGetProp(N_parent,BAD_CAST "style"))) > 0){
- xmlNewProp(N_text, BAD_CAST "style", xmlGetProp(N_parent,BAD_CAST "style"));
- }
- switch (int(xmlXPathCastStringToNumber(xmlGetProp(N_parent,BAD_CAST "alignment")))){
- case 1: xmlNewProp(N_text, BAD_CAST "props", BAD_CAST "text-align:left");
- break;
- case 2: xmlNewProp(N_text, BAD_CAST "props", BAD_CAST "text-align:right");
- break;
- case 3: xmlNewProp(N_text, BAD_CAST "props", BAD_CAST "text-align:center");
- break;
- case 4: xmlNewProp(N_text, BAD_CAST "props", BAD_CAST "text-align:justify");
- break;
- }
- for (N_curLine = N_parent->children; N_curLine; N_curLine = N_curLine->next){
- //fprintf(stderr,"A line\n");
- for (N_curText = N_curLine->children; N_curText; N_curText = N_curText->next){
- //fprintf(stderr,"a textNode\n");
- for (N_curWord = N_curText->children; N_curWord; N_curWord = N_curWord->next){
- //fprintf(stderr,"a word\n");
- text = N_curWord->children;
- xmlUnlinkNode(text);
- xmlAddChild(N_text,text);
- space = xmlNewText(BAD_CAST " ");
- xmlAddChild(N_text,space);
- }
- }
- }
- }
- if (xmlStrcasecmp(N_parent->name,BAD_CAST "column") == 0){
- //fprintf(stderr,"Found a column\n");
- for (N_cur = N_parent->children; N_cur; N_cur = N_cur->next){
- transformPage(N_cur);
- }
- xmlNewChild(N_text, NULL, BAD_CAST "cbr", NULL);
- }
- if (xmlStrcasecmp(N_parent->name,BAD_CAST "colset") == 0){
- //fprintf(stderr,"Found a colset\n");
- //create new section columns: count childNodes of N_cur
- //recurse through chunks and create textNodes
- N_Block = xmlNewChild(N_root, NULL, BAD_CAST "section", NULL);
- sprintf(buf,"columns:%d",xmlLsCountNode(N_parent));
- xmlNewProp(N_Block, BAD_CAST "props", BAD_CAST buf);
- for (N_cur = N_parent->children; N_cur; N_cur = N_cur->next){
- transformPage(N_cur);
- }
- N_Block = xmlNewChild(N_root, NULL, BAD_CAST "section", NULL);
- }
- //fprintf(stderr,"at the end\n");
-}
-
-//Count nodes, copied from debugxml.c from libxml
-// libxml copyright file below
-/*
-Except where otherwise noted in the source code (e.g. the files hash.c,
-list.c and the trio files, which are covered by a similar licence but
-with different Copyright notices) all the files are:
-
- Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Daniel Veillard shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from him.
-*/
-int ABWOutputDev::xmlLsCountNode(xmlNodePtr node) {
- int ret = 0;
- xmlNodePtr list = NULL;
-
- if (node == NULL)
- return(0);
-
- switch (node->type) {
- case XML_ELEMENT_NODE:
- list = node->children;
- break;
- case XML_DOCUMENT_NODE:
- case XML_HTML_DOCUMENT_NODE:
-#ifdef LIBXML_DOCB_ENABLED
- case XML_DOCB_DOCUMENT_NODE:
-#endif
- list = ((xmlDocPtr) node)->children;
- break;
- case XML_ATTRIBUTE_NODE:
- list = ((xmlAttrPtr) node)->children;
- break;
- case XML_TEXT_NODE:
- case XML_CDATA_SECTION_NODE:
- case XML_PI_NODE:
- case XML_COMMENT_NODE:
- if (node->content != NULL) {
- ret = xmlStrlen(node->content);
- }
- break;
- case XML_ENTITY_REF_NODE:
- case XML_DOCUMENT_TYPE_NODE:
- case XML_ENTITY_NODE:
- case XML_DOCUMENT_FRAG_NODE:
- case XML_NOTATION_NODE:
- case XML_DTD_NODE:
- case XML_ELEMENT_DECL:
- case XML_ATTRIBUTE_DECL:
- case XML_ENTITY_DECL:
- case XML_NAMESPACE_DECL:
- case XML_XINCLUDE_START:
- case XML_XINCLUDE_END:
- ret = 1;
- break;
- }
- for (;list != NULL;ret++)
- list = list->next;
- return(ret);
-}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/ABWOutputDev.h b/Build/source/libs/poppler/poppler-0.12.4/poppler/ABWOutputDev.h
deleted file mode 100644
index 450b7dd5ab5..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/ABWOutputDev.h
+++ /dev/null
@@ -1,141 +0,0 @@
-//========================================================================
-//
-// ABWOutputDev.h
-//
-// Copyright 2006-2007 Jauco Noordzij <jauco@jauco.nl>
-// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
-//
-//========================================================================
-
-#ifndef ABWOUTPUTDEV_H
-#define ABWOUTPUTDEV_H
-
-#ifdef __GNUC__
-#pragma interface
-#endif
-
-#include <stdio.h>
-#include "goo/gtypes.h"
-#include "goo/GooList.h"
-#include "GfxFont.h"
-#include "OutputDev.h"
-#include "Catalog.h"
-#include "UnicodeMap.h"
-#include "PDFDoc.h"
-
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xpath.h>
-#include <libxml/xpathInternals.h>
-
-#ifdef _WIN32
-# define SLASH '\\'
-#else
-# define SLASH '/'
-#endif
-
-#define xoutRound(x) ((int)(x + 0.5))
-
-class GfxState;
-class GooString;
-
-//------------------------------------------------------------------------
-// ABWOutputDev
-//------------------------------------------------------------------------
-
-class ABWOutputDev: public OutputDev {
-public:
-
- // Open a text output file. If <fileName> is NULL, no file is written
- // (this is useful, e.g., for searching text). If <useASCII7> is true,
- // text is converted to 7-bit ASCII; otherwise, text is converted to
- // 8-bit ISO Latin-1. <useASCII7> should also be set for Japanese
- // (EUC-JP) text. If <rawOrder> is true, the text is kept in content
- // stream order.
- ABWOutputDev(xmlDocPtr ext_doc);
-
- // Destructor.
- virtual ~ABWOutputDev();
-
- // Check if file was successfully created.
- virtual GBool isOk() { return gTrue; }
-
- //---- get info about output device
-
- // Does this device use upside-down coordinates?
- // (Upside-down means (0,0) is the top left corner of the page.)
- virtual GBool upsideDown() { return gTrue; }
-
- // Does this device use drawChar() or drawString()?
- virtual GBool useDrawChar() { return gTrue; }
-
- // Does this device use beginType3Char/endType3Char? Otherwise,
- // text in Type 3 fonts will be drawn with drawChar/drawString.
- virtual GBool interpretType3Chars() { return gFalse; }
-
- // Does this device need non-text content?
- virtual GBool needNonText() { return gFalse; }
-
- //----- initialization and control
-
- // Start a page.
- virtual void startPage(int pageNum, GfxState *state);
-
- // End a page.
- virtual void endPage();
-
- //----- update text state
- virtual void updateFont(GfxState *state);
-
- //----- text drawing
- //new feature
- virtual int DevType() {return 1234;}
-
- int getPageWidth() { return maxPageWidth; }
- int getPageHeight() { return maxPageHeight; }
- float getBiggestSeperator(xmlNodePtr N_set, unsigned int direction, float * C1, float * C2);
- void recursiveXYC(xmlNodePtr nodeset);
- void splitNodes(float splitValue, unsigned int direction, xmlNodePtr N_parent, double extravalue);
- virtual void beginString(GfxState *state, GooString *s);
- virtual void endString(GfxState *state);
- virtual void drawChar(GfxState *state, double x, double y,
- double dx, double dy,
- double originX, double originY,
- CharCode code, int nBytes, Unicode *u, int uLen);
- void beginWord(GfxState *state, double x, double y);
- void endWord();
- void beginTextBlock(GfxState *state, double x, double y);
- void endTextBlock();
- void interpretXYTree();
- void ATP_recursive(xmlNodePtr N_cur);
- void cleanUpNode(xmlNodePtr N_parent, bool aggregateInfo);
- void transformPage(xmlNodePtr N_parent);
- void generateParagraphs();
- void addAlignment(xmlNodePtr N_parent);
- void setPDFDoc(PDFDoc *priv_pdfdoc);
- void createABW();
-
-private:
- int maxPageWidth;
- int maxPageHeight;
- int G_pageNum;
- int Style, maxStyle;
- //A lot of values are nice to have around. I think that declaring some
- //global variables that contain these values is faster & easier than reading
- //them from the xml tree every time.
- double height;
- double wordSpace, charSpace;
- double X1,X2,Y1,Y2,horDist, verDist, curDx, curDy;
- bool mightBreak;
- xmlDocPtr doc;
- /* node pointers */
- xmlNodePtr N_root, N_content, N_page, N_style, N_text, N_styleset, N_Block, N_word, N_column, N_colset;
- xmlNodePtr outputDoc;
- xmlXPathContextPtr xpathCtx;
- static const unsigned int HORIZONTAL = 0;
- static const unsigned int VERTICAL = 1;
- UnicodeMap *uMap;
- PDFDoc *pdfdoc;
- int xmlLsCountNode(xmlNodePtr node);
-};
-#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.12.4/poppler/Catalog.cc
deleted file mode 100644
index 9a18e244040..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Catalog.cc
+++ /dev/null
@@ -1,739 +0,0 @@
-//========================================================================
-//
-// Catalog.cc
-//
-// Copyright 1996-2007 Glyph & Cog, LLC
-//
-//========================================================================
-
-//========================================================================
-//
-// Modified under the Poppler project - http://poppler.freedesktop.org
-//
-// All changes made under the Poppler project to this file are licensed
-// under GPL version 2 or later
-//
-// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005-2009 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2005 Jeff Muizelaar <jrmuizel@nit.ca>
-// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
-// Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
-// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2006, 2008 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2008 Pino Toscano <pino@kde.org>
-//
-// To see a description of the changes please see the Changelog file that
-// came with your tarball or type make ChangeLog if you are building from git
-//
-//========================================================================
-
-#include <config.h>
-
-#ifdef USE_GCC_PRAGMAS
-#pragma implementation
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include "goo/gmem.h"
-#include "Object.h"
-#include "XRef.h"
-#include "Array.h"
-#include "Dict.h"
-#include "Page.h"
-#include "Error.h"
-#include "Link.h"
-#include "PageLabelInfo.h"
-#include "Catalog.h"
-#include "Form.h"
-#include "OptionalContent.h"
-
-//------------------------------------------------------------------------
-// Catalog
-//------------------------------------------------------------------------
-
-Catalog::Catalog(XRef *xrefA) {
- Object catDict, pagesDict, pagesDictRef;
- Object obj, obj2;
- Object optContentProps;
- char *alreadyRead;
- int numPages0;
- int i;
-
- ok = gTrue;
- xref = xrefA;
- pages = NULL;
- pageRefs = NULL;
- numPages = pagesSize = 0;
- baseURI = NULL;
- pageLabelInfo = NULL;
- form = NULL;
- optContent = NULL;
-
- xref->getCatalog(&catDict);
- if (!catDict.isDict()) {
- error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
- goto err1;
- }
- // get the AcroForm dictionary
- catDict.dictLookup("AcroForm", &acroForm);
-
- // load Forms
- if (acroForm.isDict()) {
- form = new Form(xref,&acroForm);
- }
-
-
- // read page tree
- catDict.dictLookup("Pages", &pagesDict);
- // This should really be isDict("Pages"), but I've seen at least one
- // PDF file where the /Type entry is missing.
- if (!pagesDict.isDict()) {
- error(-1, "Top-level pages object is wrong type (%s)",
- pagesDict.getTypeName());
- goto err2;
- }
- pagesDict.dictLookup("Count", &obj);
- // some PDF files actually use real numbers here ("/Count 9.0")
- if (!obj.isNum()) {
- error(-1, "Page count in top-level pages object is wrong type (%s)",
- obj.getTypeName());
- goto err3;
- }
- pagesSize = numPages0 = (int)obj.getNum();
- obj.free();
- pages = (Page **)gmallocn(pagesSize, sizeof(Page *));
- pageRefs = (Ref *)gmallocn(pagesSize, sizeof(Ref));
- for (i = 0; i < pagesSize; ++i) {
- pages[i] = NULL;
- pageRefs[i].num = -1;
- pageRefs[i].gen = -1;
- }
- alreadyRead = (char *)gmalloc(xref->getNumObjects());
- memset(alreadyRead, 0, xref->getNumObjects());
- if (catDict.dictLookupNF("Pages", &pagesDictRef)->isRef() &&
- pagesDictRef.getRefNum() >= 0 &&
- pagesDictRef.getRefNum() < xref->getNumObjects()) {
- alreadyRead[pagesDictRef.getRefNum()] = 1;
- }
- pagesDictRef.free();
- numPages = readPageTree(pagesDict.getDict(), NULL, 0, alreadyRead);
- gfree(alreadyRead);
- if (numPages != numPages0) {
- error(-1, "Page count in top-level pages object is incorrect");
- }
- pagesDict.free();
-
- // read named destination dictionary
- catDict.dictLookup("Dests", &dests);
-
- // read root of named destination tree - PDF1.6 table 3.28
- if (catDict.dictLookup("Names", &obj)->isDict()) {
- obj.dictLookup("Dests", &obj2);
- destNameTree.init(xref, &obj2);
- obj2.free();
- obj.dictLookup("EmbeddedFiles", &obj2);
- embeddedFileNameTree.init(xref, &obj2);
- obj2.free();
- obj.dictLookup("JavaScript", &obj2);
- jsNameTree.init(xref, &obj2);
- obj2.free();
- }
- obj.free();
-
- if (catDict.dictLookup("PageLabels", &obj)->isDict())
- pageLabelInfo = new PageLabelInfo(&obj, numPages);
- obj.free();
-
- // read page mode
- pageMode = pageModeNone;
- if (catDict.dictLookup("PageMode", &obj)->isName()) {
- if (obj.isName("UseNone"))
- pageMode = pageModeNone;
- else if (obj.isName("UseOutlines"))
- pageMode = pageModeOutlines;
- else if (obj.isName("UseThumbs"))
- pageMode = pageModeThumbs;
- else if (obj.isName("FullScreen"))
- pageMode = pageModeFullScreen;
- else if (obj.isName("UseOC"))
- pageMode = pageModeOC;
- else if (obj.isName("UseAttachments"))
- pageMode = pageModeAttach;
- }
- obj.free();
-
- pageLayout = pageLayoutNone;
- if (catDict.dictLookup("PageLayout", &obj)->isName()) {
- if (obj.isName("SinglePage"))
- pageLayout = pageLayoutSinglePage;
- if (obj.isName("OneColumn"))
- pageLayout = pageLayoutOneColumn;
- if (obj.isName("TwoColumnLeft"))
- pageLayout = pageLayoutTwoColumnLeft;
- if (obj.isName("TwoColumnRight"))
- pageLayout = pageLayoutTwoColumnRight;
- if (obj.isName("TwoPageLeft"))
- pageLayout = pageLayoutTwoPageLeft;
- if (obj.isName("TwoPageRight"))
- pageLayout = pageLayoutTwoPageRight;
- }
- obj.free();
-
- // read base URI
- if (catDict.dictLookup("URI", &obj)->isDict()) {
- if (obj.dictLookup("Base", &obj2)->isString()) {
- baseURI = obj2.getString()->copy();
- }
- obj2.free();
- }
- obj.free();
-
- // get the metadata stream
- catDict.dictLookup("Metadata", &metadata);
-
- // get the structure tree root
- catDict.dictLookup("StructTreeRoot", &structTreeRoot);
-
- // get the outline dictionary
- catDict.dictLookup("Outlines", &outline);
-
- // get the Optional Content dictionary
- if (catDict.dictLookup("OCProperties", &optContentProps)->isDict()) {
- optContent = new OCGs(&optContentProps, xref);
- if (!optContent->isOk ()) {
- delete optContent;
- optContent = NULL;
- }
- }
- optContentProps.free();
-
- // perform form-related loading after all widgets have been loaded
- if (form)
- form->postWidgetsLoad();
-
- catDict.free();
- return;
-
- err3:
- obj.free();
- err2:
- pagesDict.free();
- err1:
- catDict.free();
- dests.initNull();
- ok = gFalse;
-}
-
-Catalog::~Catalog() {
- int i;
-
- if (pages) {
- for (i = 0; i < pagesSize; ++i) {
- if (pages[i]) {
- delete pages[i];
- }
- }
- gfree(pages);
- gfree(pageRefs);
- }
- dests.free();
- destNameTree.free();
- embeddedFileNameTree.free();
- jsNameTree.free();
- if (baseURI) {
- delete baseURI;
- }
- delete pageLabelInfo;
- delete form;
- delete optContent;
- metadata.free();
- structTreeRoot.free();
- outline.free();
- acroForm.free();
-}
-
-GooString *Catalog::readMetadata() {
- GooString *s;
- Dict *dict;
- Object obj;
- int c;
-
- if (!metadata.isStream()) {
- return NULL;
- }
- dict = metadata.streamGetDict();
- if (!dict->lookup("Subtype", &obj)->isName("XML")) {
- error(-1, "Unknown Metadata type: '%s'",
- obj.isName() ? obj.getName() : "???");
- }
- obj.free();
- s = new GooString();
- metadata.streamReset();
- while ((c = metadata.streamGetChar()) != EOF) {
- s->append(c);
- }
- metadata.streamClose();
- return s;
-}
-
-int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start,
- char *alreadyRead) {
- Object kids;
- Object kid;
- Object kidRef;
- PageAttrs *attrs1, *attrs2;
- Page *page;
- int i, j;
-
- attrs1 = new PageAttrs(attrs, pagesDict);
- pagesDict->lookup("Kids", &kids);
- if (!kids.isArray()) {
- error(-1, "Kids object (page %d) is wrong type (%s)",
- start+1, kids.getTypeName());
- goto err1;
- }
- for (i = 0; i < kids.arrayGetLength(); ++i) {
- kids.arrayGetNF(i, &kidRef);
- if (kidRef.isRef() &&
- kidRef.getRefNum() >= 0 &&
- kidRef.getRefNum() < xref->getNumObjects()) {
- if (alreadyRead[kidRef.getRefNum()]) {
- error(-1, "Loop in Pages tree");
- kidRef.free();
- continue;
- }
- alreadyRead[kidRef.getRefNum()] = 1;
- }
- kids.arrayGet(i, &kid);
- if (kid.isDict("Page")) {
- attrs2 = new PageAttrs(attrs1, kid.getDict());
- page = new Page(xref, start+1, kid.getDict(), kidRef.getRef(), attrs2, form);
- if (!page->isOk()) {
- ++start;
- goto err3;
- }
- if (start >= pagesSize) {
- pagesSize += 32;
- pages = (Page **)greallocn(pages, pagesSize, sizeof(Page *));
- pageRefs = (Ref *)greallocn(pageRefs, pagesSize, sizeof(Ref));
- for (j = pagesSize - 32; j < pagesSize; ++j) {
- pages[j] = NULL;
- pageRefs[j].num = -1;
- pageRefs[j].gen = -1;
- }
- }
- pages[start] = page;
- if (kidRef.isRef()) {
- pageRefs[start].num = kidRef.getRefNum();
- pageRefs[start].gen = kidRef.getRefGen();
- }
- ++start;
- // This should really be isDict("Pages"), but I've seen at least one
- // PDF file where the /Type entry is missing.
- } else if (kid.isDict()) {
- if ((start = readPageTree(kid.getDict(), attrs1, start, alreadyRead))
- < 0)
- goto err2;
- } else {
- error(-1, "Kid object (page %d) is wrong type (%s)",
- start+1, kid.getTypeName());
- }
- kid.free();
- kidRef.free();
- }
- delete attrs1;
- kids.free();
- return start;
-
- err3:
- delete page;
- err2:
- kid.free();
- kidRef.free();
- err1:
- kids.free();
- delete attrs1;
- ok = gFalse;
- return -1;
-}
-
-int Catalog::findPage(int num, int gen) {
- int i;
-
- for (i = 0; i < numPages; ++i) {
- if (pageRefs[i].num == num && pageRefs[i].gen == gen)
- return i + 1;
- }
- return 0;
-}
-
-LinkDest *Catalog::findDest(GooString *name) {
- LinkDest *dest;
- Object obj1, obj2;
- GBool found;
-
- // try named destination dictionary then name tree
- found = gFalse;
- if (dests.isDict()) {
- if (!dests.dictLookup(name->getCString(), &obj1)->isNull())
- found = gTrue;
- else
- obj1.free();
- }
- if (!found) {
- if (destNameTree.lookup(name, &obj1))
- found = gTrue;
- else
- obj1.free();
- }
- if (!found)
- return NULL;
-
- // construct LinkDest
- dest = NULL;
- if (obj1.isArray()) {
- dest = new LinkDest(obj1.getArray());
- } else if (obj1.isDict()) {
- if (obj1.dictLookup("D", &obj2)->isArray())
- dest = new LinkDest(obj2.getArray());
- else
- error(-1, "Bad named destination value");
- obj2.free();
- } else {
- error(-1, "Bad named destination value");
- }
- obj1.free();
- if (dest && !dest->isOk()) {
- delete dest;
- dest = NULL;
- }
-
- return dest;
-}
-
-EmbFile *Catalog::embeddedFile(int i)
-{
- Object efDict;
- Object obj;
- obj = embeddedFileNameTree.getValue(i);
- EmbFile *embeddedFile = 0;
- if (obj.isRef()) {
- GooString desc(embeddedFileNameTree.getName(i));
- embeddedFile = new EmbFile(obj.fetch(xref, &efDict), &desc);
- efDict.free();
- } else {
- Object null;
- embeddedFile = new EmbFile(&null);
- }
- return embeddedFile;
-}
-
-GooString *Catalog::getJS(int i)
-{
- Object obj = jsNameTree.getValue(i);
- if (obj.isRef()) {
- Ref r = obj.getRef();
- obj.free();
- xref->fetch(r.num, r.gen, &obj);
- }
-
- if (!obj.isDict()) {
- obj.free();
- return 0;
- }
- Object obj2;
- if (!obj.dictLookup("S", &obj2)->isName()) {
- obj2.free();
- obj.free();
- return 0;
- }
- if (strcmp(obj2.getName(), "JavaScript")) {
- obj2.free();
- obj.free();
- return 0;
- }
- obj2.free();
- obj.dictLookup("JS", &obj2);
- GooString *js = 0;
- if (obj2.isString()) {
- js = new GooString(obj2.getString());
- }
- else if (obj2.isStream()) {
- Stream *stream = obj2.getStream();
- js = new GooString();
- stream->reset();
- int j;
- while ((j = stream->getChar()) != EOF) {
- js->append((char)j);
- }
- }
- obj2.free();
- obj.free();
- return js;
-}
-
-NameTree::NameTree()
-{
- size = 0;
- length = 0;
- entries = NULL;
-}
-
-NameTree::Entry::Entry(Array *array, int index) {
- if (!array->getString(index, &name) || !array->getNF(index + 1, &value)) {
- Object aux;
- array->get(index, &aux);
- if (aux.isString() && array->getNF(index + 1, &value) )
- {
- name.append(aux.getString());
- }
- else
- error(-1, "Invalid page tree");
- }
-}
-
-NameTree::Entry::~Entry() {
- value.free();
-}
-
-void NameTree::addEntry(Entry *entry)
-{
- if (length == size) {
- if (length == 0) {
- size = 8;
- } else {
- size *= 2;
- }
- entries = (Entry **) grealloc (entries, sizeof (Entry *) * size);
- }
-
- entries[length] = entry;
- ++length;
-}
-
-void NameTree::init(XRef *xrefA, Object *tree) {
- xref = xrefA;
- parse(tree);
-}
-
-void NameTree::parse(Object *tree) {
- Object names;
- Object kids, kid;
- int i;
-
- if (!tree->isDict())
- return;
-
- // leaf node
- if (tree->dictLookup("Names", &names)->isArray()) {
- for (i = 0; i < names.arrayGetLength(); i += 2) {
- NameTree::Entry *entry;
-
- entry = new Entry(names.getArray(), i);
- addEntry(entry);
- }
- }
- names.free();
-
- // root or intermediate node
- if (tree->dictLookup("Kids", &kids)->isArray()) {
- for (i = 0; i < kids.arrayGetLength(); ++i) {
- if (kids.arrayGet(i, &kid)->isDict())
- parse(&kid);
- kid.free();
- }
- }
- kids.free();
-}
-
-int NameTree::Entry::cmp(const void *voidKey, const void *voidEntry)
-{
- GooString *key = (GooString *) voidKey;
- Entry *entry = *(NameTree::Entry **) voidEntry;
-
- return key->cmp(&entry->name);
-}
-
-GBool NameTree::lookup(GooString *name, Object *obj)
-{
- Entry **entry;
-
- entry = (Entry **) bsearch(name, entries,
- length, sizeof(Entry *), Entry::cmp);
- if (entry != NULL) {
- (*entry)->value.fetch(xref, obj);
- return gTrue;
- } else {
- printf("failed to look up %s\n", name->getCString());
- obj->initNull();
- return gFalse;
- }
-}
-
-Object NameTree::getValue(int index)
-{
- if (index < length) {
- return entries[index]->value;
- } else {
- return Object();
- }
-}
-
-GooString *NameTree::getName(int index)
-{
- if (index < length) {
- return &entries[index]->name;
- } else {
- return NULL;
- }
-}
-
-void NameTree::free()
-{
- int i;
-
- for (i = 0; i < length; i++)
- delete entries[i];
-
- gfree(entries);
-}
-
-GBool Catalog::labelToIndex(GooString *label, int *index)
-{
- char *end;
-
- if (pageLabelInfo != NULL) {
- if (!pageLabelInfo->labelToIndex(label, index))
- return gFalse;
- } else {
- *index = strtol(label->getCString(), &end, 10) - 1;
- if (*end != '\0')
- return gFalse;
- }
-
- if (*index < 0 || *index >= numPages)
- return gFalse;
-
- return gTrue;
-}
-
-GBool Catalog::indexToLabel(int index, GooString *label)
-{
- char buffer[32];
-
- if (index < 0 || index >= numPages)
- return gFalse;
-
- if (pageLabelInfo != NULL) {
- return pageLabelInfo->indexToLabel(index, label);
- } else {
- snprintf(buffer, sizeof (buffer), "%d", index + 1);
- label->append(buffer);
- return gTrue;
- }
-}
-
-EmbFile::EmbFile(Object *efDict, GooString *description)
-{
- m_name = 0;
- m_description = 0;
- if (description)
- m_description = description->copy();
- m_size = -1;
- m_createDate = 0;
- m_modDate = 0;
- m_checksum = 0;
- m_mimetype = 0;
- if (efDict->isDict()) {
- Object fileSpec;
- Object fileDesc;
- Object paramDict;
- Object paramObj;
- Object obj2;
- Stream *efStream = NULL;
- // efDict matches Table 3.40 in the PDF1.6 spec
- efDict->dictLookup("F", &fileSpec);
- if (fileSpec.isString()) {
- m_name = new GooString(fileSpec.getString());
- }
- fileSpec.free();
-
- // the logic here is that the description from the name
- // dictionary is used if we don't have a more specific
- // description - see the Note: on page 157 of the PDF1.6 spec
- efDict->dictLookup("Desc", &fileDesc);
- if (fileDesc.isString()) {
- delete m_description;
- m_description = new GooString(fileDesc.getString());
- } else {
- efDict->dictLookup("Description", &fileDesc);
- if (fileDesc.isString()) {
- delete m_description;
- m_description = new GooString(fileDesc.getString());
- }
- }
- fileDesc.free();
-
- efDict->dictLookup("EF", &obj2);
- if (obj2.isDict()) {
- // This gives us the raw data stream bytes
-
- obj2.dictLookup("F", &m_objStr);
- if (m_objStr.isStream()) {
- efStream = m_objStr.getStream();
-
- // dataDict corresponds to Table 3.41 in the PDF1.6 spec.
- Dict *dataDict = efStream->getDict();
-
- // subtype is normally the mimetype
- Object subtypeName;
- if (dataDict->lookup("Subtype", &subtypeName)->isName()) {
- m_mimetype = new GooString(subtypeName.getName());
- }
- subtypeName.free();
-
- // paramDict corresponds to Table 3.42 in the PDF1.6 spec
- Object paramDict;
- dataDict->lookup( "Params", &paramDict );
- if (paramDict.isDict()) {
- paramDict.dictLookup("ModDate", &paramObj);
- if (paramObj.isString()) {
- m_modDate = new GooString(paramObj.getString());
- }
- paramObj.free();
- paramDict.dictLookup("CreationDate", &paramObj);
- if (paramObj.isString()) {
- m_createDate = new GooString(paramObj.getString());
- }
- paramObj.free();
- paramDict.dictLookup("Size", &paramObj);
- if (paramObj.isInt()) {
- m_size = paramObj.getInt();
- }
- paramObj.free();
- paramDict.dictLookup("CheckSum", &paramObj);
- if (paramObj.isString()) {
- m_checksum = new GooString(paramObj.getString());
- }
- paramObj.free();
- }
- paramDict.free();
- }
- }
- obj2.free();
- }
- if (!m_name)
- m_name = new GooString();
- if (!m_description)
- m_description = new GooString();
- if (!m_createDate)
- m_createDate = new GooString();
- if (!m_modDate)
- m_modDate = new GooString();
- if (!m_checksum)
- m_checksum = new GooString();
- if (!m_mimetype)
- m_mimetype = new GooString();
-}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.12.4/poppler/FileSpec.h
deleted file mode 100644
index ec35f3f5436..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/FileSpec.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//========================================================================
-//
-// FileSpec.h
-//
-// All changes made under the Poppler project to this file are licensed
-// under GPL version 2 or later
-//
-// Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
-//
-// To see a description of the changes please see the Changelog file that
-// came with your tarball or type make ChangeLog if you are building from git
-//
-//========================================================================
-
-#ifndef FILE_SPEC_H
-#define FILE_SPEC_H
-
-#include "goo/gtypes.h"
-#include "Object.h"
-
-GBool getFileSpecName (Object *fileSpec, Object *fileName);
-GBool getFileSpecNameForPlatform (Object *fileSpec, Object *fileName);
-
-#endif /* FILE_SPEC_H */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDoc.cc
deleted file mode 100644
index b088f6cf688..00000000000
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDoc.cc
+++ /dev/null
@@ -1,914 +0,0 @@
-//========================================================================
-//
-// PDFDoc.cc
-//
-// Copyright 1996-2003 Glyph & Cog, LLC
-//
-//========================================================================
-
-//========================================================================
-//
-// Modified under the Poppler project - http://poppler.freedesktop.org
-//
-// All changes made under the Poppler project to this file are licensed
-// under GPL version 2 or later
-//
-// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2005, 2007-2009 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2008 Pino Toscano <pino@kde.org>
-// Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009 Eric Toombs <ewtoombs@uwaterloo.ca>
-// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
-// Copyright (C) 2009 Axel Struebing <axel.struebing@freenet.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
-//
-//========================================================================
-
-#include <config.h>
-
-#ifdef USE_GCC_PRAGMAS
-#pragma implementation
-#endif
-
-#include <locale.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <time.h>
-#ifdef _WIN32
-# include <windows.h>
-#endif
-#include "goo/gstrtod.h"
-#include "goo/GooString.h"
-#include "poppler-config.h"
-#include "GlobalParams.h"
-#include "Page.h"
-#include "Catalog.h"
-#include "Stream.h"
-#include "XRef.h"
-#include "Link.h"
-#include "OutputDev.h"
-#include "Error.h"
-#include "ErrorCodes.h"
-#include "Lexer.h"
-#include "Parser.h"
-#include "SecurityHandler.h"
-#include "Decrypt.h"
-#ifndef DISABLE_OUTLINE
-#include "Outline.h"
-#endif
-#include "PDFDoc.h"
-
-//------------------------------------------------------------------------
-
-#define headerSearchSize 1024 // read this many bytes at beginning of
- // file to look for '%PDF'
-
-//------------------------------------------------------------------------
-// PDFDoc
-//------------------------------------------------------------------------
-
-PDFDoc::PDFDoc(GooString *fileNameA, GooString *ownerPassword,
- GooString *userPassword, void *guiDataA) {
- Object obj;
-
- ok = gFalse;
- errCode = errNone;
-
- guiData = guiDataA;
-
- file = NULL;
- str = NULL;
- xref = NULL;
- catalog = NULL;
-#ifndef DISABLE_OUTLINE
- outline = NULL;
-#endif
-
- fileName = fileNameA;
-
- // try to open file
-#ifdef VMS
- file = fopen(fileName->getCString(), "rb", "ctx=stm");
-#else
- file = fopen(fileName->getCString(), "rb");
-#endif
- if (file == NULL) {
- // fopen() has failed.
- // Keep a copy of the errno returned by fopen so that it can be
- // referred to later.
- fopenErrno = errno;
- error(-1, "Couldn't open file '%s': %s.", fileName->getCString(),
- strerror(errno));
- errCode = errOpenFile;
- return;
- }
-
- // create stream
- obj.initNull();
- str = new FileStream(file, 0, gFalse, 0, &obj);
-
- ok = setup(ownerPassword, userPassword);
-}
-
-#ifdef _WIN32
-PDFDoc::PDFDoc(wchar_t *fileNameA, int fileNameLen, GooString *ownerPassword,
- GooString *userPassword, void *guiDataA) {
- OSVERSIONINFO version;
- wchar_t fileName2[_MAX_PATH + 1];
- Object obj;
- int i;
-
- ok = gFalse;
- errCode = errNone;
-
- guiData = guiDataA;
-
- file = NULL;
- str = NULL;
- xref = NULL;
- catalog = NULL;
-#ifndef DISABLE_OUTLINE
- outline = NULL;
-#endif
-
- //~ file name should be stored in Unicode (?)
- fileName = new GooString();
- for (i = 0; i < fileNameLen; ++i) {
- fileName->append((char)fileNameA[i]);
- }
-
- // zero-terminate the file name string
- for (i = 0; i < fileNameLen && i < _MAX_PATH; ++i) {
- fileName2[i] = fileNameA[i];
- }
- fileName2[i] = 0;
-
- // try to open file
- // NB: _wfopen is only available in NT
- version.dwOSVersionInfoSize = sizeof(version);
- GetVersionEx(&version);
- if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) {
- file = _wfopen(fileName2, L"rb");
- } else {
- file = fopen(fileName->getCString(), "rb");
- }
- if (!file) {
- error(-1, "Couldn't open file '%s'", fileName->getCString());
- errCode = errOpenFile;
- return;
- }
-
- // create stream
- obj.initNull();
- str = new FileStream(file, 0, gFalse, 0, &obj);
-
- ok = setup(ownerPassword, userPassword);
-}
-#endif
-
-PDFDoc::PDFDoc(BaseStream *strA, GooString *ownerPassword,
- GooString *userPassword, void *guiDataA) {
- ok = gFalse;
- errCode = errNone;
- guiData = guiDataA;
- if (strA->getFileName()) {
- fileName = strA->getFileName()->copy();
- } else {
- fileName = NULL;
- }
- file = NULL;
- str = strA;
- xref = NULL;
- catalog = NULL;
-#ifndef DISABLE_OUTLINE
- outline = NULL;
-#endif
- ok = setup(ownerPassword, userPassword);
-}
-
-GBool PDFDoc::setup(GooString *ownerPassword, GooString *userPassword) {
- str->setPos(0, -1);
- if (str->getPos() < 0)
- {
- error(-1, "Document base stream is not seekable");
- return gFalse;
- }
-
- str->reset();
-
- // check footer
- // Adobe does not seem to enforce %%EOF, so we do the same
-// if (!checkFooter()) return gFalse;
-
- // check header
- checkHeader();
-
- // read xref table
- xref = new XRef(str);
- if (!xref->isOk()) {
- error(-1, "Couldn't read xref table");
- errCode = xref->getErrorCode();
- return gFalse;
- }
-
- // check for encryption
- if (!checkEncryption(ownerPassword, userPassword)) {
- errCode = errEncrypted;
- return gFalse;
- }
-
- // read catalog
- catalog = new Catalog(xref);
- if (!catalog->isOk()) {
- error(-1, "Couldn't read page catalog");
- errCode = errBadCatalog;
- return gFalse;
- }
-
-#ifndef DISABLE_OUTLINE
- // read outline
- outline = new Outline(catalog->getOutline(), xref);
-#endif
-
- // done
- return gTrue;
-}
-
-PDFDoc::~PDFDoc() {
-#ifndef DISABLE_OUTLINE
- if (outline) {
- delete outline;
- }
-#endif
- if (catalog) {
- delete catalog;
- }
- if (xref) {
- delete xref;
- }
- if (str) {
- delete str;
- }
- if (file) {
- fclose(file);
- }
- if (fileName) {
- delete fileName;
- }
-}
-
-
-// Check for a %%EOF at the end of this stream
-GBool PDFDoc::checkFooter() {
- // we look in the last 1024 chars because Adobe does the same
- char *eof = new char[1025];
- int pos = str->getPos();
- str->setPos(1024, -1);
- int i, ch;
- for (i = 0; i < 1024; i++)
- {
- ch = str->getChar();
- if (ch == EOF)
- break;
- eof[i] = ch;
- }
- eof[i] = '\0';
-
- bool found = false;
- for (i = i - 5; i >= 0; i--) {
- if (strncmp (&eof[i], "%%EOF", 5) == 0) {
- found = true;
- break;
- }
- }
- if (!found)
- {
- error(-1, "Document has not the mandatory ending %%EOF");
- errCode = errDamaged;
- delete[] eof;
- return gFalse;
- }
- delete[] eof;
- str->setPos(pos);
- return gTrue;
-}
-
-// Check for a PDF header on this stream. Skip past some garbage
-// if necessary.
-void PDFDoc::checkHeader() {
- char hdrBuf[headerSearchSize+1];
- char *p;
- int i;
-
- pdfMajorVersion = 0;
- pdfMinorVersion = 0;
- for (i = 0; i < headerSearchSize; ++i) {
- hdrBuf[i] = str->getChar();
- }
- hdrBuf[headerSearchSize] = '\0';
- for (i = 0; i < headerSearchSize - 5; ++i) {
- if (!strncmp(&hdrBuf[i], "%PDF-", 5)) {
- break;
- }
- }
- if (i >= headerSearchSize - 5) {
- error(-1, "May not be a PDF file (continuing anyway)");
- return;
- }
- str->moveStart(i);
- if (!(p = strtok(&hdrBuf[i+5], " \t\n\r"))) {
- error(-1, "May not be a PDF file (continuing anyway)");
- return;
- }
- sscanf(p, "%d.%d", &pdfMajorVersion, &pdfMinorVersion);
- // We don't do the version check. Don't add it back in.
-}
-
-GBool PDFDoc::checkEncryption(GooString *ownerPassword, GooString *userPassword) {
- Object encrypt;
- GBool encrypted;
- SecurityHandler *secHdlr;
- GBool ret;
-
- xref->getTrailerDict()->dictLookup("Encrypt", &encrypt);
- if ((encrypted = encrypt.isDict())) {
- if ((secHdlr = SecurityHandler::make(this, &encrypt))) {
- if (secHdlr->checkEncryption(ownerPassword, userPassword)) {
- // authorization succeeded
- xref->setEncryption(secHdlr->getPermissionFlags(),
- secHdlr->getOwnerPasswordOk(),
- secHdlr->getFileKey(),
- secHdlr->getFileKeyLength(),
- secHdlr->getEncVersion(),
- secHdlr->getEncRevision(),
- secHdlr->getEncAlgorithm());
- ret = gTrue;
- } else {
- // authorization failed
- ret = gFalse;
- }
- delete secHdlr;
- } else {
- // couldn't find the matching security handler
- ret = gFalse;
- }
- } else {
- // document is not encrypted
- ret = gTrue;
- }
- encrypt.free();
- return ret;
-}
-
-void PDFDoc::displayPage(OutputDev *out, int page,
- double hDPI, double vDPI, int rotate,
- GBool useMediaBox, GBool crop, GBool printing,
- GBool (*abortCheckCbk)(void *data),
- void *abortCheckCbkData,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
- void *annotDisplayDecideCbkData) {
- if (globalParams->getPrintCommands()) {
- printf("***** page %d *****\n", page);
- }
- catalog->getPage(page)->display(out, hDPI, vDPI,
- rotate, useMediaBox, crop, printing, catalog,
- abortCheckCbk, abortCheckCbkData,
- annotDisplayDecideCbk, annotDisplayDecideCbkData);
-}
-
-void PDFDoc::displayPages(OutputDev *out, int firstPage, int lastPage,
- double hDPI, double vDPI, int rotate,
- GBool useMediaBox, GBool crop, GBool printing,
- GBool (*abortCheckCbk)(void *data),
- void *abortCheckCbkData,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
- void *annotDisplayDecideCbkData) {
- int page;
-
- for (page = firstPage; page <= lastPage; ++page) {
- displayPage(out, page, hDPI, vDPI, rotate, useMediaBox, crop, printing,
- abortCheckCbk, abortCheckCbkData,
- annotDisplayDecideCbk, annotDisplayDecideCbkData);
- }
-}
-
-void PDFDoc::displayPageSlice(OutputDev *out, int page,
- double hDPI, double vDPI, int rotate,
- GBool useMediaBox, GBool crop, GBool printing,
- int sliceX, int sliceY, int sliceW, int sliceH,
- GBool (*abortCheckCbk)(void *data),
- void *abortCheckCbkData,
- GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
- void *annotDisplayDecideCbkData) {
- catalog->getPage(page)->displaySlice(out, hDPI, vDPI,
- rotate, useMediaBox, crop,
- sliceX, sliceY, sliceW, sliceH,
- printing, catalog,
- abortCheckCbk, abortCheckCbkData,
- annotDisplayDecideCbk, annotDisplayDecideCbkData);
-}
-
-Links *PDFDoc::getLinks(int page) {
- return catalog->getPage(page)->getLinks(catalog);
-}
-
-void PDFDoc::processLinks(OutputDev *out, int page) {
- catalog->getPage(page)->processLinks(out, catalog);
-}
-
-GBool PDFDoc::isLinearized() {
- Parser *parser;
- Object obj1, obj2, obj3, obj4, obj5;
- GBool lin;
-
- lin = gFalse;
- obj1.initNull();
- parser = new Parser(xref,
- new Lexer(xref,
- str->makeSubStream(str->getStart(), gFalse, 0, &obj1)),
- gTrue);
- parser->getObj(&obj1);
- parser->getObj(&obj2);
- parser->getObj(&obj3);
- parser->getObj(&obj4);
- if (obj1.isInt() && obj2.isInt() && obj3.isCmd("obj") &&
- obj4.isDict()) {
- obj4.dictLookup("Linearized", &obj5);
- if (obj5.isNum() && obj5.getNum() > 0) {
- lin = gTrue;
- }
- obj5.free();
- }
- obj4.free();
- obj3.free();
- obj2.free();
- obj1.free();
- delete parser;
- return lin;
-}
-
-int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) {
- FILE *f;
- OutStream *outStr;
- int res;
-
- if (!(f = fopen(name->getCString(), "wb"))) {
- error(-1, "Couldn't open file '%s'", name->getCString());
- return errOpenFile;
- }
- outStr = new FileOutStream(f,0);
- res = saveAs(outStr, mode);
- delete outStr;
- fclose(f);
- return res;
-}
-
-int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
-
- // we don't support files with Encrypt at the moment
- Object obj;
- xref->getTrailerDict()->getDict()->lookupNF("Encrypt", &obj);
- if (!obj.isNull())
- {
- obj.free();
- return errEncrypted;
- }
- obj.free();
-
- if (mode == writeForceRewrite) {
- saveCompleteRewrite(outStr);
- } else if (mode == writeForceIncremental) {
- saveIncrementalUpdate(outStr);
- } else { // let poppler decide
- // find if we have updated objects
- GBool updated = gFalse;
- for(int i=0; i<xref->getNumObjects(); i++) {
- if (xref->getEntry(i)->updated) {
- updated = gTrue;
- break;
- }
- }
- if(updated) {
- saveIncrementalUpdate(outStr);
- } else {
- // simply copy the original file
- saveWithoutChangesAs (outStr);
- }
- }
-
- return errNone;
-}
-
-int PDFDoc::saveWithoutChangesAs(GooString *name) {
- FILE *f;
- OutStream *outStr;
- int res;
-
- if (!(f = fopen(name->getCString(), "wb"))) {
- error(-1, "Couldn't open file '%s'", name->getCString());
- return errOpenFile;
- }
-
- outStr = new FileOutStream(f,0);
- res = saveWithoutChangesAs(outStr);
- delete outStr;
-
- fclose(f);
-
- return res;
-}
-
-int PDFDoc::saveWithoutChangesAs(OutStream *outStr) {
- int c;
-
- str->reset();
- while ((c = str->getChar()) != EOF) {
- outStr->put(c);
- }
- str->close();
-
- return errNone;
-}
-
-void PDFDoc::saveIncrementalUpdate (OutStream* outStr)
-{
- XRef *uxref;
- int c;
- //copy the original file
- str->reset();
- while ((c = str->getChar()) != EOF) {
- outStr->put(c);
- }
- str->close();
-
- uxref = new XRef();
- uxref->add(0, 65535, 0, gFalse);
- int objectsCount = 0; //count the number of objects in the XRef(s)
- for(int i=0; i<xref->getNumObjects(); i++) {
- if ((xref->getEntry(i)->type == xrefEntryFree) &&
- (xref->getEntry(i)->gen == 0)) //we skip the irrelevant free objects
- continue;
- objectsCount++;
- if (xref->getEntry(i)->updated) { //we have an updated object
- Object obj1;
- Ref ref;
- ref.num = i;
- ref.gen = xref->getEntry(i)->gen;
- xref->fetch(ref.num, ref.gen, &obj1);
- Guint offset = writeObject(&obj1, &ref, outStr);
- uxref->add(ref.num, ref.gen, offset, gTrue);
- obj1.free();
- }
- }
- if (uxref->getSize() == 0) { //we have nothing to update
- delete uxref;
- return;
- }
-
- Guint uxrefOffset = outStr->getPos();
- uxref->writeToFile(outStr, gFalse /* do not write unnecessary entries */);
-
- writeTrailer(uxrefOffset, objectsCount, outStr, gTrue);
-
- delete uxref;
-}
-
-void PDFDoc::saveCompleteRewrite (OutStream* outStr)
-{
- outStr->printf("%%PDF-%d.%d\r\n",pdfMajorVersion,pdfMinorVersion);
- XRef *uxref = new XRef();
- uxref->add(0, 65535, 0, gFalse);
- for(int i=0; i<xref->getNumObjects(); i++) {
- Object obj1;
- Ref ref;
- XRefEntryType type = xref->getEntry(i)->type;
- if (type == xrefEntryFree) {
- ref.num = i;
- ref.gen = xref->getEntry(i)->gen;
- /* the XRef class adds a lot of irrelevant free entries, we only want the significant one
- and we don't want the one with num=0 because it has already been added (gen = 65535)*/
- if (ref.gen > 0 && ref.num > 0)
- uxref->add(ref.num, ref.gen, 0, gFalse);
- } else if (type == xrefEntryUncompressed){
- ref.num = i;
- ref.gen = xref->getEntry(i)->gen;
- xref->fetch(ref.num, ref.gen, &obj1);
- Guint offset = writeObject(&obj1, &ref, outStr);
- uxref->add(ref.num, ref.gen, offset, gTrue);
- obj1.free();
- } else if (type == xrefEntryCompressed) {
- ref.num = i;
- ref.gen = 0; //compressed entries have gen == 0
- xref->fetch(ref.num, ref.gen, &obj1);
- Guint offset = writeObject(&obj1, &ref, outStr);
- uxref->add(ref.num, ref.gen, offset, gTrue);
- obj1.free();
- }
- }
- Guint uxrefOffset = outStr->getPos();
- uxref->writeToFile(outStr, gTrue /* write all entries */);
-
- writeTrailer(uxrefOffset, uxref->getSize(), outStr, gFalse);
-
-
- delete uxref;
-
-}
-
-void PDFDoc::writeDictionnary (Dict* dict, OutStream* outStr)
-{
- Object obj1;
- outStr->printf("<<");
- for (int i=0; i<dict->getLength(); i++) {
- GooString keyName(dict->getKey(i));
- GooString *keyNameToPrint = keyName.sanitizedName(gFalse /* non ps mode */);
- outStr->printf("/%s ", keyNameToPrint->getCString());
- delete keyNameToPrint;
- writeObject(dict->getValNF(i, &obj1), NULL, outStr);
- obj1.free();
- }
- outStr->printf(">> ");
-}
-
-void PDFDoc::writeStream (Stream* str, OutStream* outStr)
-{
- outStr->printf("stream\r\n");
- str->reset();
- for (int c=str->getChar(); c!= EOF; c=str->getChar()) {
- outStr->printf("%c", c);
- }
- outStr->printf("\r\nendstream\r\n");
-}
-
-void PDFDoc::writeRawStream (Stream* str, OutStream* outStr)
-{
- Object obj1;
- str->getDict()->lookup("Length", &obj1);
- if (!obj1.isInt()) {
- error (-1, "PDFDoc::writeRawStream, no Length in stream dict");
- return;
- }
-
- const int length = obj1.getInt();
- obj1.free();
-
- outStr->printf("stream\r\n");
- str->unfilteredReset();
- for (int i=0; i<length; i++) {
- int c = str->getUnfilteredChar();
- outStr->printf("%c", c);
- }
- str->reset();
- outStr->printf("\r\nendstream\r\n");
-}
-
-void PDFDoc::writeString (GooString* s, OutStream* outStr)
-{
- if (s->hasUnicodeMarker()) {
- //unicode string don't necessary end with \0
- const char* c = s->getCString();
- outStr->printf("(");
- for(int i=0; i<s->getLength(); i++) {
- char unescaped = *(c+i)&0x000000ff;
- //escape if needed
- if (unescaped == '(' || unescaped == ')' || unescaped == '\\')
- outStr->printf("%c", '\\');
- outStr->printf("%c", unescaped);
- }
- outStr->printf(") ");
- } else {
- const char* c = s->getCString();
- outStr->printf("(");
- for(int i=0; i<s->getLength(); i++) {
- char unescaped = (*c)&0x000000ff;
- //escape if needed
- if (unescaped == '(' || unescaped == ')' || unescaped == '\\')
- outStr->printf("%c", '\\');
- outStr->printf("%c", unescaped);
- c++;
- }
- outStr->printf(") ");
- }
-}
-
-Guint PDFDoc::writeObject (Object* obj, Ref* ref, OutStream* outStr)
-{
- Array *array;
- Object obj1;
- Guint offset = outStr->getPos();
- int tmp;
-
- if(ref)
- outStr->printf("%i %i obj ", ref->num, ref->gen);
-
- switch (obj->getType()) {
- case objBool:
- outStr->printf("%s ", obj->getBool()?"true":"false");
- break;
- case objInt:
- outStr->printf("%i ", obj->getInt());
- break;
- case objReal:
- {
- GooString s;
- s.appendf("{0:.10g}", obj->getReal());
- outStr->printf("%s ", s.getCString());
- break;
- }
- case objString:
- writeString(obj->getString(), outStr);
- break;
- case objName:
- {
- GooString name(obj->getName());
- GooString *nameToPrint = name.sanitizedName(gFalse /* non ps mode */);
- outStr->printf("/%s ", nameToPrint->getCString());
- delete nameToPrint;
- break;
- }
- case objNull:
- outStr->printf( "null ");
- break;
- case objArray:
- array = obj->getArray();
- outStr->printf("[");
- for (int i=0; i<array->getLength(); i++) {
- writeObject(array->getNF(i, &obj1), NULL,outStr);
- obj1.free();
- }
- outStr->printf("] ");
- break;
- case objDict:
- writeDictionnary (obj->getDict(),outStr);
- break;
- case objStream:
- {
- //We can't modify stream with the current implementation (no write functions in Stream API)
- // => the only type of streams which that have been modified are internal streams (=strWeird)
- Stream *stream = obj->getStream();
- if (stream->getKind() == strWeird) {
- //we write the stream unencoded => TODO: write stream encoder
- stream->reset();
- //recalculate stream length
- tmp = 0;
- for (int c=stream->getChar(); c!=EOF; c=stream->getChar()) {
- tmp++;
- }
- obj1.initInt(tmp);
- stream->getDict()->set("Length", &obj1);
-
- //Remove Stream encoding
- stream->getDict()->remove("Filter");
- stream->getDict()->remove("DecodeParms");
-
- writeDictionnary (stream->getDict(),outStr);
- writeStream (stream,outStr);
- obj1.free();
- } else {
- //raw stream copy
- FilterStream *fs = dynamic_cast<FilterStream*>(stream);
- if (fs) {
- BaseStream *bs = fs->getBaseStream();
- if (bs) {
- Guint streamEnd;
- if (xref->getStreamEnd(bs->getStart(), &streamEnd)) {
- Object val;
- val.initInt(streamEnd - bs->getStart());
- stream->getDict()->set("Length", &val);
- }
- }
- }
- writeDictionnary (stream->getDict(), outStr);
- writeRawStream (stream, outStr);
- }
- break;
- }
- case objRef:
- outStr->printf("%i %i R ", obj->getRef().num, obj->getRef().gen);
- break;
- case objCmd:
- outStr->printf("cmd\r\n");
- break;
- case objError:
- outStr->printf("error\r\n");
- break;
- case objEOF:
- outStr->printf("eof\r\n");
- break;
- case objNone:
- outStr->printf("none\r\n");
- break;
- default:
- error(-1,"Unhandled objType : %i, please report a bug with a testcase\r\n", obj->getType());
- break;
- }
- if (ref)
- outStr->printf("endobj\r\n");
- return offset;
-}
-
-void PDFDoc::writeTrailer (Guint uxrefOffset, int uxrefSize, OutStream* outStr, GBool incrUpdate)
-{
- Dict *trailerDict = new Dict(xref);
- Object obj1;
- obj1.initInt(uxrefSize);
- trailerDict->set("Size", &obj1);
- obj1.free();
-
-
- //build a new ID, as recommended in the reference, uses:
- // - current time
- // - file name
- // - file size
- // - values of entry in information dictionnary
- GooString message;
- char buffer[256];
- sprintf(buffer, "%i", (int)time(NULL));
- message.append(buffer);
- if (fileName)
- message.append(fileName);
- else
- message.append("streamwithoutfilename.pdf");
- // file size
- unsigned int fileSize = 0;
- int c;
- str->reset();
- while ((c = str->getChar()) != EOF) {
- fileSize++;
- }
- str->close();
- sprintf(buffer, "%i", fileSize);
- message.append(buffer);
-
- //info dict -- only use text string
- if (xref->getDocInfo(&obj1)->isDict()) {
- for(int i=0; i<obj1.getDict()->getLength(); i++) {
- Object obj2;
- obj1.getDict()->getVal(i, &obj2);
- if (obj2.isString()) {
- message.append(obj2.getString());
- }
- obj2.free();
- }
- }
- obj1.free();
-
- //calculate md5 digest
- Guchar digest[16];
- Decrypt::md5((Guchar*)message.getCString(), message.getLength(), digest);
- obj1.initString(new GooString((const char*)digest, 16));
-
- //create ID array
- Object obj2,obj3,obj4,obj5;
- obj2.initArray(xref);
-
- if (incrUpdate) {
- //only update the second part of the array
- if(xref->getTrailerDict()->getDict()->lookup("ID", &obj4) != NULL) {
- if (!obj4.isArray()) {
- error(-1, "PDFDoc::writeTrailer original file's ID entry isn't an array. Trying to continue");
- } else {
- //Get the first part of the ID
- obj4.arrayGet(0,&obj3);
-
- obj2.arrayAdd(&obj3);
- obj2.arrayAdd(&obj1);
- trailerDict->set("ID", &obj2);
- }
- }
- } else {
- //new file => same values for the two identifiers
- obj2.arrayAdd(&obj1);
- obj1.initString(new GooString((const char*)digest, 16));
- obj2.arrayAdd(&obj1);
- trailerDict->set("ID", &obj2);
- }
-
-
- obj1.initRef(xref->getRootNum(), xref->getRootGen());
- trailerDict->set("Root", &obj1);
-
- if (incrUpdate) {
- obj1.initInt(xref->getLastXRefPos());
- trailerDict->set("Prev", &obj1);
- }
-
- xref->getDocInfoNF(&obj5);
- if (!obj5.isNull()) {
- trailerDict->set("Info", &obj5);
- }
-
- outStr->printf( "trailer\r\n");
- writeDictionnary(trailerDict, outStr);
- outStr->printf( "\r\nstartxref\r\n");
- outStr->printf( "%i\r\n", uxrefOffset);
- outStr->printf( "%%%%EOF\r\n");
-
- delete trailerDict;
-}
diff --git a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/ChangeLog
index 09d998768e7..e77df56abf3 100644
--- a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.18.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-0[123]-*: Adapted.
+
2011-04-14 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-01-PDF_PARSER_ONLY: Fix PDF_PARSER_ONLY for WIN32.
diff --git a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/TL-Changes
index 4529b6b79fd..86309979a7a 100644
--- a/Build/source/libs/poppler/poppler-0.12.4-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.12.4 tree as obtained from:
+Changes applied to the poppler-0.18.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
@@ -8,13 +8,12 @@ Removed:
install-sh
ltmain.sh
missing
- poppler/poppler-config.h
Removed unused dirs:
cmake
+ cpp
glib
m4
- qt
qt4
splash
test
diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY
new file mode 100644
index 00000000000..bcab94d26b1
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-01-PDF_PARSER_ONLY
@@ -0,0 +1,89 @@
+diff -ur poppler-0.18.0.orig/poppler/GlobalParams.cc poppler-0.18.0/poppler/GlobalParams.cc
+--- poppler-0.18.0.orig/poppler/GlobalParams.cc 2011-07-28 12:43:53.000000000 +0200
++++ poppler-0.18.0/poppler/GlobalParams.cc 2011-10-07 20:23:51.000000000 +0200
+@@ -211,6 +211,7 @@
+
+ #endif
+
++#ifndef PDF_PARSER_ONLY
+ #ifdef _WIN32
+
+ //------------------------------------------------------------------------
+@@ -455,6 +456,7 @@
+ }
+
+ #endif // _WIN32
++#endif // PDF_PARSER_ONLY
+
+ //------------------------------------------------------------------------
+ // PSFontParam
+@@ -709,10 +711,12 @@
+ unicodeMapCache = new UnicodeMapCache();
+ cMapCache = new CMapCache();
+
++#ifndef PDF_PARSER_ONLY
+ #ifdef _WIN32
+ baseFontsInitialized = gFalse;
+ winFontList = NULL;
+ #endif
++#endif
+
+ #ifdef ENABLE_PLUGINS
+ plugins = new GooList();
+@@ -875,9 +879,11 @@
+ deleteGooHash(unicodeMaps, GooString);
+ deleteGooList(toUnicodeDirs, GooString);
+ deleteGooHash(displayFonts, DisplayFontParam);
++#ifndef PDF_PARSER_ONLY
+ #ifdef _WIN32
+ delete winFontList;
+ #endif
++#endif
+ deleteGooHash(psFonts, PSFontParam);
+ deleteGooList(psNamedFonts16, PSFontParam);
+ deleteGooList(psFonts16, PSFontParam);
+diff -ur poppler-0.18.0.orig/poppler/GlobalParams.h poppler-0.18.0/poppler/GlobalParams.h
+--- poppler-0.18.0.orig/poppler/GlobalParams.h 2011-08-18 17:37:37.000000000 +0200
++++ poppler-0.18.0/poppler/GlobalParams.h 2011-10-07 20:20:43.000000000 +0200
+@@ -60,9 +60,11 @@
+ class GlobalParams;
+ class GfxFont;
+ class Stream;
++#ifndef PDF_PARSER_ONLY
+ #ifdef _WIN32
+ class WinFontList;
+ #endif
++#endif
+
+ //------------------------------------------------------------------------
+
+@@ -306,10 +308,12 @@
+ GooList *toUnicodeDirs; // list of ToUnicode CMap dirs [GooString]
+ GooHash *displayFonts; // display font info, indexed by font name
+ // [DisplayFontParam]
++#ifndef PDF_PARSER_ONLY
+ #ifdef _WIN32
+ GBool baseFontsInitialized;
+ WinFontList *winFontList; // system TrueType fonts
+ #endif
++#endif
+ GBool psExpandSmaller; // expand smaller pages to fill paper
+ GBool psShrinkLarger; // shrink larger pages to fit paper
+ GBool psCenter; // center pages on the paper
+diff -ur poppler-0.18.0.orig/poppler/Page.cc poppler-0.18.0/poppler/Page.cc
+--- poppler-0.18.0.orig/poppler/Page.cc 2011-03-12 11:49:45.000000000 +0100
++++ poppler-0.18.0/poppler/Page.cc 2011-10-07 20:07:46.000000000 +0200
+@@ -45,13 +45,11 @@
+ #include "XRef.h"
+ #include "Link.h"
+ #include "OutputDev.h"
+-#ifndef PDF_PARSER_ONLY
+ #include "Gfx.h"
+ #include "GfxState.h"
+ #include "Annot.h"
+ #include "TextOutputDev.h"
+ #include "Form.h"
+-#endif
+ #include "Error.h"
+ #include "Page.h"
+ #include "Catalog.h"
diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-02-warnings b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-02-warnings
new file mode 100644
index 00000000000..73c514909dd
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-02-warnings
@@ -0,0 +1,86 @@
+diff -ur poppler-0.18.0.orig/poppler/Annot.cc poppler-0.18.0/poppler/Annot.cc
+--- poppler-0.18.0.orig/poppler/Annot.cc 2011-08-25 23:25:21.000000000 +0200
++++ poppler-0.18.0/poppler/Annot.cc 2011-10-07 20:45:57.000000000 +0200
+@@ -2643,7 +2643,7 @@
+ y3 = quadrilaterals->getY3(i);
+ x4 = quadrilaterals->getX4(i);
+ y4 = quadrilaterals->getY4(i);
+- h4 = abs(y1 - y3) / 4.0;
++ h4 = fabs(y1 - y3) / 4.0;
+
+ appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x3, y3);
+ appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+diff -ur poppler-0.18.0.orig/poppler/GfxState.cc poppler-0.18.0/poppler/GfxState.cc
+--- poppler-0.18.0.orig/poppler/GfxState.cc 2011-07-28 12:58:37.000000000 +0200
++++ poppler-0.18.0/poppler/GfxState.cc 2011-10-07 20:52:53.000000000 +0200
+@@ -2997,7 +2997,7 @@
+
+ getParameterRange(&sMin, &sMax, xMin, yMin, xMax, yMax);
+ upperBound = ctm->norm() * getDistance(sMin, sMax);
+- maxSize = ceil(upperBound);
++ maxSize = (int)ceil(upperBound);
+ maxSize = std::max<int>(maxSize, 2);
+
+ {
+diff -ur poppler-0.18.0.orig/poppler/GfxState.h poppler-0.18.0/poppler/GfxState.h
+--- poppler-0.18.0.orig/poppler/GfxState.h 2011-07-29 00:25:02.000000000 +0200
++++ poppler-0.18.0/poppler/GfxState.h 2011-10-07 20:43:42.000000000 +0200
+@@ -100,7 +100,7 @@
+ }
+
+ static inline Guchar dblToByte(double x) {
+- return (x * 255.0);
++ return (Guchar)(x * 255.0);
+ }
+
+ static inline double byteToDbl(Guchar x) {
+diff -ur poppler-0.18.0.orig/poppler/Hints.cc poppler-0.18.0/poppler/Hints.cc
+--- poppler-0.18.0.orig/poppler/Hints.cc 2011-06-30 23:41:10.000000000 +0200
++++ poppler-0.18.0/poppler/Hints.cc 2011-10-07 21:51:39.000000000 +0200
+@@ -413,7 +413,7 @@
+ {
+ Guint bit, bits;
+
+- if (n < 0) return -1;
++ if (n < 0) return (Guint)-1;
+ if (n == 0) return 0;
+
+ if (n == 1)
+@@ -421,11 +421,11 @@
+
+ bit = (readBit(str) << (n-1));
+ if (bit == (Guint) -1)
+- return -1;
++ return (Guint)-1;
+
+ bits = readBits(n-1, str);
+ if (bits == (Guint) -1)
+- return -1;
++ return (Guint)-1;
+
+ return bit | bits;
+ }
+diff -ur poppler-0.18.0.orig/poppler/Lexer.cc poppler-0.18.0/poppler/Lexer.cc
+--- poppler-0.18.0.orig/poppler/Lexer.cc 2010-07-16 00:43:51.000000000 +0200
++++ poppler-0.18.0/poppler/Lexer.cc 2011-10-07 20:52:58.000000000 +0200
+@@ -215,7 +215,7 @@
+ overflownUnsignedInteger = gTrue;
+ xf = xi * 10.0 + (c - '0');
+ } else {
+- xui = xi * 10.0 + (c - '0');
++ xui = (unsigned int)(xi * 10.0 + (c - '0'));
+ }
+ } else {
+ xi = xi * 10 + (c - '0');
+diff -ur poppler-0.18.0.orig/poppler/Stream.cc poppler-0.18.0/poppler/Stream.cc
+--- poppler-0.18.0.orig/poppler/Stream.cc 2011-07-19 00:17:56.000000000 +0200
++++ poppler-0.18.0/poppler/Stream.cc 2011-10-07 20:52:50.000000000 +0200
+@@ -474,7 +474,7 @@
+ } else if (nBits == 8) {
+ Guchar *line = imgLine;
+ int readChars = str->doGetChars(nVals, line);
+- for ( ; readChars < nVals; readChars++) line[readChars] = EOF;
++ for ( ; readChars < nVals; readChars++) line[readChars] = (Guchar)EOF;
+ } else if (nBits == 16) {
+ // this is a hack to support 16 bits images, everywhere
+ // we assume a component fits in 8 bits, with this hack
diff --git a/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-03-POPPLER_VERSION b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-03-POPPLER_VERSION
new file mode 100644
index 00000000000..7afc1ed2f61
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0-PATCHES/patch-03-POPPLER_VERSION
@@ -0,0 +1,13 @@
+diff -ur poppler-0.18.0.orig/poppler/poppler-config.h.in poppler-0.18.0/poppler/poppler-config.h.in
+--- poppler-0.18.0.orig/poppler/poppler-config.h.in 2011-09-27 00:24:08.000000000 +0200
++++ poppler-0.18.0/poppler/poppler-config.h.in 2011-10-07 19:51:32.000000000 +0200
+@@ -125,6 +125,9 @@
+ #define popplerCopyright "Copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org"
+ #define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
+
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
+ //------------------------------------------------------------------------
+ // popen
+ //------------------------------------------------------------------------
diff --git a/Build/source/libs/poppler/poppler-0.12.4/AUTHORS b/Build/source/libs/poppler/poppler-0.18.0/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.18.0/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.12.4/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.18.0/CMakeLists.txt
index cb78bb53cb1..499ff23c432 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.18.0/CMakeLists.txt
@@ -10,57 +10,102 @@ include(MacroOptionalFindPackage)
find_package(PkgConfig)
include(MacroEnsureVersion)
include(MacroBoolTo01)
+find_package(Threads)
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "12")
-set(POPPLER_MICRO_VERSION "4")
+set(POPPLER_MINOR_VERSION "18")
+set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
option(ENABLE_XPDF_HEADERS "Install unsupported xpdf headers." OFF)
option(BUILD_GTK_TESTS "Whether compile the GTK+ test programs." ON)
-option(BUILD_QT3_TESTS "Whether compile the Qt3 test programs." ON)
option(BUILD_QT4_TESTS "Whether compile the Qt4 test programs." ON)
+option(BUILD_CPP_TESTS "Whether compile the CPP test programs." ON)
option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
option(ENABLE_UTILS "Compile poppler command line utils." ON)
-option(ENABLE_ABIWORD "Build the Abiword backend." ON)
+option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
option(ENABLE_LIBOPENJPEG "Use libopenjpeg for JPX streams." ON)
option(ENABLE_LCMS "Use liblcms for color management." ON)
-option(ENABLE_ZLIB "TODO" OFF)
-option(USE_EXCEPTIONS "Throw exceptions to deal with not enough memory and similar problems." OFF)
-option(USE_FIXEDPOINT "Use fixed point arithmetic" OFF)
+option(ENABLE_LIBCURL "Build libcurl based HTTP support." OFF)
+option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF)
+option(USE_FIXEDPOINT "Use fixed point arithmetic in the Splash backend" OFF)
+option(USE_FLOAT "Use single precision arithmetic in the Splash backend" OFF)
+if(WIN32)
+ option(ENABLE_RELOCATABLE "Hardcode the poppler library location (on Windows)." ON)
+else(WIN32)
+ set(ENABLE_RELOCATABLE OFF)
+endif(WIN32)
set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+if(WIN32)
+ set(_default_fontconfiguration "win32")
+else(WIN32)
+ set(_default_fontconfiguration "fontconfig")
+endif(WIN32)
+set(FONT_CONFIGURATION "${_default_fontconfiguration}" CACHE STRING "The font configuration backend (win32|fontconfig).")
+string(TOLOWER "${FONT_CONFIGURATION}" font_configuration)
+set(WITH_FONTCONFIGURATION_WIN32 OFF)
+set(WITH_FONTCONFIGURATION_FONTCONFIG OFF)
+if(font_configuration STREQUAL "win32")
+ set(WITH_FONTCONFIGURATION_WIN32 ON)
+elseif(font_configuration STREQUAL "fontconfig")
+ set(WITH_FONTCONFIGURATION_FONTCONFIG ON)
+else(font_configuration STREQUAL "win32")
+ message(FATAL_ERROR "Invalid font configuration setting: ${FONT_CONFIGURATION}")
+endif(font_configuration STREQUAL "win32")
+
# Enable these unconditionally.
set(MULTITHREADED ON)
set(OPI_SUPPORT ON)
set(TEXTOUT_WORD_LIST ON)
# setting the minimum required versions for some components
-set(QT3_MIN_VERSION "3.3.0")
set(QT4_MIN_VERSION "4.4.0")
-set(CAIRO_VERSION "1.8.4")
+set(CAIRO_VERSION "1.10.0")
+set(GLIB_REQUIRED "2.18")
macro_bool_to_01(ENABLE_SPLASH HAVE_SPLASH)
find_package(Freetype REQUIRED)
-find_package(Fontconfig REQUIRED)
+if(WITH_FONTCONFIGURATION_FONTCONFIG)
+ find_package(Fontconfig REQUIRED)
+endif(WITH_FONTCONFIGURATION_FONTCONFIG)
macro_optional_find_package(JPEG)
macro_optional_find_package(PNG)
+macro_optional_find_package(TIFF)
if(JPEG_FOUND)
set(ENABLE_LIBJPEG ${JPEG_FOUND})
endif(JPEG_FOUND)
-macro_optional_find_package(Qt3)
macro_optional_find_package(Qt4)
-macro_optional_find_package(GTK)
-if(GLIB_FOUND)
- macro_optional_find_package(Cairo)
+macro_optional_find_package(Cairo ${CAIRO_VERSION})
+if(CAIRO_FOUND)
set(HAVE_CAIRO ${CAIRO_FOUND})
- set(POPPLER_WITH_GDK ${GDK_FOUND})
- if(CAIRO_FOUND)
- set(CAIRO_REQ "cairo")
- endif(CAIRO_FOUND)
-endif(GLIB_FOUND)
+ set(CAIRO_FEATURE "#define POPPLER_HAS_CAIRO 1")
+ set(CAIRO_REQ "cairo")
+ set(POPPLER_GLIB_DISABLE_DEPRECATED "")
+ set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "")
+ macro_optional_find_package(GLIB)
+ if(GLIB_FOUND)
+ set(ENABLE_GLIB ON)
+ # Check for introspection
+ macro_optional_find_package(GObjectIntrospection 0.9.12)
+ set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND})
+ set(GLIB_REQ "glib-2.0 >= ${GLIB_REQUIRED} gobject-2.0 >= ${GLIB_REQUIRED} cairo >= ${CAIRO_VERSION}")
+ set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED")
+ set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES")
+ macro_optional_find_package(GTK)
+ endif(GLIB_FOUND)
+else(CAIRO_FOUND)
+ set(CAIRO_FEATURE "#undef POPPLER_HAS_CAIRO")
+endif(CAIRO_FOUND)
+if(ENABLE_CPP)
+ macro_optional_find_package(Iconv)
+ set(ENABLE_CPP ${ICONV_FOUND})
+ set(HAVE_ICONV ${ICONV_FOUND})
+endif(ENABLE_CPP)
if(ENABLE_ZLIB)
find_package(ZLIB)
if(ZLIB_FOUND)
@@ -68,20 +113,31 @@ if(ENABLE_ZLIB)
endif(ZLIB_FOUND)
set(ENABLE_ZLIB ${ZLIB_FOUND})
endif(ENABLE_ZLIB)
-if(ENABLE_ABIWORD)
- find_package(LibXml2)
- set(ENABLE_ABIWORD ${LIBXML2_FOUND})
-endif(ENABLE_ABIWORD)
if(ENABLE_LIBOPENJPEG)
find_package(LIBOPENJPEG)
set(ENABLE_LIBOPENJPEG ${LIBOPENJPEG_FOUND})
+ set(HAVE_OPENJPEG_H ON)
endif(ENABLE_LIBOPENJPEG)
if(ENABLE_LCMS)
find_package(LCMS)
set(USE_CMS ${LCMS_FOUND})
endif(ENABLE_LCMS)
+if(ENABLE_LIBCURL)
+ find_package(CURL)
+ include_directories(${CURL_INCLUDE_DIR})
+ set(POPPLER_HAS_CURL_SUPPORT ON)
+endif(ENABLE_LIBCURL)
-add_definitions(-DHAVE_CONFIG_H=1 ${FONTCONFIG_DEFINITIONS})
+add_definitions(-DHAVE_CONFIG_H=1)
+if(FONTCONFIG_FOUND)
+ add_definitions(${FONTCONFIG_DEFINITIONS})
+endif(FONTCONFIG_FOUND)
+if(WITH_FONTCONFIGURATION_WIN32)
+ if(MINGW)
+ # Set the minimum required Internet Explorer version to 5.0
+ add_definitions(-D_WIN32_IE=0x0500)
+ endif(MINGW)
+endif(WITH_FONTCONFIGURATION_WIN32)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/fofi
@@ -92,6 +148,9 @@ include_directories(
${FREETYPE_INCLUDE_DIRS}
)
set(HAVE_FREETYPE_H ON)
+if(CMAKE_USE_PTHREADS_INIT)
+ set(HAVE_PTHREAD ON)
+endif(CMAKE_USE_PTHREADS_INIT)
if(ENABLE_ZLIB)
include_directories(${ZLIB_INCLUDE_DIR})
@@ -104,10 +163,10 @@ if(PNG_FOUND)
include_directories(${PNG_INCLUDE_DIR})
set(ENABLE_LIBPNG ON)
endif(PNG_FOUND)
-if(ENABLE_ABIWORD)
- include_directories(${LIBXML2_INCLUDE_DIR})
- add_definitions(${LIBXML2_DEFINITIONS})
-endif(ENABLE_ABIWORD)
+if(TIFF_FOUND)
+ include_directories(${TIFF_INCLUDE_DIR})
+ set(ENABLE_LIBTIFF ON)
+endif(TIFF_FOUND)
if(LIBOPENJPEG_FOUND)
include_directories(${LIBOPENJPEG_INCLUDE_DIR})
endif(LIBOPENJPEG_FOUND)
@@ -121,10 +180,10 @@ else(DEFINED COMPILE_WARNINGS)
endif(DEFINED COMPILE_WARNINGS)
string(TOLOWER "${COMPILE_WARNINGS}" _comp_warnings)
if(_comp_warnings STREQUAL "no")
- add_definitions(${DEFAULT_COMPILE_WARNINGS_NO})
+ set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS_NO} ${CMAKE_CXX_FLAGS}")
endif(_comp_warnings STREQUAL "no")
if(_comp_warnings STREQUAL "yes")
- add_definitions(${DEFAULT_COMPILE_WARNINGS_YES})
+ set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS_YES} ${CMAKE_CXX_FLAGS}")
endif(_comp_warnings STREQUAL "yes")
if(_comp_warnings STREQUAL "kde")
set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS_KDE} ${CMAKE_CXX_FLAGS}")
@@ -133,7 +192,7 @@ endif(_comp_warnings STREQUAL "kde")
include(ConfigureChecks.cmake)
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-configure_file(poppler-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h)
+configure_file(poppler/poppler-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h)
set(poppler_SRCS
@@ -146,6 +205,9 @@ set(poppler_SRCS
goo/gmem.cc
goo/FixedPoint.cc
goo/PNGWriter.cc
+ goo/TiffWriter.cc
+ goo/JpegWriter.cc
+ goo/ImgWriter.cc
goo/gstrtod.cc
fofi/FoFiBase.cc
fofi/FoFiEncodings.cc
@@ -156,6 +218,7 @@ set(poppler_SRCS
poppler/Array.cc
poppler/BuiltinFont.cc
poppler/BuiltinFontTables.cc
+ poppler/CachedFile.cc
poppler/Catalog.cc
poppler/CharCodeToUnicode.cc
poppler/CMap.cc
@@ -172,10 +235,13 @@ set(poppler_SRCS
poppler/GfxFont.cc
poppler/GfxState.cc
poppler/GlobalParams.cc
+ poppler/Hints.cc
poppler/JArithmeticDecoder.cc
poppler/JBIG2Stream.cc
poppler/Lexer.cc
poppler/Link.cc
+ poppler/Linearization.cc
+ poppler/LocalPDFDocBuilder.cc
poppler/NameToCharCode.cc
poppler/Object.cc
poppler/OptionalContent.cc
@@ -186,11 +252,13 @@ set(poppler_SRCS
poppler/Parser.cc
poppler/PDFDoc.cc
poppler/PDFDocEncoding.cc
+ poppler/PDFDocFactory.cc
poppler/PopplerCache.cc
poppler/ProfileData.cc
poppler/PreScanOutputDev.cc
poppler/PSTokenizer.cc
poppler/Stream.cc
+ poppler/strtok_r.cpp
poppler/UnicodeMap.cc
poppler/UnicodeTypeTable.cc
poppler/XRef.cc
@@ -198,11 +266,15 @@ set(poppler_SRCS
poppler/TextOutputDev.cc
poppler/PageLabelInfo.cc
poppler/SecurityHandler.cc
+ poppler/StdinCachedFile.cc
+ poppler/StdinPDFDocBuilder.cc
poppler/Sound.cc
+ poppler/ViewerPreferences.cc
poppler/XpdfPluginAPI.cc
poppler/Movie.cc
+ poppler/Rendition.cc
)
-set(poppler_LIBS ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES})
+set(poppler_LIBS ${FREETYPE_LIBRARIES})
if(ENABLE_SPLASH)
set(poppler_SRCS ${poppler_SRCS}
poppler/SplashOutputDev.cc
@@ -227,6 +299,9 @@ if(ENABLE_SPLASH)
splash/SplashXPathScanner.cc
)
endif(ENABLE_SPLASH)
+if(FONTCONFIG_FOUND)
+ set(poppler_LIBS ${poppler_LIBS} ${FONTCONFIG_LIBRARIES})
+endif(FONTCONFIG_FOUND)
if(JPEG_FOUND)
set(poppler_SRCS ${poppler_SRCS}
poppler/DCTStream.cc
@@ -239,6 +314,13 @@ if(ENABLE_ZLIB)
)
set(poppler_LIBS ${poppler_LIBS} ${ZLIB_LIBRARIES})
endif(ENABLE_ZLIB)
+if(ENABLE_LIBCURL)
+ set(poppler_SRCS ${poppler_SRCS}
+ poppler/CurlCachedFile.cc
+ poppler/CurlPDFDocBuilder.cc
+ )
+ set(poppler_LIBS ${poppler_LIBS} ${CURL_LIBRARIES})
+endif(ENABLE_LIBCURL)
if(LIBOPENJPEG_FOUND)
set(poppler_SRCS ${poppler_SRCS}
poppler/JPEG2000Stream.cc
@@ -252,30 +334,26 @@ endif(LIBOPENJPEG_FOUND)
if(USE_CMS)
set(poppler_LIBS ${poppler_LIBS} ${LCMS_LIBRARIES})
endif(USE_CMS)
-if(ENABLE_ABIWORD)
- set(poppler_SRCS ${poppler_SRCS}
- poppler/ABWOutputDev.cc
- )
- set(poppler_LIBS ${poppler_LIBS} ${LIBXML2_LIBRARIES})
-endif(ENABLE_ABIWORD)
if(WIN32)
# gdi32 is needed under win32
set(poppler_LIBS ${poppler_LIBS} gdi32)
endif(WIN32)
+if(PNG_FOUND)
+ set(poppler_LIBS ${poppler_LIBS} ${PNG_LIBRARIES})
+endif(PNG_FOUND)
+if(TIFF_FOUND)
+ set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES})
+endif(TIFF_FOUND)
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-set(poppler_SRCS ${poppler_SRCS} poppler/GlobalParamsWin.cc)
add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 5.0.0 SOVERSION 5)
-if (ENABLE_LIBPNG)
-target_link_libraries(poppler ${poppler_LIBS} ${PNG_LIBRARIES})
-else (ENABLE_LIBPNG)
+set_target_properties(poppler PROPERTIES VERSION 18.0.0 SOVERSION 18)
target_link_libraries(poppler ${poppler_LIBS})
-endif (ENABLE_LIBPNG)
+target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
if(ENABLE_XPDF_HEADERS)
@@ -284,6 +362,7 @@ if(ENABLE_XPDF_HEADERS)
poppler/Array.h
poppler/BuiltinFont.h
poppler/BuiltinFontTables.h
+ poppler/CachedFile.h
poppler/Catalog.h
poppler/CharCodeToUnicode.h
poppler/CMap.h
@@ -302,10 +381,13 @@ if(ENABLE_XPDF_HEADERS)
poppler/GfxState.h
poppler/GfxState_helpers.h
poppler/GlobalParams.h
+ poppler/Hints.h
poppler/JArithmeticDecoder.h
poppler/JBIG2Stream.h
poppler/Lexer.h
poppler/Link.h
+ poppler/Linearization.h
+ poppler/LocalPDFDocBuilder.h
poppler/Movie.h
poppler/NameToCharCode.h
poppler/Object.h
@@ -316,11 +398,14 @@ if(ENABLE_XPDF_HEADERS)
poppler/PageTransition.h
poppler/Parser.h
poppler/PDFDoc.h
+ poppler/PDFDocBuilder.h
poppler/PDFDocEncoding.h
+ poppler/PDFDocFactory.h
poppler/PopplerCache.h
poppler/ProfileData.h
poppler/PreScanOutputDev.h
poppler/PSTokenizer.h
+ poppler/Rendition.h
poppler/Stream-CCITT.h
poppler/Stream.h
poppler/UnicodeMap.h
@@ -329,6 +414,7 @@ if(ENABLE_XPDF_HEADERS)
poppler/UnicodeCClassTables.h
poppler/UnicodeCompTables.h
poppler/UnicodeDecompTables.h
+ poppler/ViewerPreferences.h
poppler/XRef.h
poppler/CharTypes.h
poppler/CompactFontTables.h
@@ -337,6 +423,8 @@ if(ENABLE_XPDF_HEADERS)
poppler/PSOutputDev.h
poppler/TextOutputDev.h
poppler/SecurityHandler.h
+ poppler/StdinCachedFile.h
+ poppler/StdinPDFDocBuilder.h
poppler/UTF8.h
poppler/XpdfPluginAPI.h
poppler/Sound.h
@@ -348,13 +436,24 @@ if(ENABLE_XPDF_HEADERS)
goo/GooTimer.h
goo/GooMutex.h
goo/GooString.h
- goo/GooVector.h
goo/gtypes.h
goo/gmem.h
goo/gfile.h
goo/FixedPoint.h
+ goo/ImgWriter.h
+ goo/GooLikely.h
goo/gstrtod.h
DESTINATION include/poppler/goo)
+ if(PNG_FOUND)
+ install(FILES
+ goo/PNGWriter.h
+ DESTINATION include/poppler/goo)
+ endif(PNG_FOUND)
+ if(TIFF_FOUND)
+ install(FILES
+ goo/TiffWriter.h
+ DESTINATION include/poppler/goo)
+ endif(TIFF_FOUND)
install(FILES
fofi/FoFiBase.h
fofi/FoFiEncodings.h
@@ -362,10 +461,19 @@ if(ENABLE_XPDF_HEADERS)
fofi/FoFiType1.h
fofi/FoFiType1C.h
DESTINATION include/poppler/fofi)
+ if(ENABLE_LIBCURL)
+ install(FILES
+ poppler/CurlCachedFile.h
+ poppler/CurlPDFDocBuilder.h
+ DESTINATION include/poppler)
+ endif(ENABLE_LIBCURL)
if(LIBOPENJPEG_FOUND)
install(FILES
poppler/JPEG2000Stream.h
DESTINATION include/poppler)
+ install(FILES
+ goo/JpegWriter.h
+ DESTINATION include/poppler/goo)
else(LIBOPENJPEG_FOUND)
install(FILES
poppler/JPXStream.h
@@ -407,22 +515,22 @@ endif(ENABLE_XPDF_HEADERS)
if(ENABLE_UTILS)
add_subdirectory(utils)
endif(ENABLE_UTILS)
-if(GLIB_FOUND)
+if(ENABLE_GLIB)
add_subdirectory(glib)
-endif(GLIB_FOUND)
-if(QT3_FOUND)
- add_subdirectory(qt)
-endif(QT3_FOUND)
+endif(ENABLE_GLIB)
add_subdirectory(test)
if(QT4_FOUND)
add_subdirectory(qt4)
endif(QT4_FOUND)
+if(ENABLE_CPP)
+ add_subdirectory(cpp)
+endif(ENABLE_CPP)
set(PKG_CONFIG_VERSION_0_18 TRUE)
-if(PKGCONFIG_EXECUTABLE)
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _output_VAR)
+if(PKG_CONFIG_EXECUTABLE)
+ exec_program(${PKG_CONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _output_VAR)
macro_ensure_version("0.18" "${_output_VAR}" PKG_CONFIG_VERSION_0_18)
-endif(PKGCONFIG_EXECUTABLE)
+endif(PKG_CONFIG_EXECUTABLE)
if(PKG_CONFIG_VERSION_0_18)
set(PC_REQUIRES "")
set(PC_REQUIRES_PRIVATE "Requires.private: poppler = ${POPPLER_VERSION}")
@@ -435,31 +543,38 @@ poppler_create_install_pkgconfig(poppler.pc lib${LIB_SUFFIX}/pkgconfig)
if(ENABLE_SPLASH)
poppler_create_install_pkgconfig(poppler-splash.pc lib${LIB_SUFFIX}/pkgconfig)
endif(ENABLE_SPLASH)
-if(QT3_FOUND)
- poppler_create_install_pkgconfig(poppler-qt.pc lib${LIB_SUFFIX}/pkgconfig)
-endif(QT3_FOUND)
if(QT4_FOUND)
poppler_create_install_pkgconfig(poppler-qt4.pc lib${LIB_SUFFIX}/pkgconfig)
endif(QT4_FOUND)
-if(GLIB_FOUND)
+if(ENABLE_GLIB)
poppler_create_install_pkgconfig(poppler-glib.pc lib${LIB_SUFFIX}/pkgconfig)
-endif(GLIB_FOUND)
+endif(ENABLE_GLIB)
if(CAIRO_FOUND)
poppler_create_install_pkgconfig(poppler-cairo.pc lib${LIB_SUFFIX}/pkgconfig)
endif(CAIRO_FOUND)
+if(ENABLE_CPP)
+ poppler_create_install_pkgconfig(poppler-cpp.pc lib${LIB_SUFFIX}/pkgconfig)
+endif(ENABLE_CPP)
message("Building Poppler with support for:")
-show_end_message("splash output" ENABLE_SPLASH)
-show_end_message("cairo output" CAIRO_FOUND)
-show_end_message("abiword output" ENABLE_ABIWORD)
-show_end_message("qt wrapper" QT3_FOUND)
-show_end_message("qt4 wrapper" QT4_FOUND)
-show_end_message("glib wrapper" GLIB_FOUND)
-# message(" use gtk-doc: $enable_gtk_doc") # TODO
-show_end_message("use libjpeg" ENABLE_LIBJPEG)
-show_end_message("use libpng" ENABLE_LIBPNG)
-show_end_message("use zlib" ENABLE_ZLIB)
-show_end_message("use libopenjpeg" LIBOPENJPEG_FOUND)
-show_end_message("use cms" USE_CMS)
-show_end_message("command line utils" ENABLE_UTILS)
+show_end_message("font configuration" ${font_configuration})
+show_end_message_yesno("splash output" ENABLE_SPLASH)
+show_end_message_yesno("cairo output" CAIRO_FOUND)
+show_end_message_yesno("qt4 wrapper" QT4_FOUND)
+show_end_message_yesno("glib wrapper" ENABLE_GLIB)
+show_end_message_yesno(" introspection" INTROSPECTION_FOUND)
+show_end_message_yesno("cpp wrapper" ENABLE_CPP)
+show_end_message("use gtk-doc" "not supported with this CMake build system")
+show_end_message_yesno("use libjpeg" ENABLE_LIBJPEG)
+show_end_message_yesno("use libpng" ENABLE_LIBPNG)
+show_end_message_yesno("use libtiff" ENABLE_LIBTIFF)
+show_end_message_yesno("use zlib" ENABLE_ZLIB)
+show_end_message_yesno("use curl" ENABLE_LIBCURL)
+show_end_message_yesno("use libopenjpeg" LIBOPENJPEG_FOUND)
+show_end_message_yesno("use cms" USE_CMS)
+show_end_message_yesno("command line utils" ENABLE_UTILS)
+
+if(USE_FIXEDPOINT AND USE_FLOAT)
+ message("Warning: Single precision and fixed point options should not be enabled at the same time")
+endif(USE_FIXEDPOINT AND USE_FLOAT)
diff --git a/Build/source/libs/poppler/poppler-0.12.4/COPYING b/Build/source/libs/poppler/poppler-0.18.0/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/COPYING
+++ b/Build/source/libs/poppler/poppler-0.18.0/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.18.0/ChangeLog b/Build/source/libs/poppler/poppler-0.18.0/ChangeLog
new file mode 100644
index 00000000000..e71d29c2682
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/ChangeLog
@@ -0,0 +1,37227 @@
+commit 19f5db7acd64330d198f18695175df02141794d7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 27 00:15:15 2011 +0200
+
+ Update Carlos (C) year
+
+ poppler/Gfx.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6d34d4af90b8b41360de4dabb000bbcc894775d0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 27 00:09:54 2011 +0200
+
+ Rename pdfmerge and pdfextract
+
+ To pdfunite and pdfseparate, the old names were taken
+
+ utils/.gitignore | 4 +-
+ utils/CMakeLists.txt | 28 ++++----
+ utils/Makefile.am | 16 ++--
+ utils/pdfextract.1 | 49 --------------
+ utils/pdfextract.cc | 115 --------------------------------
+ utils/pdfmerge.1 | 33 ---------
+ utils/pdfmerge.cc | 176
+ --------------------------------------------------
+ utils/pdfseparate.1 | 49 ++++++++++++++
+ utils/pdfseparate.cc | 115 ++++++++++++++++++++++++++++++++
+ utils/pdfunite.1 | 33 +++++++++
+ utils/pdfunite.cc | 176
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 11 files changed, 397 insertions(+), 397 deletions(-)
+
+commit baf54c2876edd476ffc68da6518598847bb7ec8a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 26 15:54:46 2011 +0200
+
+ Remove getRawStream
+
+ Since it does exactly the same as getNextStream
+
+ poppler/DCTStream.h | 1 -
+ poppler/Stream.h | 1 -
+ utils/HtmlOutputDev.cc | 7 ++-----
+ utils/ImageOutputDev.cc | 9 +++------
+ 4 files changed, 5 insertions(+), 13 deletions(-)
+
+commit 69707f0a9b5a94c80817039db943fb4f26e743e3
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Mon Sep 19 22:00:34 2011 +0930
+
+ Update .gitignore
+
+ regtest/.gitignore | 1 +
+ utils/.gitignore | 2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 0de477817e424078cfcfcae114e7745809f0848d
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Mon Sep 19 21:57:07 2011 +0930
+
+ utils: Add Glyph & Cog copyright to pdfmerge and pdfextract man pages
+
+ utils/pdfextract.1 | 3 ++-
+ utils/pdfmerge.1 | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ce7372db64ee807dc2b491e121fbe557dbf697e8
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Mon Sep 19 22:04:27 2011 +0930
+
+ regtest: render cairo at 72ppi
+
+ For consistency with splash. It is faster and easier to compare with
+ splash results.
+
+ regtest/backends/cairo.py | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 6cf7330089c4dcc1099906d9c37c3607a2a1eeba
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Sep 19 18:42:35 2011 +0200
+
+ regtest: Ignore checksums of crashed, failed and stderr files
+
+ They shouldn't have a checksum, but it might happen with md5 files
+ generated with previous versions.
+
+ regtest/backends/__init__.py | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 6512bf1c5dab37058460882fec3407b396830981
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 18 18:38:32 2011 +0200
+
+ Render at 72 instead of 150, it's faster :D
+
+ regtest/backends/splash.py | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b828f63ed3896a22f3fe7ddbe2ec2f549d7a2c62
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 18 18:20:47 2011 +0200
+
+ install pdfextract and pdfmerge manpages
+
+ utils/CMakeLists.txt | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 986759dfbe85998c85ee9b0825c7522395567531
+Author: Thomas Freitag <Thomas.Freitag@kabelmail.de>
+Date: Sun Sep 18 18:19:30 2011 +0200
+
+ pdfextract and pdfmerge man pages
+
+ utils/Makefile.am | 2 ++
+ utils/pdfextract.1 | 48
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ utils/pdfmerge.1 | 32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 82 insertions(+), 0 deletions(-)
+
+commit 90da1af542fd7f3cecef31b15da6971345b38209
+Author: Thomas Freitag <Thomas.Freitag@kabelmail.de>
+Date: Sun Sep 18 18:19:04 2011 +0200
+
+ Complain if %d is not present and it should
+
+ utils/pdfextract.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 40e066a84ddb3a5c41805c095659af5f5704d6d8
+Author: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+Date: Sun Sep 18 18:16:14 2011 +0200
+
+ qt_subdir is unneeded
+
+ Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e23f6b9cade804136bd4bb58182f4fe0b072fbf2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Sep 18 16:27:50 2011 +0200
+
+ regtest: Do not create checksums for crashed, failed and stderr files
+
+ regtest/backends/__init__.py | 12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+commit 110b8be1d9f2694b42bd12dcb6af02bfca9866dd
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Sep 18 16:26:58 2011 +0200
+
+ Fix memory leak
+
+ poppler/Gfx.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 12c6239ca4f1f6a5de72aebd755f9d1354ea5837
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Sep 18 11:08:06 2011 +0200
+
+ regtest: Fix checksum check for tests containing spaces in filename
+
+ regtest/backends/__init__.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 93ba92db0a3af35f197a4faa5a528af98ea0f624
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 14 00:58:44 2011 +0200
+
+ Make it work with Python3
+
+ regtest/Config.py | 4 ++--
+ regtest/TestReferences.py | 8 ++++----
+ regtest/TestRun.py | 32 ++++++++++++++++----------------
+ regtest/Timer.py | 8 ++++----
+ regtest/backends/__init__.py | 12 ++++++------
+ regtest/commands/__init__.py | 6 +++---
+ regtest/commands/create-refs.py | 2 +-
+ regtest/commands/run-tests.py | 2 +-
+ regtest/main.py | 2 +-
+ 9 files changed, 38 insertions(+), 38 deletions(-)
+
+commit da1b5437148e1e6317246b16f7235c8bc280be97
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Sep 13 20:09:56 2011 +0200
+
+ regtest: Add a way to skip files
+
+ A new command line option --skip has been added to give a file
+ with the
+ list of test to skip. When --skip is not used, it look for a file
+ named
+ Skipped in the tests dir. Lines starting with '#' are considered
+ comments and are ignored.
+
+ regtest/TestReferences.py | 9 +++++++--
+ regtest/TestRun.py | 9 +++++++--
+ regtest/Utils.py | 20 ++++++++++++++++++++
+ regtest/main.py | 6 +++++-
+ 4 files changed, 39 insertions(+), 5 deletions(-)
+
+commit b730b2c1d9666f62f940762663c8318e64049d61
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Sep 13 19:04:04 2011 +0200
+
+ regtest: Limit the number of arguments to 1
+
+ It's easier to run poppler-regtest more than once if you need to run
+ different tests.
+
+ regtest/commands/create-refs.py | 24 ++++++++++++------------
+ regtest/commands/run-tests.py | 26 +++++++++++++-------------
+ regtest/main.py | 2 +-
+ 3 files changed, 26 insertions(+), 26 deletions(-)
+
+commit 5ce045d0358318859c844340c639483485b69c58
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Sep 13 18:18:21 2011 +0200
+
+ regtest: Sort tests before create-refs/run-tests and show progress
+
+ regtest/TestReferences.py | 20 ++++++++------------
+ regtest/TestRun.py | 21 ++++++++++-----------
+ regtest/Utils.py | 35 +++++++++++++++++++++++++++++++++++
+ 3 files changed, 53 insertions(+), 23 deletions(-)
+
+commit 10801b6faee9037af054fe74cc4a03620ea41d45
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Sep 12 20:13:17 2011 +0200
+
+ Add initial poppler regressions test program
+
+ regtest/Config.py | 32 ++++++
+ regtest/TestReferences.py | 73 +++++++++++++
+ regtest/TestRun.py | 156 +++++++++++++++++++++++++++
+ regtest/Timer.py | 73 +++++++++++++
+ regtest/backends/__init__.py | 220
+ +++++++++++++++++++++++++++++++++++++++
+ regtest/backends/cairo.py | 39 +++++++
+ regtest/backends/postscript.py | 35 ++++++
+ regtest/backends/splash.py | 39 +++++++
+ regtest/backends/text.py | 48 +++++++++
+ regtest/commands/__init__.py | 93 ++++++++++++++++
+ regtest/commands/create-refs.py | 65 ++++++++++++
+ regtest/commands/run-tests.py | 69 ++++++++++++
+ regtest/main.py | 77 ++++++++++++++
+ regtest/poppler-regtest | 6 +
+ 14 files changed, 1025 insertions(+), 0 deletions(-)
+
+commit 245e331a14e11a615bf47abbeb34a3561e393b41
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 12 13:43:49 2011 +0200
+
+ 0.17.4
+
+ CMakeLists.txt | 2 +-
+ NEWS | 5 +++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 9 insertions(+), 4 deletions(-)
+
+commit 194b2413eb2c6a1641508aec63336aaf89ec3b51
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 12 13:43:35 2011 +0200
+
+ gir 0.18
+
+ glib/CMakeLists.txt | 12 ++++++------
+ glib/Makefile.am | 12 ++++++------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+commit bf2cb5c9c47b4a61192101f0a48771657228e383
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue Aug 30 19:08:40 2011 +0930
+
+ Fix compile error with libpng >= 1.5.0
+
+ libpng 1.5.0 changed one of the types in the png_set_iCCP() function
+ prototype.
+
+ goo/PNGWriter.cc | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+commit 0ca5453fea9e5342188f772acd6f31af1778f236
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 30 16:20:17 2011 +0200
+
+ Compile when defining USE_FIXEDPOINT
+
+ splash/Splash.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit bd7a53bc2f27fc3979f8de306e2dcaca53d4570a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 30 16:20:08 2011 +0200
+
+ match function definition
+
+ poppler/SplashOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 508517a35cb3bc5195682a9cd89fb50a801eddc2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 29 23:55:42 2011 +0200
+
+ 0.17.3
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 32 ++++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ glib/CMakeLists.txt | 2 +-
+ glib/Makefile.am | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ 10 files changed, 42 insertions(+), 10 deletions(-)
+
+commit 1431564f3363a63a8669c8dd15970db814f4969f
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Mon Aug 29 22:22:02 2011 +0200
+
+ Add pdfextract and pdfmerge
+
+ See "Creating PDF with poppler ?" thread for more info
+
+ utils/CMakeLists.txt | 15 ++++
+ utils/Makefile.am | 10 +++
+ utils/pdfextract.cc | 111 +++++++++++++++++++++++++++++++
+ utils/pdfmerge.cc | 176
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 312 insertions(+), 0 deletions(-)
+
+commit 8ca2f41089bc6402baf9b24428af04314c037b54
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Mon Aug 29 22:20:52 2011 +0200
+
+ Rework writing of PDF files
+
+ Makes it more compatible with other PDF readers
+ See "Creating PDF with poppler ?" thread in the mailing list for
+ more info
+
+ poppler/PDFDoc.cc | 389
+ +++++++++++++++++++++++++++++++++++++++++++++++------
+ poppler/PDFDoc.h | 30 ++++-
+ 2 files changed, 375 insertions(+), 44 deletions(-)
+
+commit 33da7e270431e8e4c500e7573b3ca0dddd9f237e
+Author: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+Date: Sun Aug 28 22:07:38 2011 +0200
+
+ Fix building static-linked pdftocairo
+
+ utils/Makefile.am | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 91fafce028ca6620c0eb22e370fb4c6fd3404e3c
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue Aug 23 21:02:02 2011 +0930
+
+ cairo: align strokes when Stroke Adjust is true and line width <= 1
+
+ If the stroke coordinates are not aligned, lines in cairo may be up to
+ 1 pixel wider than the requested width. This is most obvious when the
+ line width is 1 and the rendered line is 2 pixels.
+
+ When Stroke Adjust is true, the PDF standard requires that stroke
+ coordinates be adjusted to ensure the stroke width is within half a
+ pixel of the requested width.
+
+ If Stroke Adjust is enabled and the width is <= 1 pixel (the previous
+ commit adjusts the width to be at least 1 pixel), use the method
+ documented at http://www.cairographics.org/FAQ/#sharp_lines to align
+ the coordinates to ensure the rendered width is 1 pixel.
+
+ Fixes bug #4536.
+
+ poppler/CairoOutputDev.cc | 40 +++++++++++++++++++++++++++++++++++-----
+ poppler/CairoOutputDev.h | 3 +++
+ 2 files changed, 38 insertions(+), 5 deletions(-)
+
+commit cfc67afe80b963ba662018674cadf3085466bb9f
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue Aug 23 20:46:24 2011 +0930
+
+ cairo: fix stroking of very thin lines
+
+ Lines with a width less than 1.0 are almost invisible in cairo output
+ due to antialising. The PDF standard states that when the Stroke
+ Adjust graphics parameter is true, all lines must be at least one
+ pixel wide.
+
+ Add a stroke_adjust flag to the CairoOuputDev. Like splash, use the
+ globalParam strokeAdjust setting (which defaults to true) to
+ initialize the flag and ignore the Stroke Adjust settng in PDF
+ files. This emulates Acrobat behavior.
+
+ When stroke_adjust is true, find the line width in device pixels and
+ if less than 0.5 set the line width to 0.5 device pixels. The value
+ 0.5 pixels seems to make horizontal and vertical lines look better
+ because integer aligned 1.0 wide lines in cairo are rendered two
+ pixels wide which looks too fat.
+
+ poppler/CairoOutputDev.cc | 20 +++++++++++++++++++-
+ poppler/CairoOutputDev.h | 1 +
+ 2 files changed, 20 insertions(+), 1 deletions(-)
+
+commit 7a7c932e09796b944dda69df1b339c889ee1d63a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Aug 25 00:23:40 2011 +0200
+
+ Add a way to get the fully qualified name
+
+ qt4/src/poppler-form.cc | 12 +++++++++++-
+ qt4/src/poppler-form.h | 8 +++++++-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+commit e001871d927f9cc86b4327d64e4c66ad00172ad0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Aug 24 23:44:18 2011 +0200
+
+ Clarify ownership
+
+ qt4/src/poppler-qt4.h | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 87c48fdc175be4d852b953778f915ea93cd50194
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Wed Aug 24 19:53:48 2011 +0930
+
+ cairo: fix unique id mime data
+
+ The unique id string was copied before the object number was appended
+ resulting in all images in pdf output being the same.
+
+ poppler/CairoOutputDev.cc | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 08a2ba6f1603246651f0d5e697b88d38363d7df2
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Aug 23 20:20:32 2011 +0200
+
+ pdftocairo/cmake: need to link to freetype
+
+ utils/CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 82496b18dc4aff66cc29f2b6607c8f894afe8b49
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 22 16:42:28 2011 +0200
+
+ Update Adrian (C)
+
+ poppler/GfxFont.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 2576e3a6d9746e2272c620a775e11295932eb5f2
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Mon Aug 22 21:41:36 2011 +0930
+
+ update SEE ALSO section of man pages
+
+ - ensure each man page references all other utils
+ - sort list of utils in alphabetical order
+
+ utils/pdffonts.1 | 8 +++++---
+ utils/pdfimages.1 | 8 +++++---
+ utils/pdfinfo.1 | 8 +++++---
+ utils/pdftocairo.1 | 2 +-
+ utils/pdftohtml.1 | 8 ++++++++
+ utils/pdftoppm.1 | 8 +++++---
+ utils/pdftops.1 | 8 +++++---
+ utils/pdftotext.1 | 9 +++++----
+ 8 files changed, 39 insertions(+), 20 deletions(-)
+
+commit 23ec5c8d394beb632ee45f6308215646cd1a0195
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Mon Aug 22 21:26:24 2011 +0930
+
+ cairo: only use show_text_glyphs if the surface supports it and the
+ font has toUnicode
+
+ When generating pdf output, fonts that do not have toUnicode cause an
+ excessive number of empty text ActualText entries to be written due to
+ glyphs that do not have have a mapping.
+
+ poppler/CairoOutputDev.cc | 12 ++++++++----
+ poppler/CairoOutputDev.h | 1 +
+ poppler/GfxFont.h | 3 +++
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+commit 3a574f13fa22b7c31eda0d0437f4094a5a39ff34
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Aug 19 23:23:24 2011 +0930
+
+ cairo: fix stroke patterns
+
+ Since cairo still does not yet have cairo_stroke_to_path(), this
+ implements a workaround for stroke patterns. In clipToStrokePath, the
+ stroke path and stroke parameters are saved. In tilingPatternFill and
+ fill (used to draw shading patterns) if a stroke path clip has been
+ saved, the current pattern is stroked instead of filled using the
+ saved stroke.
+ Fixes bug #11719.
+
+ poppler/CairoOutputDev.cc | 52
+ ++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/CairoOutputDev.h | 17 +++++++++++++-
+ 2 files changed, 66 insertions(+), 3 deletions(-)
+
+commit eb740dac838d2a1e32899327ca6d25c3dca641df
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Aug 22 13:41:56 2011 +0200
+
+ glib-demo: Add text attributes information to text demo
+
+ glib/demo/text.c | 103
+ ++++++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 97 insertions(+), 6 deletions(-)
+
+commit cda4aefaa136ae07778de3b1593808a5aaa2db5b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Aug 22 13:40:49 2011 +0200
+
+ glib-demo: Add pgd_pixbuf_new_for_color() to utils
+
+ To get a pixbuf for a given poppler color.
+
+ glib/demo/annots.c | 22 +---------------------
+ glib/demo/utils.c | 27 +++++++++++++++++++++++++++
+ glib/demo/utils.h | 1 +
+ 3 files changed, 29 insertions(+), 21 deletions(-)
+
+commit 2a11b2963a548186654722a393db1e19d57828f1
+Author: danigm <danigm@wadobo.com>
+Date: Mon Aug 22 12:51:50 2011 +0200
+
+ glib: Add poppler_page_get_text_attributes()
+
+ It returns a list of text attributes that apply to a range of text as
+ returned by poppler_page_get_text(). Text attributes are represented
+ by
+ a PopplerTextAttributes struct that contains font name, font size,
+ whether text is undrlined and foreground color for a range of text.
+ Fixes bug #33269.
+
+ glib/poppler-page.cc | 202
+ +++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h | 33 ++++++
+ glib/poppler.h | 1 +
+ glib/reference/poppler-sections.txt | 7 ++
+ 4 files changed, 243 insertions(+), 0 deletions(-)
+
+commit 15f99157cf3900bf20cf619e204ae53085af497d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Aug 22 12:43:12 2011 +0200
+
+ textoutputdev: Add TextFontInfo::matches()
+
+ It checks whether two TextFontInfo objects contain the same font.
+
+ poppler/TextOutputDev.cc | 4 ++++
+ poppler/TextOutputDev.h | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 5b554b39fca634c8ba58915c14522cb2920fe280
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Aug 22 13:16:23 2011 +0200
+
+ pdftocairo/cmake: link to lcms library if available
+
+ utils/CMakeLists.txt | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit f7cd236fea8740ef05635d1fd7917a778cc373f0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 22 00:00:32 2011 +0200
+
+ Ship HtmlUtils.h
+
+ utils/Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit a128a858c50287cfba74c69996276ea44370dc26
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 21 23:52:06 2011 +0200
+
+ Update Adrian's (C)
+
+ goo/PNGWriter.cc | 2 +-
+ goo/PNGWriter.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b78134314107d8344360c3313478115ed291630d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 21 23:46:09 2011 +0200
+
+ Fix copyright
+
+ c&p is evil
+
+ goo/gtypes_p.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ade53277546cef4ba19d982518c0cd83a4bb9c12
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 21 23:42:53 2011 +0200
+
+ Move HAVE_STDINT_H use to a private header
+
+ This way we do not need to expose it in poppler-config.h since
+ gtypes.h is a half public header
+
+ goo/Makefile.am | 1 +
+ goo/gtypes.h | 18 ------------------
+ goo/gtypes_p.h | 30 ++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.cc | 1 +
+ poppler/CairoRescaleBox.cc | 1 +
+ utils/pdftocairo.cc | 1 +
+ 6 files changed, 34 insertions(+), 18 deletions(-)
+
+commit 6166c3a37a4d6307d4f23ee272ea07c95bbba74a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 21 23:31:30 2011 +0200
+
+ Silence silly gcc
+
+ goo/PNGWriter.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit eb5b228c4c24152e632c931b63c64ffb1e10d45d
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Aug 20 21:13:18 2011 +0930
+
+ pdftocairo: fix writing to stdout for ps/pdf/svg
+
+ utils/pdftocairo.cc | 23 ++++++++++++++++++++---
+ 1 files changed, 20 insertions(+), 3 deletions(-)
+
+commit 1beac5896a301be68de22240017fef11e7d27d40
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Aug 13 00:23:23 2011 +0930
+
+ Add poppler version to PSOutputDev ouput
+
+ poppler/PSOutputDev.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit b35fd3651fd3dbaa876fc64b8c5cfe77ae67335f
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Aug 5 23:01:51 2011 +0930
+
+ cairo: use cairo_show_text_glyphs() when printing
+
+ This will allow cairo to setup the correct toUnicode or glyph names to
+ ensure text can be extracted.
+
+ poppler/CairoOutputDev.cc | 41
+ ++++++++++++++++++++++++++++++++++++++---
+ poppler/CairoOutputDev.h | 5 +++++
+ 2 files changed, 43 insertions(+), 3 deletions(-)
+
+commit 51ade078bc1fa737e20120ae4cb3bf693a219823
+Author: Stefan Thomas <thomas@txtbear.com>
+Date: Thu Jul 15 16:24:55 2010 +0100
+
+ pdftocairo: Added to CMake build system.
+
+ utils/CMakeLists.txt | 20 ++++++++++++++++++++
+ 1 files changed, 20 insertions(+), 0 deletions(-)
+
+commit 5a8745cdf428e22641937977eedfc1d605f6ff07
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Aug 12 23:57:01 2011 +0930
+
+ Add pdftocairo man page
+
+ utils/Makefile.am | 5 +-
+ utils/pdftocairo.1 | 254
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 258 insertions(+), 1 deletions(-)
+
+commit b67a12b2b26692e2ccec7ff2e6df18fee05be535
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu Aug 11 21:34:11 2011 +0930
+
+ pdftocairo - utility for creating png/jpeg/ps/eps/pdf/svg using
+ CairoOutputDev
+
+ utils/.gitignore | 2 +-
+ utils/Makefile.am | 20 +-
+ utils/pdftocairo.cc | 970
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 989 insertions(+), 3 deletions(-)
+
+commit 4f2d774826bf7bb7b3825e02c5ca4c2928643950
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu Aug 11 21:32:53 2011 +0930
+
+ png: add support for embedding ICC profile
+
+ goo/PNGWriter.cc | 28 ++++++++++++++++++++++++++++
+ goo/PNGWriter.h | 8 ++++++++
+ 2 files changed, 36 insertions(+), 0 deletions(-)
+
+commit 1091f47310bf0fc71bac5dd4ec81dad50b2f2537
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Wed Aug 10 18:48:15 2011 +0930
+
+ png: Add additional pixel formats
+
+ RGBA is required for images with transparency. GRAY and MONOCHROME
+ allow PNGWriter write more compact PNG files when the images is known
+ to be all gray or monochrome.
+
+ goo/PNGWriter.cc | 30 ++++++++++++++++++++++++++----
+ goo/PNGWriter.h | 11 ++++++++++-
+ 2 files changed, 36 insertions(+), 5 deletions(-)
+
+commit c6f26915db568f12892d48005746ad2922c19000
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Wed Aug 10 18:45:24 2011 +0930
+
+ png: use PNG_RESOLUTION_METER instead of PNG_RESOLUTION_UNKNOWN to
+ set resolution
+
+ gimp does not show the correct resolution unless PNG_RESOLUTION_METER
+ is used
+
+ goo/PNGWriter.cc | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 2667d2a5b34e1bbf322aea42876e7e81aa06dc29
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue Aug 9 22:05:53 2011 +0930
+
+ Use stdint.h instead of assuming the size of types
+
+ configure.ac | 1 +
+ goo/gtypes.h | 18 ++++++++++++++++++
+ poppler/CairoOutputDev.cc | 2 --
+ poppler/CairoRescaleBox.cc | 2 --
+ 4 files changed, 19 insertions(+), 4 deletions(-)
+
+commit c043f298e68bdfffcb7505ec354ec7487b5bd7b2
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Jul 8 21:13:36 2011 +0930
+
+ cairo: assume printer pixel size is 1/600" when stroking 0 width lines
+
+ Fixes bug #39067.
+
+ poppler/CairoOutputDev.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 961adf0b767be78d3556b7315de3761d3d46b107
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu Aug 18 17:44:35 2011 +0930
+
+ cairo: set mime data for soft masked images
+
+ Fixes bug #40192.
+
+ poppler/CairoOutputDev.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 86271e4810f714d4ba7a2a6651a9b1d04f653262
+Author: Joshua Richardson <jric@chegg.com>
+Date: Thu Aug 18 18:48:40 2011 +0200
+
+ pdftohtml: Support text rotation
+
+ Includes a few other fixlets.
+ See bug 38586 for more info
+
+ utils/HtmlFonts.cc | 64 ++++++++++--------
+ utils/HtmlFonts.h | 10 ++-
+ utils/HtmlOutputDev.cc | 170
+ +++++++++++++++++++++++++++++++++---------------
+ utils/HtmlOutputDev.h | 8 ++-
+ utils/HtmlUtils.h | 51 ++++++++++++++
+ 5 files changed, 218 insertions(+), 85 deletions(-)
+
+commit 56248b84e2185483dd54704c13838e8f78029d49
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Aug 18 12:40:51 2011 +0200
+
+ Only declare overprint if we are going to use it
+
+ utils/pdftoppm.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit a1093aae9f64cb6768164551d50cafaef52876c1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Aug 18 12:30:29 2011 +0200
+
+ Fix Adrian's (C)
+
+ poppler/PSOutputDev.cc | 2 +-
+ poppler/PSOutputDev.h | 3 ++-
+ poppler/PreScanOutputDev.cc | 1 +
+ poppler/PreScanOutputDev.h | 1 +
+ poppler/SplashOutputDev.cc | 1 +
+ poppler/SplashOutputDev.h | 1 +
+ 6 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 7741b24d05f50c134cf15361d52f5df7ae3c3115
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Aug 14 22:06:22 2011 +0930
+
+ ps: Avoid using /PatternType if only one instance of the pattern
+ is used
+
+ this optimization makes pages print faster on my LaserJet
+
+ poppler/PSOutputDev.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit a60e61ac64634dc59c80d8e6b0288c1269fc0154
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Aug 14 21:55:24 2011 +0930
+
+ ps: use PS Patterns for tiling fill when PS level >= 2
+
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h | 4 +-
+ poppler/Gfx.cc | 4 +-
+ poppler/OutputDev.h | 2 +-
+ poppler/PSOutputDev.cc | 59
+ +++++++++++++++++++++++++++++++++++++++---
+ poppler/PSOutputDev.h | 13 ++++++++-
+ poppler/PreScanOutputDev.cc | 2 +-
+ poppler/PreScanOutputDev.h | 2 +-
+ poppler/SplashOutputDev.cc | 2 +-
+ poppler/SplashOutputDev.h | 2 +-
+ 10 files changed, 76 insertions(+), 16 deletions(-)
+
+commit 9938770e737b2fcec8269147e70663517f848925
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 15 13:17:24 2011 +0200
+
+ 0.17.2
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 37 +++++++++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ glib/CMakeLists.txt | 2 +-
+ glib/Makefile.am | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 5 +++--
+ 10 files changed, 49 insertions(+), 11 deletions(-)
+
+commit 378fc06c574b85b5c003ca842aa743f0ffe5587e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 1 22:14:12 2011 +0200
+
+ Only assume the OC is not visible if it exists and is set to no
+
+ Similar to commit e2def20a45c1d8307fd62fabb9769121af975abf
+ but in the other branch of the if, fixes bug 39637
+
+ poppler/OptionalContent.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 861a7bfb9431609e1e148240447f23c8e83b9d0f
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Fri Jul 29 00:30:58 2011 +0200
+
+ Implement overprint in Splash
+
+ See the "Implementing overprint in Splash" thread in the mailing
+ list for more info
+
+ goo/ImgWriter.h | 2 +
+ goo/JpegWriter.cc | 54 +++++++-
+ goo/JpegWriter.h | 7 +-
+ poppler/Gfx.cc | 98 +++++++++++++--
+ poppler/GfxState.cc | 1 +
+ poppler/GfxState.h | 4 +
+ poppler/OutputDev.h | 1 +
+ poppler/SplashOutputDev.cc | 307
+ ++++++++++++++++++++++++++++++++++++++------
+ poppler/SplashOutputDev.h | 51 +++++++-
+ splash/Splash.cc | 86 +++++++++---
+ splash/Splash.h | 9 +-
+ splash/SplashBitmap.cc | 64 +++++++++-
+ splash/SplashBitmap.h | 1 +
+ splash/SplashPattern.cc | 16 ++-
+ splash/SplashPattern.h | 7 +
+ splash/SplashState.cc | 11 ++-
+ splash/SplashState.h | 22 +++
+ splash/SplashTypes.h | 5 +-
+ utils/pdftoppm.cc | 36 +++++-
+ 19 files changed, 686 insertions(+), 96 deletions(-)
+
+commit e2fa8a2ca8459d19c0f9dca445a2399b9a3d483d
+Author: Koji Otani <sho@bbr.jp>
+Date: Thu Jul 28 12:43:57 2011 +0200
+
+ Parse the "Medium" modifier when asking fontconfig for a font
+
+ poppler/GlobalParams.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 0a677dd8dc9c55936530ea1fee901cab831c52af
+Author: Koji Otani <sho@bbr.jp>
+Date: Thu Jul 28 12:42:16 2011 +0200
+
+ Improve selection of CJK fonts
+
+ Seems we need to do some more fontconfig magic for some special
+ fontconfig configurations
+ More info at bug 36474
+
+ poppler/GlobalParams.cc | 137
+ ++++++++++++++++++++++++++++++----------------
+ 1 files changed, 89 insertions(+), 48 deletions(-)
+
+commit e78aff6796a5d5a0a4f2fe8c7ceb33c506e2c8f5
+Author: William Bader <williambader@hotmail.com>
+Date: Tue Jul 26 00:10:34 2011 +0200
+
+ make -level1sep write gray instead of cmyk
+
+ If it is a gray only image
+ Bug 39012
+
+ poppler/PSOutputDev.cc | 63
+ +++++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 60 insertions(+), 3 deletions(-)
+
+commit ea31309487aab6ed407a086dff1f350b6e4bdbc9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 26 00:09:27 2011 +0200
+
+ Update (C)
+
+ poppler/PDFDoc.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a945641497946a825dc880f94200ea1d5409332b
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sat Jul 23 08:44:06 2011 +0200
+
+ Handle missing startxref properly
+
+ Bug 38209
+
+ poppler/PDFDoc.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 2c1b25ef2592367f4c18e204ab5d102f15cf272f
+Author: William Bader <williambader@hotmail.com>
+Date: Mon Jul 25 23:43:27 2011 +0200
+
+ Fix a bad memory access
+
+ When not using antialias and the character starts to the left/top
+ of the image
+ Bug 37189
+
+ splash/Splash.cc | 14 ++++++++++----
+ 1 files changed, 10 insertions(+), 4 deletions(-)
+
+commit 300900afa2140141748a7571270be5d850274072
+Author: Daniel Glöckner <daniel-gl@gmx.net>
+Date: Sat Jul 23 19:49:15 2011 +0200
+
+ Fix numerical overflow in libopenjpeg JPXStream::doLookChar()
+
+ It also includes a speed optimization. Bug 39361
+
+ poppler/JPEG2000Stream.cc | 37 ++++++++++++++++++++++++++++++++++++-
+ poppler/JPEG2000Stream.h | 36 +++++++++++-------------------------
+ 2 files changed, 47 insertions(+), 26 deletions(-)
+
+commit ec6ea621b066a3b332a8099341664889d2ff3743
+Author: Axel Struebing <axel.struebing@freenet.de>
+Date: Thu Jul 21 23:12:36 2011 +0200
+
+ Fix calculation of startXRefPos
+
+ Reviewed by Hib Eris
+ See "another problem with saving linearized files" in the mailing
+ list for more info
+
+ poppler/PDFDoc.cc | 9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+commit ce97cfcd6373c98fb8c63e9b3ef6c51738f22a50
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 20 00:24:52 2011 +0200
+
+ Render dots for 0 length dashed lines
+
+ Bug 34150
+
+ splash/Splash.cc | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit 42c1b1c4af6b07f488d1b2b02a4700f19b0ab0ef
+Author: Tomas Hoger <thoger@redhat.com>
+Date: Wed Jul 20 00:23:15 2011 +0200
+
+ Fix crash on truncated JPEG/DCT stream
+
+ Bug 36693
+
+ poppler/DCTStream.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 091b570c63694e475c24bb8805638ac70c654892
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 20 00:19:43 2011 +0200
+
+ Make sure the dict is a page dict
+
+ Fixes second part of 35925 and 39072
+
+ poppler/PDFDoc.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ac566c887ffae9d384587f7587609642aef7a016
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 20 00:17:49 2011 +0200
+
+ Do not crash if can not get page 0 for some reason
+
+ qt4/tests/test-poppler-qt4.cpp | 7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 6ad95e7b8b9766aa19f01f06f02eb430e4a4a899
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jul 11 15:04:49 2011 +0100
+
+ Complete the list of preprocessor defines that we never define
+
+ When using any of the two sanctioned build systems
+
+ poppler/poppler-config.h.cmake | 6 ++++--
+ poppler/poppler-config.h.in | 6 ++++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+commit edcc84ef0137a733cf3fab79b919af309d87325c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jul 11 15:00:39 2011 +0100
+
+ Harmonize all SPLASH_CMYK to use #if
+
+ poppler/SplashOutputDev.cc | 24 ++++++++++++------------
+ 1 files changed, 12 insertions(+), 12 deletions(-)
+
+commit a8fca630d592941c033ca6a380bf46b6e733a748
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jul 11 14:57:33 2011 +0100
+
+ Sanitize headers a big
+
+ * Remove includes to config.h as that file does not exist
+ * Add to poppler-config.h all the defines we define in the
+ configure/cmake process and are used in headers
+ * Include poppker-config.h where needed
+
+ goo/GooTimer.h | 2 +
+ goo/ImgWriter.h | 3 +-
+ goo/JpegWriter.h | 3 +-
+ goo/PNGWriter.h | 4 +-
+ goo/TiffWriter.h | 3 +-
+ goo/gfile.h | 3 +-
+ poppler/DCTStream.h | 5 +--
+ poppler/FlateStream.h | 5 +--
+ poppler/Gfx.h | 3 +-
+ poppler/GfxState.h | 2 +
+ poppler/Stream.h | 3 +-
+ poppler/poppler-config.h.cmake | 63
+ ++++++++++++++++++++++++++++++++++++++++
+ poppler/poppler-config.h.in | 63
+ ++++++++++++++++++++++++++++++++++++++++
+ splash/SplashFTFont.h | 4 ++-
+ splash/SplashMath.h | 4 ++-
+ 15 files changed, 153 insertions(+), 17 deletions(-)
+
+commit 214322f3c66a9aad4e2a46f6e305a3dacaa4f8b1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 10 01:20:21 2011 +0100
+
+ And 3 years later, Ed has answered :-)
+
+ Now all our changes are GPLv2+
+
+ poppler/GfxFont.cc | 3 +++
+ poppler/GlobalParams.cc | 3 +++
+ poppler/TextOutputDev.cc | 3 +++
+ poppler/TextOutputDev.h | 3 +++
+ poppler/UnicodeTypeTable.cc | 3 +++
+ poppler/UnicodeTypeTable.h | 3 +++
+ 6 files changed, 18 insertions(+), 0 deletions(-)
+
+commit 37cc1344672f480d4062aafbd2f3245ca1392279
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 10 01:15:44 2011 +0100
+
+ Fix header
+
+ The file was modified in 2009 and README.contributors stating
+ everything is GPLv2+ is from 2008
+
+ poppler/XpdfPluginAPI.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 230ab66f52a992557464e325d18f88573ec52423
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 10 01:06:41 2011 +0100
+
+ make files easier to include by themselves
+
+ fofi/FoFiTrueType.h | 2 ++
+ splash/Splash.h | 3 ++-
+ splash/SplashFontEngine.h | 3 ++-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 866c6d1b0daa8b28f259e1faba075026cf9007e0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 10 00:55:25 2011 +0100
+
+ Name most of the classes in poppler/ includable by themselves
+
+ poppler/Annot.h | 4 +++-
+ poppler/Catalog.h | 2 ++
+ poppler/CharCodeToUnicode.h | 4 +++-
+ poppler/CompactFontTables.h | 16 ++++++++++++++++
+ poppler/FontInfo.h | 6 +++++-
+ poppler/GfxState_helpers.h | 4 +++-
+ poppler/NameToUnicodeTable.h | 18 ++++++++++++++++++
+ 7 files changed, 50 insertions(+), 4 deletions(-)
+
+commit 6b62fb7e9bd7de7f79b9b9a6fe36a5f5da099133
+Author: William Bader <williambader@hotmail.com>
+Date: Mon Jun 27 19:38:52 2011 +0100
+
+ Remove unused variable
+
+ poppler/PSOutputDev.cc | 5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+commit 4bc6c5bd3a001bb4eb9f61488e3d4f356638e391
+Author: Adrian Bunk <bunk@stusta.de>
+Date: Tue Jul 5 15:21:06 2011 +0300
+
+ .gitignore tests additions
+
+ The following files were missing in .gitignore:
+ - cpp/tests/poppler-render
+ - qt4/tests/poppler-texts
+ - test/gtk-test
+
+ cpp/tests/.gitignore | 1 +
+ qt4/tests/.gitignore | 1 +
+ test/.gitignore | 1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 00076bc308ae320244c47777fe351c1c2bef2da8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 24 22:51:55 2011 +0100
+
+ Forgot William's (C) here
+
+ poppler/Stream.cc | 1 +
+ poppler/Stream.h | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 7e244fde4ec03da08d81af3402b21646c803bd31
+Author: William Bader <williambader@hotmail.com>
+Date: Fri Jun 24 22:39:13 2011 +0100
+
+ patch to make -level2sep and -level3sep write gray instead of cmyk
+
+ If they are only gray of course :D
+
+ poppler/PSOutputDev.cc | 34 ++++++++++++++++++++++++++++++----
+ poppler/Stream.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
+ poppler/Stream.h | 29 +++++++++++++++++++++++++++++
+ 3 files changed, 102 insertions(+), 4 deletions(-)
+
+commit abba8140a9972197faaca96ec590af7dc9408fb0
+Author: William Bader <williambader@hotmail.com>
+Date: Fri Jun 24 22:38:33 2011 +0100
+
+ patch to make -level2sep and -level3sep write cmyk instead of rgb
+
+ poppler/PSOutputDev.cc | 59
+ +++++++++++++++++++++++++++++++++++++++++++----
+ 1 files changed, 54 insertions(+), 5 deletions(-)
+
+commit 706007431325b1e8c9bf4cba35c89511b10ebf0c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jun 20 23:30:50 2011 +0100
+
+ (C) for Jim
+
+ fofi/FoFiBase.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit e23384fbb3542941d2cf59ce6560913255ca2b01
+Author: Jim Meyering <meyering@redhat.com>
+Date: Mon Jun 20 11:09:01 2011 +0200
+
+ don't gmalloc(-1) upon ftell failure
+
+ * fofi/FoFiBase.cc: Diagnose ftell failure.
+
+ fofi/FoFiBase.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit c5601bde9d8f3f56e558a6f63e563c9d337810eb
+Author: Steven Murdoch <Steven.Murdoch@cl.cam.ac.uk>
+Date: Mon Jun 20 23:25:43 2011 +0100
+
+ Fix encoding of PDF document metadata in output of pdftohtml
+
+ pdftohtml simply copies the PDF document title into the <title> HTML
+ tag, which fails when the title is UCS-2 encoded, or if it contains
+ characters which are in pdfDocEncoding (a ISO 8859-1 superset),
+ but not
+ in ISO 8859-1. This patch fixes the problem by decoding UCS-2 or
+ pdfDocEncoding into Unicode, then encoding this in the desired output
+ encoding. HTML escaping wasn't being done either, so I have used the
+ existing function HtmlFont::HtmlFilter to perform both HTML escaping
+ and character set encoding. This static method had to be made public
+ to call it from pdftohtml. See bug #37900.
+
+ utils/HtmlFonts.h | 3 ++-
+ utils/pdftohtml.cc | 41 ++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 40 insertions(+), 4 deletions(-)
+
+commit d4af1c4ef46abf1f11b7215c7b144ce7bb7912eb
+Author: Joshua Richardson <joshuarbox-junk1@yahoo.com>
+Date: Sat Jun 18 13:39:54 2011 +0100
+
+ Fix vertical spacing issues in pdftohtml output.
+
+ Bug 38019
+
+ utils/HtmlFonts.cc | 3 ++-
+ utils/HtmlOutputDev.cc | 21 +++++++++++++++++++--
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+commit 589933ef105b60e8d48854cce15a7548c2850116
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jun 13 21:24:39 2011 +0100
+
+ Forgot my (C)
+
+ poppler/PreScanOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f5d2ddd13d27078355dee63207671885bf9b0926
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jun 13 18:57:29 2011 +0100
+
+ We need to include config.h here
+
+ Fixes crash after patch to fix bug 13518
+
+ poppler/PreScanOutputDev.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 147ae4bf76a85768c9ed729ca10ee3dae93b8876
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 8 23:36:14 2011 +0100
+
+ Do not crash if link does not have an action
+
+ utils/HtmlOutputDev.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 5d9489bf566b700ef38e5e33665a2648b535e1e7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jun 4 21:46:10 2011 +0100
+
+ forgot to update the C
+
+ utils/pdftotext.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 7b123bf2b11ac81f24a966186a06de739d3c8f02
+Author: Steven Murdoch <Steven.Murdoch@cl.cam.ac.uk>
+Date: Sat Jun 4 20:22:52 2011 +0100
+
+ Fix pdftotext -htmlmeta to correctly output U+2019 in PDF metadata
+
+ In PDF documents, right single quotation mark (U+2019) may be
+ encoded as
+ 0x90 because PDFDocEncoding uses some of the reserved characters in
+ ISO 8859-1. However, pdftotext -htmlmeta assumes that characters
+ are either
+ UCS-2 or ISO 8859-1. Thus when a right single quotation mark is
+ encoded as
+ 0x90, it is output as unicode 0x90 (which is a control
+ character). pdfinfo
+ does the right thing by first converting from PDFDocEncoding to
+ Unicode
+ with pdfDocEncoding[], before encoding it in the desired character
+ set.
+ This patch applies the same logic to pdftotext. pdftohtml is broken
+ in the
+ same way, but this patch does not attempt to fix it.
+
+ Bug 37900
+
+ utils/pdftotext.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit db2ae1bdbb7fcb64ba4c91dfc574d9f970bebdf6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jun 4 13:23:11 2011 +0100
+
+ Make sure catDict is a dict
+
+ poppler/Catalog.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 58915affbdf1b5780f25d172a582c69fb2413230
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jun 4 13:20:02 2011 +0100
+
+ Make sure catDict is a dict before using it
+
+ KDE Bug 274888 shows it's possible to get aborts because of that
+
+ poppler/Catalog.cc | 26 ++++++++++++++++----------
+ 1 files changed, 16 insertions(+), 10 deletions(-)
+
+commit 4ebc7e364409fe303e7a5729b568913e3c92e7d4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jun 4 13:19:34 2011 +0100
+
+ We need to free catDict on failure
+
+ poppler/Catalog.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 335a7fc6d98f5facc1ff098a91ac968387473cb3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue May 31 23:18:26 2011 +0100
+
+ Make parse() private
+
+ poppler/Catalog.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 311d69ef2222409859817737c44b8e741289d897
+Author: Axel Strübing <axel.struebing@freenet.de>
+Date: Sun May 29 16:12:29 2011 +0100
+
+ Needs to be freed
+
+ As i said in my last commit comment :D
+
+ poppler/PDFDoc.cc | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 66c7d0199b45bc7c81c88a9989c9515398d30d43
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 28 17:32:02 2011 +0100
+
+ No need to check for NULL
+
+ We probably need to free obj4 but i don't have the stamina to properly
+ test it
+
+ poppler/PDFDoc.cc | 21 ++++++++++-----------
+ 1 files changed, 10 insertions(+), 11 deletions(-)
+
+commit 450934619a1c5b2a58f65649f567274af8d24ea7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 28 12:37:08 2011 +0100
+
+ Parse that as unicode
+
+ Fixes KDE Bug #274055
+
+ qt4/src/poppler-page.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 04dfb2c984b3c9949466e2b70e26b58029c5a7d3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat May 7 12:55:34 2011 +0200
+
+ Make FileSpec a class and move EmbFile from Catalog to FileSpec
+
+ Qt and cpp frontends adapted by Pino Toscano
+
+ cpp/poppler-document.cpp | 4 +-
+ cpp/poppler-embedded-file-private.h | 10 +-
+ cpp/poppler-embedded-file.cpp | 42 +++++++----
+ glib/poppler-annot.cc | 6 +-
+ glib/poppler-attachment.cc | 33 +++++----
+ glib/poppler-document.cc | 5 +-
+ glib/poppler-private.h | 3 +-
+ poppler/Catalog.cc | 118
+ ++---------------------------
+ poppler/Catalog.h | 55 +-------------
+ poppler/FileSpec.cc | 128
+ ++++++++++++++++++++++++++++++++
+ poppler/FileSpec.h | 51 ++++++++++++-
+ qt4/src/poppler-embeddedfile-private.h | 6 +-
+ qt4/src/poppler-embeddedfile.cc | 34 +++++---
+ qt4/src/poppler-page.cc | 5 +-
+ qt4/src/poppler-private.h | 4 +-
+ qt4/tests/check_attachments.cpp | 12 ++--
+ 16 files changed, 284 insertions(+), 232 deletions(-)
+
+commit 74f9befddd4b5848c4af0c1b2848a1322f8cd0a2
+Author: Pino Toscano <pino@kde.org>
+Date: Wed May 25 16:46:15 2011 +0200
+
+ [qt4] Page needs to be a friend of EmbeddedFile, too
+
+ qt4/src/poppler-qt4.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 74853614d617486b7b62e9c08be39a6e58bc7d9b
+Author: Pino Toscano <pino@kde.org>
+Date: Wed May 25 16:40:49 2011 +0200
+
+ update copyrights
+
+ qt4/src/poppler-embeddedfile-private.h | 2 +-
+ qt4/src/poppler-embeddedfile.cc | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit e6b2dec502c02f9fbaed480f227cf7145249a98e
+Author: Pino Toscano <pino@kde.org>
+Date: Wed May 25 16:39:09 2011 +0200
+
+ [qt4] one more usage of the new EmbeddedFile ctor
+
+ followup of a264e5385b2d0fee5126b3d0e57d42d34cafa45d
+
+ qt4/src/poppler-page.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a264e5385b2d0fee5126b3d0e57d42d34cafa45d
+Author: Pino Toscano <pino@kde.org>
+Date: Wed May 25 16:12:02 2011 +0200
+
+ [qt4] create EmbeddedFile by EmbeddedFileData only
+
+ - create the private class and pass it to the EmbeddedFile ctor,
+ reducing the amount of poppler code API exposed to the outside
+ - turn the old private EmbeddedFile(EmbFile*) ctor in a death machine
+
+ qt4/src/poppler-embeddedfile-private.h | 3 +++
+ qt4/src/poppler-embeddedfile.cc | 21 ++++++++++++++++++---
+ qt4/src/poppler-private.h | 3 ++-
+ qt4/src/poppler-qt4.h | 2 ++
+ 4 files changed, 25 insertions(+), 4 deletions(-)
+
+commit 232bfa1c59013637fd7e858e22194becb636ad21
+Author: Pino Toscano <pino@kde.org>
+Date: Wed May 25 15:55:48 2011 +0200
+
+ [Qt4] split EmbeddedFileData in an own file
+
+ qt4/src/poppler-embeddedfile-private.h | 37
+ ++++++++++++++++++++++++++++++++
+ qt4/src/poppler-embeddedfile.cc | 7 +-----
+ 2 files changed, 38 insertions(+), 6 deletions(-)
+
+commit a7242b78b3c9a64cf38ac150e6a914d7abce3355
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 7 11:10:11 2011 +0100
+
+ Do not free a shallow copy of an object we'll free later
+
+ Make sure we have our own copy we can free
+ Fixes KDE BUG #268816
+ (cherry picked from commit dab9cdf795d6caead555326958e86e844ace067b)
+
+ poppler/Catalog.cc | 12 +++++-------
+ poppler/Catalog.h | 2 +-
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+commit 4db2452b3d345d9531987998e6b5532a59137e1d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 6 14:57:51 2011 +0200
+
+ glib: Add poppler_document_get_n_attachments()
+
+ glib/poppler-document.cc | 34
+ ++++++++++++++++++++++++----------
+ glib/poppler-document.h | 1 +
+ glib/reference/poppler-sections.txt | 1 +
+ 3 files changed, 26 insertions(+), 10 deletions(-)
+
+commit 3e3284de3fe1916d7f8161ede7bf49c76d01f303
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 6 14:49:05 2011 +0200
+
+ glib: Update gtk-doc.make
+
+ gtk-doc.make | 151
+ +++++++++++++++++++++++++++++++++++++--------------------
+ 1 files changed, 98 insertions(+), 53 deletions(-)
+
+commit 9a77bd7706a08d9aeabe600e3500c14493ac8519
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 6 14:48:38 2011 +0200
+
+ glib-demo: Add missing permission flags to info demo
+
+ glib/demo/info.cc | 39 ++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 36 insertions(+), 3 deletions(-)
+
+commit 091c155f8a7bc79da84cd21877be389de1f2b1a3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 6 14:47:36 2011 +0200
+
+ glib: Add missing permissions flags to PopplerPermissions
+
+ glib/poppler-document.cc | 6 ++++++
+ glib/poppler-document.h | 10 +++++++++-
+ 2 files changed, 15 insertions(+), 1 deletions(-)
+
+commit 632d6a40ce3a5d3d8e10bf7e93e8eb578beae907
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue May 3 21:54:59 2011 +0100
+
+ 0.17.1
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 12 ++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 6 files changed, 18 insertions(+), 6 deletions(-)
+
+commit ecb136b9927a454df9360a307ccd741eaea3ca93
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue May 3 21:42:45 2011 +0100
+
+ remove unused vars
+
+ poppler/Annot.cc | 9 ++-------
+ poppler/ArthurOutputDev.cc | 12 ++----------
+ 2 files changed, 4 insertions(+), 17 deletions(-)
+
+commit ad131763640b2e27dde75c42b514386284b6a60d
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Apr 27 22:36:13 2011 +0200
+
+ [qt4/tests] turn some assignments to bool into QVERIFY checks
+
+ qt4/tests/check_optcontent.cpp | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit be08dd69d9dd4fcb22400f2f0aea331222e88e4a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 27 20:45:36 2011 +0100
+
+ update copyright years
+ (cherry picked from commit 2fbd493197309de5700f71f09967c9d23add88d3)
+
+ poppler/Annot.cc | 1 +
+ utils/pdftotext.cc | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 39bcce0c8ed378aafb1019ffd1ae40330f6bb63f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 27 19:39:01 2011 +0100
+
+ Remove more variables that are set but then unused
+
+ poppler/SplashOutputDev.cc | 11 +------
+ utils/HtmlOutputDev.cc | 75
+ +-------------------------------------------
+ 2 files changed, 2 insertions(+), 84 deletions(-)
+
+commit 6656cf657b62d626910a02dfae9b6a1eb77772dd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 27 08:46:37 2011 +0100
+
+ Remove unused vars
+
+ poppler/TextOutputDev.cc | 6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+commit ce55510f4dd10dfec2fc5b1c211c4a546c6ebc98
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 27 08:42:34 2011 +0100
+
+ Remove unused vars
+
+ splash/Splash.cc | 5 ++---
+ splash/SplashFTFontEngine.cc | 4 +---
+ splash/SplashXPath.cc | 6 ++----
+ 3 files changed, 5 insertions(+), 10 deletions(-)
+
+commit 49d199fd1ea14383638739d95d019adb33b17768
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 27 08:38:17 2011 +0100
+
+ Fix page_transition::operator=
+
+ cpp/poppler-page-transition.cpp | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 807c1df2bf79c7c6378390b41dc230d80533ae3f
+Author: Tom Gleason <tom@buildadam.com>
+Date: Tue Apr 26 17:06:07 2011 +0100
+
+ bbox coordinates are relative to MediaBox size, not CropBox size
+
+ utils/pdftotext.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 813f41367a681702ae7a155d5c2f3195124a9096
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Apr 3 20:40:15 2011 +0200
+
+ forms: fix mem leak in case of error
+
+ poppler/Form.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 722baf8baf42e2c7a49e1560aae5235677d1ddee
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Apr 3 20:17:57 2011 +0200
+
+ forms: check form field is actually terminal before creating the
+ widget
+
+ poppler/Form.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 5f6f7fc569d1c891956a3c37b3e328504635ab33
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Apr 3 15:06:45 2011 +0100
+
+ Properly initialize pageObjectNum to 0
+
+ Bug 35925
+
+ poppler/Hints.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit d6786edc2549164214342a50782b72c2fd904b63
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Apr 3 13:11:18 2011 +0200
+
+ forms: Remove unused parameter
+
+ poppler/Form.cc | 2 +-
+ poppler/Form.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 62692ff381f3b7907b330bfc2019416ed058ea46
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Apr 3 13:01:42 2011 +0200
+
+ forms: rework the way form fields tree is built
+
+ Now we build the tree as described by the doc, without ignoring
+ container fields and always creating a child widget for composed
+ (field
+ + annot) dictionaries. The way check and radio buttons are set
+ has been
+ reworked too, since now it's possible to have a set of buttons where
+ children are not widgets, but form fields with a child widget.
+
+ poppler/Annot.cc | 4 +-
+ poppler/Form.cc | 237
+ +++++++++++++++++++++++++++++-------------------------
+ poppler/Form.h | 17 +++--
+ 3 files changed, 137 insertions(+), 121 deletions(-)
+
+commit a6802301d9c3ab8bf68bd8821f562f8ecced8491
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 28 17:42:37 2011 +0200
+
+ forms: Add debug methods to print the forms tree
+
+ poppler/Form.cc | 78
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Form.h | 25 +++++++++++++++++
+ 2 files changed, 103 insertions(+), 0 deletions(-)
+
+commit 46f87da04700cdd1afa634f9c554e376f6f6f752
+Author: José Aliste <jaliste@src.gnome.org>
+Date: Thu Mar 31 08:09:41 2011 -0400
+
+ Fix a memleak in AnnotScreen::initialize
+
+ poppler/Annot.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit b64178eaa5dd01f914649d6faa870fa140ddaf9b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 30 15:17:54 2011 +0200
+
+ glib: docs: Add PopplerActionJavascript to poppler-sections.txt
+
+ glib/reference/poppler-sections.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 3d777181ddee8f7ab2cc9e4684879cb5b52b065c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 30 15:16:04 2011 +0200
+
+ glib: Use Javascript instead of JavaScript for consistency
+
+ glib/poppler-action.h | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit c4774fecfe3d523f32d5980f50e31daa798c9692
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 30 15:08:59 2011 +0200
+
+ glib-demo: show javascript actions in actions view
+
+ glib/demo/utils.c | 25 +++++++++++++++++++++++++
+ 1 files changed, 25 insertions(+), 0 deletions(-)
+
+commit 68bbbe1a3f68d242b35027ae41f5751b02a2a700
+Author: José Aliste <jaliste@src.gnome.org>
+Date: Tue Mar 29 04:56:37 2011 -0400
+
+ glib: add JavaScript actions
+
+ glib/poppler-action.cc | 24 ++++++++++++++++++++++++
+ glib/poppler-action.h | 14 +++++++++++++-
+ 2 files changed, 37 insertions(+), 1 deletions(-)
+
+commit 3dd934088a06f246718382601030c9b093d04160
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 30 00:03:58 2011 +0100
+
+ Need to create the globalParams
+
+ qt4/tests/check_optcontent.cpp | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit ce0d4278a32b3ba19c2002ed0c481c58b1854d59
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 29 23:47:33 2011 +0100
+
+ Long gone
+
+ Makefile.am | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 12337026533aa59bb66022ce8a119f37aafd4fad
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 29 23:40:57 2011 +0100
+
+ increase sonames
+
+ CMakeLists.txt | 2 +-
+ glib/CMakeLists.txt | 2 +-
+ glib/Makefile.am | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+commit a6e613b01698c6b38deff5248fcf7c0b17d041c3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 29 23:40:38 2011 +0100
+
+ more typos
+
+ NEWS | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit e3ee037ede67212836be158b935deb7ea974b7f7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 29 23:38:24 2011 +0100
+
+ typo
+
+ NEWS | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 8bcd94964f0af17a3f5b6edf71127df3daa00b1a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 29 23:30:30 2011 +0100
+
+ typo
+
+ NEWS | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a05b9dacbe5dbd4337fdbb3e7d7d364ad5fbaeab
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 29 23:28:49 2011 +0100
+
+ 0.17.0 version number
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 4637b737b4735c70017b46a3ed6c0ee069c02c9b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 29 23:28:41 2011 +0100
+
+ 0.17.0 news
+
+ NEWS | 108
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 108 insertions(+), 0 deletions(-)
+
+commit a55cc5d9c67ede1d96f6e5a58179ddd9f563c53f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 29 22:51:40 2011 +0100
+
+ Update years
+
+ poppler/Catalog.cc | 2 +-
+ poppler/Catalog.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d96efb6c1af621be78e998ba1a228022c3c076fc
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 29 11:13:03 2011 +0200
+
+ fix comment
+
+ poppler/ViewerPreferences.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 74ec81d66d4d5bc45cccc4aa8794df1c517f2d74
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 29 11:07:36 2011 +0200
+
+ viewer preferences: read PrintScaling and Duplex
+
+ poppler/ViewerPreferences.cc | 24 ++++++++++++++++++++++++
+ poppler/ViewerPreferences.h | 14 ++++++++++++++
+ 2 files changed, 38 insertions(+), 0 deletions(-)
+
+commit b41bcd484dd7a93a339270926c57caa524059d8f
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 29 10:58:46 2011 +0200
+
+ free the viewerPreferences Object
+
+ poppler/Catalog.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 1dd88d0b6b7cbfda76e81902a351c89457a061a8
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 29 09:58:10 2011 +0200
+
+ read the ViewerPreferences dict once, and construct ViewerPreferences
+ on demand
+
+ this way it is possible to know whether the ViewerPreferences
+ dictionary is present in the Catalog
+
+ poppler/Catalog.cc | 24 +++++++++---------------
+ poppler/Catalog.h | 3 ++-
+ 2 files changed, 11 insertions(+), 16 deletions(-)
+
+commit f10b0b8c88a7df83ada09f32b6cb6fd930fcb748
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 29 09:57:46 2011 +0200
+
+ assume the prefDict is not null
+
+ poppler/ViewerPreferences.cc | 4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+commit d4a5ea45057cad531a8979cf9861ac05cdd56613
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 29 09:54:22 2011 +0200
+
+ fix variable name for DisplayDocTitle
+
+ poppler/ViewerPreferences.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit cf84a05ae524aa9b266463cc23cccc3860ff1ba3
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 28 23:18:02 2011 +0200
+
+ viewer preferences: read NonFullScreenPageMode and Direction
+
+ poppler/ViewerPreferences.cc | 26 ++++++++++++++++++++++++++
+ poppler/ViewerPreferences.h | 15 +++++++++++++++
+ 2 files changed, 41 insertions(+), 0 deletions(-)
+
+commit 460253a6705a227ff7c36e9c31cceb93cce4d78b
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 28 22:37:54 2011 +0200
+
+ read some boolean viewer preferences
+
+ - HideToolbar
+ - HideMenubar
+ - HideWindowUI
+ - FitWindow
+ - CenterWindow
+ - DisplayDocTitle
+
+ poppler/ViewerPreferences.cc | 41
+ +++++++++++++++++++++++++++++++++++++++++
+ poppler/ViewerPreferences.h | 13 +++++++++++++
+ 2 files changed, 54 insertions(+), 0 deletions(-)
+
+commit 9fa9ac3546674120532bb512b82af6471cbebf01
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 28 19:58:16 2011 +0200
+
+ add skeleton for ViewerPreferences
+
+ a small class for handling the ViewerPreferences dictionary of
+ a Catalog,
+ created on demand and in any occasion (so defaults are in one
+ place only)
+
+ CMakeLists.txt | 2 ++
+ poppler/Catalog.cc | 23 +++++++++++++++++++++++
+ poppler/Catalog.h | 4 ++++
+ poppler/Makefile.am | 2 ++
+ poppler/ViewerPreferences.cc | 30 ++++++++++++++++++++++++++++++
+ poppler/ViewerPreferences.h | 34 ++++++++++++++++++++++++++++++++++
+ 6 files changed, 95 insertions(+), 0 deletions(-)
+
+commit c6081f0bf00d7dcdfa1d09e91e4c9a1fe5a54ad6
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 28 19:55:00 2011 +0200
+
+ delete the temporary buffers created by pdfDocEncodingToUTF16()
+
+ poppler/Form.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit d94d5056d5570e2f5cb578736eba12317ea63fa4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 28 18:20:31 2011 +0200
+
+ glib-demo: show the activation action of form fields if there's one
+
+ glib/demo/forms.c | 21 ++++++++++++++++-----
+ 1 files changed, 16 insertions(+), 5 deletions(-)
+
+commit ba0f36b76d0c2fd4ef39f3013fc125a53747c03f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 28 18:17:52 2011 +0200
+
+ glib: Add poppler_form_field_get_action()
+
+ Fixes bug #33174.
+
+ glib/poppler-form-field.cc | 34
+ ++++++++++++++++++++++++++++++++++
+ glib/poppler-form-field.h | 1 +
+ glib/poppler-private.h | 1 +
+ glib/reference/poppler-sections.txt | 1 +
+ 4 files changed, 37 insertions(+), 0 deletions(-)
+
+commit ae5b9cf884ce38dde409c3e5b0f6c46f7d6327d2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 28 17:43:53 2011 +0200
+
+ Revert "Patch for embedding videos in to the pdf"
+
+ This reverts commit 66575c990f379871e4b796befc899de178332670.
+
+ It introduces new API to glib frontend that is wrong and will be
+ changed soon.
+
+ glib/poppler-annot.cc | 33 -----
+ glib/poppler-annot.h | 5 -
+ poppler/Annot.cc | 377
+ -------------------------------------------------
+ poppler/Annot.h | 2 -
+ 4 files changed, 0 insertions(+), 417 deletions(-)
+
+commit b7edd4c93539585652961ecf2db9c4462415c8bc
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 27 12:31:19 2011 +0200
+
+ annot: Always create appearance streams when NeedAppearances is true
+
+ Fixes regression in document example_054.pdf
+
+ poppler/Annot.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit e9350899e77c28452c48b56349ad7758b3fd47ba
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 24 20:09:18 2011 +0000
+
+ Introduce splash-friendly getRGBLine functions
+
+ So it does not need to pack and unpack the color again and again
+
+ poppler/GfxState.cc | 248
+ +++++++++++++++++++++++++++++++++++++++++--
+ poppler/GfxState.h | 22 +++-
+ poppler/SplashOutputDev.cc | 43 ++------
+ 3 files changed, 265 insertions(+), 48 deletions(-)
+
+commit 7b08795a9541e9fa01836b4c7fd63f6fe295ad80
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 24 12:16:07 2011 +0100
+
+ glib: Add g_return macros to make sure index is correct in form
+ field choice methods
+
+ glib/poppler-form-field.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit f1102fccd2899bc7f97414b1e2a295c59f03da22
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 24 12:15:30 2011 +0100
+
+ glib-demo: Fix a crash when a choice form field has no items selected
+
+ glib/demo/forms.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b3971ee6bca6b14b75f046c831a31ac1e5e3241e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 22 22:08:27 2011 +0000
+
+ kill this TODO, n is too small
+
+ poppler/SplashOutputDev.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 1064d75817401fe24f728c189b450e9e906beb56
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 22 20:43:05 2011 +0000
+
+ kill unmaintained abiword backend
+
+ CMakeLists.txt | 16 -
+ configure.ac | 16 -
+ poppler/ABWOutputDev.cc | 1179
+ -----------------------------------------------
+ poppler/ABWOutputDev.h | 141 ------
+ poppler/Makefile.am | 17 -
+ utils/CMakeLists.txt | 10 -
+ utils/Makefile.am | 18 +-
+ utils/pdftoabw.cc | 201 --------
+ 8 files changed, 2 insertions(+), 1596 deletions(-)
+
+commit abf167af8b15e5f3b510275ce619e6fdb42edd40
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Mon Mar 21 21:34:46 2011 +0000
+
+ Implement tiling/patterns in SplashOutputDev
+
+ Fixes bug 13518
+
+ poppler/CairoOutputDev.cc | 5 +-
+ poppler/CairoOutputDev.h | 10 +-
+ poppler/Gfx.cc | 6 +-
+ poppler/OutputDev.h | 6 +-
+ poppler/PSOutputDev.cc | 8 +-
+ poppler/PSOutputDev.h | 6 +-
+ poppler/PreScanOutputDev.cc | 22 ++++-
+ poppler/PreScanOutputDev.h | 16 +++-
+ poppler/SplashOutputDev.cc | 265
+ +++++++++++++++++++++++++++++++++++++++++++
+ poppler/SplashOutputDev.h | 12 ++
+ 10 files changed, 334 insertions(+), 22 deletions(-)
+
+commit 66575c990f379871e4b796befc899de178332670
+Author: Srinivas Adicherla <srinivas.adicherla@gmail.com>
+Date: Thu Mar 17 20:14:05 2011 +0000
+
+ Patch for embedding videos in to the pdf
+
+ glib/poppler-annot.cc | 33 +++++
+ glib/poppler-annot.h | 5 +
+ poppler/Annot.cc | 377
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 2 +
+ 4 files changed, 417 insertions(+), 0 deletions(-)
+
+commit ec1917968d2f1c7a00772a0829b3fcc6957d8f3c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Mar 14 00:13:26 2011 +0000
+
+ Only build gtk-test if we have to build gtk-test
+
+ test/Makefile.am | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 1acbb01e72a22f70f00dc058ff206e3bc05bc0ab
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 13 14:49:48 2011 +0000
+
+ (C) years
+
+ poppler/CachedFile.cc | 2 +-
+ poppler/CurlCachedFile.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit bc8aeb269aa92406081f749064ceff75bb3145e7
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sat Mar 12 23:17:59 2011 +0100
+
+ Check response code of libcurl call
+
+ poppler/CachedFile.cc | 8 +++++++-
+ poppler/CurlCachedFile.cc | 12 +++++++++---
+ 2 files changed, 16 insertions(+), 4 deletions(-)
+
+commit 0268cedee5b460835a4747d0ea41bbe12269310d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Mar 12 15:24:30 2011 +0100
+
+ cairo: Fix typo
+
+ poppler/CairoFontEngine.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5aa369e68e5c9f14efc888c7b26da06aa8bd2a78
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 12 13:47:34 2011 +0000
+
+ Remove unused variable
+
+ poppler/CurlCachedFile.cc | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit c0dffbe28f91b30b36310ab0b9a9b948610550ae
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 12 12:15:58 2011 +0100
+
+ update copyright years
+
+ cpp/poppler-document-private.h | 2 +-
+ cpp/poppler-document.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b8fab173ffdd1e62a34b530228d08bc5ec6725ac
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 12 12:13:05 2011 +0100
+
+ [cpp] init the globalParams early in the document loading
+
+ introduce a small RAII class to init/deinit the globalParams, and
+ make document_private inherit from it
+
+ cpp/poppler-document-private.h | 17 ++++++++----
+ cpp/poppler-document.cpp | 52
+ +++++++++++++++++++++------------------
+ 2 files changed, 39 insertions(+), 30 deletions(-)
+
+commit a97a54cb22def2a9fc381fb81842dad9e5c3931f
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 12 12:12:11 2011 +0100
+
+ forms: delete tmp_str after being converted to GooString
+
+ poppler/Form.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 9671fe07f8c9ade956742cb141b99518c3b12bad
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Mar 11 00:05:52 2011 +0000
+
+ getForm can return NULL, do not crash if that happens
+
+ poppler/Annot.cc | 10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+commit bd32672899f5ca4509ec9311de8092d14bec8ab1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 10 23:33:15 2011 +0000
+
+ update copyright years
+
+ poppler/Catalog.cc | 2 +-
+ qt4/src/poppler-form.cc | 1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 841f3bbca37015ec2c58d7b85a73cef5681294f8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 10 23:30:51 2011 +0000
+
+ Do not infinite loop
+
+ poppler/Form.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f2fcafdc2b982d9bbed3c01bc7d45c8bd0603f19
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 10 23:27:41 2011 +0000
+
+ Create the globalParams before the pdfdoc
+
+ qt4/src/poppler-private.cc | 5 +----
+ qt4/src/poppler-private.h | 12 ++++++++----
+ 2 files changed, 9 insertions(+), 8 deletions(-)
+
+commit f956b03604b195623ab034a06942a39547adf905
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 10 00:01:18 2011 +0000
+
+ compile
+
+ qt4/src/poppler-form.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f0ec3bedc5490aa35e54563019fcf2c3f8b7647d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 9 20:54:15 2011 +0100
+
+ forms: Remove unused method FormWidget::updateField()
+
+ poppler/Form.cc | 22 ----------------------
+ poppler/Form.h | 2 --
+ 2 files changed, 0 insertions(+), 24 deletions(-)
+
+commit 93c25e100ae2564b9a866b95bed16d2fac619bd7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 9 20:49:32 2011 +0100
+
+ forms: Rename FormField::createActivationAction() to
+ FormField::getActivationAction()
+
+ And use the existing action from the AnnotWidget instead of creating a
+ new one.
+
+ poppler/Form.cc | 11 ++---------
+ poppler/Form.h | 2 +-
+ qt4/src/poppler-form.cc | 3 +--
+ 3 files changed, 4 insertions(+), 12 deletions(-)
+
+commit 59fb0489bfabfd8acccafdcd0361ce005664962a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 9 20:19:24 2011 +0100
+
+ annots: Check whether we need to create an appearance stream in
+ AnnotWidget::draw()
+
+ And never modify the AP entry since it breaks check and radio buttons
+ that doesn't have an appearance for the Off state.
+
+ poppler/Annot.cc | 79
+ +++++++++---------------------------------------------
+ poppler/Annot.h | 1 -
+ 2 files changed, 13 insertions(+), 67 deletions(-)
+
+commit f3b00ef51ceef6d9b7a1aa7e0f19249abf8ca6f3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 9 18:19:12 2011 +0100
+
+ annots: Add Annot::setAppearanceState() and use it from FormWidget
+
+ This method not only updates the current appearance state, but
+ also the
+ appearance stream corresponding to the new state.
+
+ poppler/Annot.cc | 43 ++++++++++++++++++++++++++++++++++++-------
+ poppler/Annot.h | 2 ++
+ poppler/Form.cc | 7 +++----
+ 3 files changed, 41 insertions(+), 11 deletions(-)
+
+commit d59561212253302d4dcb23392bb8306b8e5c68d1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 9 17:35:28 2011 +0100
+
+ forms: Make FormWidget use a real widget annotation instead of
+ duplicating code
+
+ When creating annotations, if it's a widget annotation, look first
+ whether it has already been created by a FormWidget and reuse
+ it instead
+ of duplicating it.
+
+ poppler/Annot.cc | 42 +++++++++++++--------
+ poppler/Annot.h | 2 +-
+ poppler/Catalog.cc | 2 +-
+ poppler/Form.cc | 107
+ ++++++++++++++++++++++++---------------------------
+ poppler/Form.h | 23 +++++------
+ 5 files changed, 89 insertions(+), 87 deletions(-)
+
+commit 2dd7e1ba09d4501adf9d10ab4cb8ee003cace74a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 9 10:25:00 2011 +0100
+
+ forms: Move modified flag from FormWidget to FormField
+
+ poppler/Form.cc | 16 ++++++++--------
+ poppler/Form.h | 6 ++++--
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+commit b04f03be7e43e309af5f164ef71788e7b8915841
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 9 10:17:57 2011 +0100
+
+ forms: Move field names handling from FormWidget to FormField
+
+ poppler/Form.cc | 149
+ ++++++++++++++++++++++++++++++-------------------------
+ poppler/Form.h | 20 +++++---
+ 2 files changed, 95 insertions(+), 74 deletions(-)
+
+commit abe1e0d5a37bcdb4376901306d3adccfb33ff3b4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Mar 8 21:39:00 2011 +0100
+
+ annots: Make sure no border is drawn for invalid border arrays
+
+ Fixes regression on ClassSchedule_2091_ENGL.pdf
+
+ poppler/Annot.cc | 8 ++++++--
+ poppler/Annot.h | 2 +-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 14d145371e86ccb92f09b1ca750ced52171b2885
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Mar 8 20:14:57 2011 +0100
+
+ forms: Remove loadDefaults method
+
+ Moving the code to initialize form field stuff to form field
+ constructors and widget stuff to form widget constructors. Clean up an
+ simplify the code.
+
+ poppler/Form.cc | 227
+ +++++++++++++++++++++----------------------------------
+ poppler/Form.h | 21 +----
+ 2 files changed, 91 insertions(+), 157 deletions(-)
+
+commit 0585d7820455c93fe5b732b7a9a20d423df47075
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Mar 8 15:36:45 2011 +0100
+
+ forms: Handle field values (V entry) by field objects
+
+ Rather than AnnotWidget or FormWidget, and use the form field object
+ from AnnotWidget to get the values.
+
+ poppler/Annot.cc | 52 ++++----
+ poppler/Form.cc | 400
+ ++++++++++++++++++++++++++----------------------------
+ poppler/Form.h | 21 ++--
+ 3 files changed, 230 insertions(+), 243 deletions(-)
+
+commit dc100eb9080fb58164fc94c86bfb1728cecd21c3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 7 20:14:27 2011 +0100
+
+ annots: Use the field object to get MaxLen instead of parsing the
+ field dict
+
+ poppler/Annot.cc | 10 ++++------
+ 1 files changed, 4 insertions(+), 6 deletions(-)
+
+commit 7149634f184dc3f07f2a70c296aac207ef24952c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 7 19:55:45 2011 +0100
+
+ forms: Parse the default resources dictionary in Form
+
+ And use it in AnnotWidget instead of parsing the dictionary again.
+
+ poppler/Annot.cc | 65
+ ++++++++++++++++++++---------------------------------
+ poppler/Annot.h | 12 +++++-----
+ poppler/Form.cc | 16 +++++++++++++
+ poppler/Form.h | 5 ++++
+ 4 files changed, 52 insertions(+), 46 deletions(-)
+
+commit 2e73f17975811177c0b3c16b8bd97c7eb912bc44
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 7 18:41:48 2011 +0100
+
+ forms: Parse field variable text entries (DA, Q) in FormField()
+
+ And use them from AnnotWidget instead of parsing the field dictionary
+ again.
+
+ poppler/Annot.cc | 28 +++++-----------------------
+ poppler/Form.cc | 17 +++++++++++++++++
+ poppler/Form.h | 9 +++++++++
+ 3 files changed, 31 insertions(+), 23 deletions(-)
+
+commit 8677a34911563a712b2dcf0b6e411cee0bad9c44
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 7 18:24:07 2011 +0100
+
+ forms: Parse default variable text entries (DA, Q) on Form
+ construction
+
+ And use them from AnnotWidget instead of parsing the acroForm
+ dictionary
+ again.
+
+ poppler/Annot.cc | 99
+ +++++++++++++++++++++++++----------------------------
+ poppler/Form.cc | 11 ++++++
+ poppler/Form.h | 12 ++++++
+ 3 files changed, 70 insertions(+), 52 deletions(-)
+
+commit 41420bfd88685d9b1ac44dc7444ea3abee92097c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 7 09:18:25 2011 +0100
+
+ annots: Only parse the dash array for dashed borders
+
+ poppler/Annot.cc | 16 +++++++++-------
+ 1 files changed, 9 insertions(+), 7 deletions(-)
+
+commit c198a3f83d8508ddaf84564871d9202ffba8096c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 6 17:52:01 2011 +0100
+
+ annots: Use the field object to get the top index of a form field
+ choice
+
+ Instead of parsing the field dictionary again.
+
+ poppler/Annot.cc | 14 ++------------
+ poppler/Annot.h | 1 -
+ 2 files changed, 2 insertions(+), 13 deletions(-)
+
+commit 5cf803ec181dbf1112f67b4f4a9c77b88d102e3b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 6 17:47:18 2011 +0100
+
+ forms: Add FormFieldChoice::getTopIndex()
+
+ poppler/Form.cc | 5 +++++
+ poppler/Form.h | 5 ++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 1248f59e2045749ece1f5a5e579b866b8330a752
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 6 17:41:33 2011 +0100
+
+ annots: Draw widget background using the existing appearance
+ characteristics
+
+ Instead of parsing the appearance characteristics dictionary again
+
+ poppler/Annot.cc | 23 +++++++----------------
+ 1 files changed, 7 insertions(+), 16 deletions(-)
+
+commit dc249ad4529997001ae1f96dcfd7351766ca8e8d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 6 17:34:33 2011 +0100
+
+ annots: Factor out generateFieldAppearance()
+
+ Adding methods to render every form field type and using the field
+ object when possible instead of parsing the field dictionary again.
+
+ poppler/Annot.cc | 312
+ +++++++++++++++++++++++-------------------------------
+ poppler/Annot.h | 8 +-
+ 2 files changed, 138 insertions(+), 182 deletions(-)
+
+commit f98b3540db731026e0febf1f010548f0f0ef9142
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 6 15:57:22 2011 +0100
+
+ annots: Move code to draw the border of an AnnotWidget to a new method
+
+ And use the field object instead of parsing the field dictionary
+ again.
+
+ poppler/Annot.cc | 242
+ +++++++++++++++++++++++++++---------------------------
+ poppler/Annot.h | 3 +
+ 2 files changed, 124 insertions(+), 121 deletions(-)
+
+commit 9854f3173f994bbe3f57d33bd1d0e045833859c2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 6 15:56:06 2011 +0100
+
+ annots: Add AnnotColor::adjustColor() to be able to adjust an
+ existing AnnotColor
+
+ poppler/Annot.cc | 7 +++++++
+ poppler/Annot.h | 2 ++
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 2bf82f27bd9c8f97e5484ea97be661f65221163d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Mar 5 15:30:01 2011 +0100
+
+ annots: Remove unused class AnnotBorderStyle
+
+ poppler/Annot.cc | 22 ----------------------
+ poppler/Annot.h | 36 ------------------------------------
+ 2 files changed, 0 insertions(+), 58 deletions(-)
+
+commit 128dcaf282f418d8c45cea4df6ad4d3167b3e39c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Mar 5 13:12:49 2011 +0100
+
+ annots: Add AnnotBorder::parseDashArray() to parse dash arrays
+
+ The code was duplicated in AnnotBorderArray and AnnotBorderBS
+
+ poppler/Annot.cc | 91
+ ++++++++++++++++++-----------------------------------
+ poppler/Annot.h | 4 ++-
+ 2 files changed, 34 insertions(+), 61 deletions(-)
+
+commit ec2643d311e0ce55f0ff5309c0c420140d053a50
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 1 19:50:55 2011 +0000
+
+ fix copyright years
+
+ poppler/Annot.cc | 2 +-
+ poppler/Annot.h | 2 +-
+ poppler/ArthurOutputDev.cc | 2 +-
+ poppler/ArthurOutputDev.h | 2 +-
+ poppler/FontInfo.cc | 1 +
+ poppler/Form.cc | 4 ++--
+ poppler/Form.h | 3 ++-
+ poppler/GlobalParams.cc | 1 +
+ poppler/GlobalParams.h | 1 +
+ poppler/Link.cc | 2 +-
+ poppler/Link.h | 2 +-
+ poppler/OutputDev.h | 2 +-
+ poppler/PDFDoc.cc | 2 +-
+ poppler/Page.cc | 2 +-
+ poppler/Page.h | 2 +-
+ poppler/TextOutputDev.cc | 2 +-
+ poppler/TextOutputDev.h | 2 +-
+ qt4/src/poppler-form.cc | 2 +-
+ qt4/src/poppler-link-extractor-private.h | 2 +-
+ qt4/src/poppler-link-extractor.cc | 2 +-
+ qt4/src/poppler-page.cc | 2 +-
+ qt4/src/poppler-private.h | 2 +-
+ utils/HtmlOutputDev.cc | 2 +-
+ utils/HtmlOutputDev.h | 4 ++--
+ 24 files changed, 27 insertions(+), 23 deletions(-)
+
+commit 900974ebfbe6ab7ae21ed151ff79f9578d2bdae2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 1 19:42:22 2011 +0000
+
+ Fix years
+
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c804db4d8261274b013f8c340abfc921c77bb3cf
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 1 19:22:31 2011 +0100
+
+ move the fontconfig.h inclusion from GlobalParams.h to GlobalParams.cc
+
+ this avoids a dependency on the fontconfig headers to the users of
+ the core
+
+ poppler/GlobalParams.cc | 4 ++++
+ poppler/GlobalParams.h | 3 ---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 2d77c7f9c41f1121354413bcdc3beded35a247f9
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 1 16:51:04 2011 +0100
+
+ create the GooString on stack, not in heap
+
+ poppler/Annot.cc | 5 ++---
+ poppler/Form.cc | 5 ++---
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+commit 5dc2ef0e27ac48c81739cdfe8e8070ebbc410c87
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 1 16:39:36 2011 +0100
+
+ annots: avoid temporary GooString's just for comparisons, just
+ use strcmp
+
+ other than reducing few GooString allocations, strcmp should be much
+ faster than GooString::cmp
+
+ poppler/Annot.cc | 128
+ +++++++++++++++++++++++------------------------------
+ 1 files changed, 56 insertions(+), 72 deletions(-)
+
+commit 535e48ab764ee4e377451ddd032044b51b842c4a
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 1 16:07:34 2011 +0100
+
+ [qt4] ignore "Widget" annotations
+
+ they usually are forms or something else we do not support, so do
+ not complain about them for now
+
+ qt4/src/poppler-page.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit f0e5c36e7f1c5d0f0f51e3a6a6acd6c423f86df7
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 1 16:02:54 2011 +0100
+
+ annots: avoid a temporary GooString just for comparisons, just
+ use strcmp
+
+ other than reducing few GooString allocations, strcmp should be much
+ faster than GooString::cmp
+
+ poppler/Annot.cc | 54
+ ++++++++++++++++++++++++++----------------------------
+ 1 files changed, 26 insertions(+), 28 deletions(-)
+
+commit 58a3b83a8fbd8b13eb98c4f677f4ed19b6ae44cd
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 1 15:35:45 2011 +0100
+
+ fix appendAnnot() invocation on annotations reading
+
+ 1) check that the annot is actually a non-NULL pointer (otherwise
+ doing anything else is pointless)
+ 2) call appendAnnot() only if the annotation isOk() (that will
+ increase the annot refcount), but always decrement the refcount
+ (so valid annotation will have it at 1, while invalid will be deleted)
+
+ poppler/Annot.cc | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 664865a2ddca9c20ac36a41aef52ebf12eab838d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Mar 1 10:56:40 2011 +0100
+
+ Merge Link and AnnotLink code
+
+ Annotations now belong to the Page and are created only once on
+ demand.
+ Annots are now ref counted and Links is a list of AnnotLink objects,
+ Link object has been removed. The AnnotLink API is mostly the
+ same than
+ Link and frontends APIs are not affected.
+ Qt4 changes made by Pino Toscano.
+
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-page.cc | 29 +++----
+ glib/poppler-private.h | 1 -
+ poppler/Annot.cc | 79 +++++++++++++------
+ poppler/Annot.h | 24 ++++--
+ poppler/ArthurOutputDev.cc | 4 -
+ poppler/ArthurOutputDev.h | 3 -
+ poppler/CairoOutputDev.cc | 3 -
+ poppler/CairoOutputDev.h | 6 --
+ poppler/FontInfo.cc | 4 +-
+ poppler/Form.cc | 36 +++------
+ poppler/Form.h | 5 +-
+ poppler/Link.cc | 124
+ +++++-------------------------
+ poppler/Link.h | 43 +---------
+ poppler/OutputDev.h | 4 +-
+ poppler/PDFDoc.cc | 4 +-
+ poppler/Page.cc | 63 ++++++++--------
+ poppler/Page.h | 11 ++-
+ poppler/TextOutputDev.cc | 9 +-
+ poppler/TextOutputDev.h | 10 +-
+ qt4/src/poppler-link-extractor-private.h | 2 +-
+ qt4/src/poppler-link-extractor.cc | 3 +-
+ qt4/src/poppler-page.cc | 12 +--
+ utils/HtmlOutputDev.cc | 7 +-
+ utils/HtmlOutputDev.h | 4 +-
+ 25 files changed, 188 insertions(+), 304 deletions(-)
+
+commit 1f6573e949aaba0eb0a4c2f9cd73d7ad45ba67be
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 21:53:32 2011 +0100
+
+ small fixes to the pdftohtml manpage
+
+ - capitalize HTML, PDF, XML, PNG
+ - dont -> do not
+ - fix UTF-8 character
+ - fix hypens used as minus
+
+ utils/pdftohtml.1 | 18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+commit e927384897595f1bda5f7e41b552602f9cc8ed95
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 16:39:59 2011 +0100
+
+ [qt4] fix caption of push button fields
+
+ instead of asking the 'onStr' of the underlying form widget,
+ take (if available) the 'MK' entry, i.e. the appearance
+ characteristics dictionary,
+ and use the normal caption of that
+
+ qt4/src/poppler-form.cc | 25 +++++++++++++++++++++++--
+ 1 files changed, 23 insertions(+), 2 deletions(-)
+
+commit 5b24ee2c934feea1b7d46c8ec423d1c547258be2
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 16:24:22 2011 +0100
+
+ annots: 'CA', 'RC' and 'AC' are strings, not names
+
+ poppler/Annot.cc | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit e64f6cb23e9a564b3f80daea9abcfe8bb29189eb
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 15:22:32 2011 +0100
+
+ make getOnStr() return the GooString* instead of its char*
+
+ ... and modify its use accordingly
+ this way it is easier to check for a numm onStr, without the risk
+ of dereferencing a NULL pointer
+
+ poppler/Form.cc | 6 +++---
+ poppler/Form.h | 2 +-
+ qt4/src/poppler-form.cc | 7 ++-----
+ 3 files changed, 6 insertions(+), 9 deletions(-)
+
+commit f9c978fc2ab8a1f901f2136ae95deb9d41076155
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 14:39:52 2011 +0100
+
+ [qt4] directly use the dict
+
+ qt4/src/poppler-form.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 071966e48577c515b17a424baeae85ae4fc80a20
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 14:21:11 2011 +0100
+
+ [qt4] move textAlignment() as a private function
+
+ qt4/src/poppler-form.cc | 33 +++++++++++++++++++++++++++++++--
+ qt4/src/poppler-private.h | 25 -------------------------
+ 2 files changed, 31 insertions(+), 27 deletions(-)
+
+commit adc236771f11eeb4197064747836e8ed3fbfeba9
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 14:13:50 2011 +0100
+
+ [qt4] use FormWidget::getAlternateUiName()
+
+ ... instead of read the value on our own
+
+ qt4/src/poppler-form.cc | 9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+commit 9f111483cf6196dedf3cee380c3e5224776203ea
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 14:12:16 2011 +0100
+
+ forms: read the TU field as alternateUiName
+
+ poppler/Form.cc | 8 ++++++++
+ poppler/Form.h | 2 ++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+commit cfaadaa9e4a857fcea3b5a2cadacd352de6c469d
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 14:07:35 2011 +0100
+
+ [qt4] use FormWidget::getPartialName()
+
+ ... instead of read the value on our own
+
+ qt4/src/poppler-form.cc | 9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+commit 2478896a0c1f6e5842f3d8b172e4cc7e6bd58cd8
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 13:24:09 2011 +0100
+
+ [qt4] use the new FormWidget::createActivationAction()
+
+ qt4/src/poppler-form.cc | 13 +++----------
+ 1 files changed, 3 insertions(+), 10 deletions(-)
+
+commit 1dcb683a5c2dd6a1de654e90a4394f65d63dc296
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 27 13:22:48 2011 +0100
+
+ add FormWidget::createActivationAction()
+
+ used to get and create a new activation action object of a form widget
+
+ poppler/Form.cc | 12 ++++++++++++
+ poppler/Form.h | 3 +++
+ 2 files changed, 15 insertions(+), 0 deletions(-)
+
+commit bd4cc73e438a7d4d4a10c50c69e65b5bdc63ddf2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 27 11:04:45 2011 +0000
+
+ Some more missing copyrights
+
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h | 2 +-
+ poppler/Gfx.cc | 2 +-
+ poppler/OutputDev.h | 2 +-
+ poppler/TextOutputDev.cc | 1 +
+ 5 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 6c2ed4781d8ecfffdf24e1459aafd554b3527686
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 27 10:55:22 2011 +0000
+
+ Add 2011 years
+
+ poppler/Annot.cc | 2 +-
+ poppler/CairoFontEngine.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b297fb9de0779ac84d5b7ef68c792afefe598320
+Author: William Bader <williambader@hotmail.com>
+Date: Sun Feb 27 01:48:55 2011 +0000
+
+ access the pixels directly
+
+ Faster, bug 34005
+
+ splash/Splash.cc | 21 +++++++++++----------
+ 1 files changed, 11 insertions(+), 10 deletions(-)
+
+commit de77e26759f1c33698abe248ad29b75c329a043c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 27 01:39:23 2011 +0000
+
+ Fix crash in some pdf
+
+ Has to be 3 and not nComps since it's a output buffer, a the input one
+ Bug 34357
+
+ poppler/GfxState.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4f82a2e08cb2c930956c6b38030fa7b015a0de5a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 27 01:38:33 2011 +0000
+
+ Implement GfxDeviceCMYKColorSpace::getRGBLine
+
+ poppler/GfxState.cc | 22 +++++++++++++++++++++-
+ poppler/GfxState.h | 12 +++++++++++-
+ 2 files changed, 32 insertions(+), 2 deletions(-)
+
+commit 4980b99214281dcab8f82b5b618aadc24de371f4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 26 14:00:33 2011 +0100
+
+ annots: Don't assume y1 > y3 for quad points of a highlight annotation
+
+ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=643028
+
+ poppler/Annot.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e6ae0f8609cd66e9e124af59adefdff9d610dcd4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 26 13:23:47 2011 +0100
+
+ cairo: Handle font type fontCIDType2OT when creating freetype font
+
+ Fixes https://bugzilla.gnome.org/show_bug.cgi?id=643273
+
+ poppler/CairoFontEngine.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 22eb01d305ea2560d26417ca8df9c0465d4e9a82
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 26 12:17:49 2011 +0100
+
+ cairo: Fix a crash when rendering a document with inline images
+
+ poppler/CairoOutputDev.cc | 28 ++++++++++++++++------------
+ poppler/CairoOutputDev.h | 2 +-
+ 2 files changed, 17 insertions(+), 13 deletions(-)
+
+commit a6599dd1fda37186b876b5b2de80be1731dd5946
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 26 11:59:03 2011 +0100
+
+ glib: Add some more introspection annotations
+
+ glib/poppler-attachment.cc | 2 +-
+ glib/poppler-document.cc | 4 ++--
+ glib/poppler-media.cc | 2 +-
+ glib/poppler-page.cc | 6 +++---
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 89c66f236c85ac5a53ae12b01cdebc30e27b78d3
+Author: Peter Ward <peteraward@gmail.com>
+Date: Sat Feb 26 11:39:58 2011 +0100
+
+ glib: Add missing "out" annotation to poppler_page_get_size()
+
+ glib/poppler-page.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7a68199b342eb3f33733f7d7446ede8f94130fba
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 26 11:09:27 2011 +0100
+
+ cairo: Check if cairo version is == 1.11.2 to use mesh gradients api
+
+ Cairo API has changed in 1.11.3.
+
+ poppler/CairoOutputDev.cc | 4 ++--
+ poppler/CairoOutputDev.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 97e7ab1a4eea2160f3f0847d10f6c16f2d66ef11
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Feb 25 20:33:39 2011 +0000
+
+ Do not ask freetype for a font of size 0x0
+
+ Fixes rendering bug at 34602
+
+ splash/SplashFTFont.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 3590a2d38082fc705040cdb31bf0b22ff12dd3e4
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu Feb 24 18:47:35 2011 +0000
+
+ Fix rendering of some substituted fonts
+
+ More info in bug 34522
+
+ poppler/GfxFont.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 384753f1f9f780687bdead99a6548ef8598b898a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 21 19:19:48 2011 +0000
+
+ Use gfree since we allocate with gmalloc
+
+ Bug 34512
+
+ goo/GooString.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d775420c3c6cb5a29ff74712d3fc210fcb4b4627
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 19 11:19:57 2011 +0000
+
+ Do not delete textOut twice when using -bbox
+
+ utils/pdftotext.cc | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit e1a56d73b066e7152ccf6ccf36206def7956cb00
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 16 00:06:45 2011 +0000
+
+ Lots of rendering improvements by Thomas and Andrea
+
+ Function.cc: Stitching functions incorrectly reported 0 as output
+ size.
+ Function.cc: Remove cache from PostScriptFunction
+ Function.cc: Make PSStack stack allocated
+ GfxState.cc & GfxState.h: Abstract GfxSimpleShading, add Matrix::norm
+ method, add simple caching, parameter range computation
+ SplashOutputDev.cc & SplashOutputDev..h & Splash.cc & SplashPattern.h:
+ Improve splash rendering, implement radial and abstract simple
+ shadings
+ in splash
+
+ And maybe something more, look at the
+ Followup Bug 32349 & Poppler: More shading fun ;-)
+ thread for more info
+
+ poppler/Function.cc | 122 +--------
+ poppler/Function.h | 3 +-
+ poppler/GfxState.cc | 638
+ ++++++++++++++++++++++++++++++++++++++-----
+ poppler/GfxState.h | 90 +++++--
+ poppler/SplashOutputDev.cc | 253 +++++++++++++++--
+ poppler/SplashOutputDev.h | 67 ++++-
+ splash/Splash.cc | 126 +++++++---
+ splash/SplashPattern.h | 7 +-
+ 8 files changed, 1008 insertions(+), 298 deletions(-)
+
+commit 675b3505f963a0110dac7f865654232cbb865ef5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 13 16:21:52 2011 +0100
+
+ tests: Merge splash and cairo tests into a single gtk-test tool
+
+ With a command line option to use cairo or splash backends.
+
+ test/CMakeLists.txt | 20 +--
+ test/Makefile.am | 29 ++---
+ test/gtk-cairo-test.cc | 190 ----------------------
+ test/gtk-splash-test.cc | 311 -------------------------------------
+ test/gtk-test.cc | 397
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 412 insertions(+), 535 deletions(-)
+
+commit 728c022cdc1ea12aa54077d44276f9d7714930d4
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 13 13:25:51 2011 +0100
+
+ remove more references to the qt3 frontend
+
+ followup of d82f98a274bfa008c218e265a080c4af7ce95131
+
+ Makefile.am | 3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+commit 15e5b3f16015361754fdc14da4a0dde5af887568
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 13 13:23:06 2011 +0100
+
+ remove more GDK-related stuff
+
+ followup of 149b7fec472beda9d1538e0f26607c9498d504c2
+
+ Makefile.am | 1 -
+ cmake/modules/FindGDK.cmake | 22 ----------------------
+ config.h.cmake | 3 ---
+ glib/reference/Makefile.am | 1 -
+ glib/reference/poppler-sections.txt | 1 -
+ 5 files changed, 0 insertions(+), 28 deletions(-)
+
+commit 50aa15a0bd7100fc9b9243de1d6e6f4b59df1488
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 13 13:07:19 2011 +0100
+
+ remove GDK API here too
+
+ followup of 149b7fec472beda9d1538e0f26607c9498d504c2
+
+ glib/poppler-features.h.cmake | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit f410cd11268254b9d0422201c9860d775f73fdd8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 13 12:55:37 2011 +0100
+
+ gtk-splash-test: Don't use GDK deprecated API
+
+ test/gtk-splash-test.cc | 28 +++++++++++++++-------------
+ 1 files changed, 15 insertions(+), 13 deletions(-)
+
+commit a0568e449061d6b6af5485e340cd6f9d3e54ef7c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 13 12:27:22 2011 +0100
+
+ glib: remove gdk referenes from pkg-config files
+
+ poppler-glib-uninstalled.pc.in | 2 +-
+ poppler-glib.pc.cmake | 2 +-
+ poppler-glib.pc.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 149b7fec472beda9d1538e0f26607c9498d504c2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 13 11:51:57 2011 +0100
+
+ glib: Remove deprecated GDK API
+
+ It removes the GDK dependency so that poppler-glib now only depends on
+ glib and cairo.
+
+ CMakeLists.txt | 9 --
+ configure.ac | 44 +------
+ glib/CMakeLists.txt | 14 +--
+ glib/Makefile.am | 8 +-
+ glib/poppler-features.h.in | 6 -
+ glib/poppler-page.cc | 296
+ --------------------------------------------
+ glib/poppler-page.h | 34 -----
+ 7 files changed, 4 insertions(+), 407 deletions(-)
+
+commit a5482d64472a81206dd8d0c5bb80007f6d5bb893
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 13 11:40:23 2011 +0100
+
+ glib: Remove test-poppler-glib, poppler-glib-demo does the same
+ and more
+
+ glib/CMakeLists.txt | 8 -
+ glib/Makefile.am | 14 -
+ glib/test-poppler-glib.cc | 657
+ ---------------------------------------------
+ 3 files changed, 0 insertions(+), 679 deletions(-)
+
+commit cab0cf028a192772dcb5c3f4aefa0a421e73e9e7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Feb 11 19:42:34 2011 +0000
+
+ Do not infinite loop in some broken files
+
+ poppler/JBIG2Stream.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 1125cc8ccf386d8e0a0679aa73614bc2cb8037b0
+Author: William Bader <williambader@hotmail.com>
+Date: Tue Feb 8 20:27:16 2011 +0000
+
+ Allow setting the rasterization resolution
+
+ More info at bug 34001
+
+ poppler/GlobalParams.cc | 15 +++++++++++++++
+ poppler/GlobalParams.h | 3 +++
+ poppler/PSOutputDev.cc | 7 ++++++-
+ utils/pdftops.1 | 6 ++++++
+ utils/pdftops.cc | 6 ++++++
+ 5 files changed, 36 insertions(+), 1 deletions(-)
+
+commit 96e169b0eca31891f3cd564365d4a2a5c6e2a2c0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 8 19:58:31 2011 +0000
+
+ Make really sure the uMap static pointer is valid
+
+ It might happen you are extremely unlucky and get the same
+ globalParams after a new delete/creation
+
+ qt4/src/poppler-private.cc | 51
+ +++++++++++++++++++++++++++++++++++++------
+ qt4/src/poppler-private.h | 34 ++--------------------------
+ 2 files changed, 47 insertions(+), 38 deletions(-)
+
+commit c3470145f95791167c19a438934a923eab8a93cf
+Author: William Bader <williambader@hotmail.com>
+Date: Tue Feb 8 19:54:48 2011 +0000
+
+ Add PS level1 non standard binary output option
+
+ More info at bug 34003
+
+ poppler/GlobalParams.cc | 18 ++++-
+ poppler/GlobalParams.h | 5 +-
+ poppler/PSOutputDev.cc | 227
+ +++++++++++++++++++++++++++++++++-------------
+ utils/pdftops.1 | 7 ++
+ utils/pdftops.cc | 8 ++-
+ 5 files changed, 198 insertions(+), 67 deletions(-)
+
+commit 37077aa475d2dee81f87daa05297b201eeb99c87
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 7 19:48:28 2011 +0000
+
+ Make sure tx is inside the bitmap
+
+ Seems to be what the code tried to do, fixes crash in bug 33948
+ depending on
+ the resolution you render it
+
+ poppler/SplashOutputDev.cc | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 5aa854f70c8f563efe56dafa8bd6b3cdd5c95451
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 6 13:24:35 2011 +0100
+
+ cairo: Use the new cairo unique id to set the surface id when printing
+
+ Set the unique surface id when attaching jpeg images to the surface so
+ that cairo can reuse the mime data even when a new surface is created
+ with the same mime data. This reduces the size of the output file when
+ printing.
+
+ poppler/CairoOutputDev.cc | 18 ++++++++++++++++--
+ poppler/CairoOutputDev.h | 2 +-
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+commit fe7b8aa4fc78aacf3226d019db74146ceaebd63c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 2 22:35:40 2011 +0000
+
+ Workaround bug when converting pdf to ps with level1
+
+ See bug 31926 for more info
+
+ poppler/PSOutputDev.cc | 2 +-
+ poppler/PreScanOutputDev.cc | 7 +++++++
+ poppler/PreScanOutputDev.h | 7 +++++++
+ 3 files changed, 15 insertions(+), 1 deletions(-)
+
+commit 5984ad081cd609f3146e0da5e22097ef073eb519
+Author: William Bader <williambader@hotmail.com>
+Date: Sun Jan 30 17:02:02 2011 +0000
+
+ Increase precision
+
+ Fixes some issues with pdf from bug 27482
+
+ poppler/PSOutputDev.cc | 200
+ ++++++++++++++++++++++++------------------------
+ 1 files changed, 100 insertions(+), 100 deletions(-)
+
+commit c60d5afbeb986c1b335357202c5f551a3c146a76
+Author: Jim Meyering <meyering@redhat.com>
+Date: Mon Jan 24 15:51:20 2011 +0100
+
+ demo: don't use an uninitialized local variable
+
+ * text.c (pgd_text_get_text): Before this change, when
+ poppler_page_get_text returned NULL, we'd use "n_recs" uninitialized.
+
+ glib/demo/text.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit a3bdc56e2f086444419eddfcda5d2010a9a6b5c0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jan 29 11:23:33 2011 +0100
+
+ glib-demo: Add a tooltip with current selected character in text demo
+
+ To make sure that the offset of the text returned by
+ poppler_page_get_text() matches
+ the list of rectangles returned by poppler_page_get_text_layout().
+
+ glib/demo/text.c | 60
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 60 insertions(+), 0 deletions(-)
+
+commit bf2d86c8db430595fb3c55edd3f6c8d289bdaeb5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jan 28 20:34:08 2011 +0000
+
+ Make sure uMap is still valid before using it
+
+ Fixes KDE bug 264667
+
+ qt4/src/poppler-private.cc | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit e6fb20d7b3bf8ea8aedc1bcd910e035059835b5f
+Author: Axel Strübing <axel.struebing@freenet.de>
+Date: Fri Jan 28 19:20:15 2011 +0000
+
+ Extract text of a pdf correctly
+
+ See "[poppler] text extraction does not work" in the mailing list
+ for more info
+
+ poppler/GfxFont.cc | 14 +++++++++++++-
+ poppler/GfxFont.h | 2 ++
+ 2 files changed, 15 insertions(+), 1 deletions(-)
+
+commit 4829d36a3b005585db8c8115f7ee81a4e2384780
+Author: Simon Kellner <kellner@kit.edu>
+Date: Wed Jan 26 22:59:49 2011 +0000
+
+ fix labelToIndex on multiple prefixes
+
+ A PDF document can use page label prefixes, for example, to label
+ only inside a chapter ("A-1" .. "A-<n>", "B-1" .. "B-<m>" et cetera).
+ When calculating a page index for a given label, poppler would
+ disregard the page range for all preceding prefixes that do not
+ match the given prefix.
+
+ poppler/PageLabelInfo.cc | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit e57c75fbd95ef8399b0785500f6893465bc808c3
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Mon Jan 24 19:48:09 2011 +1030
+
+ cairo: Implement Type 4,5,6,7 shadings using cairo mesh gradients
+
+ Fixes bugs #19076 and #32791.
+
+ poppler/CairoOutputDev.cc | 139
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 12 ++++
+ poppler/Gfx.cc | 10 +++-
+ poppler/OutputDev.h | 2 +
+ 4 files changed, 161 insertions(+), 2 deletions(-)
+
+commit 5081356fcc69012e9df95dbf1e3c36e7c1e751c4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 25 20:26:25 2011 +0000
+
+ Fix leak in SplashOutputDev::axialShadedFill
+
+ poppler/SplashOutputDev.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 19dc283c3af597deab297341a37495c06988948b
+Author: Thomas Klausner <wiz@danbala.tuwien.ac.at>
+Date: Mon Jan 24 19:05:08 2011 +0000
+
+ Include zlib header since we use things defined there
+
+ goo/PNGWriter.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 5056e33e01ce0f7db1a5401b7b38d30e84eedf69
+Author: Sam Liao <phyomh@gmail.com>
+Date: Mon Jan 17 13:07:22 2011 +0800
+
+ Poppler: Fix line selection, dont check y for Line selection
+
+ When a line is selected while the Y values of selection is
+ not in the y range of words, the render will render the
+ line with reverse color while the words does not show up.
+
+ This fix neglect the Y vaules to make sure that the words
+ also displayed when line is selected.
+
+ poppler/TextOutputDev.cc | 16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 88812e716c1a0c87a504118d47eb4cc6f52962fa
+Author: Andreas Hartmetz <ahartmetz@gmail.com>
+Date: Fri Jan 21 23:33:47 2011 +0000
+
+ Add Hinting API to ArthurOutputDev
+
+ poppler/ArthurOutputDev.cc | 11 +++++++++--
+ poppler/ArthurOutputDev.h | 15 ++++++++++++++-
+ 2 files changed, 23 insertions(+), 3 deletions(-)
+
+commit dc5ec4668bdfe3b6ba41f0a2e551bbc07f8839ba
+Author: Andreas Hartmetz <ahartmetz@gmail.com>
+Date: Fri Jan 21 23:32:50 2011 +0000
+
+ support slight hinting in Splash backend
+
+ cpp/poppler-page-renderer.cpp | 2 +-
+ poppler/SplashOutputDev.cc | 6 +++++-
+ poppler/SplashOutputDev.h | 4 +++-
+ qt4/src/poppler-private.h | 3 ++-
+ qt4/src/poppler-qt4.h | 4 +++-
+ splash/SplashFTFont.cc | 27 ++++++++++++++++++---------
+ splash/SplashFTFont.h | 2 ++
+ splash/SplashFTFontEngine.cc | 10 +++++++---
+ splash/SplashFTFontEngine.h | 6 ++++--
+ splash/SplashFontEngine.cc | 4 +++-
+ splash/SplashFontEngine.h | 2 ++
+ 11 files changed, 50 insertions(+), 20 deletions(-)
+
+commit 0c5b1bef9f3f98001cee20061b1eaf20b965c5a9
+Author: William Bader <williambader@hotmail.com>
+Date: Fri Jan 21 19:01:45 2011 +0000
+
+ Fix rendering for some pdf with -level1sep
+
+ Also some speed improvemensts. Bug #32365
+
+ poppler/PSOutputDev.cc | 207
+ +++++++++++++++++++++++++++++++++++++-----------
+ poppler/PSOutputDev.h | 13 ++-
+ 2 files changed, 170 insertions(+), 50 deletions(-)
+
+commit 6cb8965fb8bce6da2a4460e86f592c1ea3a84a5c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jan 21 18:43:21 2011 +0000
+
+ fix (C) years
+
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h | 2 +-
+ qt4/src/poppler-private.cc | 2 +-
+ qt4/tests/check_strings.cpp | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 24f9c8924b2135da616386d0fa691fe790b4e7a4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jan 21 08:43:34 2011 +0000
+
+ Access the correct variable
+
+ Fixes asert on bug 33063
+
+ poppler/Annot.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 07a8808c22445c421f3064da7e5227dcbf40358b
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Jan 17 21:34:23 2011 +0100
+
+ fix unicodeToQString() to correctly decode the Unicode sequence
+
+ Use a UnicodeMap to convert the sequence to UTF-8, and convert from
+ that to QString.
+ Also, ignore the last character of the Unicode sequence if it is 0x0.
+
+ Add a couple of testcases for it.
+
+ qt4/src/poppler-private.cc | 30 ++++++++++++++++++++++++------
+ qt4/tests/check_strings.cpp | 21 +++++++++++++++++++++
+ 2 files changed, 45 insertions(+), 6 deletions(-)
+
+commit ed367c08d788c88c49de770019bf826cfebb3e2c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 16 17:25:02 2011 +0000
+
+ Don't need this either
+
+ configure.ac | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 76ab657dc81ed0af7d9f2efaca2e68d570063001
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 16 17:22:56 2011 +0000
+
+ And this is the last bit of qt3 cleaning?
+
+ configure.ac | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 9a02856c2762e65b8f03e443e728e05e5a86f65b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 16 17:21:00 2011 +0000
+
+ Another qt3 unused file
+
+ m4/qt.m4 | 16 ----------------
+ 1 files changed, 0 insertions(+), 16 deletions(-)
+
+commit 26da7a52d31eb677ab6399de2c07140aa272b35e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 16 17:17:59 2011 +0000
+
+ Yet more qt3 cleaning
+
+ configure.ac | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 8dc9c693abb0033247a338d0f7d1f3f7a57c1a55
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 16 17:14:34 2011 +0000
+
+ Some more qt3 thigs i forgot to kill
+
+ CMakeLists.txt | 5 -
+ Makefile.am | 1 -
+ cmake/modules/FindQt3.cmake | 319
+ -------------------------------------------
+ 3 files changed, 0 insertions(+), 325 deletions(-)
+
+commit d82f98a274bfa008c218e265a080c4af7ce95131
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 16 17:13:06 2011 +0000
+
+ Kill qt3 frontend
+
+ CMakeLists.txt | 5 -
+ Makefile.am | 5 -
+ configure.ac | 18 --
+ poppler-qt-uninstalled.pc.in | 7 -
+ poppler-qt.pc.cmake | 13 --
+ poppler-qt.pc.in | 13 --
+ qt/.gitignore | 7 -
+ qt/CMakeLists.txt | 34 ----
+ qt/Makefile.am | 48 -----
+ qt/poppler-document.cc | 344
+ --------------------------------
+ qt/poppler-fontinfo.cc | 83 --------
+ qt/poppler-link-qt3.h | 188 ------------------
+ qt/poppler-link.cc | 267 -------------------------
+ qt/poppler-page-transition-private.h | 28 ---
+ qt/poppler-page-transition.cc | 95 ---------
+ qt/poppler-page-transition.h | 146 --------------
+ qt/poppler-page.cc | 357
+ ----------------------------------
+ qt/poppler-private.cc | 147 --------------
+ qt/poppler-private.h | 102 ----------
+ qt/poppler-qt.h | 311 -----------------------------
+ qt/test-poppler-qt.cpp | 122 ------------
+ 21 files changed, 0 insertions(+), 2340 deletions(-)
+
+commit 301352e5585d4ab6e7b609b4ab79b4d8b8656092
+Author: Daiki Ueno <ueno@unixuser.org>
+Date: Sun Jan 9 18:48:50 2011 +0000
+
+ Do not crash in case jpeg_create_decompress fails
+
+ Bug 32890
+
+ poppler/DCTStream.cc | 21 ++++++++++++---------
+ poppler/DCTStream.h | 8 ++++++--
+ 2 files changed, 18 insertions(+), 11 deletions(-)
+
+commit 17baf0498485720b4ea5952bb46287f533139d0a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jan 8 13:03:31 2011 +0000
+
+ Remove declaration of function without implementation
+
+ poppler/XRef.h | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit a9e280508f5d669c8b6e1a6bb888b9369d868ab3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jan 8 10:39:41 2011 +0100
+
+ glib: Fix memory leak when calling poppler_page_get_text_layout()
+ for pages with no text
+
+ glib/poppler-page.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 5d62d18941810ef7d668eafa8b001085133fb169
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jan 8 10:33:32 2011 +0100
+
+ glib: Use NULL instead of FALSE in g_return_val_if_fail() for
+ functions returning a pointer
+
+ glib/poppler-page.cc | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 1324ae13f1fc2fa28951c2c7f7d63d4756537229
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jan 6 01:15:30 2011 +0100
+
+ [cpp/apidox] advertize the 'pnm' image format
+
+ cpp/poppler-image.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit b192363960c26111167b1b08db9910e5f39dcf8b
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jan 6 01:09:09 2011 +0100
+
+ [cpp] Add PNM (PBM/PGM/PPM) exporting to 'image'.
+
+ Introduce a custom ImgWriter (PNMWriter) for exporting in the PNM
+ variants,
+ and use it choosing the output format matching as close as possible
+ the format of the image.
+
+ cpp/CMakeLists.txt | 1 +
+ cpp/Makefile.am | 2 +
+ cpp/PNMWriter.cc | 119
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ cpp/PNMWriter.h | 43 ++++++++++++++++++
+ cpp/poppler-image.cpp | 22 +++++++++-
+ 5 files changed, 186 insertions(+), 1 deletions(-)
+
+commit bebc530cbde7898759e1bd3629d2836ce0fb1d08
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Dec 31 12:11:40 2010 +1030
+
+ cairo: Don't set JPX mime data if the stream specifies a colorspace
+
+ The stream colorspace overides, and may be different to, the
+ colorspace in the JPX data.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=32746
+
+ poppler/CairoOutputDev.cc | 46
+ ++++++++++++++++++++++++++++++--------------
+ poppler/CairoOutputDev.h | 1 +
+ 2 files changed, 32 insertions(+), 15 deletions(-)
+
+commit 1399b9ab14b19f25583c75af2b36f63a6a01129a
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Dec 29 15:56:45 2010 +0100
+
+ [cpp] add TIFF output to 'image'
+
+ cpp/poppler-image.cpp | 12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+commit 1c7937dbc3c577ffc12cacc8de33d320e2f30ce9
+Author: William Bader <williambader@hotmail.com>
+Date: Wed Dec 29 14:47:06 2010 +0000
+
+ Make pdftoppm be able of writing tif files
+
+ BUG 32027
+
+ CMakeLists.txt | 15 ++++
+ config.h.cmake | 3 +
+ configure.ac | 32 ++++++++
+ goo/Makefile.am | 2 +
+ goo/TiffWriter.cc | 202
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ goo/TiffWriter.h | 53 +++++++++++++
+ poppler/Makefile.am | 11 +++
+ splash/SplashBitmap.cc | 18 ++++-
+ splash/SplashBitmap.h | 5 +-
+ splash/SplashTypes.h | 4 +-
+ utils/pdftoppm.1 | 6 ++
+ utils/pdftoppm.cc | 14 +++-
+ 12 files changed, 358 insertions(+), 7 deletions(-)
+
+commit bae91ecb638fcfee001e5c9a86a754610da796e4
+Author: William Bader <williambader@hotmail.com>
+Date: Tue Dec 28 11:53:54 2010 +0000
+
+ Add -singlefile option to pdftoppm
+
+ Bug 32025
+
+ utils/pdftoppm.1 | 3 +++
+ utils/pdftoppm.cc | 26 +++++++++++++++++++++++---
+ 2 files changed, 26 insertions(+), 3 deletions(-)
+
+commit ff58ee66c27da09a370a3000ab55eb1a24921852
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 27 20:07:21 2010 +0000
+
+ bump soname just in case the getPage change is not BC
+
+ qt/CMakeLists.txt | 2 +-
+ qt/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 453df02e195a96d0210f297c21c8ffba646659da
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 27 19:51:13 2010 +0000
+
+ Make distcheck work
+
+ glib/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6a34cec72c1a1b6576858a7836aae4a902fb5ed7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 27 19:29:52 2010 +0000
+
+ increase core soname
+
+ CMakeLists.txt | 2 +-
+ poppler/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 8c11e9d68dceb609d04b3b383d22c307b5981d86
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 27 19:23:29 2010 +0000
+
+ 0.16.0 project version increase
+
+ CMakeLists.txt | 4 ++--
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 8c1fd83c6061279af00c1172fe41cee61f19d917
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 27 19:22:22 2010 +0000
+
+ 0.16.0 NEWS
+
+ NEWS | 24 ++++++++++++++++++++++++
+ 1 files changed, 24 insertions(+), 0 deletions(-)
+
+commit 0294d6e50691a3e40fad0d6e4fa9056944a91efd
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Thu Dec 23 15:56:32 2010 +0000
+
+ Be more correct when drawing radial shadings
+
+ Fixes 32349
+
+ poppler/Gfx.cc | 25 ++++++++++++++++---------
+ 1 files changed, 16 insertions(+), 9 deletions(-)
+
+commit 3aa08e378927889b35b6fa858d6da568250ba6ec
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 19 22:36:47 2010 +0000
+
+ Seems to work with this version, so enable it
+
+ CMakeLists.txt | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 93cf184b7573980bf2e56342e64f9b99c5d0b415
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 19 14:16:25 2010 +0000
+
+ Fix last commit
+
+ Applying patches by hand is bad
+
+ poppler/PDFDoc.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ebb580d756a8321de87814f05ab572564732c15e
+Author: Philip Lorenz <lorenzph+freedesktop@gmail.com>
+Date: Sun Dec 19 14:08:31 2010 +0000
+
+ Windows fixes
+
+ poppler/PDFDoc.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 88a4154420e016d93c5ce05b5b8e09b6bddcadc9
+Author: Philip Lorenz <lorenzph+freedesktop@gmail.com>
+Date: Sun Dec 19 13:03:01 2010 +0000
+
+ build on newer MSVC
+
+ qt4/src/poppler-annotation.h | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 18cd9f6aeb48266c551952c395eb9cd662bc27f5
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Sat Dec 18 17:59:54 2010 +0000
+
+ compile in windows
+
+ poppler/FontInfo.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 471102ef68b439dfa13e20e3b0f2e143f8d0dc85
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 17 00:36:36 2010 +0000
+
+ Remove -resolution
+
+ Actually use -zoom that is there for a reason
+
+ utils/pdftohtml.1 | 3 ---
+ utils/pdftohtml.cc | 15 ++++++---------
+ 2 files changed, 6 insertions(+), 12 deletions(-)
+
+commit edf6c47feb5b7658e585bcce196e465245e1dc98
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 16 22:56:40 2010 +0000
+
+ kill useless code
+
+ utils/pdftohtml.cc | 8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
+
+commit 185a2f81485e19f96393a431be5523a277747b94
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 16 22:56:15 2010 +0000
+
+ static-ify some vars
+
+ utils/HtmlOutputDev.cc | 9 ---------
+ utils/pdftohtml.cc | 8 ++++----
+ 2 files changed, 4 insertions(+), 13 deletions(-)
+
+commit e4dfc548c57b690db9122d1db3342ed0a785c8bb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Dec 14 19:45:46 2010 +0000
+
+ We need this to make the define really be defined
+
+ config.h.cmake | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 06da4b46c442778c67b788b747f04b386b5247ac
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue Dec 14 09:06:57 2010 +1030
+
+ cairo: Use A1 instead of A8 for imagemask
+
+ The cairo PDF surface now optimizes the case of cairo_mask() with
+ solid source and A1 mask to use a PDF stencil mask.
+
+ Fixes https://bugs.launchpad.net/ubuntu/+source/libcairo/+bug/680628
+ where a 65K PDF printed to PDF using poppler-cairo turns into an 8MB
+ PDF.
+
+ CMakeLists.txt | 2 ++
+ configure.ac | 1 +
+ poppler/CairoOutputDev.cc | 25 ++++++++++++++++++-------
+ 3 files changed, 21 insertions(+), 7 deletions(-)
+
+commit 6ef457dc818e7e241e5d2e264bc2d78b132ae638
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 13 14:08:29 2010 +0000
+
+ Move -fno-exceptions -fno-check-new to default flags
+
+ Makes sense since we decided not to support the exception path in
+ gmem a
+ while ago
+
+ cmake/modules/PopplerMacros.cmake | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 86e469600b58ae05cb6ede1b4017fbdac99cc556
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 13 14:04:00 2010 +0000
+
+ More gcc flags movement
+
+ -Wchar-subscripts is part of -Wall so remove it
+ Move -fno-common to default options since it makes sense to use it
+
+ cmake/modules/PopplerMacros.cmake | 4 ++--
+ configure.ac | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 2b74241d8b1fd1ec9fab4f6f673bbaaa1cb3d949
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 13 13:56:52 2010 +0000
+
+ Promote -Wcast-align to the general warnings we ask gcc to give
+
+ cmake/modules/PopplerMacros.cmake | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7313e0a4de6f2146c1dcb3d235f18a3c844d12d5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 12 23:28:18 2010 +0000
+
+ Do not return 99 (or 1) with -h, -v and -printenc
+
+ Bug 32149
+
+ utils/pdffonts.cc | 2 ++
+ utils/pdfimages.cc | 2 ++
+ utils/pdfinfo.cc | 3 +++
+ utils/pdftoppm.cc | 2 ++
+ utils/pdftops.cc | 5 ++++-
+ utils/pdftotext.cc | 3 +++
+ 6 files changed, 16 insertions(+), 1 deletions(-)
+
+commit 669cbfc9fd78a22d4f14b0af43143e1f5dc28cd5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Dec 11 19:04:22 2010 +0000
+
+ Fix the preliminary bbox/clip calculation
+
+ Code based in code posted by Suzuki Toshiya in the freetype mailing
+ list
+
+ splash/SplashFTFont.cc | 15 +++++++++------
+ 1 files changed, 9 insertions(+), 6 deletions(-)
+
+commit 2984002a64acca7014edeadd900dd52cdf7d9eac
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Dec 11 18:57:52 2010 +0000
+
+ Remove the * we just need to increase the pointer
+
+ Gives a warning with newer gcc's
+
+ splash/Splash.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 9b45fa072198da4a5032004ac943cf2227aa97ea
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 10 12:05:58 2010 +0000
+
+ Make PreScanOutputDev be less agressive when deciding to rasterize
+
+ BUG 30107
+
+ poppler/PreScanOutputDev.cc | 14 +++++++++++++-
+ poppler/PreScanOutputDev.h | 4 ++++
+ 2 files changed, 17 insertions(+), 1 deletions(-)
+
+commit f96f6a06cdc33b4654669ac74d5abd0d546a127d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 5 12:06:21 2010 +0000
+
+ Adapt the zlib-base FlateStream code to API changes
+
+ Bug 32065
+
+ poppler/FlateStream.cc | 9 ++++++---
+ poppler/FlateStream.h | 9 +++++++++
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+commit 7b1f83990a1f68306daf5f7dbeabcd38f4382e3b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 29 22:27:46 2010 +0000
+
+ 0.15.3
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 18 ++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 6 files changed, 24 insertions(+), 6 deletions(-)
+
+commit 7c23a993193aaaa4d4b5b6d1161a0455d1e2a8c0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 29 21:33:31 2010 +0000
+
+ Add some more isNum before calling getNum
+
+ poppler/GfxState.cc | 48
+ ++++++++++++++++++++++++++++++++----------------
+ 1 files changed, 32 insertions(+), 16 deletions(-)
+
+commit 62ec4f591c258e702ee79b519919a931517220bf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 29 20:50:43 2010 +0000
+
+ pass fetchOriginatorNums in some more calls
+
+ Fixes some more crashes in broken files
+
+ poppler/Parser.cc | 7 ++++++-
+ poppler/Parser.h | 1 +
+ poppler/XRef.cc | 6 +++---
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+commit d2a0e2ca723142478858f7edfb7c98807d554578
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Nov 25 10:36:38 2010 +0000
+
+ Skip over loops in Pages tree
+
+ poppler/Catalog.cc | 15 ++++++++++-----
+ 1 files changed, 10 insertions(+), 5 deletions(-)
+
+commit 7abd371364e6e4aaef932f26b0664f7f9d760c42
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 28 13:57:50 2010 +0000
+
+ this var is not about xobjects only anymroe
+
+ poppler/FontInfo.cc | 6 +++---
+ poppler/FontInfo.h | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 1ac14df61d711097837e44d80a9332f0a854b95e
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Nov 28 13:49:41 2010 +0000
+
+ find fonts inside patterns
+
+ Bug 31948
+
+ poppler/FontInfo.cc | 50
+ +++++++++++++++++++++++++++-----------------------
+ 1 files changed, 27 insertions(+), 23 deletions(-)
+
+commit d30dd8c6f6491beac9750447126930168394cd9f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 28 13:25:39 2010 +0000
+
+ Use sets instead of arrays
+
+ poppler/FontInfo.cc | 46 ++++++++--------------------------------------
+ poppler/FontInfo.h | 11 +++--------
+ 2 files changed, 11 insertions(+), 46 deletions(-)
+
+commit 4c20bf14c0b1d7f1d5e530ded890186487da32b5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 28 12:50:24 2010 +0000
+
+ Use FontInfoScanner
+
+ No idea why we didn't do this before, duplicate code is evil and now
+ pdffonts doesn't crash on pdf from bug 20486
+
+ utils/pdffonts.cc | 185
+ ++++++++---------------------------------------------
+ 1 files changed, 26 insertions(+), 159 deletions(-)
+
+commit d915f3d5a9e9e2e5dcd6be4cf8fac1b5849a13e9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 24 21:51:46 2010 +0000
+
+ protect against null ref here
+
+ poppler/Catalog.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit cf32faaa16d763561fb9dfc4469345e4b3ba2369
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 24 21:48:54 2010 +0000
+
+ Protect against NULL values here
+
+ poppler/JPEG2000Stream.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 46a6cc5952c59504863baed3ad2870093c462f12
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 24 19:42:59 2010 +0000
+
+ Check the objects are numbers before using them
+
+ Bug 31895
+
+ poppler/GfxState.cc | 26 ++++++++++++++++++--------
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+commit 52e25cca7e75a8b8eac95a3cec258f1cd9f8ecaa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 23 20:31:14 2010 +0000
+
+ If it is not a Page but has no Kids either let's just pretend it's
+ a page
+
+ Fixes broken PDF at bug 31861
+
+ poppler/Catalog.cc | 2 +-
+ poppler/Dict.cc | 4 ++++
+ poppler/Dict.h | 2 ++
+ 3 files changed, 7 insertions(+), 1 deletions(-)
+
+commit c6127898b13311197971b1c6b1b306b91e28cf0e
+Author: Hib Eris <hib@hiberis.nl>
+Date: Mon Nov 22 13:08:48 2010 +0000
+
+ Use gmallocn_checkoverflow when parsing Hints table
+
+ Prevents running out of memory with malicious documents.
+
+ poppler/Hints.cc | 26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 6a17cc89eda52f08cbacbf9bfaaeda22cf041e82
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Mon Nov 22 19:20:56 2010 +0000
+
+ Improve rendering of radial shadings
+
+ Improves the duck rendering in bug 22098
+
+ poppler/Gfx.cc | 71
+ ++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 34 insertions(+), 37 deletions(-)
+
+commit 9093adede4f9ad6fb2962dcefcb09c1d8c357715
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 21 23:49:12 2010 +0000
+
+ pedantic ;
+
+ poppler/CurlPDFDocBuilder.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 61445f5af749510fb647059af01abf1faf664195
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 20 22:19:35 2010 +0000
+
+ forgot to upadte year here
+
+ poppler/Parser.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3628837febb21bcd1b54f3fb737628ea59e5d95d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 20 22:15:08 2010 +0000
+
+ And now generalize the previous fix
+
+ Works for loops of more than one item as in bug 28784
+
+ poppler/Dict.cc | 4 ++--
+ poppler/Dict.h | 2 +-
+ poppler/Object.cc | 4 ++--
+ poppler/Object.h | 9 +++++----
+ poppler/Parser.cc | 19 +++++++++++++------
+ poppler/Parser.h | 7 ++++++-
+ poppler/XRef.cc | 30 +++++++++++++++++++++++++-----
+ poppler/XRef.h | 2 +-
+ 8 files changed, 55 insertions(+), 22 deletions(-)
+
+commit b0555189a7fbd7f6a899e582783b9e0df44d5d6a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 20 21:32:24 2010 +0000
+
+ Protect against more loops when parsing
+
+ poppler/Dict.cc | 4 ++--
+ poppler/Dict.h | 2 +-
+ poppler/Object.cc | 4 ++--
+ poppler/Object.h | 8 ++++----
+ poppler/Parser.cc | 2 +-
+ poppler/XRef.cc | 4 ++--
+ poppler/XRef.h | 2 +-
+ 7 files changed, 13 insertions(+), 13 deletions(-)
+
+commit 555fa897b275ca7195f22a727b049c8c4f2d74cd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 20 19:14:38 2010 +0000
+
+ Detect loops in FormField creation
+
+ poppler/Form.cc | 88
+ +++++++++++++++++++++++++++++++-----------------------
+ poppler/Form.h | 14 +++++----
+ 2 files changed, 58 insertions(+), 44 deletions(-)
+
+commit 1802ddef374cb1451975480b2427e5d23ee2c737
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 20 18:58:17 2010 +0000
+
+ Forgot to port this away from GooVector :-S
+
+ poppler/CurlCachedFile.cc | 3 +--
+ poppler/CurlCachedFile.h | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+commit 32e53c5436b8c3654e7043f1d86596a79511a4cf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 20 18:54:59 2010 +0000
+
+ fix spacing
+
+ poppler/Form.cc | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 1cb3d5d94a1d89ccded96d977bcabfbe438fb81f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 20 18:08:45 2010 +0000
+
+ fix the memset
+
+ Fixes crash in broken pdf
+
+ poppler/Hints.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 22e8cebaa15adb4b19c9556cdca43cc3e77832b7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 20 17:20:34 2010 +0000
+
+ Ensure the obj are num before reading them
+
+ poppler/GfxState.cc | 32 ++++++++++++++++++++++----------
+ 1 files changed, 22 insertions(+), 10 deletions(-)
+
+commit 08b2db36db4e011ebe36d2d945cb1a0498f1c5fb
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Nov 20 14:00:36 2010 +0100
+
+ add my copyright here
+
+ poppler/Hints.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 91aa4b02aa93ffe3828479194067de42d52be465
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Nov 20 13:13:46 2010 +0100
+
+ [cpp] include <ios> for std::hex() and std::left()
+
+ cpp/poppler-global.cpp | 1 +
+ cpp/tests/poppler-dump.cpp | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 1c924412923cb01f2cb95b0943cb7bbaf7e8cfb6
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Nov 20 13:02:36 2010 +0100
+
+ [cpp] include <iterator> for std::back_inserter()
+
+ cpp/poppler-document.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 95b551025a34f3a7bcff2852eac6d186bc8a7cb0
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Nov 20 12:54:21 2010 +0100
+
+ use a std::vector<char> instead of a var-length-array of char's
+
+ poppler/Hints.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 4faaff893515c80cb69b02e431a0f8483274a497
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Nov 19 23:53:35 2010 +0000
+
+ [win32] Simplify strtok_r implementation
+
+ The previous implementation did not compile with mingw64.
+
+ poppler/strtok_r.cpp | 137
+ +-------------------------------------------------
+ 1 files changed, 1 insertions(+), 136 deletions(-)
+
+commit 255f84927a649d980f047fe755c9c308535a3779
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Nov 19 23:45:33 2010 +0000
+
+ Correct parsing of linearization table
+
+ Fixes bug #31627
+
+ poppler/Linearization.cc | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 9d05138f0b7d15945f546564036bc67815593db0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 14 16:05:28 2010 +0000
+
+ 0.15.2
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 22 ++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 6 files changed, 28 insertions(+), 6 deletions(-)
+
+commit 2d18543bd6b3a5a9ff2dfab63339d5bfcccd0b2f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 14 15:41:56 2010 +0000
+
+ This does actually work now :D
+
+ qt4/tests/check_metadata.cpp | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit d772364b8a5858cbd98e256547d319260fa9d084
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Nov 11 21:52:25 2010 +0100
+
+ [Qt4] New function setDebugErrorFunction().
+
+ This new function + typedef can be useful to direct the ebug/error
+ messages
+ to a different place than the default qDebug()'s one.
+
+ Base on an idea of Albert, added closure and polish by me.
+
+ qt4/src/poppler-private.cc | 20 +++++++++++++++++++-
+ qt4/src/poppler-qt4.h | 24 ++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+), 1 deletions(-)
+
+commit ce929cf33f4b6b6421f9d327b4bb792816d47aac
+Author: Jakob Voss <jakob.voss@gbv.de>
+Date: Wed Nov 10 23:41:44 2010 +0000
+
+ Add -p flag to pdfimages
+
+ Adds the page the image is in to the image filename
+
+ utils/ImageOutputDev.cc | 25 ++++++++++++++++++-------
+ utils/ImageOutputDev.h | 19 +++++++++++++++----
+ utils/pdfimages.1 | 3 +++
+ utils/pdfimages.cc | 6 +++++-
+ 4 files changed, 41 insertions(+), 12 deletions(-)
+
+commit 6296c28968613aadb7ea084092945a54005eca9b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 10 23:28:45 2010 +0000
+
+ Kill GooVector
+
+ std::vector does the same and GooVector is not part of xpdf so
+ we don't
+ need to maintain it in case we ever get a new xpdf release we want to
+ merge with
+
+ CMakeLists.txt | 1 -
+ goo/GooVector.h | 159
+ --------------------------------------------
+ goo/Makefile.am | 1 -
+ poppler/CachedFile.cc | 19 +++---
+ poppler/CachedFile.h | 15 ++--
+ poppler/Catalog.cc | 12 ++--
+ poppler/Catalog.h | 10 ++-
+ poppler/Form.h | 3 +-
+ poppler/Gfx.h | 7 +-
+ poppler/Hints.cc | 5 +-
+ poppler/Hints.h | 6 +-
+ poppler/StdinCachedFile.cc | 2 +-
+ poppler/StdinCachedFile.h | 2 +-
+ poppler/Stream.h | 1 -
+ poppler/XRef.cc | 10 ++--
+ poppler/XRef.h | 7 +-
+ utils/HtmlFonts.cc | 8 +-
+ utils/HtmlFonts.h | 12 ++--
+ utils/HtmlLinks.cc | 8 +--
+ utils/HtmlLinks.h | 4 +-
+ 20 files changed, 66 insertions(+), 226 deletions(-)
+
+commit 5934c320aa136c1a6e97fb9bf54bdfdccfcab521
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Nov 10 22:50:36 2010 +0000
+
+ Linearization improvements
+
+ Read
+ http://lists.freedesktop.org/archives/poppler/2010-November/006642.html
+ for the detailed patch description
+
+ CMakeLists.txt | 4 +
+ glib/poppler-action.cc | 4 +-
+ glib/poppler-document.cc | 17 +-
+ glib/poppler-page.cc | 1 +
+ poppler/CachedFile.h | 2 +-
+ poppler/Catalog.cc | 352 +++++++++++++++++++++-----------
+ poppler/Catalog.h | 14 +-
+ poppler/FontInfo.cc | 5 +-
+ poppler/Hints.cc | 439
+ +++++++++++++++++++++++++++++++++++++++
+ poppler/Hints.h | 95 +++++++++
+ poppler/Linearization.cc | 224 ++++++++++++++++++++
+ poppler/Linearization.h | 45 ++++
+ poppler/Makefile.am | 4 +
+ poppler/PDFDoc.cc | 284 +++++++++++++++++++++----
+ poppler/PDFDoc.h | 38 +++-
+ poppler/PSOutputDev.cc | 39 ++--
+ poppler/PSOutputDev.h | 14 +-
+ poppler/Stream.cc | 13 +-
+ poppler/Stream.h | 11 +-
+ poppler/XRef.cc | 351 ++++++++++++++++++-------------
+ poppler/XRef.h | 25 ++-
+ qt/poppler-document.cc | 14 ++-
+ qt/poppler-page.cc | 19 +-
+ qt/poppler-private.h | 14 +-
+ qt/poppler-qt.h | 3 +-
+ qt4/src/poppler-document.cc | 12 +-
+ qt4/src/poppler-link.cc | 7 +-
+ qt4/src/poppler-page.cc | 3 +-
+ qt4/src/poppler-ps-converter.cc | 2 +
+ utils/HtmlOutputDev.cc | 2 +-
+ utils/HtmlOutputDev.h | 3 +
+ utils/pdffonts.cc | 6 +-
+ utils/pdfinfo.cc | 22 ++-
+ utils/pdftohtml.cc | 2 +-
+ utils/pdftops.cc | 3 +-
+ 35 files changed, 1690 insertions(+), 403 deletions(-)
+
+commit abb1313ae40ab7efb073406f47fa53bf7afe0b88
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Nov 8 01:54:03 2010 +0100
+
+ [cpp/apidox] add the minimum version of 'image'
+
+ cpp/poppler-image.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit f559e77cb7d76c5fe6a79be9086667a29613c912
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Nov 8 01:52:48 2010 +0100
+
+ [cpp] add image::bytes_per_row()
+
+ cpp/poppler-image.cpp | 8 ++++++++
+ cpp/poppler-image.h | 1 +
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 14dea4d74698d5d7d994e687f8176652d790dba7
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Nov 7 22:57:31 2010 +0100
+
+ [arthur] use the untransformed line width, not the transformed one
+
+ ... as the painter will do the transformation itself already;
+ seems to product better results
+
+ poppler/ArthurOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f077e82af0724be88d28c896a3c208f1d50ccff9
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Nov 7 21:50:48 2010 +0100
+
+ [qt4] New Page::renderToPainter()
+
+ This new painter-based painting function ican be used for painting
+ (with Arthur only for now) without getting an image first.
+ Also add a new flag type for it, with a single item telling whether
+ do not save+restore the provided painter.
+
+ Mostly based on a patch by Matthias Fauconneau
+ (matthias.fauconneau@gmail.com), thanks!
+
+ qt4/src/poppler-page.cc | 62
+ +++++++++++++++++++++++++++++++-------------
+ qt4/src/poppler-qt4.h | 65
+ ++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 107 insertions(+), 20 deletions(-)
+
+commit df02d1fc9e65422121e5e8f493c13229552ec0e7
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Nov 7 19:47:56 2010 +0100
+
+ [arthur] remove unused 'm_image' attribute
+
+ poppler/ArthurOutputDev.cc | 1 -
+ poppler/ArthurOutputDev.h | 2 +-
+ 2 files changed, 1 insertions(+), 2 deletions(-)
+
+commit b29582cd0d542a3e70dbca3fb75770daa4cc91ca
+Author: Matthias Fauconneau <matthias.fauconneau@gmail.com>
+Date: Sun Nov 7 19:44:11 2010 +0100
+
+ [arthur] small fixes and memory leaks
+
+ - fix font rendering (transforming the glyph path and not only the
+ glyph origin)
+ - fix image rendering (alpha was set to zero)
+
+ poppler/ArthurOutputDev.cc | 122
+ +++++++++++++++++++------------------------
+ 1 files changed, 54 insertions(+), 68 deletions(-)
+
+commit 970f075569bf9be5e5ddc3a9ad1fabec5435dfaf
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Nov 7 16:31:02 2010 +0100
+
+ [cpp/tests] add a simple poppler-render test
+
+ ... to ease testing the render capabilities of poppler-cpp.
+ quite minimal at the moment.
+
+ cpp/tests/CMakeLists.txt | 3 +
+ cpp/tests/Makefile.am | 9 +++-
+ cpp/tests/poppler-render.cpp | 113
+ ++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 124 insertions(+), 1 deletions(-)
+
+commit bfe4139c742cb0a669f5504df7e22e3e57243d9a
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Nov 7 16:23:26 2010 +0100
+
+ [cpp] Add page_renderer, to render pages over images.
+
+ This new class introduces a very simple way to render a page, using
+ the Splash backend,
+ giving an 'image' as result.
+ It can hold a color for the "paper" of the pages, and some hints
+ for the actual rendering.
+
+ cpp/CMakeLists.txt | 2 +
+ cpp/Makefile.am | 2 +
+ cpp/poppler-page-renderer.cpp | 212
+ +++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-page-renderer.h | 66 +++++++++++++
+ 4 files changed, 282 insertions(+), 0 deletions(-)
+
+commit 91e3f7b4ea42a5821fd78e1edf55e95250c9bc68
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Nov 7 16:19:34 2010 +0100
+
+ [cpp] add an internal way to get a 'page_private' of a 'page'
+
+ useful for getting a 'page_private' in the implementation of other
+ cpp classes
+ without the need to add friends to 'page'
+
+ cpp/poppler-page-private.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit fa7c41cb9c52ecd3d7c574455b1258a3021b8c75
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Nov 4 20:55:34 2010 +0000
+
+ Improvements to the splash backend
+
+ Antialias and shadings.
+ Code by Thomas Freitag <Thomas.Freitag@alfa.de> and Christian
+ Feuersänger <cfeuersaenger@googlemail.com>
+ More info at bug 30436
+
+ poppler/CairoOutputDev.h | 5 +-
+ poppler/Function.cc | 4 +-
+ poppler/Function.h | 2 +
+ poppler/Gfx.cc | 12 +-
+ poppler/OutputDev.h | 16 ++-
+ poppler/PSOutputDev.h | 4 +-
+ poppler/SplashOutputDev.cc | 182 ++++++++++++++++++++-
+ poppler/SplashOutputDev.h | 68 ++++++++-
+ splash/Splash.cc | 395
+ +++++++++++++++++++++++++++++++++++++++++++-
+ splash/Splash.h | 11 +-
+ splash/SplashBitmap.cc | 4 +-
+ splash/SplashBitmap.h | 3 +
+ splash/SplashPattern.cc | 17 ++-
+ splash/SplashPattern.h | 36 ++++-
+ 14 files changed, 735 insertions(+), 24 deletions(-)
+
+commit 0aa040163741ab8ba093a742e556bba2a5ab7edf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 3 20:40:24 2010 +0000
+
+ Do not add sibling children as parents
+
+ Fixes c2ff94b1600b8a5841a5e4627f014560ac460f1a
+
+ poppler/Function.cc | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit c2ff94b1600b8a5841a5e4627f014560ac460f1a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 3 00:02:02 2010 +0000
+
+ Do not loop forever in broken documents
+
+ StitchingFunctions that have themselves up in the parent chain
+ are wrong
+
+ poppler/Function.cc | 22 +++++++++++++++++++---
+ poppler/Function.h | 6 ++++--
+ 2 files changed, 23 insertions(+), 5 deletions(-)
+
+commit cad66a7d25abdb6aa15f3aa94a35737b119b2659
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 2 19:14:34 2010 +0000
+
+ Fix crash in broken documents
+
+ mapLen = (code + 256) & ~255; can wrap and you end up with mapLen
+ < code
+ that is not what you wanted
+
+ poppler/CharCodeToUnicode.cc | 16 +++++++++++-----
+ 1 files changed, 11 insertions(+), 5 deletions(-)
+
+commit 7e5f31c1c41193c6e49355970e6d027b91d45825
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 2 00:32:01 2010 +0000
+
+ make some more fields private
+
+ splash/SplashFontFile.h | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 6751eb48dc49890f7ad8b732b3fc29a2db746ec4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 2 00:26:08 2010 +0000
+
+ Make the destructor private
+
+ You are not supposed to call it, you should call unref
+
+ splash/SplashFontFile.h | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit b718e821d5f21ea5b0c44c6c2b59769c9b94892a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Oct 28 08:46:09 2010 +0100
+
+ Revert fdfffc9c68314d3f64dee7e0ef8617105e3198dd
+
+ It is not a leak and makes things crash :D
+
+ poppler/SplashOutputDev.cc | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 15b9aeac5a20c544db1aebe00113ebc2f7ba52c7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Oct 28 00:37:29 2010 +0100
+
+ if reallocn fails, free p
+
+ goo/gmem.cc | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 561c0567a5741d7c49903c51c8020187dccaa0d9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Oct 27 22:43:51 2010 +0100
+
+ fix comment
+
+ poppler/SplashOutputDev.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 4ef38cc99a879202e717447a422272cf85eeccfc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Oct 27 22:36:07 2010 +0100
+
+ Fix memory leaks that can happen with broken documents
+
+ poppler/SplashOutputDev.cc | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit fdfffc9c68314d3f64dee7e0ef8617105e3198dd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Oct 27 20:40:19 2010 +0100
+
+ Fix memory leak
+
+ poppler/SplashOutputDev.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 90d479d9d5c947175e60ab689f440ae9c24f0b2b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Oct 27 20:39:48 2010 +0100
+
+ Do not crash if bitmap->alpha == NULL
+
+ Happens in broken files
+
+ splash/Splash.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 6ad36277971ec46d4a4ef0c45625e60f8c5f1247
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Oct 25 18:59:49 2010 +0100
+
+ Initialze movie to NULL on broken pdf files
+
+ poppler/Annot.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 2d0b6e2956a81164bca6adc9aacad0e620480957
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 24 00:23:21 2010 +0100
+
+ Here the chars to read is the increment size not the initialSize
+
+ Fixes crash in file provided by Robert Święcki
+
+ poppler/Stream.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit dcb02d2100136b6035485be3be214ce3d9f1c102
+Author: Vincent Torri <vtorri@univ-evry.fr>
+Date: Sat Oct 23 23:45:05 2010 +0100
+
+ remove -ansi flag for cywin and mingw
+
+ configure.ac | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 17cdc81224c72f7b58de61734c9ead337ff7b42b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 23 23:37:59 2010 +0100
+
+ update my C year
+
+ poppler/SplashOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e09ddce7e21bbd62b384d9d59fbd1e0f14f7d05f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 23 23:33:00 2010 +0100
+
+ Fix crash in malformed documents
+
+ poppler/SplashOutputDev.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 906e4e15421d8f3f0a825ca767e5eac3169853d6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 23 23:12:44 2010 +0100
+
+ Do not leak attrs1
+
+ poppler/Catalog.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit ec32bb45a57a8a839156c946fcde1270aa6019d9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 23 23:00:03 2010 +0100
+
+ Do not crash if n is 0
+
+ poppler/Function.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 9edf7e4fefb37989af9a2558aaa83d7cd4694ec6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 23 22:59:50 2010 +0100
+
+ add unlikely marker
+
+ poppler/Decrypt.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c46e863b7b94dc2f83a7d89f4afb8fe3bc8ec35c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 23 22:55:49 2010 +0100
+
+ Do not divide by 0 in rc4InitKey
+
+ poppler/Decrypt.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit bcb13ed5828e2a855efd5e38b2acd15ca37a9991
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 23 22:40:17 2010 +0100
+
+ Check obj2 is a num before reading it
+
+ poppler/Gfx.cc | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit c64a49307782299cb7a950a66419f9d59707f38b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Oct 20 22:29:29 2010 +0100
+
+ 0.15.1
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 6 files changed, 52 insertions(+), 6 deletions(-)
+
+commit 3b45c66de91243d7419657512cf726c9e1c26dfb
+Author: Kenneth Berland <ken@hero.com>
+Date: Sun Oct 17 14:24:16 2010 +0100
+
+ Add -bbox option to pdftotext
+
+ utils/pdftotext.1 | 4 ++
+ utils/pdftotext.cc | 125
+ +++++++++++++++++++++++++++++++++++++++++-----------
+ 2 files changed, 103 insertions(+), 26 deletions(-)
+
+commit 71ec4c7a6715a40d536d1e4b911dae48d1bba7b9
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Oct 17 14:57:43 2010 +0200
+
+ [CMake] update MacroOptionalFindPackage.cmake from KDE SVN
+
+ no radical changes, just a minor improvement for the "explicitly
+ disabled" case
+
+ cmake/modules/MacroOptionalFindPackage.cmake | 40
+ +++++++++++++++++++------
+ 1 files changed, 30 insertions(+), 10 deletions(-)
+
+commit ab0049d8be5dfe1989c4aa33c2732915c62fecb2
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Oct 17 14:29:22 2010 +0200
+
+ [CMake] Cairo package: make the version check really working
+
+ cmake/modules/FindCairo.cmake | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 1cea33717c92631ee9c417d9f89e32b03695c75a
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Oct 17 13:55:58 2010 +0200
+
+ [CMake] Bump cairo dependency to 1.10
+
+ followup of fc9b85894754d175af916eaf6cb127efd601df7e
+
+ CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d6f49aa2da15cd2e9cf775d6b1d2d04a005c8cdd
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 17 14:22:57 2010 +0200
+
+ [cairo] Fix a crash when redering documents with invalid type 3 fonts
+
+ poppler/CairoFontEngine.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e2fad550c3cbf86541730582151e1bb6470ed9c1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 17 13:47:33 2010 +0200
+
+ [glib-demo] Use poppler_page_get_selected_region() in selections demo
+
+ glib/demo/selections.c | 73
+ ++++++++++++++---------------------------------
+ 1 files changed, 22 insertions(+), 51 deletions(-)
+
+commit 88013458e141de58ed801480707ae0dfe92b9aa2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 17 13:46:26 2010 +0200
+
+ [glib] Add poppler_page_get_selected_region()
+
+ that returns a cairo_region_t, and deprecate
+ poppler_page_get_selection_region().
+
+ glib/poppler-page.cc | 81
+ +++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h | 4 ++
+ glib/reference/poppler-sections.txt | 1 +
+ 3 files changed, 86 insertions(+), 0 deletions(-)
+
+commit fc9b85894754d175af916eaf6cb127efd601df7e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 17 12:54:18 2010 +0200
+
+ [configure] Bump cairo dependency to 1.10
+
+ configure.ac | 2 +-
+ poppler/CairoOutputDev.cc | 4 ----
+ 2 files changed, 1 insertions(+), 5 deletions(-)
+
+commit dd14ef6b211ac1c8a4f16bb6094dbfd6a09cbef9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 17 12:46:55 2010 +0100
+
+ Improve dict lookup speed for big dicts
+
+ Based on a patch by Paweł Wiejacha <pawel.wiejacha@gmail.com>
+
+ poppler/Dict.cc | 98
+ +++++++++++++++++++++++++++++++++++++++++++-----------
+ poppler/Dict.h | 2 +
+ 2 files changed, 80 insertions(+), 20 deletions(-)
+
+commit bb38a0c71434413f2728109c73278de1b8a58571
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 17 12:52:01 2010 +0200
+
+ [glib-demo] Make glib demo program installable
+
+ It's a useful tool for testing and debugging not only for people who
+ install from sources.
+
+ glib/demo/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d26d0fab2ddfff853f6681a3518813a2d65a4112
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 17 12:36:46 2010 +0200
+
+ [glib-demo] Use printing options in print demo
+
+ glib/demo/print.c | 96
+ +++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 93 insertions(+), 3 deletions(-)
+
+commit 4a71dcdd350d0c0515ca349f0b875b33289d25ee
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 17 12:31:41 2010 +0200
+
+ [glib] Add poppler_page_render_for_printing_with_options()
+
+ It allows to print with the same options acroread has:
+
+ - Print document
+ - Print document and markup
+ - Print document and stamps
+
+ glib/poppler-page.cc | 77
+ ++++++++++++++++++++++++++++++----
+ glib/poppler-page.h | 3 +
+ glib/poppler.h | 19 +++++++++
+ glib/reference/poppler-sections.txt | 4 ++
+ 4 files changed, 94 insertions(+), 9 deletions(-)
+
+commit 0b3b2ebc3930bd46fb13fb2158fc695b0962f7c5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 16 15:09:05 2010 +0100
+
+ Add a callback to know which page has been printed
+
+ qt4/src/poppler-ps-converter.cc | 16 ++++++++++++++--
+ qt4/src/poppler-qt4.h | 10 ++++++++++
+ 2 files changed, 24 insertions(+), 2 deletions(-)
+
+commit 4bd25223c4d15dfa91965a6e86eaa444a5a81f71
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 16 15:08:05 2010 +0100
+
+ Do not omit this character
+
+ Mimics Cairo backend and Adode Reader behaviour
+
+ splash/SplashFTFont.cc | 4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+commit b604a008a2a379a21e5fdfa0799886f80d893a08
+Author: Christian Feuersänger <cfeuersaenger@googlemail.com>
+Date: Thu Oct 14 23:56:36 2010 +0100
+
+ Improve rendering of Shading Type 6 and 7
+
+ poppler/Gfx.cc | 212
+ +++++++++++++++++++++++++++++++++++++++++----------
+ poppler/Gfx.h | 9 ++-
+ poppler/GfxState.cc | 96 +++++++++++++++++++++++-
+ poppler/GfxState.h | 127 ++++++++++++++++++++++++++++++-
+ 4 files changed, 397 insertions(+), 47 deletions(-)
+
+commit c6bb63b31c268e4e842532e6839b15edb31cf25c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Oct 14 23:33:13 2010 +0100
+
+ Only clip boxes to mediabox if we are at the page level
+
+ Fixes bug 30784
+
+ poppler/Page.cc | 19 +++++++++++--------
+ 1 files changed, 11 insertions(+), 8 deletions(-)
+
+commit 4a248b3f523209ec16ace587229412653b2276d0
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Oct 14 18:32:05 2010 +0200
+
+ [cpp] make it compile also when there are no image formats available
+
+ including the ImgWirter.h is enough to get the definition of ImgWriter
+
+ cpp/poppler-image.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit de1501d87549269f9214c9e3fba4cbf39960826e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Oct 13 19:18:36 2010 +0100
+
+ remove windows eol
+
+ poppler/Gfx.cc | 38 +++++++++++++++++++-------------------
+ 1 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 12e68b49feef10b654944dd71eab0852cfeceb89
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Oct 10 23:04:57 2010 +0200
+
+ [cpp] Add a new 'image' class.
+
+ This implicitely shared class represents the data buffer of an
+ "image",
+ with direct access to the data.
+ It also has a function to save to file (png/jpeg).
+
+ Still a FIXME in the copy() method and in the save() (for mono
+ images only).
+
+ cpp/CMakeLists.txt | 2 +
+ cpp/Makefile.am | 3 +
+ cpp/poppler-image-private.h | 48 +++++
+ cpp/poppler-image.cpp | 431
+ +++++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-image.h | 70 +++++++
+ 5 files changed, 554 insertions(+), 0 deletions(-)
+
+commit db31687ba476e272b72625a8a78b50780522ee7d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Oct 9 10:33:06 2010 +0200
+
+ [glib] docs: Document poppler_annot_markup_get_date()
+
+ glib/poppler-annot.cc | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit a7cf8d322a4a687c9810a577cc92ff6b9725ecdc
+Author: Fernando Herrera <fherrera@onirica.com>
+Date: Thu Oct 7 17:28:31 2010 +0200
+
+ [glib] Fix introspection annotations for poppler_document_get_page*()
+
+ Return value should be transfer full since the caller owns the only
+ reference.
+
+ glib/poppler-document.cc | 6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+commit d690bea929553d1a4392d42d949843e9467ba8cb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Oct 5 22:18:22 2010 +0100
+
+ Make sure obj is a num before reading it
+
+ Not sure if using a 0 is correct otherwise, but if your matrix is
+ broken you're probably going to get a wrong rendering anyway, so who
+ cares. Bug #30590
+
+ poppler/Gfx.cc | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit b17be2bc32cf71bac0473bf4ac16359e3027b4fc
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 3 12:14:11 2010 +0200
+
+ [annots] Fix a crash when drawing square/circle annots without
+ a border
+
+ Fixes bug #30580
+
+ poppler/Annot.cc | 121
+ +++++++++++++++++++++++++++---------------------------
+ 1 files changed, 61 insertions(+), 60 deletions(-)
+
+commit e3d3944c1988343704e3ba3a5d60609719466afb
+Author: Tomas Hoger <thoger@redhat.com>
+Date: Wed Sep 29 20:03:45 2010 +0100
+
+ Fix uninitialized uses on DCTScanInfo
+
+ poppler/Stream.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit f380647f09d88339c936184bbe86c70c0d47de4b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 29 20:02:10 2010 +0100
+
+ Free names
+
+ poppler/Catalog.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit aa0fd32a8501473832bce1b8b804dd3f9a45735b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 27 22:39:09 2010 +0100
+
+ Consider render value when colorizing text
+
+ Fixes bug 2807
+
+ poppler/CairoOutputDev.cc | 18 +++---------------
+ poppler/CairoOutputDev.h | 2 --
+ poppler/Gfx.cc | 21 +++++++++++++++++----
+ poppler/PSOutputDev.cc | 26 ++++++++++----------------
+ poppler/PSOutputDev.h | 3 +--
+ poppler/SplashOutputDev.cc | 18 +++---------------
+ poppler/SplashOutputDev.h | 4 +---
+ 7 files changed, 35 insertions(+), 57 deletions(-)
+
+commit cf710b999b510203e9348ea9f04360be1fe957b8
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Sep 24 00:50:37 2010 +0200
+
+ [Qt4] enable the generation of the QCH file
+
+ ... usable in Qt Assistant
+
+ qt4/src/Doxyfile | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+commit be6d933071c9ab043f01f374a884472c4ce3007e
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Sep 23 15:55:45 2010 +0200
+
+ update Doxyfile's for qt4 and cpp
+
+ no changes in the actual configuration values
+
+ cpp/Doxyfile | 155 +++++--
+ qt4/src/Doxyfile | 1469
+ +++++++++++++++++++++++++++++++++---------------------
+ 2 files changed, 1018 insertions(+), 606 deletions(-)
+
+commit 721da3d542ab9b234b058f3c14ea9303d748107e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Sep 23 14:09:11 2010 +0200
+
+ [glib] Use g_memdup instead of g_strdup in poppler_document_get_id()
+
+ Ids are not null-terminated strings, but fixed size byte arrays.
+
+ glib/demo/info.cc | 8 ++++++--
+ glib/poppler-document.cc | 33 ++++++++++++++-------------------
+ 2 files changed, 20 insertions(+), 21 deletions(-)
+
+commit 4ffc0ed73397e4e58f04c3577b093a3fd39c22bd
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Sep 23 02:21:12 2010 +0200
+
+ [cpp] small clarification in document::load_from_data() apidox
+
+ cpp/poppler-document.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 9491dc4a10706109d0f2b4d15f21b9a1db51d8c9
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Sep 23 02:18:07 2010 +0200
+
+ [cpp] add document::load_from_raw_data()
+
+ ... to be able to load a document from an external data buffer,
+ with no need to copy the data.
+
+ add as well a new document_private constructor to handle the new
+ situation,
+ and make sure to properly use the raw data when unlocking the document
+
+ cpp/poppler-document-private.h | 5 ++++
+ cpp/poppler-document.cpp | 53
+ ++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-document.h | 4 +++
+ 3 files changed, 62 insertions(+), 0 deletions(-)
+
+commit a3c1f2d5ea1de969e9aaaa84ee38866938b4ce0c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 22 20:14:27 2010 +0100
+
+ fix copyright
+
+ poppler/Form.cc | 1 +
+ poppler/Form.h | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 1aad013e353a9e59bdab8a1b4ce93f2ad7aaf4f2
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Sep 22 17:07:38 2010 +0200
+
+ update copyrights
+
+ cpp/poppler-document.h | 2 +-
+ cpp/poppler-page-transition.cpp | 2 +-
+ cpp/poppler-private.cpp | 2 +-
+ cpp/poppler-rectangle.cpp | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 2d6d66ebe0215df66e33cb5974c58c324fab50b6
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Sep 22 17:07:13 2010 +0200
+
+ [cpp/tests] poppler-dump: show the PDF IDs, if available
+
+ cpp/tests/poppler-dump.cpp | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit e39fde1b62544b90e73a2fc3609a260991db3a47
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Sep 22 16:52:08 2010 +0200
+
+ [cpp] add document::get_pdf_id()
+
+ ... to get the IDs of a PDF document, if present.
+
+ cpp/poppler-document.cpp | 29 +++++++++++++++++++++++++++++
+ cpp/poppler-document.h | 1 +
+ 2 files changed, 30 insertions(+), 0 deletions(-)
+
+commit 299a1849a148fa0a7b3171c45ec68b9901aa93bb
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Sep 22 16:36:30 2010 +0200
+
+ [Qt4] add Document::getPdfId()
+
+ ... to get the IDs of a PDF document, if present.
+
+ also, add two test cases for it in the metadata unit test
+
+ qt4/src/poppler-document.cc | 16 +++++++++++++
+ qt4/src/poppler-qt4.h | 14 +++++++++++
+ qt4/tests/check_metadata.cpp | 50
+ ++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 80 insertions(+), 0 deletions(-)
+
+commit dd9bcdb720ac1bf8a022635bcbb3b56e4b75bb15
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Sep 22 16:29:46 2010 +0200
+
+ Make the internal get_id() not fail because of null bytes in the ID.
+
+ Passing the const char* of the byte string to convert is not enough
+ if its length must be checked,
+ as it might fail when the string of the ID contains null bytes.
+ Instead, pass the original GooString so its size is properly checked.
+
+ Also, remove an hardcoded 16 and make it dependent on pdfIdLength,
+ as used elsewhere in get_id() function.
+
+ poppler/PDFDoc.cc | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 9554cbc3cb4fc0cd7ad2295f5d27a18e030c6aee
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Sep 22 12:54:25 2010 +0200
+
+ [glib-demo] Show form field names in forms demo
+
+ glib/demo/forms.c | 26 ++++++++++++++++++++------
+ 1 files changed, 20 insertions(+), 6 deletions(-)
+
+commit 257634b26b682628dba5ee5f94cb0bad030bcb4f
+Author: Mark Riedesel <mark@klowner.com>
+Date: Wed Sep 22 12:52:49 2010 +0200
+
+ [glib] Add methods to get mapping, partial an fully qualified form
+ field names
+
+ See bug #28780.
+
+ glib/poppler-form-field.cc | 68
+ +++++++++++++++++++++++++++++++++++
+ glib/poppler-form-field.h | 3 ++
+ glib/reference/poppler-sections.txt | 3 ++
+ 3 files changed, 74 insertions(+), 0 deletions(-)
+
+commit 6db98abc59c154dcb18d69fc37e44ce804c3ccc9
+Author: Mark Riedesel <mark@klowner.com>
+Date: Wed Sep 22 12:41:16 2010 +0200
+
+ Add getLabel method to FormWidget
+
+ See bug #28780.
+
+ poppler/Form.cc | 64
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Form.h | 8 +++++++
+ 2 files changed, 72 insertions(+), 0 deletions(-)
+
+commit bcdca66fd57439735e0b9aa182ab7cfce29e9ed0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Sep 21 11:49:37 2010 +0200
+
+ [glib] Fix minimum value of creation and modification date properties
+
+ It should be -1 which means there's no date specified
+
+ glib/poppler-document.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d2578bd66129466b2dd114b6407c147598e09d2b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 19:19:27 2010 +0100
+
+ Avoid loops in Form::fieldLookup
+
+ Fixes crash in broken pdf provided by Joel Voss of Leviathan
+ Security Group
+
+ poppler/Dict.h | 3 +++
+ poppler/Form.cc | 27 ++++++++++++++++++++++++---
+ 2 files changed, 27 insertions(+), 3 deletions(-)
+
+commit 2fe825deac055be82b220d0127169cb3d61387a8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 19:15:25 2010 +0100
+
+ Make sure obj1 is a num before reading it
+
+ Fixes crash in broken pdf provided by Joel Voss of Leviathan
+ Security Group
+
+ poppler/Gfx.cc | 20 ++++++++++++++++----
+ 1 files changed, 16 insertions(+), 4 deletions(-)
+
+commit 473de6f88a055bb03470b4af5fa584be8cb5fda4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 19:11:42 2010 +0100
+
+ Fix memory leak if obj2 is not a dict
+
+ Found thanks to PDF provided by Joel Voss of Leviathan Security Group
+
+ poppler/Form.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 9706e28657ff7ea52aa69d9efb3f91d0cfaee70b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 19:09:37 2010 +0100
+
+ Fix crash when idx is out of range
+
+ Found thanks to PDF provided by Joel Voss of Leviathan Security Group
+
+ poppler/Function.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 26a5817ffec9f05ac63db6c5cd5b1f0871d271c7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 19:08:54 2010 +0100
+
+ Fix crash when idx is out of range
+
+ Fixes crash in broken pdf provided by Joel Voss of Leviathan
+ Security Group
+
+ poppler/Function.cc | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit dfdf3602bde47d1be7788a44722c258bfa0c6d6e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 19:07:12 2010 +0100
+
+ Give a value to color.c[i]
+
+ Might not be the better solution but it's better than having a random
+ value there
+
+ Found thanks to PDF provided by Joel Voss of Leviathan Security Group
+
+ poppler/Gfx.cc | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 01c85c08305bae16242f5979ab107fa5bb5f5100
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 19:04:37 2010 +0100
+
+ Forgot my (C) here
+
+ poppler/Decrypt.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bf2055088a3a2d3bb3d3c37d464954ec1a25771f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 19:03:19 2010 +0100
+
+ Properly initialize stack
+
+ Fixes crash in broken pdf provided by Joel Voss of Leviathan
+ Security Group
+
+ poppler/Function.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit e853106b58d6b4b0467dbd6436c9bb1cfbd372cf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 19:01:36 2010 +0100
+
+ Properly initialize parser
+
+ Fixes crash in broken pdf provided by Joel Voss of Leviathan
+ Security Group
+
+ poppler/Gfx.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 3422638b2a39cbdd33a114a7d7debc0a5f688501
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 18:58:43 2010 +0100
+
+ Fix crash in broken pdf (parser->getStream() is 0)
+
+ Found thanks to PDF provided by Joel Voss of Leviathan Security Group
+
+ poppler/Gfx.cc | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+commit a2dab0238a69240dad08eca2083110b52ce488b7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 18:55:51 2010 +0100
+
+ Initialize properly charactersRead
+
+ It is possible that there are calls to getPos before reset
+ Found thanks to PDF provided by Joel Voss of Leviathan Security Group
+
+ poppler/Decrypt.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 39d140bfc0b8239bdd96d6a55842034ae5c05473
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 18:54:31 2010 +0100
+
+ Fix crash in broken pdf (code < 0)
+
+ Found thanks to PDF provided by Joel Voss of Leviathan Security Group
+
+ fofi/FoFiType1.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit c6a091512745771894b54a71613fd6b5ca1adcb3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 21 18:50:25 2010 +0100
+
+ Fix memory leak
+
+ Found thanks to PDF provided by Joel Voss of Leviathan Security Group
+
+ poppler/Stream.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 9b6ddb68b80ef19cd2615900bd24da76374003d9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 20 19:47:47 2010 +0100
+
+ Fix copyright
+
+ poppler/PDFDoc.cc | 1 +
+ poppler/PDFDoc.h | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit fa3abc23656204eedd022ee1c73d9e5af758cdac
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Sep 17 22:20:09 2010 +0200
+
+ [cpp] More bits of API documentation.
+
+ cpp/poppler-global.cpp | 124
+ +++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-page-transition.cpp | 32 ++++++++++
+ cpp/poppler-rectangle.cpp | 19 ++++++
+ 3 files changed, 175 insertions(+), 0 deletions(-)
+
+commit c5f7b5becc9993c05b67a470d5a1e431806b98d6
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Sep 17 20:26:37 2010 +0200
+
+ update copyrights
+
+ qt4/src/poppler-private.cc | 2 +-
+ qt4/tests/check_strings.cpp | 18 ++++++++++++++++++
+ 2 files changed, 19 insertions(+), 1 deletions(-)
+
+commit ae517042570327b860c1db6b68f9697d5c104657
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Sep 17 19:39:10 2010 +0200
+
+ [cpp] improve a bit the Unicode* -> ustring conversion
+
+ (although IMHO not yet solved)
+
+ cpp/poppler-private.cpp | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit f4c6ef88f01f6763943a3e6e006e52dbea0b149c
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Sep 17 16:07:05 2010 +0200
+
+ [Qt4/tests] check_strings: add a new test case for
+ QStringToUnicodeGooString
+
+ not much test data at the moment though
+
+ qt4/tests/check_strings.cpp | 37 +++++++++++++++++++++++++++++++++++++
+ 1 files changed, 37 insertions(+), 0 deletions(-)
+
+commit ffd227b7669895325d752009d5185973cf86ce5b
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Sep 17 14:25:57 2010 +0200
+
+ [Qt4] optimize UnicodeParsedString using less memory from QString
+
+ - reserve() the right number of chars in the result string, so there
+ is less possibility to make it gr
+ ow its buffer
+ - do not call unicodeToQString() just to create a 1 character string,
+ but directly append a QChar crea
+ ted with the resulting unicode value (always belonging to the BMP)
+
+ this should reduce of a very little bit the memory usage, while give
+ a sensible speedup of UnicodeParsedString invocations
+
+ qt4/src/poppler-private.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 6180890008f2b1814f092f50b8f75376399905ba
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Sep 17 13:23:25 2010 +0200
+
+ [Qt4/tests] check_strings: add a test case for UnicodeParsedString
+
+ very simple test data for it, at the moment
+
+ qt4/tests/check_strings.cpp | 48
+ +++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 48 insertions(+), 0 deletions(-)
+
+commit c5f78d7d3953d62a746c6f5a90085ea020fe5ec7
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Sep 17 12:54:32 2010 +0200
+
+ [Qt4/tests] check_string: use a pool of GooString
+
+ this way we can reuse the GooString in a data set even after a test
+ run (eg in benchmarks),
+ making sure they all are properly freed
+
+ qt4/tests/check_strings.cpp | 35 ++++++++++++++++++++++++++++++-----
+ 1 files changed, 30 insertions(+), 5 deletions(-)
+
+commit 0cd5a256bdf7778c0c720941a611ad8ab56fa2e9
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Sep 17 00:27:53 2010 +0200
+
+ [Qt4/tests] first version of a unit test for strings
+
+ this is used for testing the various string conversions:
+ - unicodeToQString
+ - UnicodeParsedString
+ - QStringToUnicodeGooString
+ - QStringToGooString
+ the 1st and the 4th have basic tests
+
+ given private symbols are used, this unit test is not compiled on
+ windows (at least, it supposed to be so)
+
+ qt4/tests/CMakeLists.txt | 3 +
+ qt4/tests/Makefile.am | 7 +++-
+ qt4/tests/check_strings.cpp | 101
+ +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 110 insertions(+), 1 deletions(-)
+
+commit c6e8b21c9829672e6ca42e6cdc0ca631a06af73f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Sep 17 13:44:38 2010 +0200
+
+ [glib] docs: Document PopplerDocument properties
+
+ glib/poppler-document.cc | 380
+ +++++++++++++++++++++++++++-------------------
+ 1 files changed, 223 insertions(+), 157 deletions(-)
+
+commit d4a6c17255821925906c17b79b88eebed9edfee1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Sep 17 13:04:33 2010 +0200
+
+ [glib] Add accessor for all PopplerDocument properties
+
+ PopplerDocument:linearized is now a boolean value rather than string,
+ so this commit breaks the API again.
+
+ glib/demo/info.cc | 8 +-
+ glib/poppler-document.cc | 532
+ ++++++++++++++++++++++++++++-------
+ glib/poppler-document.h | 74 +++--
+ glib/reference/poppler-sections.txt | 16 +
+ 4 files changed, 498 insertions(+), 132 deletions(-)
+
+commit a5fec843dbb40fdd2007b926405b96789b21496d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Sep 17 10:38:14 2010 +0200
+
+ [glib-demo] Show permanent/update ID in document info demo
+
+ glib/demo/info.cc | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit bfaf8f3cc62f28c6255d42680b9464ab9973737e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Sep 17 10:37:32 2010 +0200
+
+ [glib] Add poppler_document_get_id() to get the PDF file identifier
+
+ glib/poppler-document.cc | 52
+ +++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h | 3 ++
+ glib/reference/poppler-sections.txt | 1 +
+ 3 files changed, 56 insertions(+), 0 deletions(-)
+
+commit b15641677447b2e89853a667fc34bcca1383a97a
+Author: srinivas adicherla <srinivas.adicherla@gmail.com>
+Date: Fri Sep 17 10:36:22 2010 +0200
+
+ Add a method to get the PDF file identifier
+
+ poppler/PDFDoc.cc | 65
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PDFDoc.h | 3 ++
+ 2 files changed, 68 insertions(+), 0 deletions(-)
+
+commit 3b4a901a4431814590449b6cd5ea418f4d6c1172
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 16 23:23:03 2010 +0100
+
+ Add -s option
+
+ Writes a single html file
+ Since git does not allow multiple authors i'm adding them here
+ OSSD CDAC Mumbai by Leena Chourey (leenac@cdacmumbai.in) and Onkar
+ Potdar (onkar@cdacmumbai.in)
+
+ utils/HtmlFonts.cc | 11 +++++-
+ utils/HtmlFonts.h | 18 +++++++++-
+ utils/HtmlOutputDev.cc | 84
+ ++++++++++++++++++++++++++++++-----------------
+ utils/pdftohtml.1 | 3 ++
+ utils/pdftohtml.cc | 15 +++++++--
+ 5 files changed, 93 insertions(+), 38 deletions(-)
+
+commit 2792330f6caeeb42e2996271456b562489215c4c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 15 22:42:09 2010 +0100
+
+ new soversions
+
+ CMakeLists.txt | 2 +-
+ cpp/CMakeLists.txt | 2 +-
+ cpp/Makefile.am | 2 +-
+ glib/CMakeLists.txt | 2 +-
+ glib/Makefile.am | 4 ++--
+ poppler/Makefile.am | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ 8 files changed, 9 insertions(+), 9 deletions(-)
+
+commit 1cf56c732b63d0a310bc45b8e4b3f3f357a42cb1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 15 20:56:42 2010 +0100
+
+ 0.15.0 in the versions
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 4ec0be498b557c3cf631e43823c6d7004304dff3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 15 20:56:34 2010 +0100
+
+ 0.15.0 NEWS
+
+ NEWS | 90
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 90 insertions(+), 0 deletions(-)
+
+commit c01a17745c04aef3e6f2225679c867a03e731e83
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Sep 16 20:55:56 2010 +0200
+
+ [CMake] disable the GObject introspection system
+
+ it cannot complete the scanning propecure correctly without libtool
+ it seems
+
+ CMakeLists.txt | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 9be7d3143b12f291409f88f3d725a239934b205e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 15 19:19:30 2010 +0100
+
+ update copyright
+
+ poppler/OptionalContent.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b9333529bba43a71655fdbf1919ba515f7df9ca3
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Sep 15 17:23:54 2010 +0200
+
+ [cpp/tests] poppler-dump: convert out_ustring() to an
+ operator<<(std::ostream&)
+
+ so we have a chance to better output the bytearray of a string to
+ the stream
+
+ cpp/tests/poppler-dump.cpp | 26 ++++++++++++++++++--------
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+commit a44f711b4412332875337e9fb7509f18db806ddc
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Sep 15 16:44:30 2010 +0200
+
+ [cpp/tests] poppler-dump: add a "--show-text <physical|raw>" option
+
+ ... to show the text of a page in the specified layout
+
+ cpp/tests/poppler-dump.cpp | 29 +++++++++++++++++++++++++++++
+ 1 files changed, 29 insertions(+), 0 deletions(-)
+
+commit 0094c9372b5b439af2564d83d6fb7439f4bdba88
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Sep 15 13:19:13 2010 +0200
+
+ [cpp] add a new page::text() for specifying a layout mode
+
+ add a new text_layout_enum enum for the layout mode, used by the
+ new text()
+ make the old text() implementation call the new one with the old value
+ (= physical)
+ add & adapt the apidox accordingly
+
+ cpp/poppler-page.cpp | 27 +++++++++++++++++++++++++--
+ cpp/poppler-page.h | 5 +++++
+ 2 files changed, 30 insertions(+), 2 deletions(-)
+
+commit 4ec3e7784cdba5c0720b1992ba500e97a7e0ed2b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Sep 15 11:24:07 2010 +0200
+
+ Set initial state of optional content groups based on BaseState field
+
+ There's a test case using BaseState attached to bug #30106
+
+ poppler/OptionalContent.cc | 14 +++++++++-----
+ 1 files changed, 9 insertions(+), 5 deletions(-)
+
+commit f49aa86812ed8ad91d41c675bc670b3d88d3444a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Sep 13 14:37:10 2010 +0200
+
+ [glib] doc: Document PopplerPage:label property
+
+ glib/poppler-page.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit f41fe7ae6e374100574c49d1bb7a3ddc646786c8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Sep 13 14:36:43 2010 +0200
+
+ [glib] doc: Add poppler_page_get_label to poppler-sections.txt
+
+ glib/reference/poppler-sections.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 91b8246766a8e5d9cca385b5854667d7967a9d71
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Sep 13 14:22:56 2010 +0200
+
+ [glib-demo] Use poppler_page_get_label() instead of g_object_get()
+
+ glib/demo/page.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b82412ef86091f4d249c818cebf00e4c59bae311
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Sep 13 14:22:03 2010 +0200
+
+ [glib] Add poppler_page_get_label()
+
+ It's just an accessor for the property label
+
+ glib/poppler-page.cc | 47
+ ++++++++++++++++++++++++++++++++++-------------
+ glib/poppler-page.h | 1 +
+ 2 files changed, 35 insertions(+), 13 deletions(-)
+
+commit ff88abf61f4bf90ad276a8593be1818d39c8ecac
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Sep 13 10:05:45 2010 +0200
+
+ [glib] Avoid core headers to be parsed by the g-i scanner
+
+ glib/poppler-document.cc | 2 ++
+ glib/poppler-page.cc | 2 ++
+ glib/poppler-private.h | 3 +++
+ 3 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 53324502898ae5fbbb21a4fb819e4a84acdc1a64
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Sep 12 11:42:03 2010 +0200
+
+ [glib] Fix a crash when building layer actions
+
+ Some layers are just the parent of others, but not actually a layer so
+ they don't have an optional content object. Fixes bug #30106.
+
+ glib/poppler-action.cc | 15 +++++++++------
+ 1 files changed, 9 insertions(+), 6 deletions(-)
+
+commit dfc6ea7877635212aa7c5f7ade07af4aa9467e96
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Sep 12 11:36:58 2010 +0200
+
+ [glib] Fix layers array generation when it contains multiple arrays
+
+ Fixes layers for document attached to bug #30106.
+
+ glib/poppler-document.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 7574912b6c0ff0421c69b6e8c6835957d5126d7d
+Author: Jonathan Liu <net147@gmail.com>
+Date: Thu Sep 9 20:34:03 2010 +0100
+
+ Fix checking whether _WIN32 is defined
+
+ Bug 29329
+
+ poppler/StdinCachedFile.cc | 2 +-
+ utils/pdftoppm.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 2fc83068c32e09fa3de03a157a420490431ea706
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 5 14:26:27 2010 +0100
+
+ Increase the number of cached glyphs for small sizes
+
+ Should not increase memory usage much and gives me a 17% speed
+ increase
+ in the firefox nytimes advertisment pdf
+
+ splash/SplashFont.cc | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 0d96f74f31171c58a55e4ac36d492ce36dd5e7c5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 5 12:31:57 2010 +0100
+
+ Use std::sort instead of qsort
+
+ Gives a nice speed improvement without any real code change
+ Passes regression tests
+ Based on Paweł Wiejacha patches
+
+ poppler/GfxFont.cc | 17 ++++++--------
+ splash/SplashXPath.cc | 48
+ +++++++++++++++++++++++++++--------------
+ splash/SplashXPathScanner.cc | 10 +++++---
+ 3 files changed, 44 insertions(+), 31 deletions(-)
+
+commit 3b4816b2b8caa0e2baafbe4c0eb1e45e452d01ce
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 1 20:43:35 2010 +0100
+
+ forgot the file
+
+ qt4/tests/poppler-texts.cpp | 40
+ ++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 40 insertions(+), 0 deletions(-)
+
+commit b0db93c71a83946aa3e02bae6b396223dcca19d1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 1 20:43:14 2010 +0100
+
+ add since and rename enum
+
+ qt4/src/poppler-page.cc | 2 +-
+ qt4/src/poppler-qt4.h | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit a86f9d90be99a36c41c6932fb4d9a202c4ff6d05
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 1 20:20:48 2010 +0100
+
+ Clarify the ownership
+
+ qt4/src/poppler-qt4.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 33ad3a17ac26879fcd6a7fad2023dd219bc5919f
+Author: Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
+Date: Wed Sep 1 20:19:54 2010 +0100
+
+ Add a way to access the raw text
+
+ poppler/TextOutputDev.cc | 23 ++++++++++++++++++++---
+ qt4/src/poppler-page.cc | 11 +++++++++--
+ qt4/src/poppler-qt4.h | 19 +++++++++++++++++++
+ qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/Makefile.am | 7 ++++++-
+ 5 files changed, 55 insertions(+), 6 deletions(-)
+
+commit 46e89248b3c5b1789baa3bd9bfa012570720ddb5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 1 19:54:02 2010 +0100
+
+ quadding is not a GBool but an int
+
+ poppler/Annot.cc | 2 +-
+ poppler/Annot.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit ae79fc504c5424be2fa21dbc5498ced4db6e5dd3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 31 22:14:57 2010 +0100
+
+ Make GBool a bool instead of an int
+
+ Passes the regression tests and might make things faster and use a bit
+ less memory
+
+ cpp/tests/CMakeLists.txt | 2 +-
+ cpp/tests/Makefile.am | 2 +-
+ goo/gtypes.h | 7 +-
+ utils/CMakeLists.txt | 2 +-
+ utils/Makefile.am | 2 +-
+ utils/parseargs.c | 208
+ ----------------------------------------------
+ utils/parseargs.cc | 208
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ 7 files changed, 216 insertions(+), 215 deletions(-)
+
+commit d3f32f2c4f9f46620c0287c44bef686f340461f3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 31 18:51:17 2010 +0100
+
+ Read from the correct variable
+
+ Fixes crash on KDE bug 249586
+
+ poppler/Movie.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 681bb38eafc720b309172ed7c650439c559663a0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Aug 26 23:55:58 2010 +0100
+
+ Make declaration match what there is in the .cc file
+
+ poppler/TextOutputDev.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c91e869304fc263c52f21ee484a57a6f1900f6b2
+Author: Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
+Date: Thu Aug 26 19:40:46 2010 +0100
+
+ Add -r option to pdftohtml
+
+ Fixes bug 29551
+
+ utils/pdftohtml.1 | 3 +++
+ utils/pdftohtml.cc | 18 +++++++++++++-----
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+commit 9b4be586640b4ad344b1b3ed4c9cda8351257f0c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Aug 25 19:26:30 2010 +0100
+
+ Use 3 not nComps
+
+ poppler/GfxState.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 218f67c527fb41babf2703ba068d072f8326e37b
+Author: Paweł Wiejacha <pawel.wiejacha@gmail.com>
+Date: Tue Aug 24 23:47:06 2010 +0100
+
+ Make SplashOutputDev::imageSrc faster
+
+ By using getRGBLine when possible
+
+ poppler/SplashOutputDev.cc | 39 ++++++++++++++++++++++++++++++---------
+ 1 files changed, 30 insertions(+), 9 deletions(-)
+
+commit 868f4a1f22051b7978f47a0614f23fd66dbb7ca8
+Author: Paweł Wiejacha <pawel.wiejacha@gmail.com>
+Date: Tue Aug 24 23:35:21 2010 +0100
+
+ Make GfxICCBasedColorSpace::getRGBLine faster
+
+ By calling doTransform less
+
+ poppler/GfxState.cc | 15 +++++++--------
+ poppler/GfxState.h | 4 +++-
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+commit 46e37c54c6365cf37dc1e223a3c146e7b96a56af
+Author: Paweł Wiejacha <pawel.wiejacha@gmail.com>
+Date: Tue Aug 24 21:23:34 2010 +0100
+
+ Do not call pow three times when one is enough
+
+ poppler/GfxState.cc | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 8591c804598576556c6d24a66b6648de8ed1c4eb
+Author: Mike Slegeir <tehpola@yahoo.com>
+Date: Sun Aug 22 22:01:03 2010 +0100
+
+ Use splash instead of external gs invocation to render the background
+
+ Patch in bug 19404, should fix 9746 too
+
+ utils/pdftohtml.1 | 8 ++-
+ utils/pdftohtml.cc | 210
+ +++++++++++++++++++++++++++++++++++++---------------
+ 2 files changed, 158 insertions(+), 60 deletions(-)
+
+commit 7fc3c21a8c5d6cf8517100427b182887a9569ed0
+Author: Ilya Gorenbein <igorenbein@finjan.com>
+Date: Fri Aug 20 20:24:31 2010 +0100
+
+ Fix failure to parse PDF with damaged internal structure
+
+ Patch in bug 29189, fixes bug 3870
+
+ poppler/PDFDoc.cc | 24 ++++++++++++---
+ poppler/XRef.cc | 80
+ ++++++++++++++++++++++++++++++----------------------
+ poppler/XRef.h | 5 ++-
+ 3 files changed, 68 insertions(+), 41 deletions(-)
+
+commit bedf48d4397ae412a6d28fc8fea16cc23a29f07c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 17 22:02:59 2010 +0100
+
+ use memset instead of a for
+
+ splash/Splash.cc | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 03ca5b4a5c9964d9c0e9913eb2061692848c4b95
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 10 19:55:31 2010 +0100
+
+ Update copyrights
+
+ goo/GooTimer.cc | 1 +
+ goo/GooTimer.h | 1 +
+ goo/gfile.cc | 2 +-
+ poppler/DCTStream.cc | 1 +
+ poppler/DCTStream.h | 1 +
+ poppler/GfxState.cc | 2 +-
+ poppler/Page.cc | 2 +-
+ qt4/src/poppler-annotation.cc | 2 +-
+ 8 files changed, 8 insertions(+), 4 deletions(-)
+
+commit 3bca8ddc10bf4291bf0c0e39c67341a05953e949
+Author: Jonathan Liu <net147@gmail.com>
+Date: Tue Aug 10 19:42:40 2010 +0100
+
+ Tell windows we are writing/reading binary data
+
+ Bug #29329
+
+ poppler/StdinCachedFile.cc | 9 +++++++++
+ utils/pdftoppm.cc | 9 +++++++++
+ 2 files changed, 18 insertions(+), 0 deletions(-)
+
+commit bdd617f2177a7836f6b6686fde892664513a32a7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Aug 3 13:05:26 2010 +0200
+
+ [glib] Fix a crash when a layer doesn't have a name
+
+ Fixes bug #28842.
+
+ glib/poppler-layer.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit e9f0646ca664cc27825f7e084f8419fe0de1fcfc
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Aug 3 13:02:52 2010 +0200
+
+ Catalog page array might contain NULL for some pages in invalid
+ documents
+
+ Fixes a crash reproducible with gtk-splash-test when opening document
+ attached to bug #28842.
+
+ poppler/PDFDoc.cc | 27 +++++++++++++++------------
+ 1 files changed, 15 insertions(+), 12 deletions(-)
+
+commit 842209782ca3ba8c1c783cccf565372a18b3fda5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 30 19:29:12 2010 +0100
+
+ Do not crash when using pdftops in some files
+
+ Fixes crash in file in kde bug 246269. The output is still wrong
+ though
+
+ fofi/FoFiType1C.cc | 12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+commit 0dd7c80b7baf2622eb4780a867c4dc6291773f3b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jul 26 23:58:26 2010 +0100
+
+ Do not overwrite the rgb values
+
+ Recommended by Koji Otani in Re: [poppler] Question about code
+ Passed the regression testing in my files
+
+ poppler/GfxState.cc | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 627edf88c8f5c073a68bd05990df56e1af547292
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jul 25 13:56:03 2010 +0200
+
+ [annots] Fix a crash when adding a new annotation and annots object
+ is an array
+
+ When annots object is an array instead of a ref, the modified
+ object is
+ actually de page object.
+
+ poppler/Page.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 5d86f9b600b1e10de93bcaf1b925fadbc2a47522
+Author: mpsuzuki <mpsuzuki@hiroshima-u.ac.jp>
+Date: Sat Jul 24 15:12:05 2010 +0100
+
+ reindent correctly
+
+ poppler/TextOutputDev.cc | 34 +++++++++++++++++-----------------
+ 1 files changed, 17 insertions(+), 17 deletions(-)
+
+commit d0a6f9abdab88ec43004b6766337db304cbf6a25
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jul 22 21:28:55 2010 +0200
+
+ [CMake] improve the way include dirs and cflags for gdk and gtk
+ are set
+
+ correctly include_directories() for the include dirs, while add the
+ cflags which are not include dirs as definitions
+
+ glib/CMakeLists.txt | 5 +++--
+ glib/demo/CMakeLists.txt | 5 ++++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 02d85dd2cc154dbb6caa04a349532033d833edd1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 20 13:53:56 2010 +0200
+
+ [glib-demo] Add support for adding annots in annot demo
+
+ glib/demo/annots.c | 114
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 114 insertions(+), 0 deletions(-)
+
+commit 969cb850f5c2bc31de82c591b2b3210b5cfabf5f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 20 13:53:29 2010 +0200
+
+ [glib] docs: Add new symbols to poppler-sections.txt
+
+ glib/reference/poppler-sections.txt | 18 ++++++++++++++++++
+ 1 files changed, 18 insertions(+), 0 deletions(-)
+
+commit 251959438b6257fe71ed58e79eec60cda68a66cf
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 20 13:53:00 2010 +0200
+
+ [glib] Add poppler_page_add_annot()
+
+ glib/poppler-document.cc | 7 ++++---
+ glib/poppler-page.cc | 19 +++++++++++++++++++
+ glib/poppler-page.h | 2 ++
+ 3 files changed, 25 insertions(+), 3 deletions(-)
+
+commit 78a4f6976e708f2cc23aac49fbff0faf00e74bc3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 20 13:51:16 2010 +0200
+
+ [glib] annots: Add several setter methods
+
+ glib/poppler-annot.cc | 278
+ +++++++++++++++++++++++++++++++++++++++++++-----
+ glib/poppler-annot.h | 26 +++++
+ glib/poppler-private.h | 6 +
+ 3 files changed, 285 insertions(+), 25 deletions(-)
+
+commit fee488c9db60ab691ce9ff5eef284be2af897aee
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jul 18 11:26:59 2010 +0200
+
+ [annots] Add AnnotMarkup::setOpacity
+
+ poppler/Annot.cc | 8 ++++++++
+ poppler/Annot.h | 1 +
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+commit d15a355ede2d8510c4df847ea0b92b5357b29914
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jul 18 09:57:35 2010 +0200
+
+ Set the page reference (P in annot dict) when adding a new annot to
+ a page
+
+ poppler/Annot.cc | 9 +++++++++
+ poppler/Annot.h | 3 +++
+ poppler/Page.cc | 2 ++
+ 3 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 49ffb46db3118db874d2d9830bb034762d625c61
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jul 19 16:31:54 2010 +0100
+
+ Remove exception support
+
+ We don't use it and don't even support it properly
+
+ CMakeLists.txt | 1 -
+ config.h.cmake | 3 --
+ configure.ac | 4 ---
+ goo/gmem.cc | 56
+ +++++++++++----------------------------
+ goo/gmem.h | 38 ++++++++-------------------
+ poppler/poppler-config.h.cmake | 5 ---
+ poppler/poppler-config.h.in | 5 ---
+ 7 files changed, 27 insertions(+), 85 deletions(-)
+
+commit dd2e9399868e3dbf2fa4ede050f8d74d29ebbbb4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jul 19 16:31:43 2010 +0100
+
+ add uninstalled.pc to ignore
+
+ .gitignore | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit d1033006aae381a0f075e02d54638a1af997caf3
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Jul 17 21:46:14 2010 +0200
+
+ add FindGObjectIntrospection.cmake and
+ GObjectIntrospectionMacros.cmake to the dist
+
+ Makefile.am | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit ce8d03950736cc35d035a44a7d88e5f2a9defa74
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Jul 17 21:39:08 2010 +0200
+
+ [CMake/glib] add support for gobject-introspection
+
+ other than a module to find (using pkg-config) gobject-introspection,
+ this adds a macro (gir_add_introspections) to add new introspections
+ in a directory.
+ its working is much similar (even the variable names used) to
+ the Makefile version provided by gobject-repository itself, with
+ the notable difference of a disabled libtool in the g-ir-scanner
+ invocation.
+ the only additional step needed is adding two custom targets, compiled
+ by ALL, which have the gir and the typelib files as dependencies,
+ to make them build with the usual `make all'.
+
+ CMakeLists.txt | 5 +-
+ cmake/modules/FindGObjectIntrospection.cmake | 61 +++++++++++++++
+ cmake/modules/GObjectIntrospectionMacros.cmake | 94
+ ++++++++++++++++++++++++
+ glib/CMakeLists.txt | 36 +++++++++
+ 4 files changed, 194 insertions(+), 2 deletions(-)
+
+commit 78bf43d8e11aa52db9862af118c597e117d31083
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Jul 17 20:28:58 2010 +0200
+
+ [CMake] properly use the glib2 include dirs
+
+ properly use GLIB2_INCLUDE_DIRS (pkg-config result) for the glib
+ include dirs,
+ while turn GLIB2_CFLAGS into GLIB2_CFLAGS_OTHERS to add the remaining
+ CFLAGS as definitions
+
+ glib/CMakeLists.txt | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 6f3082d677bc62aa3f8124132e3e337c01be2629
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Jul 17 19:28:09 2010 +0200
+
+ [CMake] split the generated sources of poppler_glib_SRCS in an own
+ poppler_glib_generated_SRCS
+
+ glib/CMakeLists.txt | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 2a252dd9b05857bbd10dee235e873886fc74ec17
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Jul 17 14:57:38 2010 +0200
+
+ [CMake] add stub message and TODO for the gobject-introspection
+ support
+
+ CMakeLists.txt | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 8a3d1794a8ef5d525bb454755fec018e3fcb3816
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 16 14:00:32 2010 +0100
+
+ update
+
+ TODO | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 31ac578942b82cbd16b064abca586ccb89dfa7ce
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 15 15:05:10 2010 +0200
+
+ Rework ChangeLog generation to fix make distcheck
+
+ Makefile.am | 22 +++++++++++++++++++---
+ 1 files changed, 19 insertions(+), 3 deletions(-)
+
+commit 5da5825ecab63089a19aac694826271019a94e6d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 15 15:03:20 2010 +0200
+
+ [glib] docs: Add version.xml to content_files var
+
+ glib/reference/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fe69b474ae63c9d5d2538db9e51e666dd6ea9fb3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jul 15 10:51:21 2010 +0100
+
+ Fix padding of names
+
+ The previous method returned 2 for documents with 100 pages, which
+ is wrong as 100 needs 3
+ characters, not 2
+
+ utils/pdftoppm.cc | 14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+commit e265ae2d8a46df00ab1bbd863f01f652068d265f
+Author: Brian Cameron <brian.cameron@oracle.com>
+Date: Wed Jul 14 20:26:25 2010 +0100
+
+ Add uninstalled .pc file for poppler when using autoconf
+
+ Makefile.am | 9 ++++++++-
+ configure.ac | 9 ++++++++-
+ poppler-cairo-uninstalled.pc.in | 6 ++++++
+ poppler-cpp-uninstalled.pc.in | 7 +++++++
+ poppler-glib-uninstalled.pc.in | 7 +++++++
+ poppler-qt-uninstalled.pc.in | 7 +++++++
+ poppler-qt4-uninstalled.pc.in | 7 +++++++
+ poppler-splash-uninstalled.pc.in | 7 +++++++
+ poppler-uninstalled.pc.in | 6 ++++++
+ 9 files changed, 63 insertions(+), 2 deletions(-)
+
+commit 552ab99e60fe4068be8e4e415924e4be289e47cd
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 13 10:18:01 2010 +0200
+
+ Handle ColorTransform in DCT streams when using libjpeg
+
+ Fixes bug #28873.
+
+ poppler/DCTStream.cc | 30 ++++++++++++++++++++++++++++++
+ poppler/DCTStream.h | 1 +
+ 2 files changed, 31 insertions(+), 0 deletions(-)
+
+commit 8a6697f89625106f3c373dbc7b4dc521e22502f7
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sat Jul 3 16:42:04 2010 +0200
+
+ Only define findModifier() when used
+
+ Prevents a warning when building with win32 font backend.
+
+ poppler/GlobalParams.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b1fdb87a4ebb5079c731256cce1870de8c54c65d
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Jul 2 10:53:20 2010 +0200
+
+ Fix compile warnings on auto imports for mingw compiler
+
+ cpp/Makefile.am | 2 +-
+ cpp/tests/Makefile.am | 2 ++
+ glib/Makefile.am | 2 ++
+ poppler/Makefile.am | 2 +-
+ qt4/demos/Makefile.am | 2 ++
+ qt4/src/Makefile.am | 2 +-
+ qt4/tests/Makefile.am | 2 ++
+ 7 files changed, 11 insertions(+), 3 deletions(-)
+
+commit 9e577110134eb1e093e697b7504efca759000086
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Jul 2 10:51:24 2010 +0200
+
+ Check for declaration of gettimeofday()
+
+ The function gettimeofday() is not declared in ansi mode with the
+ mingw compiler, even though the function exists. Therefore,
+ configure must
+ not only check with AC_CHECK_FUNC, but also with AC_CHECK_DECL.
+
+ Also, the checks must run in a C++ context because that is where
+ gettimeofday() is used.
+
+ configure.ac | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 58c8430ac584f3ba5e97aceb148e6287bfc45f95
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Jun 30 15:06:44 2010 +0200
+
+ Set -ansi compiler flag early in configure.ac
+
+ The -ansi compiler flag does not enable warnings, but turns of certain
+ features of GCC. To force feature tests to use this flag, it should be
+ set early in configure.ac
+
+ This is important for the mingw compiler where header files refrain
+ from declaring certain function (e.g. gettimeofday()) when the -ansi
+ flag is set.
+
+ configure.ac | 7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit e3663a855a9c86f0a3988a7a50fa40d37d0ea069
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Jul 2 14:45:15 2010 +0200
+
+ Use MAX_PATH instead of _MAX_PATH everywhere
+
+ _MAX_PATH is compiler specific and not availble with the mingw
+ compiler
+ in ansi mode. MAX_PATH is in the Windows api and thus always available
+ when windows.h is included.
+
+ goo/gfile.cc | 4 ++--
+ poppler/GlobalParams.cc | 2 +-
+ poppler/PDFDoc.cc | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 7227c407d23a37f5d95e6c01cb7411be2f82ca85
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Jun 30 16:15:06 2010 +0200
+
+ Check for _WIN32 instead of _MSC_VER
+
+ goo/GooTimer.cc | 6 +++---
+ goo/GooTimer.h | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 34e727e011529be312313a1f4d4fa1ba9c545888
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Jun 29 16:43:31 2010 +0200
+
+ Fix cross compiling for Windows with autotools
+
+ When cross compiling for Windows with autotools, libtool creates
+ libpoppler_qt4_la-poppler-optcontent.lo instead of
+ poppler-optcontent.lo. Thus, explicitly using poppler-optcontent.lo to
+ create poppler-optcontent.moc does not work well.
+
+ qt4/src/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1bc2f4501ea4e56ca99ae4d94d6cf34cf33c2c7a
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Jun 29 15:34:22 2010 +0200
+
+ define poppler_qt4_EXPORTS when building with autotools
+
+ Lets you build the qt4 bindings for Windows with automake/autoconf.
+
+ qt4/src/Makefile.am | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 5825114a26cc6eece2e556063f640dda53ea1e11
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 11 12:24:20 2010 +0100
+
+ Compile++
+
+ glib/demo/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 5e4d8eeea0b9dba68420c164975418c76a53be85
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jul 10 15:54:28 2010 +0200
+
+ [pdf-inspector] Do not render for printing
+
+ test/pdf-inspector.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit e6824972a213a888ca0185b7ae0a75fc23f75797
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jul 10 15:52:15 2010 +0200
+
+ [annots] Use a transparency group for markup annots without AP and
+ opacity != 1
+
+ Fixes bug #623616.
+
+ poppler/Annot.cc | 346
+ +++++++++++++++++++++++++-----------------------------
+ poppler/Annot.h | 3 +
+ poppler/Gfx.cc | 9 +--
+ poppler/Gfx.h | 2 +-
+ 4 files changed, 165 insertions(+), 195 deletions(-)
+
+commit 70ce0b6ea1a0d61f5048d2ae49c639d74a643b29
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 9 17:04:00 2010 +0200
+
+ [annots] Clamp QuadPoints coords to annot rectangle instead of
+ ignore points
+
+ Fixes appearance stream generation for document attached to bug
+ #623616.
+
+ poppler/Annot.cc | 38 +++++++++++++++++++++-----------------
+ 1 files changed, 21 insertions(+), 17 deletions(-)
+
+commit 8a9e561bfe64f71e9f38c43e5c6be7e5069b2349
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Jul 2 21:07:53 2010 +0200
+
+ Nicer autogen.sh output
+
+ autogen.sh | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit ce4d328294cea73f4b7368691dc1fed6bd45d569
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Jul 2 20:51:47 2010 +0200
+
+ Add option for autogen.sh to skip configure
+
+ If you do not want to automatically run configure when calling
+ autogen.sh, run it with:
+
+ $ NOCONFIGURE=1 ./autogen.sh
+
+ This feature is modeled after gnome-autogen.sh behaviour.
+
+ autogen.sh | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit d7ee87c5d0a35c8d4fcc88bde4b8496c49f397c6
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Jul 6 15:16:08 2010 +0100
+
+ warnings-=2
+
+ poppler/GfxFont.cc | 3 ++-
+ utils/HtmlOutputDev.cc | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 1e7f457ca1617fd8c958feef8dd7e694476dedd9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 9 12:29:14 2010 +0200
+
+ [cairo] Use ceil to convert double to int in tilingPatternFill()
+
+ Fixes rendering of page 2 of document attached to bug #28954.
+
+ poppler/CairoOutputDev.cc | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 91a7605eb51144f2e7dea69aa9454fff47c49bd2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 9 11:42:56 2010 +0200
+
+ [glib] Fix build when GDK is enabled
+
+ glib/test-poppler-glib.cc | 8 +-------
+ 1 files changed, 1 insertions(+), 7 deletions(-)
+
+commit 09e3e0e9c5134688c4ed2af5cd3a12aa2986474c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 8 18:56:38 2010 +0200
+
+ [glib] Fix poppler_page_find_tex() when called more than once
+
+ Fixes bug #27927
+
+ glib/poppler-page.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 25427bdecb219ffe6f0592d2ac36de60c247bfd9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 8 17:46:22 2010 +0200
+
+ Fix build when compiling without glib frontend
+
+ configure.ac | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 550684731356a66753ec19f5a8ca4b572db6d2d5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 8 17:16:02 2010 +0200
+
+ [glib-demo] Add selections demo
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/main.c | 4 +-
+ glib/demo/selections.c | 687
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/selections.h | 31 +++
+ 4 files changed, 723 insertions(+), 1 deletions(-)
+
+commit b257428150e2c13dcc24fd8f75e4ee2c679ab414
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 8 14:45:29 2010 +0200
+
+ [glib] Add poppler_page_get_selected_text()
+
+ And change poppler_page_get_text() to return the text of the whole
+ page. For consistency with poppler_page_get_selection_region()
+ get_seletect_text() doesn't invert the y coords as get_text()
+ did. This
+ change breaks the API. Users of poppler_page_get_text should:
+
+ - Use the new poppler_page_get_text() if they want the text of the
+ whole page
+
+ - Use poppler_page_get_selected_text() if they want the text of the
+ selected area. In this case they shouldn't invert the y coords
+ anymore
+ before calling the method.
+
+ glib/demo/text.c | 9 +------
+ glib/poppler-page.cc | 43
+ ++++++++++++++++++++++++++---------
+ glib/poppler-page.h | 3 +-
+ glib/reference/poppler-sections.txt | 1 +
+ 4 files changed, 36 insertions(+), 20 deletions(-)
+
+commit bedc88225c948ad1288b69c6c106adce36233442
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 7 11:55:47 2010 +0200
+
+ [cairo] Fix warning on signed/unsigned comparison
+
+ poppler/CairoFontEngine.cc | 12 ++++++------
+ poppler/CairoFontEngine.h | 8 ++++----
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 092aa901b9ec35a48bc1fb229ad16a3b00eef5f2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jul 5 11:16:49 2010 +0200
+
+ [glib] docs: add some more introspection annotations
+
+ glib/poppler-attachment.cc | 4 ++--
+ glib/poppler-document.cc | 12 ++++++------
+ glib/poppler-media.cc | 4 ++--
+ glib/poppler-page.cc | 4 ++--
+ 4 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 6c4e14fd90d5ef2d6670a980ab2476b6fab58df7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jul 5 10:49:59 2010 +0200
+
+ [glib] docs: fix POPPLER_CHECK_VERSION() docs
+
+ glib/poppler-features.h.in | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ed324a867ecf1f616c4b2dc575f01d5cf1b67c38
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 2 18:28:45 2010 +0200
+
+ [glib] Rename instrospection files as 0.16 instead of 0.14
+
+ glib/Makefile.am | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+commit a55f567ff1ea0858eda13a024ed765a016f3bff0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 2 18:23:03 2010 +0200
+
+ [glib] docs: Remove unneeded empty line in doc comment
+
+ glib/poppler-features.h.in | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit f16015303422280eaa21c3144eca0f1a330dce8a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 2 18:19:13 2010 +0200
+
+ [glib] docs: Add GObject introspection annotations
+
+ glib/poppler-annot.cc | 45
+ ++++++++++++++++++-------------------
+ glib/poppler-document.cc | 8 +++---
+ glib/poppler-page.cc | 23 ++++++++++++------
+ glib/reference/poppler-docs.sgml | 2 +
+ 4 files changed, 43 insertions(+), 35 deletions(-)
+
+commit 60242038e4dce7f0c90f2bfa0e771120247dbc9d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 09:35:29 2010 +0200
+
+ [glib] Add GObject introspection support
+
+ configure.ac | 5 +++
+ glib/Makefile.am | 29 ++++++++++++++++
+ m4/introspection.m4 | 94
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 128 insertions(+), 0 deletions(-)
+
+commit 3160950a7d7161457405c9084c31af230329b3f0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 2 12:47:04 2010 +0200
+
+ [glib] docs: Add index of deprecated symbols
+
+ glib/reference/poppler-docs.sgml | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 593db7acf6edce1267f69d12310bf4098ff24c97
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 2 12:44:39 2010 +0200
+
+ [glib] docs: deprecate GDK API
+
+ glib/poppler-page.cc | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 6facefb3fa8f97a9d330545308fb2d89c7f57fa0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 1 18:01:45 2010 +0200
+
+ [glib] docs: Add index of new symbols for versions 0.12, 0.14 and 0.16
+
+ glib/poppler-action.h | 10 +++++++---
+ glib/poppler-annot.cc | 17 +++++++++++++++++
+ glib/poppler-date.cc | 2 ++
+ glib/poppler-document.cc | 16 +++++++++++++++-
+ glib/poppler-layer.cc | 12 ++++++++++++
+ glib/poppler-media.cc | 14 ++++++++++++--
+ glib/poppler-media.h | 3 +++
+ glib/poppler-movie.cc | 6 ++++++
+ glib/poppler-page.cc | 2 ++
+ glib/reference/poppler-docs.sgml | 12 ++++++++++++
+ 10 files changed, 88 insertions(+), 6 deletions(-)
+
+commit 166b78c0ce8a4536873c4f60b392c24c8a68e7aa
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 1 17:25:03 2010 +0200
+
+ [glib] docs: document PopplerMediaSaveFunc
+
+ glib/poppler-media.h | 18 +++++++++++++++++-
+ 1 files changed, 17 insertions(+), 1 deletions(-)
+
+commit 5cc0a51f88580c65ac2d5c6ff02b8cf14697b70c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 1 17:20:13 2010 +0200
+
+ [glib] Use the same name for parameter in function prototype
+
+ glib/poppler-media.h | 10 +++++-----
+ glib/poppler-movie.h | 6 +++---
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+commit 6793fd8fd2d33d3d58c6556b5dbe6d0497e56646
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 1 15:49:49 2010 +0200
+
+ [glib] docs: document some enums in poppler-action
+
+ glib/poppler-action.h | 92
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 92 insertions(+), 0 deletions(-)
+
+commit 8e139696dbe19f54ad54364a711b929146f11080
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 1 15:02:58 2010 +0200
+
+ [glib] docs: mark structures in poppler-private.h as private
+
+ glib/poppler-private.h | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit ccae7e574047d66c638003cc36fa1edeef4d35ed
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 1 14:59:50 2010 +0200
+
+ [glib] docs: document PopplerDocument enums
+
+ glib/poppler-document.h | 65
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 65 insertions(+), 0 deletions(-)
+
+commit 4fbff172693c38cdc4ae8070a55ceb706aa213cd
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 1 14:26:53 2010 +0200
+
+ [glib] docs: document PopplerFontInfo
+
+ glib/poppler-document.cc | 106
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 106 insertions(+), 0 deletions(-)
+
+commit 465dd4897ff603a6fd96503cf4746fc808b0f827
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 1 12:59:39 2010 +0200
+
+ [glib] docs: document some enums
+
+ glib/poppler.h | 55
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 55 insertions(+), 0 deletions(-)
+
+commit de3d599ea9e948867cfe395f42ed659670110c4c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 1 12:31:10 2010 +0200
+
+ [glib] docs: document boxed types defined in poppler-page
+
+ glib/poppler-page.cc | 147
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h | 79 +++++++++++++++++++++++++++
+ 2 files changed, 226 insertions(+), 0 deletions(-)
+
+commit 34c52190e1dbf4d3effa44b4408faa1fbae0d12d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 1 09:33:08 2010 +0200
+
+ [glib] Remove splash header file
+
+ glib/poppler-page.cc | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 6910545a487f206ccd059bb295d2312228dbf2ba
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 19:03:04 2010 +0200
+
+ [glib] docs: Remove invalid symbol from poppler-sections.txt
+
+ glib/reference/poppler-sections.txt | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 65ea3b636cb5a38660e526a483a4d95f5acdf8db
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 19:02:32 2010 +0200
+
+ [glib] docs: fix typo
+
+ glib/poppler-form-field.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 689bfec40b5b3030c2819cb4aac42c3ab6279278
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 19:01:47 2010 +0200
+
+ [glib] docs: Add missing doc for parameter
+
+ glib/poppler-document.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 0b3d77627f255a4bf3da6ee875ad8d9eb931c96e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 19:00:59 2010 +0200
+
+ [glib] Use the same name for parameter in function prototype
+
+ glib/poppler-page.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 19e1944c00ac2da6b18b015721fc3a8d1898a23a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 18:01:52 2010 +0200
+
+ [glib] docs: Add media and movie to docs
+
+ glib/poppler-media.cc | 6 ++++++
+ glib/poppler-movie.cc | 6 ++++++
+ glib/reference/poppler-docs.sgml | 3 ++-
+ 3 files changed, 14 insertions(+), 1 deletions(-)
+
+commit ca48bee07e6b4a20ea7b40b472a335e75feb4739
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 17:56:50 2010 +0200
+
+ [glib] docs: Add missing types to poppler.types
+
+ glib/reference/poppler.types | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 613ccf81317a007ed5017ee788466613a6699bb5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 17:54:22 2010 +0200
+
+ [glib] docs: rework poppler-sections.txt
+
+ - Better organization of sections and contents
+ - Use of Standard and Private subsections
+ - Add missing sections
+ - Remove enums section
+
+ glib/reference/poppler-sections.txt | 424
+ ++++++++++++++++++++++++-----------
+ 1 files changed, 295 insertions(+), 129 deletions(-)
+
+commit b37556a32b79f8711ed7eca24abf19511872a70a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 12:01:44 2010 +0200
+
+ [glib] docs: Add index of symbols
+
+ glib/reference/poppler-docs.sgml | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 7f5fa4e19b4e324a396d64261b9125c1a557ac84
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 12:00:35 2010 +0200
+
+ [glib] docs: Add version information
+
+ configure.ac | 1 +
+ glib/reference/Makefile.am | 2 +-
+ glib/reference/poppler-docs.sgml | 7 ++++++-
+ glib/reference/version.xml.in | 1 +
+ 4 files changed, 9 insertions(+), 2 deletions(-)
+
+commit 848d5e158fa9eadd19a658db314ba3fff9d026e8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 30 11:30:41 2010 +0200
+
+ [glib] docs: do not use gtk-doc templates
+
+ configure.ac | 2 +-
+ glib/poppler-action.cc | 6 +
+ glib/poppler-annot.cc | 6 +
+ glib/poppler-attachment.cc | 6 +
+ glib/poppler-attachment.h | 16 +
+ glib/poppler-document.cc | 8 +
+ glib/poppler-features.h.in | 59 ++++
+ glib/poppler-form-field.cc | 6 +
+ glib/poppler-layer.cc | 6 +
+ glib/poppler-page.cc | 6 +
+ glib/reference/tmpl/poppler-action.sgml | 216 ------------
+ glib/reference/tmpl/poppler-annot.sgml | 377 --------------------
+ glib/reference/tmpl/poppler-attachment.sgml | 68 ----
+ glib/reference/tmpl/poppler-document.sgml | 410
+ ----------------------
+ glib/reference/tmpl/poppler-enums.sgml | 246 -------------
+ glib/reference/tmpl/poppler-features.sgml | 83 -----
+ glib/reference/tmpl/poppler-form-field.sgml | 318 -----------------
+ glib/reference/tmpl/poppler-layer.sgml | 83 -----
+ glib/reference/tmpl/poppler-page.sgml | 483
+ --------------------------
+ glib/reference/tmpl/poppler-private.sgml | 148 --------
+ glib/reference/tmpl/poppler-unused.sgml | 8 -
+ glib/reference/tmpl/poppler.sgml | 285 ---------------
+ glib/reference/tmpl/stamp-poppler-enums.sgml | 22 --
+ gtk-doc.make | 78 +++--
+ m4/gtk-doc.m4 | 2 +-
+ 25 files changed, 171 insertions(+), 2777 deletions(-)
+
+commit 16e15ac845206217086e2adac9f220e75c0c630d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 29 21:44:02 2010 +0100
+
+ bitmap can be null at this stage, check it isn't
+
+ poppler/JBIG2Stream.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 38e5d28a184d0ca8df71a7ea910ce85d7a225e4e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jun 21 20:38:00 2010 +0100
+
+ more pow 0.5 -> sqrt
+
+ poppler/GfxState.cc | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 58a53ca0a4e8434e8478f8fe121067dcf05c017d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jun 21 19:24:20 2010 +0100
+
+ sqrt is much faster than pow 0.5
+
+ poppler/GfxState.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit bf86a9fc464aca57ebec207a213dcc2cc6031940
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jun 21 19:20:47 2010 +0100
+
+ introduce getChars to save some method calls
+
+ Can give us a decent speedup when we go a lot though this methods
+
+ poppler/Catalog.cc | 12 +----
+ poppler/DCTStream.cc | 51 ++++++++++++++------
+ poppler/DCTStream.h | 3 +
+ poppler/GfxFont.cc | 22 +-------
+ poppler/GfxState.cc | 30 +++--------
+ poppler/JPEG2000Stream.cc | 67 +++++++-------------------
+ poppler/JPEG2000Stream.h | 38 ++++++++++++++-
+ poppler/Link.cc | 14 +----
+ poppler/Object.h | 4 ++
+ poppler/Stream.cc | 90 +++++++++++++++++++----------------
+ poppler/Stream.h | 118
+ ++++++++++++++++++++++++++++++++++++++++++++-
+ 11 files changed, 279 insertions(+), 170 deletions(-)
+
+commit 65c14073a3b1035ca5fe3bd6667abd315272841e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jun 21 17:19:22 2010 +0200
+
+ Reduce pow operations in GfxCalRGBColorSpace::getXYZ()
+
+ We were doing the same pow operation 3 times!. It makes document
+ attached to bug #28591 render a little faster.
+
+ poppler/GfxState.cc | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 9365c05c1f66b3000febf32c45cef2ffe79e041a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jun 19 10:36:39 2010 +0200
+
+ [glib] Fix links/annots area for rotated documents with page CropBox
+ not starting at 0,0
+
+ Fixes bug #28588.
+
+ glib/poppler-page.cc | 25 ++++++++++---------------
+ 1 files changed, 10 insertions(+), 15 deletions(-)
+
+commit d9504c0a288c84b68a516f715505d6bc94b911f5
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Jun 18 23:59:04 2010 +0200
+
+ [autotools] link the 'cpp' tests against libpoppler as well
+
+ ... this way gatof() can be found correctly
+ should fix bug #28605
+
+ cpp/tests/Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 62975737bcaa6e0a2ecab981aa3e0c8f2ff10571
+Author: Brian Cameron <brian.cameron@oracle.com>
+Date: Fri Jun 18 19:22:17 2010 +0100
+
+ Compile with Sun Studio
+
+ goo/ImgWriter.h | 3 ++-
+ goo/JpegWriter.h | 3 ++-
+ poppler/SplashOutputDev.cc | 6 ++++++
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+commit 7cbe3d1521aea8b484efb8663e75684e05b6fb61
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jun 17 23:01:21 2010 +0100
+
+ Optimize Splash::compositeBackground
+
+ Optimization takes into account the two most common cases, the
+ pixel not
+ being painted at all (alpha == 0) meaning we just copy the paperColor
+ and the pixel being opage meaning we have to do nothing
+
+ splash/Splash.cc | 34 ++++++++++++++++++++++++++--------
+ 1 files changed, 26 insertions(+), 8 deletions(-)
+
+commit f323e5e4cdcc20075ee7c722f7adc088c0772249
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jun 17 22:59:37 2010 +0100
+
+ Check the objects are num before reading them
+
+ Might have caused the kde bug #241995
+
+ poppler/GfxState.cc | 11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 35e87d2062b1d82db0d765de5a6187122a0fa99c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 16 11:52:25 2010 +0200
+
+ [gib-demo] Add demo for poppler_page_get_text_layout()
+
+ glib/demo/text.c | 182
+ ++++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 164 insertions(+), 18 deletions(-)
+
+commit ddcea568b3a7334e062d6214f43d0a2c2ec95be4
+Author: Daniel Garcia <danigm@yaco.es>
+Date: Tue Jun 15 16:57:32 2010 +0200
+
+ [glib] Add poppler_page_get_text_layout()
+
+ Returns an array of PopplerRectangle items and each Rectangle is a
+ text character position.
+
+ The position in this array represent the offset in text returned by
+ poppler_page_get_text
+
+ glib/poppler-page.cc | 91
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h | 4 ++-
+ 2 files changed, 94 insertions(+), 1 deletions(-)
+
+commit 6e9fe8832c37b560ac4d0b0e32d618bde70ee117
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Jun 16 00:22:59 2010 +0200
+
+ [Qt4] and support 'Print' named action here too...
+
+ qt4/src/poppler-annotation.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 53c003f36af5d77f50fe238eaec4c5f7c3a485c7
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Jun 16 00:18:13 2010 +0200
+
+ [CMake] install the new goo/GooLikely.h
+
+ CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 2ba752aabc8dad4bb35a351697b1590795c54ca4
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Jun 16 00:06:30 2010 +0200
+
+ update copyrights
+
+ qt4/src/poppler-link.h | 3 ++-
+ qt4/src/poppler-page.cc | 1 +
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 38bf54bbad40288be763c6a1a89d90477c9ef89d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 15 23:05:43 2010 +0100
+
+ move the declaration of likely/unlikely to an own file in goo/
+
+ goo/GooLikely.h | 22 ++++++++++++++++++++++
+ goo/Makefile.am | 1 +
+ poppler/Object.h | 9 +--------
+ splash/Splash.cc | 4 +---
+ 4 files changed, 25 insertions(+), 11 deletions(-)
+
+commit 9838edf8c7497858e3bac2743784a3259f61cfdd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 15 22:54:34 2010 +0100
+
+ Protect us against negative y coordinates
+
+ Happens very rarely, like in bug 28480
+
+ splash/Splash.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 8b32c3e9826d4462fd9d16fab4200ebb23251046
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Jun 15 23:55:01 2010 +0200
+
+ [Qt4/apidox] ok, now the *proper* version for 'Print'...
+
+ qt4/src/poppler-link.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b54e5ac49f69bd1c906e517edcb436e042199cd5
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Jun 15 23:53:50 2010 +0200
+
+ [Qt4/apidox] add the proper version for the new 'Print'
+
+ qt4/src/poppler-link.h | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 71ad18c3b6b73e23d71600d07ce00bdfaf0bef60
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Jun 15 23:51:01 2010 +0200
+
+ [Qt4] recognize the 'Print' named action here too
+
+ qt4/src/poppler-annotation.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 96f60f2748ba76de0d296a9838dbd7181f506e36
+Author: Guillermo Amaral <gamaral@kdab.com>
+Date: Tue Jun 15 23:47:46 2010 +0200
+
+ [Qt4] recognize 'Print' as name in named actions
+
+ qt4/src/poppler-link.h | 3 ++-
+ qt4/src/poppler-page.cc | 2 ++
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 25494311c5b8eb88d43df420ec91a1aedad20d05
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 15 17:44:23 2010 +0200
+
+ [glib] Add some G_UNLIKELY()
+
+ glib/poppler-document.cc | 12 ++++++------
+ glib/poppler-page.cc | 17 ++++++++++-------
+ 2 files changed, 16 insertions(+), 13 deletions(-)
+
+commit 52f133fb962256edb577b7f639c5c13221c6365d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 15 14:20:49 2010 +0200
+
+ [glib] Use g_slice for actions and destinations
+
+ glib/poppler-action.cc | 21 +++++++++------------
+ 1 files changed, 9 insertions(+), 12 deletions(-)
+
+commit f035c94d8b5b34c0c3bb47b8cfc2f9c720a4fc71
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 15 14:01:07 2010 +0200
+
+ [glib] Use g_slice_dup in _copy() function for iterators
+
+ glib/poppler-document.cc | 9 +++------
+ 1 files changed, 3 insertions(+), 6 deletions(-)
+
+commit c84f69681828c7e3b969f666f9b84f1531976c6f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 15 13:57:18 2010 +0200
+
+ [glib] Use g_slice for mappings and PopplerRectangle
+
+ glib/poppler-page.cc | 50
+ ++++++++++++++++++--------------------------------
+ 1 files changed, 18 insertions(+), 32 deletions(-)
+
+commit e12b9ab105f3b56b47ded871693b939ed421c853
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 15 13:49:27 2010 +0200
+
+ [glib] Use poppler_image_mapping_free() instead of g_free()
+
+ glib/poppler-page.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fb791a15f7472042fb2174e6f5df6924dd4eeb9b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 15 13:37:52 2010 +0200
+
+ [glib] Remove poppler_mapping_free and use poppler_link_mapping_free
+ instead
+
+ glib/poppler-page.cc | 9 +--------
+ 1 files changed, 1 insertions(+), 8 deletions(-)
+
+commit 6186d7220e545eb89597626933a10acd0cd25173
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 15 13:16:59 2010 +0200
+
+ [glib] Use _new() methods instead of g_new() to create boxed structs
+
+ glib/poppler-page.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 44639cb7b10ab6d66122ae2b6b7f3e5745f933bd
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 15 10:39:00 2010 +0200
+
+ [glib-demo] Use poppler_rectangle_free() instead of g_free()
+
+ glib/demo/find.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3ca304f3837af27ae49541a5f441d8729264a945
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jun 14 19:16:41 2010 +0100
+
+ Add more caching to ObjectStreams
+
+ Makes opening of file from bug 26759 ten times faster
+
+ poppler/XRef.cc | 62
+ +++++++++++++++++++++++++++++++++++++++++++++++--------
+ poppler/XRef.h | 4 +-
+ 2 files changed, 55 insertions(+), 11 deletions(-)
+
+commit cc2e5f190e19ee8169f67df2541302a2816873d3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jun 14 18:17:01 2010 +0200
+
+ [glib-demo] Support password protected documents
+
+ glib/demo/main.c | 175
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 170 insertions(+), 5 deletions(-)
+
+commit 34b2dbb6bbaf0189c92eea6b7924999ab2b6ad11
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jun 14 17:41:51 2010 +0200
+
+ [glib-demo] Remove GLIB_CHECK_VERSION(), we already depend on
+ glib 2.18
+
+ glib/demo/attachments.c | 5 -----
+ glib/demo/main.c | 32 +-------------------------------
+ 2 files changed, 1 insertions(+), 36 deletions(-)
+
+commit a52670a46c0561025d8b86cd2865603f0720c695
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 13 15:31:15 2010 +0100
+
+ do not distribute these two files
+
+ they are generated on configure/cmake time and depend on the machine
+
+ glib/Makefile.am | 7 +++----
+ poppler/Makefile.am | 4 ++--
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+commit eb0206ba8458f1dba004ac7bef856dcbb2ccbba5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 9 18:56:16 2010 +0100
+
+ we need to ship these two files
+
+ Bug 28458
+
+ Makefile.am | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 7dfdf1ee293b7d36a049a90d8a17462ed0e50f2c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 8 21:54:52 2010 +0100
+
+ Typo--
+
+ utils/pdftoppm.1 | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 57cc04ee1a122794b338c0d9818dbdaea46a42d6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 8 21:49:40 2010 +0100
+
+ Add cropbox to the manpage
+
+ utils/pdftoppm.1 | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit f9e6cb9647981f7afbb20261b3ccedaf003657d2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 8 20:43:11 2010 +0100
+
+ 0.14.0
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 18 ++++++++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 24 insertions(+), 6 deletions(-)
+
+commit 963afdc39153fee69ecb939c98deeef4f64638de
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 8 20:29:58 2010 +0100
+
+ libpoppler-qt4.so.3.2.0 -> libpoppler-qt4.so.3.3.0
+
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c1629be8011f3bddbf619246090640d62136d521
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 8 20:23:00 2010 +0100
+
+ Increase soname as _PopplerActionMovie struct grew
+
+ glib/CMakeLists.txt | 2 +-
+ glib/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5ef45b1e72aed88ece0905b1204edee641f3c8fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 8 19:35:20 2010 +0100
+
+ Do not exit when trying to allocate memory for the XRef fails
+
+ See bug 28406
+
+ poppler/XRef.cc | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit e7a5e9f70ee1283a2ca6734552d905279c97989b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 4 08:46:33 2010 +0100
+
+ a bit of docu
+
+ poppler/Object.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9ff4dab2558f7c2700fd7fcaccacdad9619dbdda
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 4 08:44:34 2010 +0100
+
+ Add support for unsigned integer numbers
+
+ So files store their P as a 32 bit unsigned instead of as a 32 bit
+ signed, making us to overflow our objInt parsing and rejecting to open
+ the file, this patch introduces objUint that only happens when the
+ number is not real, does not fit in a 32 bit integer but still fits
+ in a
+ 32 bit unsigned integer
+
+ poppler/Lexer.cc | 32 +++++++++++++++++++++++++-------
+ poppler/Object.cc | 5 ++++-
+ poppler/Object.h | 14 +++++++++++---
+ poppler/SecurityHandler.cc | 22 ++++++++++++++++++++++
+ 4 files changed, 62 insertions(+), 11 deletions(-)
+
+commit 41e9af7f505dbfbda36f6ac97df90f2a42ab3160
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 1 21:40:07 2010 +0100
+
+ If the document is not encrypted it is ok to print
+
+ poppler/XRef.cc | 16 ++++++++++------
+ 1 files changed, 10 insertions(+), 6 deletions(-)
+
+commit b15c793a8a58b17a7fe7b32c1037726e1e0e1bf0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 1 20:57:16 2010 +0100
+
+ Check it is a stream, not that it is not none
+
+ People is reporting aborts, e.g. KDE bug 240208
+ but can not check if this really fixes it since he can not share the
+ document
+
+ poppler/Lexer.h | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit a72c68117ba05f3934e2df227cdcaf53a375f0ce
+Author: Pino Toscano <pino@kde.org>
+Date: Fri May 28 18:11:02 2010 +0200
+
+ [cpp apidox] add a start of API documentation for the 'page' class
+
+ cpp/poppler-page.cpp | 68
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 68 insertions(+), 0 deletions(-)
+
+commit acf7729e8e270e1b4b2a552272dc280ae6d7b352
+Author: Pino Toscano <pino@kde.org>
+Date: Fri May 28 17:38:35 2010 +0200
+
+ [cpp] fix the font_iterator current page status
+
+ cpp/poppler-font.cpp | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 4e017ff24a01cbbf1b39eedc3d7697f8b180fdd9
+Author: Pino Toscano <pino@kde.org>
+Date: Fri May 28 17:15:28 2010 +0200
+
+ [cpp apidox] add API documentation for the 'font_info' and
+ 'font_iterator' classes
+
+ cpp/poppler-font.cpp | 71
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 71 insertions(+), 0 deletions(-)
+
+commit 2ff840b62e41e2fc98e9fcff7330f40216de58a5
+Author: Pino Toscano <pino@kde.org>
+Date: Fri May 28 14:34:37 2010 +0200
+
+ [cpp] move the actual convert_date(const char*) implementation in
+ the detail
+
+ this way it is possible to call it from inside poppler-cpp without
+ an implicit conversion to std::string
+
+ cpp/poppler-document.cpp | 2 +-
+ cpp/poppler-embedded-file.cpp | 4 ++--
+ cpp/poppler-global.cpp | 23 ++---------------------
+ cpp/poppler-private.cpp | 25 +++++++++++++++++++++++++
+ cpp/poppler-private.h | 2 ++
+ 5 files changed, 32 insertions(+), 24 deletions(-)
+
+commit 8112e9111313eaded4cd2e89d0e67efb0f3e29db
+Author: Pino Toscano <pino@kde.org>
+Date: Fri May 28 13:13:50 2010 +0200
+
+ [cpp] add a time_type typedef
+
+ ... defined as unsigned int, and use it all around
+ (it changes nothing for client code)
+
+ cpp/poppler-document.cpp | 8 ++++----
+ cpp/poppler-document.h | 2 +-
+ cpp/poppler-embedded-file.cpp | 4 ++--
+ cpp/poppler-embedded-file.h | 4 ++--
+ cpp/poppler-global.cpp | 4 ++--
+ cpp/poppler-global.h | 4 +++-
+ 6 files changed, 14 insertions(+), 12 deletions(-)
+
+commit bc5bdb43b12437e00aaddc27a74b9ac4b6498446
+Author: Pino Toscano <pino@kde.org>
+Date: Fri May 28 13:01:53 2010 +0200
+
+ use the proper type for iterating on a GooVector
+
+ poppler/XRef.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 87128ab0dfec6be1a034361512ee41301b078831
+Author: Maciej Mrozowski <reavertm@gmail.com>
+Date: Thu May 27 17:31:00 2010 +0200
+
+ [CMake] Do not force -O2, preserve compiler flags instead.
+
+ cmake/modules/PopplerMacros.cmake | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 241c338facb45641ef1a271c904355a014bbf28d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu May 27 20:37:55 2010 +0100
+
+ Allow quality & progressive mode to be utilised in JpegWriter
+
+ goo/JpegWriter.cc | 15 +++++++++++++--
+ goo/JpegWriter.h | 4 ++++
+ splash/SplashBitmap.cc | 18 +++++++++---------
+ splash/SplashBitmap.h | 4 ++++
+ 4 files changed, 30 insertions(+), 11 deletions(-)
+
+commit 9eda6e8aaae412a9882141d1b5b8c7bf0c823c68
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue May 25 23:44:30 2010 +0100
+
+ Do not follow loops blindly
+
+ Fixes crash in pdf in bug 28172
+
+ poppler/XRef.cc | 21 +++++++++++++++------
+ poppler/XRef.h | 7 ++++---
+ 2 files changed, 19 insertions(+), 9 deletions(-)
+
+commit bbee6e0c8c9b181f8d19c167c867d74a765685fb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue May 25 23:13:38 2010 +0100
+
+ update copyright
+
+ poppler/JBIG2Stream.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 80b72b9f2fd70395580205b8b176e0576e132cf5
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed May 26 13:07:57 2010 +0200
+
+ [autotools] sync autotool build with cmake build
+
+ In addition to commit 69c2cf76cef9c190ac07726f60f1dccd3df5cb6d
+
+ poppler/poppler-config.h.in | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 30ea3ab8a1eecafb3366aef193910098fdb7ccc8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue May 25 23:07:56 2010 +0100
+
+ Fix crash when parsing pdf in bug 28170
+
+ This code is a can of crashing worms :-7
+
+ poppler/JBIG2Stream.cc | 23 ++++++++++++++++-------
+ 1 files changed, 16 insertions(+), 7 deletions(-)
+
+commit b5a9021037c4e6cbbfd622433f3de693d1f47671
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue May 25 20:00:57 2010 +0100
+
+ 0.13.4
+
+ CMakeLists.txt | 2 +-
+ NEWS | 16 ++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ glib/reference/tmpl/poppler-action.sgml | 5 +++++
+ glib/reference/tmpl/poppler-annot.sgml | 18 ++++++++++++++++++
+ glib/reference/tmpl/poppler-attachment.sgml | 3 +++
+ glib/reference/tmpl/poppler-document.sgml | 5 +++++
+ glib/reference/tmpl/poppler-enums.sgml | 17 +++++++++++++++++
+ glib/reference/tmpl/poppler-features.sgml | 3 +++
+ glib/reference/tmpl/poppler-form-field.sgml | 3 +++
+ glib/reference/tmpl/poppler-layer.sgml | 4 ++++
+ glib/reference/tmpl/poppler-page.sgml | 13 +++++++++++++
+ glib/reference/tmpl/poppler-private.sgml | 3 +++
+ glib/reference/tmpl/poppler.sgml | 6 ++++++
+ glib/reference/tmpl/stamp-poppler-enums.sgml | 3 +++
+ qt4/src/Doxyfile | 2 +-
+ 17 files changed, 103 insertions(+), 4 deletions(-)
+
+commit 57ab0ebe993d79fe551bba58e0a70d55d32828f8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 12 20:49:31 2010 +0100
+
+ better copyright
+
+ poppler/strtok_r.cpp | 23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
+
+commit 69c2cf76cef9c190ac07726f60f1dccd3df5cb6d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 12 20:47:25 2010 +0100
+
+ mingw does not provide strtok_r
+
+ Copy the glibc implementation
+
+ CMakeLists.txt | 1 +
+ poppler/Makefile.am | 1 +
+ poppler/poppler-config.h.cmake | 4 +
+ poppler/strtok_r.cpp | 189
+ ++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 195 insertions(+), 0 deletions(-)
+
+commit 9e9b5e0d87a7450bd2223538673321ecec720c36
+Author: Marek Kasik <mkasik@redhat.com>
+Date: Tue May 11 12:06:17 2010 +0200
+
+ Better check of overlapping of table cells when selecting text
+
+ Add check for overlapping of upper right cell with lower left cell
+ of assumed table (related to #3188).
+
+ poppler/TextOutputDev.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit a3e40b460b7690ef73ccf143b10da07e91d9ee7f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon May 10 17:41:04 2010 +0200
+
+ [annots] Adjust bbox for line annots when y1 = y2
+
+ Some documents like pdf_commenting_new.pdf, have y1 = y2 but
+ line_width > 0, acroread renders the lines in such cases even
+ though the
+ annot bbox is empty.
+
+ poppler/Annot.cc | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit e30d24c506a9ff742f8af5d6c71273abeddaa265
+Author: Pino Toscano <pino@kde.org>
+Date: Tue May 4 15:19:26 2010 +0200
+
+ [cpp] ustring::{from,to}_utf8(): fix in/out buffer sizes
+
+ cpp/poppler-global.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit aaa19a673020e12dbfceb4d25ade0ece7875fd83
+Author: Pino Toscano <pino@kde.org>
+Date: Tue May 4 12:07:43 2010 +0200
+
+ [cpp] make the pkg-config files really working
+
+ poppler-cpp.pc.cmake | 6 +++++-
+ poppler-cpp.pc.in | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+commit 8f963ccde41ef1faa719254fccc5bdfe75e9fa87
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Sun May 2 18:42:10 2010 +0200
+
+ Windows: define strtok_r as strtok_s
+
+ poppler/poppler-config.h.cmake | 4 ++++
+ poppler/poppler-config.h.in | 4 ++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit c9d8df51c96e50ad72f7954baba2254259fc894c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 1 19:52:51 2010 +0100
+
+ 2010 in these copyrights
+
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 9ce71fb35fdd66c55872956432160a5c76a62080
+Author: Jakub Wilk <ubanus@users.sf.net>
+Date: Sat May 1 19:50:54 2010 +0100
+
+ Use strtok_r instead strtok
+
+ strtok is not thread safe
+
+ fofi/FoFiType1.cc | 8 +++++---
+ poppler/CharCodeToUnicode.cc | 6 ++++--
+ poppler/GlobalParams.cc | 6 ++++--
+ poppler/PDFDoc.cc | 4 +++-
+ poppler/UnicodeMap.cc | 21 ++++++++++++++++++---
+ 5 files changed, 34 insertions(+), 11 deletions(-)
+
+commit 6b2983f89e87792a393880dab6dc1fedb748db2c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Apr 30 14:48:50 2010 +0200
+
+ [cairo] Set device offset and matrix to smask depending on the
+ group target
+
+ It seems to fix all of my test cases. Fixes bug #27208.
+
+ poppler/CairoOutputDev.cc | 21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
+
+commit ac32021704178721ee007a6b6831283e323e500f
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Apr 30 01:14:14 2010 +0200
+
+ demote the #warning to a simple FIXME comment
+
+ poppler/ArthurOutputDev.cc | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 8c1bc17552c989c15f318d9d109607a9a594ca6b
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Apr 30 01:12:19 2010 +0200
+
+ MSVC: define fmax() and fmin()
+
+ MSVC does not provide those functions, so we need to define them to
+ the existing max()/mix() macros.
+ Thanks to Patrick Spendrin for the hint!
+
+ poppler/poppler-config.h.cmake | 5 +++++
+ poppler/poppler-config.h.in | 5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 71063d51a45835b0267a7e3f823ef49689cfd06f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Apr 29 20:28:07 2010 +0200
+
+ Make sure we are drawing text before calling endTextObject()
+
+ This is actually the right fix for the previous commit.
+
+ poppler/Gfx.cc | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit e909219d8e92994bd52976f9676015fa6ca9fc91
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Apr 29 18:34:22 2010 +0200
+
+ Set textHaveCSPattern=false again before filling the pattern in
+ opEndText()
+
+ Fixes cairo backend regressions caused by commit
+ ccf238b32e236f69c0507a5421ac2649dfa8d865.
+
+ poppler/Gfx.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 29572d6ac7829b60efce2d8e489473c55e370f26
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 27 23:39:23 2010 +0100
+
+ fabs for doubles
+
+ poppler/TextOutputDev.cc | 24 ++++++++++++------------
+ 1 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 4905e2bd764ea601e3bf9c5195c740e5bf186af5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 27 23:34:34 2010 +0100
+
+ fix include
+
+ splash/SplashBitmap.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit f9f0e4b747a1527bd6354897cdba7954d58651de
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 27 14:26:23 2010 +0200
+
+ Fix first color stop offset of linear gradients
+
+ Fixes bug #27837.
+
+ poppler/Gfx.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5b822011029f3721fbafd4a7bf01b9d6fee35d25
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 24 18:18:08 2010 +0200
+
+ include standard float.h instead of unportable values.h
+
+ poppler/TextOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit dee7cb8691528293bb5b8f266970cdb6771e301b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 24 15:39:23 2010 +0100
+
+ 0.13.3
+
+ CMakeLists.txt | 2 +-
+ NEWS | 31 +++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 35 insertions(+), 4 deletions(-)
+
+commit 07864c9e2a7a32b48bdbab92c8b2f79bce1d9f5b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 24 13:07:02 2010 +0100
+
+ minor cleanups
+
+ utils/HtmlLinks.cc | 15 ++-------------
+ utils/HtmlLinks.h | 16 ++++++++++++++--
+ 2 files changed, 16 insertions(+), 15 deletions(-)
+
+commit e501eabb2f0775444a2bf64005a3a3f1ffa281b4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 24 13:06:12 2010 +0100
+
+ Do not assume the parameter will have more than 5 chars
+
+ utils/pdftohtml.cc | 30 ++++++++++++++++++------------
+ 1 files changed, 18 insertions(+), 12 deletions(-)
+
+commit 6cc4d571339214e9eeeb682ba48fb220cef905f9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 24 13:04:05 2010 +0100
+
+ Fix end() to return the correct last valid value
+
+ goo/GooVector.h | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 4ed53e30e735b79c46eab9d54883531c6e187b17
+Author: William Bader <williambader@hotmail.com>
+Date: Fri Apr 23 22:52:24 2010 +0100
+
+ Silence some Illegal entry in bfrange block in ToUnicode CMap
+
+ Fixes #27728
+
+ poppler/CharCodeToUnicode.cc | 7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 16a004784043e2a8587c0c3c6d23889df8a80470
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Apr 22 19:39:01 2010 +0100
+
+ Avoid the usage of std::
+
+ poppler/TextOutputDev.cc | 25 +++++++++++--------------
+ 1 files changed, 11 insertions(+), 14 deletions(-)
+
+commit a7dcb2b4ffee57b7f78529cbaeaab647ab93de86
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Apr 22 13:31:41 2010 +0200
+
+ Windows: include config.h in GlobalParamsWin.cc only if not included
+ already
+
+ GlobalParamsWin.cc is not compiled standalone but only #include'd by
+ GlobalParams.cc (on Windows only), so config.h has already included
+ already
+ as safety check, check for PACKAGE_NAME (#define'd in config.h)
+ before #include'ing it again
+
+ poppler/GlobalParamsWin.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit fba076e17af24a9c9883504282316bba119a908c
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Apr 22 13:24:04 2010 +0200
+
+ avoid accidental max() macro replacement with some compilers (eg MSVC)
+
+ defining an empty macro and using it between "max" and "(", such
+ compilers won't try to replace their macro max(a, b) there; in any
+ case, empty spaces are just fine
+
+ poppler/TextOutputDev.cc | 11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+commit ccf238b32e236f69c0507a5421ac2649dfa8d865
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Wed Apr 21 19:21:37 2010 +0100
+
+ Improve colorizing text and masks in pattern colorspace
+
+ Bug #27482
+
+ poppler/Gfx.cc | 137
+ +++++++++++++++++++++-----------------------
+ poppler/Gfx.h | 4 +-
+ poppler/SplashOutputDev.cc | 41 ++++++++++++-
+ poppler/SplashOutputDev.h | 3 +-
+ 4 files changed, 106 insertions(+), 79 deletions(-)
+
+commit 8e86dfb328d94939ecf390d34af533b831b2837b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 21 19:19:53 2010 +0100
+
+ Add copyright
+
+ poppler/TextOutputDev.cc | 1 +
+ poppler/TextOutputDev.h | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 6f9f3d33ff8058e28243ba45b8547e21ad0d088a
+Author: Andre Klapper <a9016009@gmx.de>
+Date: Wed Apr 21 19:57:15 2010 +0200
+
+ [glib-demo] Compile with -DGSEAL_ENABLE
+
+ Fixes bug #27579.
+
+ glib/demo/images.c | 2 +-
+ glib/demo/layers.c | 4 ++--
+ glib/demo/render.c | 8 ++++----
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 6b14c18d60cae130869f9a5c7688dfe880602224
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Apr 21 19:56:49 2010 +0200
+
+ [cairo] Make sure we always use a new path in doPath()
+
+ Fixes document
+ http://acroeng.adobe.com/Test_Files/images/transparency/Untitled-2.pdf
+ when rendering with cairo backend.
+
+ poppler/CairoOutputDev.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 4f71d64c69500ed78daf4d797c8af6cfbd3d970e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Apr 21 11:44:49 2010 +0200
+
+ [cairo] Fix pattern size when bbox is not at 0,0
+
+ poppler/CairoOutputDev.cc | 11 +++++++++--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+commit 9c5612f6e013a8698eff6531ec388a7e6c1fb89a
+Author: Marek Kasik <mkasik@redhat.com>
+Date: Fri Feb 12 14:31:01 2010 +0100
+
+ Distinguish between columns and tables when selecting text
+
+ This commit add ability to detect tables in text by checking borders
+ of 4 neighbouring text blocks for arrangement (to the left, to
+ the right,
+ center, ...). Detected border of whole table is then stored in
+ ExMin, ExMax,
+ EyMin and EyMax of each block together with id of detected
+ table. Sorting
+ of blocks is then performed on the these borders to be able to
+ distinguish
+ tables from columns.
+ Pasting of selected text was modified so that tables are pasted
+ correctly
+ (even with multi line cells).
+
+ poppler/TextOutputDev.cc | 490
+ ++++++++++++++++++++++++++++++++++++++++------
+ poppler/TextOutputDev.h | 5 +
+ 2 files changed, 437 insertions(+), 58 deletions(-)
+
+commit db014ffb357e760d9397544c5a8fe747cdb497ab
+Author: Brian Ewins <brian.ewins@gmail.com>
+Date: Mon Nov 23 08:58:19 2009 +0000
+
+ Select top right to bottom left in RTL mode
+
+ This makes pure RTL selection work. Bidi is not handled at all.
+ Rendering of the selection is poor and the dumped text appears
+ to still be in reverse order to me.
+
+ poppler/TextOutputDev.cc | 57
+ ++++++++++++++++++++++++++++++++++-----------
+ 1 files changed, 43 insertions(+), 14 deletions(-)
+
+commit b1d43fa052d9160c4f319a67415ecf3ebf2cf9b3
+Author: Brian Ewins <brian.ewins@gmail.com>
+Date: Sun Nov 22 09:47:40 2009 +0000
+
+ Make pdftotext newlines match copy and paste
+
+ The output of pdftotext didn't insert line breaks,
+ resulting in jumbled text. Change the rules to
+ emit a newline at the end of each line unless
+ a hyphenation is being supressed, and an extra
+ newline at the end of each flow.
+
+ poppler/TextOutputDev.cc | 17 +++--------------
+ 1 files changed, 3 insertions(+), 14 deletions(-)
+
+commit f83b677a8eb44d65698b77edb13a5c7de3a72c0f
+Author: Brian Ewins <brian.ewins@gmail.com>
+Date: Thu Nov 12 02:50:29 2009 +0000
+
+ Use a reading-order sort to order blocks
+
+ This switches the block sort from XY to reading order,
+ using the rules from T. Breuel's "High Performance
+ Document Layout Analysis".
+
+ Signed-off-by: Brian Ewins <brian.ewins@gmail.com>
+
+ poppler/TextOutputDev.cc | 164
+ ++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/TextOutputDev.h | 8 ++
+ 2 files changed, 167 insertions(+), 5 deletions(-)
+
+commit a2191a4d45e0abaec97c19aacae37c4c5824bd36
+Author: Brian Ewins <brian.ewins@gmail.com>
+Date: Mon Nov 9 06:24:51 2009 +0000
+
+ Separate flow construction from reading order
+
+ If the blocks were already in reading order, then
+ constructing flows is simplified, since blocks
+ cannot be picked out-of-order. Make this change
+ first in preparation for adding a reading-order
+ sort.
+
+ Signed-off-by: Brian Ewins <brian.ewins@gmail.com>
+
+ poppler/TextOutputDev.cc | 96
+ ++++++++-------------------------------------
+ 1 files changed, 17 insertions(+), 79 deletions(-)
+
+commit 345ed51af9b9e7ea53af42727b91ed68dcc52370
+Author: Brian Ewins <brian.ewins@gmail.com>
+Date: Thu Oct 29 01:46:29 2009 +0000
+
+ Fix bug 3188, text selection across table cells
+
+ Bug 3188. When selecting text, poppler goes across the whole
+ page then down, rather than across each cell, down that cell,
+ then across to the next cell. This leads to illegible paste
+ results.
+
+ Teach TextPage to visit the selection in flow order rather than
+ block order.
+
+ Signed-off-by: Brian Ewins <brian.ewins@gmail.com>
+
+ poppler/TextOutputDev.cc | 334
+ ++++++++++++++++++++++++---------------------
+ 1 files changed, 178 insertions(+), 156 deletions(-)
+
+commit 12d83931ae1b899b70c7ea5c01f03f123b1bb9a8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Apr 18 17:53:48 2010 +0200
+
+ [cairo] Check pattern status after setting matrix when rendering
+ images
+
+ Fixes rendering of document attached to kde bug
+ http://bugs.kde.org/show_bug.cgi?id=135417.
+
+ poppler/CairoOutputDev.cc | 34 ++++++++++++++++++++++++++++++++++
+ 1 files changed, 34 insertions(+), 0 deletions(-)
+
+commit ff6d501a2fc887fd49a985161f756d6d6b8e6c0d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Apr 18 17:51:42 2010 +0200
+
+ [cairo] Fix a crash when rendering 0x0 images
+
+ See kde bug http://bugs.kde.org/show_bug.cgi?id=135417
+
+ poppler/CairoOutputDev.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 84cd2186861436fbaa7c29aa691e69fcd543a1c2
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Apr 13 23:42:28 2010 +0200
+
+ Properly initialize variable
+
+ poppler/CachedFile.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 24f244f486f332b0bd76c6525c5d9d03168a76e6
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Apr 13 23:54:28 2010 +0200
+
+ pdftops: require output filename when reading from stdin
+
+ utils/pdftops.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 955f9f53ff225f6794a494fdd0f0fe5ee1a41d88
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Apr 13 23:47:40 2010 +0200
+
+ pdftotext: require output filename when reading from stdin
+
+ utils/pdftotext.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 31388aa8b5117619878431b7fed2d033000af541
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Apr 13 23:27:20 2010 +0200
+
+ pdftohtml: require output filename when reading from stdin
+
+ utils/pdftohtml.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit a8d43ec1c7f5448a7f63d9bbd9062d56ee1c7c58
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 14 19:21:33 2010 +0100
+
+ update XOPEN_SOURCE to 600 in non standard compile options
+
+ it seems helps compiling on some BSD
+
+ cmake/modules/PopplerMacros.cmake | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 4cce1f14e964edf1bf2d9fb8286ee002a67dc212
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 13 21:57:16 2010 +0100
+
+ include strings.h on non windows platforms
+
+ poppler/GlobalParams.cc | 2 ++
+ test/perf-test.cc | 2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 55c76069c52f9f51c6b8c60fe1aa8de499012ea8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Apr 12 19:32:46 2010 +0200
+
+ [glib] Use existing cairo api when rendering to a pixbuf
+
+ I should fix bug #5589 for the GDK api too.
+
+ glib/poppler-page.cc | 227
+ ++++++++++++++++++++-----------------------------
+ 1 files changed, 93 insertions(+), 134 deletions(-)
+
+commit 51aefe1423a068e8c119c21a8791d265aecbeaf5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Apr 9 12:50:00 2010 +0200
+
+ [cairo] Implement colorizing image masks with pattern colorspace
+
+ poppler/CairoOutputDev.cc | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit bd8f44289770175a17ac45e4788b0d374cc93d5a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Apr 9 12:02:38 2010 +0200
+
+ Partially revert "[cairo] Do not change device offset of mask surface"
+
+ This partially reverts commit
+ a32f6f9ebaed3e4827b9dc6cb37e307c2798f521.
+ It fixed bug #27208, but it's causing regressions on other documents.
+
+ poppler/CairoOutputDev.cc | 11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+commit bcb405c43fb7140f5d601d00de4d30913a0050ef
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Apr 8 12:02:48 2010 +0200
+
+ Pages were always created without forms by Catalog
+
+ Use getForm() instead of form when creating a page object.
+
+ poppler/Catalog.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d46581c574b3088a82555cbc3b76e95e2571b9c0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 7 20:25:23 2010 +0100
+
+ Fix destructor
+
+ poppler/Catalog.cc | 19 +++++++------------
+ poppler/Catalog.h | 3 +--
+ 2 files changed, 8 insertions(+), 14 deletions(-)
+
+commit ab14433f8b3d7c67f279cece65dfdd40c6675ac0
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Mar 25 15:33:33 2010 +0100
+
+ Parse Form on demand
+
+ poppler/Catalog.cc | 21 +++++++++++++--------
+ poppler/Catalog.h | 2 +-
+ 2 files changed, 14 insertions(+), 9 deletions(-)
+
+commit c72a2c7f70b13a7b7b531b3c983d9a9bc104bac7
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Mar 25 17:33:11 2010 +0100
+
+ Parse Names on demand
+
+ poppler/Catalog.cc | 112
+ ++++++++++++++++++++++++++++++++++++++++++----------
+ poppler/Catalog.h | 18 ++++++--
+ 2 files changed, 104 insertions(+), 26 deletions(-)
+
+commit 32053360c93607cf9bdc092257cefad5d4df9ec5
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Mar 25 16:32:22 2010 +0100
+
+ Parse Dests on demand
+
+ poppler/Catalog.cc | 27 +++++++++++++++++++++------
+ poppler/Catalog.h | 2 +-
+ 2 files changed, 22 insertions(+), 7 deletions(-)
+
+commit da0f8e69eecb944e128474f62829f729eeabd189
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Mar 25 16:48:07 2010 +0100
+
+ Parse Outline on demand in PDFDoc
+
+ poppler/PDFDoc.cc | 17 ++++++++++++-----
+ poppler/PDFDoc.h | 2 +-
+ 2 files changed, 13 insertions(+), 6 deletions(-)
+
+commit d7a69c8cad112cb6616d0192d8a4028fdaee2f73
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Mar 25 16:05:02 2010 +0100
+
+ Parse Outline on demand
+
+ poppler/Catalog.cc | 23 ++++++++++++++++++++---
+ poppler/Catalog.h | 2 +-
+ 2 files changed, 21 insertions(+), 4 deletions(-)
+
+commit c149e027fa76824221a78fe6d3bf9bfe953491d4
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Mar 25 15:51:51 2010 +0100
+
+ Parse StructTreeRoot on demand
+
+ poppler/Catalog.cc | 22 +++++++++++++++++++---
+ poppler/Catalog.h | 2 +-
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+
+commit 3c6effe44d6d97f175c2ee7f3913d8c4ba34d612
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Mar 25 14:55:22 2010 +0100
+
+ Parse Metadata on demand
+
+ poppler/Catalog.cc | 16 +++++++++++++---
+ 1 files changed, 13 insertions(+), 3 deletions(-)
+
+commit 749d67ea2346a3453ef41dc37ba59d419ad900b0
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Mar 25 15:09:58 2010 +0100
+
+ Parse PageLabelInfo on demand
+
+ poppler/Catalog.cc | 37 +++++++++++++++++++++++++++++--------
+ poppler/Catalog.h | 3 +++
+ 2 files changed, 32 insertions(+), 8 deletions(-)
+
+commit 78f7d106714fa489a66c39410163a6902ba24856
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sat Mar 27 14:43:57 2010 +0100
+
+ Parse PageMode and PageLayout on demand
+
+ poppler/Catalog.cc | 109
+ +++++++++++++++++++++++++++++++++++-----------------
+ poppler/Catalog.h | 11 +++--
+ 2 files changed, 81 insertions(+), 39 deletions(-)
+
+commit f5dd5be64d09186ee289632c1a61979d15edd605
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Apr 7 19:48:39 2010 +0200
+
+ Fix saving update docs that have a compressed xref table
+
+ - Use the original xref table size as Size field in the trailer
+ dictionary to make sure size = maxObjId + 1
+
+ - Use the right generation number for compressed objects that which
+ must be 0. gen field in xref entry for compressed objects is the
+ index of the object in the stream, not the generation number.
+
+ Fixes bug #27450.
+
+ poppler/PDFDoc.cc | 9 ++++-----
+ 1 files changed, 4 insertions(+), 5 deletions(-)
+
+commit 3f302fdd78cd78873bf5376af84e83741a8daadb
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Apr 6 23:58:46 2010 +0200
+
+ use a GooVector<bool> instead of a non-standard variable-length-array
+
+ poppler/CachedFile.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 425a62b5fa8e4e69bfc1c64ed126b5baac06d78a
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Apr 6 10:57:30 2010 +0200
+
+ pdfutils: fix deleting fileName
+
+ utils/pdfinfo.cc | 2 +-
+ utils/pdftoabw.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 198c9d61ba93ba62ea2da44a23cd948d43556c3e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 6 22:00:14 2010 +0100
+
+ Use the topleft of the Rect of text annots to draw
+
+ Not use the full rect when we are drawing "our" notes
+
+ poppler/Annot.cc | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 1422802f029483ad3e62a3a13e66b2d3990ac58f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 6 12:32:12 2010 +0200
+
+ [cairo] Use current fill_opacity when drawing soft masked images
+
+ Fixes GNOME Bug https://bugzilla.gnome.org/show_bug.cgi?id=614915
+
+ poppler/CairoOutputDev.cc | 27 ++++++++++++++++++++-------
+ 1 files changed, 20 insertions(+), 7 deletions(-)
+
+commit c152d30f879e6cde45de58bb9249035e127e84e7
+Author: Hib Eris <hib@hiberis.nl>
+Date: Mon Apr 5 18:55:29 2010 +0200
+
+ delete fileName in utils
+
+ utils/pdftohtml.cc | 1 +
+ utils/pdftops.cc | 1 +
+ utils/pdftotext.cc | 1 +
+ 3 files changed, 3 insertions(+), 0 deletions(-)
+
+commit f091c83414ab32a4ecf1fa2bd15f13a3cf113a86
+Author: Hib Eris <hib@hiberis.nl>
+Date: Mon Apr 5 20:12:01 2010 +0100
+
+ add some docu
+
+ poppler/CachedFile.h | 30 ++++++++++++++++++++++++++++++
+ poppler/CurlPDFDocBuilder.h | 2 ++
+ poppler/LocalPDFDocBuilder.h | 2 ++
+ poppler/PDFDocBuilder.h | 9 +++++++++
+ poppler/PDFDocFactory.h | 12 ++++++++++++
+ poppler/StdinPDFDocBuilder.h | 2 ++
+ 6 files changed, 57 insertions(+), 0 deletions(-)
+
+commit fc071d800cb4329a3ccf898d7bf16b4db7323ad8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Apr 5 19:11:26 2010 +0100
+
+ Rework DCTStream error handling, should work better now
+
+ Fixes bug 26280
+
+ poppler/DCTStream.cc | 35 ++++++++++++++---------------------
+ poppler/DCTStream.h | 5 +++--
+ utils/HtmlOutputDev.cc | 4 ++--
+ 3 files changed, 19 insertions(+), 25 deletions(-)
+
+commit a9d801b2db20ecb08734ee5cdb703abf11994b6e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Apr 5 16:55:02 2010 +0100
+
+ Make some paremeters const & to clearly show we just read them
+
+ poppler/CachedFile.cc | 18 ++++++++++--------
+ poppler/CachedFile.h | 8 +++++---
+ poppler/CurlCachedFile.cc | 9 +++++----
+ poppler/CurlCachedFile.h | 3 ++-
+ poppler/CurlPDFDocBuilder.cc | 9 +++++----
+ poppler/CurlPDFDocBuilder.h | 5 +++--
+ poppler/LocalPDFDocBuilder.cc | 15 ++++++++-------
+ poppler/LocalPDFDocBuilder.h | 5 +++--
+ poppler/PDFDocBuilder.h | 5 +++--
+ poppler/PDFDocFactory.cc | 7 ++++---
+ poppler/PDFDocFactory.h | 3 ++-
+ poppler/StdinCachedFile.cc | 3 ++-
+ poppler/StdinCachedFile.h | 3 ++-
+ poppler/StdinPDFDocBuilder.cc | 7 ++++---
+ poppler/StdinPDFDocBuilder.h | 5 +++--
+ utils/pdffonts.cc | 4 ++--
+ utils/pdfimages.cc | 4 ++--
+ utils/pdfinfo.cc | 4 ++--
+ utils/pdftoabw.cc | 4 ++--
+ utils/pdftohtml.cc | 4 ++--
+ utils/pdftoppm.cc | 2 +-
+ utils/pdftops.cc | 4 ++--
+ utils/pdftotext.cc | 4 ++--
+ 23 files changed, 76 insertions(+), 59 deletions(-)
+
+commit a04ee3ea6066c97d41fc40d5d97c600a1870855a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Apr 5 16:50:58 2010 +0100
+
+ forgot my (C)
+
+ poppler/Form.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ed723c8ac4a21a50d7d236cdcf7a635defd8dffb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Apr 5 16:50:15 2010 +0100
+
+ The copy constructor of GooString never worked, so do not use it
+
+ poppler/Form.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a28be8e4009b86fdfd92da928def194225a736c6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Apr 5 16:49:06 2010 +0100
+
+ Add some const correctnes to GooString
+
+ goo/GooString.cc | 12 ++++++------
+ goo/GooString.h | 21 ++++++++++++---------
+ 2 files changed, 18 insertions(+), 15 deletions(-)
+
+commit 46aee9e4d225b88a3dfd4afbe57259f337bb15d3
+Author: Hib Eris <hib@hiberis.nl>
+Date: Mon Apr 5 14:36:09 2010 +0200
+
+ Use PDFDocFactory in utils
+
+ utils/pdffonts.cc | 16 ++++++++--------
+ utils/pdfimages.cc | 11 ++++++++++-
+ utils/pdfinfo.cc | 31 +++++++------------------------
+ utils/pdftoabw.cc | 10 +++++++++-
+ utils/pdftohtml.cc | 10 +++++++++-
+ utils/pdftoppm.cc | 17 +++++++++++------
+ utils/pdftops.cc | 9 ++++++++-
+ utils/pdftotext.cc | 14 +++++++-------
+ 8 files changed, 69 insertions(+), 49 deletions(-)
+
+commit d487a90688c4431075c9e4db040b3b02625e208f
+Author: Hib Eris <hib@hiberis.nl>
+Date: Mon Apr 5 14:35:52 2010 +0200
+
+ Add PDFDocFactory
+
+ CMakeLists.txt | 2 +
+ poppler/Makefile.am | 2 +
+ poppler/PDFDocFactory.cc | 71
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PDFDocFactory.h | 42 +++++++++++++++++++++++++++
+ 4 files changed, 117 insertions(+), 0 deletions(-)
+
+commit 869135920831fb0d15db734f3dcd7a67146cc241
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Feb 24 15:24:26 2010 +0100
+
+ Add CurlPDFDocBuilder
+
+ CMakeLists.txt | 2 +
+ poppler/CurlPDFDocBuilder.cc | 46
+ ++++++++++++++++++++++++++++++++++++++++++
+ poppler/CurlPDFDocBuilder.h | 30 +++++++++++++++++++++++++++
+ poppler/Makefile.am | 6 +++-
+ 4 files changed, 82 insertions(+), 2 deletions(-)
+
+commit ec5c6117a64f9cb03560091c4d7948d4287b6975
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Feb 25 11:23:28 2010 +0100
+
+ Add LocalPDFDocBuilder and StdinPDFDocBuilder
+
+ CMakeLists.txt | 4 +++
+ poppler/LocalPDFDocBuilder.cc | 45
+ +++++++++++++++++++++++++++++++++++++++++
+ poppler/LocalPDFDocBuilder.h | 30 +++++++++++++++++++++++++++
+ poppler/Makefile.am | 4 +++
+ poppler/StdinPDFDocBuilder.cc | 42
+ ++++++++++++++++++++++++++++++++++++++
+ poppler/StdinPDFDocBuilder.h | 30 +++++++++++++++++++++++++++
+ 6 files changed, 155 insertions(+), 0 deletions(-)
+
+commit 919b735d1c0b99bf72280aff8db87ba503954498
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Apr 4 11:05:35 2010 +0200
+
+ Add PDFDocBuilder
+
+ CMakeLists.txt | 1 +
+ poppler/Makefile.am | 1 +
+ poppler/PDFDocBuilder.h | 32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 34 insertions(+), 0 deletions(-)
+
+commit 1ab07faf05661d6d92186974c4b1c279b6178747
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Apr 4 11:29:53 2010 +0200
+
+ Add PDFDoc::ErrorPDFDoc
+
+ poppler/PDFDoc.cc | 14 ++++++++++++++
+ poppler/PDFDoc.h | 3 +++
+ 2 files changed, 17 insertions(+), 0 deletions(-)
+
+commit efc7e5efeddd8f70b7c74573d3194aba0a7d4631
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Apr 4 11:17:37 2010 +0200
+
+ Cleanup PDFDoc
+
+ poppler/PDFDoc.cc | 40 +++++++++++++++-------------------------
+ poppler/PDFDoc.h | 3 ++-
+ 2 files changed, 17 insertions(+), 26 deletions(-)
+
+commit 08a3435e67ebf21beac2fefcbd21ad65f9293fd1
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Feb 23 02:29:26 2010 +0100
+
+ Add HTTP support using libcurl
+
+ With libcurl, poppler can handle documents over http.
+
+ CMakeLists.txt | 18 ++++++++
+ config.h.cmake | 6 +++
+ configure.ac | 16 +++++++
+ poppler/CurlCachedFile.cc | 95
+ ++++++++++++++++++++++++++++++++++++++++
+ poppler/CurlCachedFile.h | 39 ++++++++++++++++
+ poppler/Makefile.am | 20 ++++++++
+ poppler/poppler-config.h.cmake | 5 ++
+ poppler/poppler-config.h.in | 5 ++
+ utils/pdfinfo.cc | 16 ++++++-
+ 9 files changed, 219 insertions(+), 1 deletions(-)
+
+commit a87abf6ad9fb66d35a70c9412adc5d8ba2889b96
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Feb 24 14:46:59 2010 +0100
+
+ Use cached files to read from stdin in pdfinfo
+
+ This fixes reading from stdin.
+
+ utils/pdfinfo.cc | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 958b04b14baf03c07492fa1cbd225d9968b9efc1
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Feb 23 02:02:10 2010 +0100
+
+ Add support for reading a cached file from stdin
+
+ CMakeLists.txt | 2 ++
+ poppler/Makefile.am | 2 ++
+ poppler/StdinCachedFile.cc | 37 +++++++++++++++++++++++++++++++++++++
+ poppler/StdinCachedFile.h | 26 ++++++++++++++++++++++++++
+ 4 files changed, 67 insertions(+), 0 deletions(-)
+
+commit 9539f75bd06150a3868209c5b04a75f5253722cc
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sat Apr 3 15:08:20 2010 +0200
+
+ Add support for cached files
+
+ CMakeLists.txt | 2 +
+ poppler/CachedFile.cc | 246
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CachedFile.h | 113 ++++++++++++++++++++++
+ poppler/Makefile.am | 2 +
+ poppler/Stream.cc | 102 ++++++++++++++++++++
+ poppler/Stream.h | 58 ++++++++++++
+ 6 files changed, 523 insertions(+), 0 deletions(-)
+
+commit 8c6aefb8aa8929b9c47791d3062ed3ac8512626f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Apr 4 16:08:12 2010 +0200
+
+ [lexer] Correctly parse numbers with '+' sign
+
+ See GNOME Bug: https://bugzilla.gnome.org/show_bug.cgi?id=614549
+
+ poppler/Lexer.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit ab5044e451e3714d385295f0b4ce9a15c8f2562c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Apr 4 12:32:42 2010 +0100
+
+ Add the -o[dd] and -e[ven] options to pdftoppm
+
+ I've been using this patch forever and it's a pain to apply and
+ unapply
+ it each time
+
+ utils/pdftoppm.1 | 6 ++++++
+ utils/pdftoppm.cc | 8 ++++++++
+ 2 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 0e371fb628a7e7d0cc1656e6405af4c97dbebf5d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Apr 4 12:30:34 2010 +0100
+
+ Fix my roll optimization
+
+ Thanks Carlos for noticing
+
+ poppler/Function.cc | 12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+commit a32f6f9ebaed3e4827b9dc6cb37e307c2798f521
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 28 18:43:14 2010 +0200
+
+ [cairo] Do not change device offset of mask surface
+
+ Also call cairo_paint() after set_source_rgb() to paint the
+ background.
+ Fixes bug #27208.
+
+ poppler/CairoOutputDev.cc | 13 ++-----------
+ 1 files changed, 2 insertions(+), 11 deletions(-)
+
+commit efa5d9544d29252e3df36cc4e65c3d880b3c5172
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 27 22:11:49 2010 +0000
+
+ remove empty section
+
+ NEWS | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 5722df7a5387e43ec73f659ca58d2d07b9c4be3b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 27 22:04:43 2010 +0000
+
+ poppler 0.13.2
+
+ CMakeLists.txt | 2 +-
+ NEWS | 39 +++++++++++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 43 insertions(+), 4 deletions(-)
+
+commit b82fd707747b9d87ebf3c8f7ce5ab70ccdf82809
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 27 22:00:58 2010 +0000
+
+ gtk-doc changes
+
+ glib/reference/tmpl/poppler-action.sgml | 7 +++----
+ glib/reference/tmpl/poppler-annot.sgml | 9 ---------
+ glib/reference/tmpl/poppler-private.sgml | 10 ++++++++++
+ glib/reference/tmpl/poppler-unused.sgml | 8 ++++++++
+ glib/reference/tmpl/poppler.sgml | 10 ++++++++++
+ 5 files changed, 31 insertions(+), 13 deletions(-)
+
+commit ed0354be4eac615b80e7a868984cc527853788b4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 27 21:44:59 2010 +0000
+
+ some forgotten copyrights
+
+ qt/poppler-page.cc | 2 +-
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-movie.cc | 3 ++-
+ qt4/src/poppler-page.cc | 2 +-
+ 4 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 2aedeedf9ef2e2d3eb17bc36d728e68c2f7af762
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sat Mar 27 14:38:27 2010 +0000
+
+ Correctly initialize actualText
+
+ poppler/TextOutputDev.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit b53f9b203598555d6d706c3804aba013b8566921
+Author: Jan Engelhardt <jengelh@medozas.de>
+Date: Sat Mar 27 13:23:42 2010 +0000
+
+ make qt3 detection use pkgconfig
+
+ m4/qt.m4 | 101
+ ++++---------------------------------------------------
+ qt/Makefile.am | 4 +-
+ 2 files changed, 10 insertions(+), 95 deletions(-)
+
+commit 320d4cee46e108498440179d8f9eab22cd5383d9
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 24 21:51:58 2010 +0100
+
+ Revert "no more needed"
+
+ This reverts commit 24d6bc8c78cb3148db2098ae4d69bd744340cf52.
+ It is actually needed.
+
+ cpp/tests/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit af21b5ab366bfdda203c26a77f4ae6ed0e70f64e
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 23 00:13:21 2010 +0100
+
+ [CMake] remove the (now) unneeded stuff from Find{GLIB,GDK,GTK}.cmake,
+ and search for them
+
+ this way each bit (GLIB, GDK, and GTK) can be enabled/disabled
+ independently from the others
+
+ CMakeLists.txt | 4 +++-
+ cmake/modules/FindGDK.cmake | 14 +-------------
+ cmake/modules/FindGLIB.cmake | 14 +-------------
+ cmake/modules/FindGTK.cmake | 14 +-------------
+ 4 files changed, 6 insertions(+), 40 deletions(-)
+
+commit 9b93ed5ce6712ec4cdf58148628e95685c289ef5
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 23 00:02:27 2010 +0100
+
+ [CMake] copy FindGTK.cmake as FindGLIB.cmake and FindGDK.cmake
+
+ this way FindGTK.cmake can be split in the various parts
+
+ cmake/modules/FindGDK.cmake | 34 ++++++++++++++++++++++++++++++++++
+ cmake/modules/FindGLIB.cmake | 34 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 68 insertions(+), 0 deletions(-)
+
+commit 0ec21cae0b4623644c3efca1d2836a9f38f25737
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 22 22:11:04 2010 +0100
+
+ [Qt] add the unhandled cases for 'actionOCGState'
+
+ qt/poppler-page.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 5211e09595135b8e6c68efd1b8b689b518092b84
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 22 22:07:44 2010 +0100
+
+ [CMake/cpp] move the BUILD_CPP_TESTS option to the main CMakeLists.txt
+
+ CMakeLists.txt | 1 +
+ cpp/tests/CMakeLists.txt | 3 ---
+ 2 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 24d6bc8c78cb3148db2098ae4d69bd744340cf52
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 22 22:00:55 2010 +0100
+
+ no more needed
+
+ cpp/tests/CMakeLists.txt | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit a07ef8f703ab896f89ed211a5780e4a669b04fc7
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 22 22:00:15 2010 +0100
+
+ [CMake] revert addition of "-Wl,--no-add-needed" to the link flags,
+ if available
+
+ for now it is safer without it
+
+ cmake/modules/PopplerMacros.cmake | 6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+commit 86debcc9bba28a7c86f01ca9e63bde5fcd541846
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 22 21:49:22 2010 +0100
+
+ [CMake] add "-ansi" to the CXXFLAGS only on Linux
+
+ cmake/modules/PopplerMacros.cmake | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 0819acd52a2ce74f0e176626d7b2233e10232d53
+Merge: c4ddbe8 92738eb
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 22 21:43:01 2010 +0100
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/poppler/poppler
+
+commit 92738ebb8a9c7cfc879aae59c2cbdf3159f03cd3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Mar 22 20:28:15 2010 +0000
+
+ Add a search overload that takes doubles
+
+ QRectF is evil and is float in some arch and causes search to loop
+ infinitely because of double->float conversion
+
+ qt4/src/poppler-page.cc | 22 +++++++++++++++-------
+ qt4/src/poppler-qt4.h | 16 ++++++++++++++--
+ 2 files changed, 29 insertions(+), 9 deletions(-)
+
+commit 0a895f14c8125c5de7b97e8e799459c431eb51cb
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Mon Mar 22 19:03:54 2010 +0000
+
+ correctly initialize the grayscale softmask color
+
+ Fixes file with sha1sum e6e1576803a1bd74ad822eebbd750ee7b8357d25
+
+ poppler/SplashOutputDev.cc | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+commit c4ddbe89df9e48343a9606728b7c182080d87ece
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Sat Mar 20 21:55:17 2010 +0100
+
+ [CMake] when the conf configuration backend is "win32", set the
+ required Internet Explorer version to 5.0
+
+ ... as done with autotools as well
+
+ CMakeLists.txt | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 97da1f9d060493d9fb54a20e980c3f6e2b82c97e
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 20 17:51:07 2010 +0100
+
+ [CMake] check whether a link flag is supported before adding it to
+ the link flags
+
+ this way we can add -Wl,--as-needed and -Wl,--no-add-needed only if
+ the current GCC/LD supports them
+
+ cmake/modules/PopplerMacros.cmake | 23 ++++++++++++++++++++---
+ 1 files changed, 20 insertions(+), 3 deletions(-)
+
+commit 223bce6d14e632f457a81b2ec091fe16369d2eb6
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 20 14:08:58 2010 +0100
+
+ [CMake] with GCC, pass --as-needed and --no-add-needed to the linker
+
+ --as-needed allows to avoid overlinking, linking only to the libraries
+ whose symbols are actually used
+ --no-add-needed makes the linker not use the NEEDED libraries
+ automatically, so we have to always make sure we specify all the
+ libraries actually used in a exe/lib
+
+ cmake/modules/PopplerMacros.cmake | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit fc761f0d385708daaef1b95968532795b04f11b0
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 20 14:05:59 2010 +0100
+
+ [CMake] poppler-dump uses parseargs.c which uses the poppler core API,
+ so it must link to it
+
+ cpp/tests/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit a210440b05d14efc53224a10e8b3ac7d508043b5
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 20 14:04:02 2010 +0100
+
+ [CMake] poppler-glib uses the freetype API, so it must explicitly
+ link to it
+
+ glib/CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f5d352666b92cee0390470d7b892ec8dcbf046a5
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 20 14:03:19 2010 +0100
+
+ [CMake] pdftoabw uses the libxml2 API, so it must explicitly link
+ to it
+
+ utils/CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3fc2c4affe825f4aabcee161ec794338bd359403
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 18 13:52:52 2010 +0100
+
+ [glib] Use g_slice_new/free instead of g_new/free to alloc/free
+ iterators
+
+ glib/poppler-document.cc | 27 +++++++++++++--------------
+ 1 files changed, 13 insertions(+), 14 deletions(-)
+
+commit 7bd6a8558646983669ce699f83d5ed42d7fce476
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 18 13:34:03 2010 +0100
+
+ [glib] Move find_annot_movie_for_action() from page to action
+
+ And remove _poppler_action_movie_set_movie().
+
+ glib/poppler-action.cc | 93
+ ++++++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-page.cc | 79 ----------------------------------------
+ glib/poppler-private.h | 2 -
+ 3 files changed, 82 insertions(+), 92 deletions(-)
+
+commit e5e3d310aa488638431dd85ac3383a12056674bf
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 18 12:20:26 2010 +0100
+
+ Update copyright header
+
+ poppler/Link.cc | 2 +-
+ poppler/Link.h | 1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit c76870178a031e437de3f9ed7baa64efb96955d6
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 18 12:13:36 2010 +0100
+
+ [glib-demo] OCG State Actions demo
+
+ glib/demo/utils.c | 64
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 64 insertions(+), 0 deletions(-)
+
+commit 456e42f91dfbf73b71a5dbdde13d7ccdb5637d79
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 18 12:12:51 2010 +0100
+
+ [glib] Add support for OCG State actions
+
+ glib/poppler-action.cc | 125
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-action.h | 25 +++++++++-
+ glib/poppler.h | 1 +
+ 3 files changed, 150 insertions(+), 1 deletions(-)
+
+commit 4b109899e0732bbf65cacd875829e869e61eda48
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 18 12:10:19 2010 +0100
+
+ [glib] Make get_layer_rbgroup() and get_layers() doc funcs public
+ for internal use
+
+ glib/poppler-document.cc | 12 ++++++------
+ glib/poppler-private.h | 3 +++
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+commit 38a55f6118debf994ce1fc41e987b0e3766047ba
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 18 12:08:30 2010 +0100
+
+ Add support for Set-OCG-State actions
+
+ Fixes bug #23522.
+
+ poppler/Link.cc | 80
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Link.h | 31 +++++++++++++++++++++
+ 2 files changed, 111 insertions(+), 0 deletions(-)
+
+commit bf398e53b0823d0a6272679858b67c5ffd704425
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 23:06:44 2010 +0100
+
+ [CMake] fix pkg-config executable variable name
+
+ CMakeLists.txt | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit ab1a37666704d6b15c19b694ee191327847c23da
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 23:04:01 2010 +0100
+
+ [CMake] proper way of looking for pkg-config
+
+ cmake/modules/FindGTK.cmake | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 7f07a7dcea031f99a9a6d7c424184a2e69ee0062
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 22:58:08 2010 +0100
+
+ [CMake] update FindFontconfig.cmake with a more recent version
+
+ ... present in KDE (as before)
+
+ cmake/modules/FindFontconfig.cmake | 15 +++++++++------
+ 1 files changed, 9 insertions(+), 6 deletions(-)
+
+commit beee143ffbdc699ab19f10a01e5747200ea1927a
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 18:36:32 2010 +0100
+
+ [CMake] set the LINK_INTERFACE_LIBRARIES for the poppler and
+ poppler-cpp libraries
+
+ this should reduce the libraries linked by frontends and utility
+ applications
+
+ CMakeLists.txt | 1 +
+ cpp/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 5ab791cb2a029edcde84b00a47165adfe4d98a98
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 16:39:38 2010 +0100
+
+ [CMake] small cleanups in FindGTK.cmake
+
+ - update the header will all the stuff found and the variables set
+ - add my copyright for this year
+ - remove no more useful UsePkgConfig inclusion
+
+ cmake/modules/FindGTK.cmake | 17 ++++++++++++-----
+ 1 files changed, 12 insertions(+), 5 deletions(-)
+
+commit fcbc76d82e3059c8288fbdc8da117ac9b38a70f2
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 16:36:41 2010 +0100
+
+ [CMake] switch gtk2 (gtk+, gdk-pixbuf, gthread, gio) search to use
+ the new pkg_check_modules() way
+
+ cmake/modules/FindGTK.cmake | 27 ++-------------------------
+ 1 files changed, 2 insertions(+), 25 deletions(-)
+
+commit 5b8135e0899aa3578045eca40940a3495c48d895
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 16:27:40 2010 +0100
+
+ [CMake] link poppler-glib to the gdk2 libraries, if gdk2 was found
+
+ glib/CMakeLists.txt | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 3dc4979d72048e81ae3b2d60dab11e791ac95696
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 16:26:04 2010 +0100
+
+ [CMake] switch gdk2 search to use the new pkg_check_modules() way
+
+ cmake/modules/FindGTK.cmake | 13 +------------
+ 1 files changed, 1 insertions(+), 12 deletions(-)
+
+commit 0ef3d899cb8dea75c97ae1038cac5006f97bc0d2
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 16:05:07 2010 +0100
+
+ [CMake] switch glib2 search to use the new pkg_check_modules() way
+
+ cmake/modules/FindGTK.cmake | 18 ++----------------
+ 1 files changed, 2 insertions(+), 16 deletions(-)
+
+commit d2dc83cb8de481e44ea584eee77881978af920fa
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 15:56:16 2010 +0100
+
+ [CMake] rename GLIB_VERSION to GLIB_REQUIRED
+
+ this way it matches autotools, and it is going to not conflict with
+ my next changes
+
+ CMakeLists.txt | 4 ++--
+ cmake/modules/FindGTK.cmake | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 34accfe27305cae18e09243ab2a607287b86fa47
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 13:55:09 2010 +0100
+
+ [CMake] set all the definitions for poppler-glib in a single place
+
+ glib/CMakeLists.txt | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3d93daf50c61019ca70f42e7ccf33897800b262a
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 17 13:49:22 2010 +0100
+
+ [CMake] no need to check for BUILD_GTK_TESTS for single tests
+
+ poppler_add_test(... BUILD_GTK_TESTS ...) takes care of that already
+
+ glib/CMakeLists.txt | 4 ++--
+ test/CMakeLists.txt | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 946a11345d01d39538d22114e50aa3e179059883
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 20:24:25 2010 +0100
+
+ [build] Update cmake files
+
+ CMakeLists.txt | 2 ++
+ glib/CMakeLists.txt | 4 ++++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 922c0fe392ba439453edb5b2e88b74f0caa586b3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 20:08:23 2010 +0100
+
+ [glib-demo] Rendition actions demo
+
+ glib/demo/utils.c | 112
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 112 insertions(+), 0 deletions(-)
+
+commit 163b3f79d67543bc37b64875e30dcc9b7053e1d5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 20:08:00 2010 +0100
+
+ [glib] Add support for rendition actions
+
+ glib/poppler-action.cc | 22 ++++++++++++++++++++++
+ glib/poppler-action.h | 14 +++++++++++++-
+ 2 files changed, 35 insertions(+), 1 deletions(-)
+
+commit d9b1e40751beddf48a8694b20bfcc4b4cb41060a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 20:06:45 2010 +0100
+
+ [glib] Add PopplerMedia representing a Rendition Media Clip
+
+ glib/Makefile.am | 2 +
+ glib/poppler-media.cc | 302
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-media.h | 53 +++++++++
+ glib/poppler-private.h | 2 +
+ glib/poppler.h | 2 +
+ 5 files changed, 361 insertions(+), 0 deletions(-)
+
+commit 0224b81c4729a98a56b7a68054422ea655018d6a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 17:54:03 2010 +0100
+
+ [glib-demo] Add page number to annots demo
+
+ glib/demo/annots.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 0153b892c63e4fccd0819150cf7b4213857a11c5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 17:49:51 2010 +0100
+
+ [glib] Add poppler_annot_get_page_index() to get the page associated
+ to annot
+
+ glib/poppler-annot.cc | 19 +++++++++++++++++++
+ glib/poppler-annot.h | 1 +
+ 2 files changed, 20 insertions(+), 0 deletions(-)
+
+commit b47337ea91696fea8f42a68a6fa160681ab284b2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 17:49:17 2010 +0100
+
+ [annots] Checks screen annots associated with a rendition action
+ have a valid page ref
+
+ poppler/Annot.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 9417fd793ec8d806822669aa614193073e7dfe50
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 16:52:30 2010 +0100
+
+ [annots] Save page index of the page associated with the annot
+
+ poppler/Annot.cc | 14 +++++---------
+ poppler/Annot.h | 4 ++--
+ 2 files changed, 7 insertions(+), 11 deletions(-)
+
+commit 36b76a5d01b74c6381433b6f6f7ffb9f02696a60
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 14:12:11 2010 +0100
+
+ Rework LinkRendition to follow the spec
+
+ poppler/Link.cc | 68
+ ++++++++++++++++++++++++++++++++++---------------------
+ poppler/Link.h | 12 ++++++---
+ 2 files changed, 50 insertions(+), 30 deletions(-)
+
+commit 7b5885ee7d2026df9a6e87327b6d02f37d79b8b2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 12:25:12 2010 +0100
+
+ [glib-demo] Annot screen demo
+
+ glib/demo/annots.c | 17 +++++++++++++++++
+ 1 files changed, 17 insertions(+), 0 deletions(-)
+
+commit bdb76c7cb89bcb6fb139b0ef348d96b7780d57ed
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 12:24:19 2010 +0100
+
+ [glib] Add support for screen annotation
+
+ Based on patch by Sam Kaplan.
+
+ glib/poppler-annot.cc | 75
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-annot.h | 8 +++++
+ glib/poppler-page.cc | 3 ++
+ glib/poppler-private.h | 1 +
+ glib/poppler.h | 1 +
+ 5 files changed, 88 insertions(+), 0 deletions(-)
+
+commit 54892b1375e360113432b07c6ba058f861d21fe8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 12:21:30 2010 +0100
+
+ [annots] Save the action already parsed in AnnotScreen
+
+ poppler/Annot.cc | 9 +++++++--
+ poppler/Annot.h | 5 +++--
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+commit 5a84a2d749478f19631dbfad2be06ec4ea85038c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 11:16:17 2010 +0100
+
+ [glib-demo] Annot and links movie demo
+
+ glib/demo/annots.c | 20 +++++++++
+ glib/demo/utils.c | 115
+ +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ glib/demo/utils.h | 3 +
+ 3 files changed, 137 insertions(+), 1 deletions(-)
+
+commit 2cf5ee4f62089df099f78cd4d39a4eb7589d1b47
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 11:04:17 2010 +0100
+
+ [glib] Add support for movie actions
+
+ Based on patch by Hugo Mercier.
+
+ glib/poppler-action.cc | 35 ++++++++++++++++++---
+ glib/poppler-action.h | 15 ++++++++-
+ glib/poppler-page.cc | 81
+ +++++++++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler-private.h | 2 +
+ 4 files changed, 125 insertions(+), 8 deletions(-)
+
+commit 132b6f072fefd231d42f31626f1b5009c4e8319e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 10:56:23 2010 +0100
+
+ [glib] Add support for movie annotations
+
+ Based on patch by Hugo Mercier.
+
+ glib/poppler-annot.cc | 97
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-annot.h | 10 +++++
+ glib/poppler-page.cc | 3 +
+ glib/poppler-private.h | 1 +
+ glib/poppler.h | 1 +
+ 5 files changed, 112 insertions(+), 0 deletions(-)
+
+commit aecad2bb12be44825d273e364ec6a0444dac5605
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 15 10:48:03 2010 +0100
+
+ [glib] Add PopplerMovie class
+
+ glib/Makefile.am | 2 +
+ glib/poppler-movie.cc | 140
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-movie.h | 42 ++++++++++++++
+ glib/poppler-private.h | 2 +
+ glib/poppler.h | 2 +
+ 5 files changed, 188 insertions(+), 0 deletions(-)
+
+commit 5b3234a16e0d465bff2b5e277cb64b4f4b0a8dbd
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 14 16:10:26 2010 +0100
+
+ Split Movie class into Rendition and Movie classes to follow the spec
+
+ poppler/Annot.cc | 16 ++-
+ poppler/Link.cc | 10 +-
+ poppler/Link.h | 6 +-
+ poppler/Makefile.am | 2 +
+ poppler/Movie.cc | 438
+ +++++-----------------------------------------
+ poppler/Movie.h | 138 +++------------
+ poppler/Rendition.cc | 400
+ ++++++++++++++++++++++++++++++++++++++++++
+ poppler/Rendition.h | 157 +++++++++++++++++
+ qt4/src/poppler-movie.cc | 9 +-
+ 9 files changed, 657 insertions(+), 519 deletions(-)
+
+commit f9c163730478e3b6d8a1e73dbae6c52c28ae1e84
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 8 14:49:12 2010 +0100
+
+ [Qt4] include Object.h and Annot.h, now needed
+
+ qt4/src/poppler-movie.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit a00532f509c19c5455e0db5068db95dd4583e8dd
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 8 14:22:53 2010 +0100
+
+ Check for Null instead of None to know whether a dict entry is present
+
+ Dict::lookup returns obj->initNull() when the key is not found.
+
+ poppler/Movie.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit b51e66c9a7e2f7f39ae1edf8bda02a7bc1ad4ebd
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 8 14:15:22 2010 +0100
+
+ [annots] Create appearance stream for Movie Annotations when not
+ defined
+
+ See bug #23108
+
+ poppler/Annot.cc | 103
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h | 4 ++-
+ 2 files changed, 105 insertions(+), 2 deletions(-)
+
+commit fae59411852e5c2c45825c5ea963318f1ed5dc6a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 8 14:07:09 2010 +0100
+
+ Fix handling of poster in Movie
+
+ Poster is not always a stream, it can be a boolean too. Also, get the
+ reference when available instead of fetching the stream.
+
+ poppler/Movie.cc | 25 ++++++++++++-------------
+ poppler/Movie.h | 6 ++++--
+ 2 files changed, 16 insertions(+), 15 deletions(-)
+
+commit a451f83d101bf265a1e7e2a17c0b320895e70f4e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 7 12:22:57 2010 +0100
+
+ Save width, height (aspect) in Movie object and provide getAspect()
+ method
+
+ poppler/Movie.cc | 3 ++-
+ poppler/Movie.h | 4 ++++
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit f88d469f860da17055fc4b98b64aef241fcf0185
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Mar 6 12:33:40 2010 +0100
+
+ Move Movie objects parsing code from Annot to Movie
+
+ poppler/Annot.cc | 244
+ ++------------------------------------------
+ poppler/Annot.h | 73 +-------------
+ poppler/Link.cc | 4 +-
+ poppler/Movie.cc | 255
+ ++++++++++++++++++++++++++++++++++++++--------
+ poppler/Movie.h | 25 ++++-
+ qt4/src/poppler-movie.cc | 11 ++-
+ 6 files changed, 246 insertions(+), 366 deletions(-)
+
+commit ec9138b574c7226ad733880d3d43b86bb72073f4
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 23:17:50 2010 +0100
+
+ [autotools] add also cpp/tests/CMakeLists.txt to the "dist files"
+
+ Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit ef3258d6fc57e7a62d951cc826804e50e8e1b526
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 23:14:12 2010 +0100
+
+ [autotools] fix location of poppler-config.h.cmake
+
+ Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fd1d9c882997ff35acd5a458e9dfeba3ad6c8b25
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 22:42:06 2010 +0100
+
+ [CMake] just enable what needed each time
+
+ CMakeLists.txt | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 476bde472a7e694afde96a04ea335fe9582d6fad
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 22:39:45 2010 +0100
+
+ [CMake] add small description for the zlib option
+
+ taken from two bits in configure.ac
+
+ CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1267d7e0c36e262984070a3b55fea46e7289a4b4
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 19:34:03 2010 +0100
+
+ [CMake] add a note about gtk-doc not supported yet
+
+ CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 201b18ad0837e84d874b56e1b0469d1b2d45378b
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 19:30:36 2010 +0100
+
+ [CMake] sync with poppler-config.h.in: add
+ WITH_FONTCONFIGURATION_{FONTCONFIG,WIN32}
+
+ poppler/poppler-config.h.cmake | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 0d0044e8cc2d406f066338102ec73e1b56214cc3
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 19:25:27 2010 +0100
+
+ [CMake] move poppler-config.h.cmake in the poppler subdirectory,
+ where poppler-config.h.in is
+
+ CMakeLists.txt | 2 +-
+ poppler-config.h.cmake | 90
+ ----------------------------------------
+ poppler/poppler-config.h.cmake | 90
+ ++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 91 insertions(+), 91 deletions(-)
+
+commit f785e29a901d2c76204dd26e9585446fdd817ebd
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 18:35:34 2010 +0100
+
+ [CMake] remove the generated poppler-enums.{c,h} in the clean target
+
+ ie usually when doing `make clean'
+
+ glib/CMakeLists.txt | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 369604603375dbe3516136b6f8f9d0c26e0b744f
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 18:26:45 2010 +0100
+
+ [CMake] use the --template option of glib-mkenums (like done with
+ autotools)
+
+ glib/CMakeLists.txt | 24 ++++--------------------
+ 1 files changed, 4 insertions(+), 20 deletions(-)
+
+commit bbcbb34fec10c90edd5960bdbcc6849bc8f39526
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 17:34:40 2010 +0100
+
+ [CMake] set POPPLER_GLIB_DISABLE_DEPRECATED and
+ POPPLER_GLIB_DISABLE_SINGLE_INCLUDES as done with autotools
+
+ CMakeLists.txt | 6 ++++++
+ glib/CMakeLists.txt | 6 +++++-
+ 2 files changed, 11 insertions(+), 1 deletions(-)
+
+commit 190fa971c12ca1b3007f6ba349a77a7c15c47490
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 17:24:25 2010 +0100
+
+ reorder to match what's in the correspondent .in
+
+ glib/poppler-features.h.cmake | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ff46def8b178420a86a974ec2ce767a538bba8be
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 17:23:16 2010 +0100
+
+ [CMake] GDK_FEATURE is no more needed here
+
+ glib/CMakeLists.txt | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 1eb8026a3060ef61a88c535177510f7ac7e7fc25
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 17:19:58 2010 +0100
+
+ [CMake] set in one place whether to build the glib frontend
+
+ CMakeLists.txt | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit a1a6f23e2345814e147a72211ce9139555385223
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 17:09:58 2010 +0100
+
+ [CMake] correctly set the GLIB_REQ stuff
+
+ CMakeLists.txt | 1 +
+ poppler-glib.pc.cmake | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 0f2e5d6925c5938281d9bafc297a43867c4a915b
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 17:03:21 2010 +0100
+
+ [CMake] move the minimum GLib version to the main CMakeLists.txt
+
+ CMakeLists.txt | 1 +
+ cmake/modules/FindGTK.cmake | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit efdffba45d15b538dbfb294403e99f3a6470b4d9
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 16:58:27 2010 +0100
+
+ [CMake] align the GDK stuff (GDK_{FEATURE,REQ}) to what done with
+ autotools
+
+ CMakeLists.txt | 6 +++++-
+ poppler-glib.pc.cmake | 2 +-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit cfecc69b7f05920f543ee7e9aafeafaa4c3506fb
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 16:49:14 2010 +0100
+
+ [CMake] apparently there's not a minimum version requirement for GDK,
+ so drop the check
+
+ cmake/modules/FindGTK.cmake | 5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+commit 8ff1cf03d2607b0f13bbbbf272f2b03d8927bd24
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 16:47:21 2010 +0100
+
+ [CMake] first look for Cairo, then for GLib/GDK/GTK
+
+ this starts to align to the searches done with autotools
+ also, move the CAIRO_FEATURE to the main CMakeLists.txt
+
+ CMakeLists.txt | 19 +++++++++++--------
+ glib/CMakeLists.txt | 1 -
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+commit bcaf62b8e252594530d3050761ba563cf3b1fb6e
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 16:00:03 2010 +0100
+
+ [CMake] enhance/rewrite a bit the FindCairo module
+
+ make use of some features of CMake 2.6 (as we require it):
+ - newer pkg-config handling (aka pkg_check_modules())
+ - version checking for modules (PACKAGE_FIND_VERSION*)
+ - find_package_handle_standard_args()
+ also, after the pkg-config search to win32, search for cairo again
+ (double-check plus real search for win32)
+ furthermore, introduce CAIRO_INCLUDE_DIRS with the include paths
+ requires (kind of "obsoletes" CAIRO_CFLAGS, left there in case it
+ is used again)
+
+ apply the changes to the rest of the build system (specify the
+ version needed, use the correct variable for includes)
+
+ CMakeLists.txt | 2 +-
+ cmake/modules/FindCairo.cmake | 64
+ ++++++++++++++++++++++++++--------------
+ glib/CMakeLists.txt | 2 +-
+ 3 files changed, 43 insertions(+), 25 deletions(-)
+
+commit c96aa0f5fc74ae04f483485b787aaf65f1791991
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 02:01:13 2010 +0100
+
+ add Patrick's copyright notices
+
+ cpp/poppler-global.h | 1 +
+ goo/gtypes.h | 14 ++++++++++++++
+ poppler/GlobalParams.cc | 1 +
+ poppler/SplashOutputDev.cc | 1 +
+ 4 files changed, 17 insertions(+), 0 deletions(-)
+
+commit 3311bedd2eb831ef1fd553f3f50960331cf6885f
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Sun Mar 7 01:56:15 2010 +0100
+
+ MSVC: disable for the 'ustring' class the warning C4251 (which does
+ not apply)
+
+ cpp/poppler-global.h | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 9efa18397bd05fbd27c7811fa6e0f34ce94012e0
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Sun Mar 7 01:48:03 2010 +0100
+
+ MSVC: disable warning C4800, which is of no use for now
+
+ goo/gtypes.h | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 3a88d1bf8d2c5a9e8014e0d46e24c9ec06556469
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Sun Mar 7 01:26:10 2010 +0100
+
+ MSVC: no isfinite(), so provide it using _finite()
+
+ poppler/SplashOutputDev.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 7774912c46f832f25c51b4cfc0e9430b1cd7fa1f
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Sun Mar 7 01:22:31 2010 +0100
+
+ MSVC: do not force constness here, so the right overload will
+ be chosen
+
+ poppler/GlobalParams.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit cf07a5d85b402b6956c9605fbdc88bddcb94a3cf
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Mar 7 00:49:07 2010 +0100
+
+ [CMake] show end yes/no message about the GDK usage
+
+ just like done with autotools
+
+ CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 42c98f8eabe304d5e3dc8c1ebdd5b0b6c221e696
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 6 17:18:08 2010 +0100
+
+ [CMake] make the font configuration backend selection take a string
+ (like with autotools)
+
+ this way it is possible to set the cmake variable FONT_CONFIGURATION
+ to either "win32" (default on windows) or "fontconfig" (default
+ elsewhere) to the font backend to use
+ as a consequence, make fontconfig a requirement only if the font
+ backend chosen is "fontconfig"
+
+ CMakeLists.txt | 39 +++++++++++++++++++++++++++++----------
+ 1 files changed, 29 insertions(+), 10 deletions(-)
+
+commit bda6e7cd089f2970af2e9540b4415633ffcf0ebb
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 6 17:13:30 2010 +0100
+
+ [CMake] add a show_end_message() macro to show a generic string
+ as value
+
+ make show_end_message_yesno() call it with the proper "yes" or
+ "no" string
+
+ cmake/modules/PopplerMacros.cmake | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+commit d313c0f508711b3b7166b84608c43ebf1f07194b
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 6 17:08:59 2010 +0100
+
+ [CMake] rename the show_end_message() macro to
+ show_end_message_yesno()
+
+ CMakeLists.txt | 26 +++++++++++++-------------
+ cmake/modules/PopplerMacros.cmake | 4 ++--
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+commit 0425ff835fa26df5e25e628a6c56f3a180713905
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Mar 5 22:21:56 2010 +0100
+
+ update copyright
+
+ poppler/ArthurOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c5ea135ca58e112110be3ae10d887f3188172765
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Mar 5 22:14:57 2010 +0100
+
+ [arthur] update the miter limit
+
+ poppler/ArthurOutputDev.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 552f344b3e3df7c796afa6946149b0a5590cc4f7
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Mar 5 22:04:39 2010 +0100
+
+ [arthur] update the line dash style
+
+ poppler/ArthurOutputDev.cc | 12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+commit bc42ee05fceef0d0dd2ab0587c184dfc37cf29bf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Mar 5 18:54:32 2010 +0000
+
+ fix copyright year
+
+ poppler/CairoOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b21461e91ed671ef29fd3cf4780fda44f82a0679
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Mar 5 15:14:08 2010 +0100
+
+ [cairo] Close image stream before resetting it again
+
+ poppler/CairoOutputDev.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 866bcc7edb47fe11355081045e2d316a4d530649
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Mar 4 14:19:50 2010 +0100
+
+ [Qt4] no need to save&restore on a newly created painter
+
+ qt4/src/poppler-page.cc | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 654698b556eb53eab7c2d55fc6b3fdd9e35173bb
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Mar 4 13:16:11 2010 +0100
+
+ [Qt4] use Arthur unconditionally
+
+ arthur is no more tied to splash, so can be used in an occasion
+
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-page.cc | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+commit 41931b6310d2ae81e622db904246f019ceb8410d
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Mar 4 13:13:11 2010 +0100
+
+ [Qt4] compile Arthur unconditionally
+
+ as the arthur output dev does not require splash anymore, we can
+ always compile it with poppler-qt4
+
+ poppler/Makefile.am | 4 ++--
+ qt4/src/CMakeLists.txt | 6 +-----
+ qt4/src/Makefile.am | 6 +-----
+ 3 files changed, 4 insertions(+), 12 deletions(-)
+
+commit 48a29e2bbc9aa9bd0cb2775a2365c0ffdeb6ce87
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Mar 4 13:11:43 2010 +0100
+
+ [Arthur] make ArthurOutputDev compile even with Splash disabled
+
+ text rendering is disabled in that case for now
+
+ poppler/ArthurOutputDev.cc | 11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+commit 2013a19b6457753890affad8c4049f2ce4627df7
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Mar 4 13:02:43 2010 +0100
+
+ [CMake/tests] compile gtk-splash-test only if splash is enabled
+
+ test/CMakeLists.txt | 14 +++++++++-----
+ 1 files changed, 9 insertions(+), 5 deletions(-)
+
+commit ae740c5cfefbae13f82b750e39fa3dbbdc94858b
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 2 23:22:06 2010 +0100
+
+ [cpp] update the copyrights
+
+ cpp/poppler-document-private.h | 2 +-
+ cpp/poppler-document.cpp | 2 +-
+ cpp/poppler-embedded-file.cpp | 2 +-
+ cpp/poppler-embedded-file.h | 2 +-
+ cpp/poppler-global.cpp | 3 ++-
+ cpp/poppler-global.h | 2 +-
+ cpp/poppler-page.cpp | 2 +-
+ cpp/poppler-page.h | 2 +-
+ cpp/poppler-rectangle.h | 2 +-
+ cpp/poppler-toc.cpp | 2 +-
+ cpp/poppler-version.cpp | 2 +-
+ cpp/tests/poppler-dump.cpp | 2 +-
+ 12 files changed, 13 insertions(+), 12 deletions(-)
+
+commit 24b1d8d0b4ae7cea9fbc331f19cd5ce3917b8b4d
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 2 23:15:56 2010 +0100
+
+ [cpp] {from,to}_utf_8() -> {from,to}_utf8()
+
+ cpp/poppler-global.cpp | 4 ++--
+ cpp/poppler-global.h | 4 ++--
+ cpp/poppler-page.cpp | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 690af1bc58de1ebe710c5e599f1cb635e4838fc8
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Mar 2 16:33:04 2010 +0100
+
+ [cpp] define poppler_cpp_EXPORTS when building with autotools as well
+
+ fixes building on Windows
+
+ cpp/Makefile.am | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 7492a376e7e5ec35534276ac15485123645617b0
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 2 22:16:07 2010 +0100
+
+ [cpp/tests] use gmtime() when gmtime_r() is not available
+
+ cpp/tests/poppler-dump.cpp | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+commit de013cc14a0621782c53f481ed7e559f241855a3
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 2 22:05:25 2010 +0100
+
+ [cpp] include config.h _after_ the other includes
+
+ cpp/poppler-global.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 388e5d6aebcabbfc90894c86248159c63701cb0a
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Mar 2 15:51:23 2010 +0100
+
+ Use ICONV_CONST when necessary
+
+ cpp/poppler-global.cpp | 10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+commit aaa58b26733a2f7c778632da4942b588050cf33f
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 2 21:53:55 2010 +0100
+
+ [CMake] properly define ICONV_CONST
+
+ CMakeLists.txt | 1 -
+ cmake/modules/FindIconv.cmake | 3 +++
+ config.h.cmake | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 6304b0d8959fccf96b030c757d78e845d04757e4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 28 15:33:53 2010 +0100
+
+ poppler 0.13.1
+
+ CMakeLists.txt | 2 +-
+ NEWS | 33 +++++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 37 insertions(+), 4 deletions(-)
+
+commit 9eac71862915c851c07075e3ca3af82eb9e4e775
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 28 15:33:19 2010 +0100
+
+ Make sure the private headers end up in the tarball on make dist
+
+ cpp/Makefile.am | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit b488172311c2921ab4c365d71ad8b1ab7f596c71
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 28 14:25:36 2010 +0100
+
+ Add copyright notices
+
+ poppler/CairoFontEngine.cc | 3 ++-
+ poppler/CairoFontEngine.h | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 5453cff5b7cb47cadfdae585a58409117af8c1f1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 28 13:51:22 2010 +0100
+
+ [cairo] Select filter for images based on scale factor
+
+ When rendering images and interpolate flag is disabled or missing, we
+ always interpolate unless scale factor is >= 400%
+
+ See bugs #25268, #9860
+
+ poppler/CairoOutputDev.cc | 64
+ +++++++++++++++++++++++++++++++++------------
+ poppler/CairoOutputDev.h | 2 +
+ 2 files changed, 49 insertions(+), 17 deletions(-)
+
+commit e65456cbd5cae2750426aabeb2d66a10537616f0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 28 13:13:13 2010 +0100
+
+ [cairo] Refactor scaled size computation into a new method
+
+ poppler/CairoOutputDev.cc | 52
+ ++++++++++++++++++++++----------------------
+ poppler/CairoOutputDev.h | 2 +
+ 2 files changed, 28 insertions(+), 26 deletions(-)
+
+commit 32aa9ae7d0087298661829265de00e93398272b3
+Author: Jan Kümmel <jan+freedesktop@snorc.org>
+Date: Sat Feb 27 17:58:46 2010 +0100
+
+ [cairo] Omit writing of embedded fonts into tempary files
+
+ Fixes bug #26694.
+
+ poppler/CairoFontEngine.cc | 146
+ ++++++++++++++++++++++++--------------------
+ 1 files changed, 80 insertions(+), 66 deletions(-)
+
+commit 7ba52a32343ca73730a80b64c136e3f03348e7d9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 27 17:42:46 2010 +0100
+
+ [cairo] Remove unused 'face' from CairoFreeTypeFont class
+
+ poppler/CairoFontEngine.cc | 6 ++----
+ poppler/CairoFontEngine.h | 3 +--
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+commit 7c3140c88c00282e10888143fffe3c402d48fb05
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Feb 27 13:13:47 2010 +0100
+
+ Don't use '\' character in PostScript names
+
+ poppler/PSOutputDev.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 8e354a15a1861719c00799937ad9f9bb1bb71e9f
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Wed Feb 24 18:58:11 2010 +0000
+
+ Fix remaining part of 26243
+
+ Thomas says: The "gn" is colored with a shading pattern, but the
+ shading has a bbox,
+ so it is clipped to this bbox, too. But when coloring text or masks in
+ pattern colorspace, this is definely wrong.
+
+ poppler/Gfx.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit fcbc571a98775b1daa8f562fc8674fb2d15b6626
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 23 17:02:47 2010 +0100
+
+ [cpp] make checksum() return an array of data, instead of a string
+
+ a checksum is a sequence of values after all, so just return it as
+ such instead of pretending it is a string
+ accordingly adapt the mini dump application
+
+ cpp/poppler-embedded-file.cpp | 10 ++++++++--
+ cpp/poppler-embedded-file.h | 2 +-
+ cpp/tests/poppler-dump.cpp | 4 ++--
+ 3 files changed, 11 insertions(+), 5 deletions(-)
+
+commit fbefb9bef9f7a099d51919255a98f412d1e1d696
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 23 16:56:47 2010 +0100
+
+ [cpp apidox] add API documentation for the 'embedded_file' class
+
+ cpp/poppler-embedded-file.cpp | 43
+ +++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 43 insertions(+), 0 deletions(-)
+
+commit 6d39cca0a035fc656d3b86ba66dedaccee532fcb
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 23 16:41:56 2010 +0100
+
+ [cpp apidox] add API documentation for the 'toc' and 'toc_item'
+ classes
+
+ cpp/poppler-toc.cpp | 57
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 57 insertions(+), 0 deletions(-)
+
+commit 857e4ceb26d959c48c7af6bff53ca1bfe5307236
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 23 15:39:58 2010 +0100
+
+ [cpp] when the loading of the document fails, put back the data
+ where it was before
+
+ cpp/poppler-document-private.h | 2 +-
+ cpp/poppler-document.cpp | 10 +++++++---
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+commit 7838b182143086192ac8dcf571da0ce1743619e2
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 23 00:04:09 2010 +0100
+
+ [cpp] add the directory of the generated html apidox to the ignore
+ list
+
+ cpp/.gitignore | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 71a38a23a9db5cac872c666283b7abcb1462210c
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 23:43:34 2010 +0100
+
+ [cpp] add page::text() to get the text inside a page region
+
+ cpp/poppler-page.cpp | 16 ++++++++++++++++
+ cpp/poppler-page.h | 1 +
+ 2 files changed, 17 insertions(+), 0 deletions(-)
+
+commit 4c75360233bc67f097551980a46ecce976927220
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 23:05:53 2010 +0100
+
+ [cpp] add page::search()
+
+ cpp/poppler-page.cpp | 51
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-page.h | 8 +++++++
+ 2 files changed, 59 insertions(+), 0 deletions(-)
+
+commit 8932c53a084083eb42d109dd17bac3ad41ce65b5
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 22:39:36 2010 +0100
+
+ [cpp] add getters and setters for left/top/right/bottom
+
+ cpp/poppler-rectangle.h | 18 ++++++++++++++++++
+ 1 files changed, 18 insertions(+), 0 deletions(-)
+
+commit 8e1ea57f558fa3a1702a17d79b5aaffc486c6a56
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 22:19:51 2010 +0100
+
+ [cpp] add a global enum for case sensitivity
+
+ cpp/poppler-global.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit ae41b087de8f0a7d525320dcf1d64ff22fe982b6
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 19:06:21 2010 +0100
+
+ [cpp apidox] doxygen configuration for poppler-cpp
+
+ cpp/Doxyfile | 1551
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 1551 insertions(+), 0 deletions(-)
+
+commit 1a36a7bcc684065478a3ade2c2938f0e3672140a
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 19:05:49 2010 +0100
+
+ [cpp apidox] very small start of intro page
+
+ cpp/Mainpage.dox | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 85e052ab7a4c462143325ecf60eebba35411b790
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 18:53:20 2010 +0100
+
+ [cpp apidox] start adding API documentation for the global 'poppler'
+ namespace
+
+ ... including the 'convert_date' function and faking the 'noncopyable'
+ class
+
+ cpp/poppler-global.cpp | 16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+commit b01608f91fb6cf6e9c4fb6e6ee3cb57517a766bf
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 18:52:24 2010 +0100
+
+ [cpp apidox] exclude the 'detail' namespace from apidox extraction
+
+ this includes also the 'noncopyable' typedef, but that will be
+ handled differently
+
+ cpp/poppler-global.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit f17a7a8cfdeabb3ced3ba8d42c869d892c528e13
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 18:51:30 2010 +0100
+
+ [cpp apidox] add API documentation for the version functions
+
+ cpp/poppler-version.cpp | 12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+commit f6c4bbddc7d04c0b1a6b25c41cbf6d81ae40cc0c
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 18:50:54 2010 +0100
+
+ [cpp apidox] start adding API documentation for 'document'
+
+ cpp/poppler-document.cpp | 182
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 182 insertions(+), 0 deletions(-)
+
+commit cbb7519904d9b6395d0128e16a79324e4b8bfcc0
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 22 13:15:11 2010 +0100
+
+ [CMake] no more need to build system check for the Cairo blend modes
+
+ followup of 880890c14e99a954b365a3a6b59deeffa5304d30 for the cmake
+ build system
+
+ cmake/modules/FindCairo.cmake | 18 ------------------
+ config.h.cmake | 3 ---
+ 2 files changed, 0 insertions(+), 21 deletions(-)
+
+commit 80f47bbf45faf751c661c1d0931e8e1da622b8ca
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Feb 22 12:43:06 2010 +0100
+
+ [cairo] Use cairo_surface_set_mime_data() when printing
+
+ When rendering a jpeg image for printing, using
+ cairo_surface_set_mime_data() to attach the jpeg stream to the
+ surface reduces drastically the size of the output file.
+
+ poppler/CairoOutputDev.cc | 42
+ ++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 1 +
+ 2 files changed, 43 insertions(+), 0 deletions(-)
+
+commit d63293af6dbff65f160be0118b1580c03a1aab56
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Nov 27 09:52:23 2009 +0100
+
+ [cairo] Turn EXTEND_PAD off when printing
+
+ poppler/CairoOutputDev.cc | 98
+ ++++++++++++++++++++++++++++++--------------
+ 1 files changed, 67 insertions(+), 31 deletions(-)
+
+commit 880890c14e99a954b365a3a6b59deeffa5304d30
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Feb 22 11:01:05 2010 +0100
+
+ [cairo] Use CAIRO_VERSION macros to check whether blend modes are
+ available
+
+ configure.ac | 24 ------------------------
+ poppler/CairoOutputDev.cc | 4 ++--
+ 2 files changed, 2 insertions(+), 26 deletions(-)
+
+commit 5c300ce00b5c59da767ca1ffec12f96f0ebbe701
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 21 21:20:10 2010 +0100
+
+ [Qt4/apidox] fix typo
+
+ qt4/src/poppler-qt4.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3f89ccf871e2f4a14129ad3e986b8cd19cdf129c
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 21 21:06:31 2010 +0100
+
+ [CMake] set the CXXFLAGS in a better way
+
+ CMakeLists.txt | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit a18dab9e53a20a76eb46fa3a868fffdd3c754ce2
+Merge: fa09892 f3862f7
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 21 19:56:38 2010 +0100
+
+ Merge remote branch 'origin/cpp-frontend'
+
+ * origin/cpp-frontend: (34 commits)
+ [cpp/tests] poppler-dump: show a string for the font type
+ [cpp/tests] poppler-dump: show the orientation of the pages
+ [cpp/tests] poppler-dump: a bit less output in permissions lines
+ [cpp/tests] poppler-dump: add --show-all to show all the information
+ [cpp] use iconv for the utf8 <-> utf16 conversions
+ [cpp] add the build system stuff for iconv, mandatory for cpp
+ [cpp] fixup unicode GooString <-> ustring conversions
+ [cpp] fix installation of poppler-version.h with autotools and
+ builddir != srcdir
+ simplify
+ [cpp/tests] add a simple poppler-dump test
+ [cpp] use the correct index (instead of an uninitialized variable)
+ [cpp] properly delete the children of a toc item
+ [cpp] actually implement toc::root()
+ [cpp] fix the reference to the vector data
+ [cpp] fix the reference to the vector data
+ [cpp] add destructor for 'rectangle'
+ [cpp] add out stream operators for rect and rectf
+ [cpp] add namespace to namespace functiond to link properly
+ [cpp] add default empty parameters for the passwords of the document
+ loading functions
+ [cpp] add "human friendly" output representation for byte_array
+ ...
+
+ Conflicts:
+ config.h.cmake
+
+commit fa0989297e95b6adebed71336ea206d1b279ab24
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 21 16:59:57 2010 +0000
+
+ Detect the need for nanosleep in solaris
+
+ Fixes bug 26650
+
+ ConfigureChecks.cmake | 5 +++++
+ test/CMakeLists.txt | 17 +++++++++++------
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+commit d074485aa9d9fac6b715382002f53e3303bbc519
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 20 10:08:33 2010 +0000
+
+ Do not call getPixel if we know how to access the data
+
+ Gives a 20% speed increase in some pdf
+
+ splash/Splash.cc | 19 ++++++++++---------
+ 1 files changed, 10 insertions(+), 9 deletions(-)
+
+commit d4cafe357bd86feb4b56e5dfbf5b7822e237a2ee
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 20 10:07:20 2010 +0000
+
+ Only call getPixel when really needed
+
+ Gives a 8% speed increase in some pdf
+
+ splash/Splash.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit c3122cfbe090f3a4045269222f941cd5ce77c171
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 20 10:04:37 2010 +0000
+
+ Move test code to the header to it can be inlined
+
+ Gives a 10% speed increase in some documents
+
+ splash/SplashClip.cc | 40 ++++++++++++++--------------------------
+ splash/SplashClip.h | 43 +++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 55 insertions(+), 28 deletions(-)
+
+commit d987fb9b77e6da454eb898cc6c8baaf747b7ac4f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Feb 19 23:59:03 2010 +0000
+
+ implement writeImgFile for splashModeXBGR8
+
+ splash/SplashBitmap.cc | 25 +++++++++++++++++++++++--
+ 1 files changed, 23 insertions(+), 2 deletions(-)
+
+commit f9425c0b5b112ac673d0499f79a743afce719593
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Feb 19 20:18:13 2010 +0000
+
+ use pkgconfig to detect libpng on autotools too
+
+ configure.ac | 12 ++++--
+ goo/Makefile.am | 7 +++-
+ m4/libpng.m4 | 99
+ ---------------------------------------------------
+ poppler/Makefile.am | 3 ++
+ 4 files changed, 17 insertions(+), 104 deletions(-)
+
+commit 0cb07d645527f25997f5e1b104a6be92441d8ffa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 18 23:27:20 2010 +0000
+
+ Only swap w with h if rotation is 90 or 270
+
+ utils/pdftoppm.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 35015ed11090d67cab69443e607d4d80ca03c619
+Author: Nils Höglund <nils.hoglund@gmail.com>
+Date: Thu Feb 18 23:14:51 2010 +0000
+
+ Match the number of calls to beginMarkedContent and endMarkedContent
+
+ poppler/Gfx.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit ee265760e6ecec93fe26fb8e02848872555daefd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 18 23:13:48 2010 +0000
+
+ make sure properties exists before using it
+
+ poppler/TextOutputDev.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit eab7a55815c06525c7aeba254b66498ab147a958
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 17 21:54:31 2010 +0000
+
+ if malloc failed return false
+
+ splash/SplashFTFont.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit e2def20a45c1d8307fd62fabb9769121af975abf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 16 23:31:05 2010 +0000
+
+ Only assume the OC is not visible if it exists and is set to no
+
+ Fixes bug 26532 and a small line that was not drawn in 15899
+
+ poppler/OptionalContent.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5edd175bdd0f7c2fc3aecb72384de4cb0788fc4e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 16 20:57:22 2010 +0000
+
+ Add and fix copyright years
+
+ poppler/CairoOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0f0fba1b04589061449f98b9dcd8a0c4e7ad2d74
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 16 22:00:51 2010 +0100
+
+ make the descriptions specify they refer to the Splash backend
+
+ config.h.cmake | 4 ++--
+ configure.ac | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 39b4699020b5cfa1a10e5ef00f0e355e27b21c9f
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 16 21:56:30 2010 +0100
+
+ [CMake] reflect that poppler-glib needs cairo now
+
+ poppler-glib.pc.cmake | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5c66c775bcd686c61ea136bcd8f261fb631c5e71
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 16 20:52:15 2010 +0000
+
+ We don't need to pass anything to FontConfig
+
+ Makes it much easier to manage and also fixes bug 26544
+
+ poppler/GlobalParams.cc | 11 +++--------
+ poppler/GlobalParams.h | 6 +-----
+ 2 files changed, 4 insertions(+), 13 deletions(-)
+
+commit 582b5259b3c65ee1bef99dbdfccf00f37269b76f
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 16 16:36:24 2010 +0100
+
+ [CMake] find the system threads, and define in the config.h if we
+ have pthreads
+
+ CMakeLists.txt | 4 ++++
+ config.h.cmake | 3 +++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 1dff9d440556a155fb5ca7bed15fc6a1f77a1c97
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 16 16:10:44 2010 +0100
+
+ [CMake] add the HAVE_LIBOPENJPEG and HAVE_OPENJPEG_H defines, to
+ match autotools' ones
+
+ CMakeLists.txt | 1 +
+ config.h.cmake | 6 ++++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 4a0bcaa83e6e6533cd48c63449a08467d51c13ea
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 16 16:01:53 2010 +0100
+
+ [CMake] config.h.cmake: change some comments to match autotools' ones
+
+ config.h.cmake | 10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 9e38082c3e571d035f0152d65661e5dd97fdd5d8
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 16 15:58:30 2010 +0100
+
+ [CMake] add the Win32-specific ENABLE_RELOCATABLE option, matching
+ autotools' one
+
+ CMakeLists.txt | 5 +++++
+ config.h.cmake | 3 +++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit eb03020893ed591c18817d75d427a1296cb1f233
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 16 15:49:50 2010 +0100
+
+ [CMake] config.h.cmake: move POPPLER_WITH_GDK in the same place of
+ autotools' generated one, and with the same comment
+
+ config.h.cmake | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit ba65b3af047b758094b999b2939065c5127508dd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 10 23:08:04 2010 +0000
+
+ Wrap #include <jpeglib.h> in extern "C" to fix build
+
+ Fixes bug 26351
+
+ goo/JpegWriter.h | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit d3d2a3ee0a3505f44d1196823716b768d434ba73
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 10 23:16:27 2010 +0100
+
+ [CMake] fix typo: "MULTITHREAD" -> "MULTITHREADED"
+
+ CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0dae2294cf8a2f312d8e6504be4e1be516b34b1b
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Tue Feb 9 21:44:07 2010 +0000
+
+ Fix regression in painting. Fixes bug 26243
+
+ poppler/Gfx.cc | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+commit aa9c3acbc73bafb33c8a797701ed0488a4a74263
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jan 28 17:23:18 2010 +0100
+
+ [cairo] Add clipToStrokePath() method
+
+ It's unimplemented, it just contains a log message to help when
+ debugging.
+
+ poppler/CairoOutputDev.cc | 4 ++++
+ poppler/CairoOutputDev.h | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 41a450c8db45fd064798d15c3d8fe5ab536a7b30
+Author: David Benjamin <davidben@mit.edu>
+Date: Fri Jan 22 00:26:59 2010 -0500
+
+ [cairo] Avoid leaving pointers to free'd memory
+
+ Fixes potential free'd memory access introduced by
+ 3a94e8ce90c0a4d11c5c5aa8805c167c8a0434e5. I don't think this is
+ actually
+ possible in the current code; we push/pop before and after rendering a
+ PDF, so the bottom state should never have a mask.
+
+ Still, better to clean this up.
+
+ poppler/CairoOutputDev.cc | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+commit 309228404710debee4337cc53c641dfef64ad86c
+Author: David Benjamin <davidben@mit.edu>
+Date: Wed Jan 27 22:41:16 2010 +0000
+
+ Allow commands to abort the current stream
+
+ In many instances, the sensible response (and what acroread does) in
+ case of an error is abort the PDF stream. To avoid changing the return
+ value of every function and using C++ exceptions, we communicate via a
+ commandAborted variable.
+
+ This patch, matching acroread's behavior aborts the current stream
+ when
+ there are too few arguments or we pop too many times. Implementation
+ note 39 in Appendix H of the PDF reference contradicts the former, but
+ hand-crafted test PDFs as well as the file in #24575 suggest
+ otherwise.
+
+ Unlike all the other attempts, this patch actually fixes the PDF in
+ bug #24575.
+
+ poppler/Gfx.cc | 11 +++++++++++
+ poppler/Gfx.h | 1 +
+ 2 files changed, 12 insertions(+), 0 deletions(-)
+
+commit 8284008aa8230a92ba08d547864353d3290e9bf9
+Author: David Benjamin <davidben@mit.edu>
+Date: Wed Jan 27 22:40:33 2010 +0000
+
+ Add a stack of stateGuards to Gfx
+
+ While a stack of states is a good way to maintain graphics contexts,
+ if
+ the command stream you are interpreting is untrusted, we must place
+ appropriate guards to be sure that, not only do we not pop past
+ the end
+ of the stack, but we do not pop past the stack as it was when we began
+ rendering.
+
+ poppler/Gfx.cc | 30 +++++++++++++++++++++++++++++-
+ poppler/Gfx.h | 11 +++++++++++
+ 2 files changed, 40 insertions(+), 1 deletions(-)
+
+commit 4ae84c830f842d100cbb702b32970951a5a5769f
+Author: David Benjamin <davidben@mit.edu>
+Date: Wed Jan 27 22:39:20 2010 +0000
+
+ Maintain the height of the stack in Gfx
+
+ Introduces a new variable Gfx::stackHeight that maintains up-to-date
+ information about the current height of the stack.
+
+ poppler/Gfx.cc | 4 ++++
+ poppler/Gfx.h | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 120fe6ef673c648ae7b19ad2a7e9aef22ee25810
+Author: David Benjamin <davidben@mit.edu>
+Date: Wed Jan 27 22:38:43 2010 +0000
+
+ Do not use objects just after deleting them
+
+ The error condition in GfxCIDFont::GfxCIDFont references cMapName and
+ collection, so they should not be deleted yet.
+
+ poppler/GfxFont.cc | 8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 3375fa96c7a7dbbb98f5a7b3df9e840a5f30bc80
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 27 22:32:29 2010 +0000
+
+ GooVector rewrite, old version had "unknown" origins/license
+
+ goo/GooVector.h | 237
+ +++++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 141 insertions(+), 96 deletions(-)
+
+commit a945fe64e16ac9aa2577c5db05fc7f3fd4955b7b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jan 27 16:15:40 2010 +0100
+
+ [cairo] Fix downscaling images when document is rotated
+
+ Fixes bug #26264.
+
+ poppler/CairoOutputDev.cc | 37 +++++++++++++++++++++++++++++++++++--
+ 1 files changed, 35 insertions(+), 2 deletions(-)
+
+commit 428cc965c17f167ea00540beeaeaac5c3e426686
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 26 21:01:32 2010 +0000
+
+ Add POPPLER_WITH_GDK in cmake build system
+
+ Bug 26247
+
+ glib/CMakeLists.txt | 1 +
+ glib/poppler-features.h.cmake | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 0af1ae75fd4c8031343f668bed5d8ca6588ee652
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jan 26 20:49:17 2010 +0100
+
+ [cairo] Use the right matrix for the mask in drawMaskedImage()
+
+ Fixes bug #16906.
+
+ poppler/CairoOutputDev.cc | 7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit d8ceaff39f5b80624b6bdc703c2a180dfc3d73ee
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jan 26 11:57:06 2010 +0100
+
+ [cairo] Add some more LOG messages
+
+ poppler/CairoOutputDev.cc | 18 +++++++++++++++---
+ 1 files changed, 15 insertions(+), 3 deletions(-)
+
+commit 778e764b3cb77526260c3c8b46acf19ad06fc61d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jan 25 22:40:20 2010 +0000
+
+ poppler 0.13.0
+
+ CMakeLists.txt | 4 +-
+ NEWS | 99
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 104 insertions(+), 5 deletions(-)
+
+commit 1b5333f2685b8ab85bb1f5b899332c5a0ac99a3d
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Jan 25 02:19:00 2010 +0100
+
+ [CMake] allow multiple targets with the same name
+
+ this is needed for building the unit tests later without explicitly
+ having
+ enabling them at configure time (thus compile them on-demand)
+ for this, set the cmake policy 0003 as OLD (allow), and consecuently
+ 0011 for
+ setting the former from an include()d script
+
+ cmake/modules/PopplerDefaults.cmake | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 92e1f46866c063c370ef1d6324f6a6c01aed6680
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Jan 25 02:15:27 2010 +0100
+
+ [CMake] do not add the fake buildtests target for the MSVC IDE
+
+ cmake/modules/PopplerMacros.cmake | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit dea5aa37de079196fa916b1db9af782cf25045f9
+Author: Maciej Mrozowski <reavertm@gmail.com>
+Date: Mon Jan 25 00:51:20 2010 +0000
+
+ Install some more goo files
+
+ CMakeLists.txt | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 671a971c45a1e8ce8f6daade82117a9a137034d6
+Author: Maciej Mrozowski <reavertm@gmail.com>
+Date: Mon Jan 25 00:48:31 2010 +0000
+
+ do not install a private header
+
+ qt4/src/Makefile.am | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 54c86e53a143a8f9d196e4bef2a733c6f00f6026
+Author: Maciej Mrozowski <reavertm@gmail.com>
+Date: Mon Jan 25 00:33:07 2010 +0000
+
+ Only build tests if told to
+
+ test/CMakeLists.txt | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit eb082274694aadb80dd16caea65d7f0a1adf8b46
+Author: Maciej Mrozowski <reavertm@gmail.com>
+Date: Mon Jan 25 00:29:55 2010 +0000
+
+ Only build demos and test if told so. Install poppler-layer.h
+
+ glib/CMakeLists.txt | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 73fcc310cd7d6ef435b453485c1c99a33f77212a
+Author: Maciej Mrozowski <reavertm@gmail.com>
+Date: Mon Jan 25 00:29:09 2010 +0000
+
+ install man pages
+
+ utils/CMakeLists.txt | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 8672217af4cf88d5506572c2b40fbb0d1d0dbd87
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jan 25 00:11:50 2010 +0000
+
+ Make the poppler object cache params be a ref
+
+ And make sure what we was is a ref, otherwise we abort
+
+ poppler/Gfx.cc | 14 ++++++++------
+ poppler/PopplerCache.cc | 12 ++++++------
+ poppler/PopplerCache.h | 6 +++---
+ 3 files changed, 17 insertions(+), 15 deletions(-)
+
+commit 9567fd8d3d905897d0abacd77885102ae86ba8a9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 24 20:15:49 2010 +0000
+
+ ImgWriter is a header too
+
+ goo/Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 735e8a690d0bd3ab4bec90bdad975d19ac3d4689
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 24 19:51:19 2010 +0000
+
+ noone maintains this either
+
+ msvc/config.h | 62 ---------------------------------
+ msvc/poppler/poppler-config.h | 77
+ -----------------------------------------
+ 2 files changed, 0 insertions(+), 139 deletions(-)
+
+commit d485564f0dc86f62b996380bfbd570cf3f543e4f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 24 19:22:33 2010 +0000
+
+ remove files noone maintains
+
+ README.windows | 63 -----------------------
+ makefile.vc | 150
+ --------------------------------------------------------
+ 2 files changed, 0 insertions(+), 213 deletions(-)
+
+commit 38467f2738c88f060ae1d30332e34da743a888a5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 24 19:18:44 2010 +0000
+
+ only compile glib frontend if cairo is found
+
+ CMakeLists.txt | 4 ++--
+ glib/CMakeLists.txt | 25 +++++++------------------
+ 2 files changed, 9 insertions(+), 20 deletions(-)
+
+commit cf045acf46307d51fb6d9959451b53681e6cac03
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 24 19:01:52 2010 +0000
+
+ compile
+
+ glib/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 0397cf4f193015286464ae70ab202ed400110e30
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 24 19:00:09 2010 +0000
+
+ Add and fix copyright years
+
+ poppler/CairoFontEngine.cc | 1 +
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h | 2 +-
+ poppler/Gfx.cc | 2 +-
+ poppler/Gfx.h | 2 +-
+ poppler/PopplerCache.cc | 1 +
+ poppler/PopplerCache.h | 1 +
+ 7 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 9c9f18b6ceea546dfb21ef0aab29ba99733dcb52
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jan 24 19:27:29 2010 +0100
+
+ [glib-demo] Remove #ifdef HAVE_CAIRO macros from several demos
+
+ glib/demo/images.c | 2 -
+ glib/demo/layers.c | 71
+ +++-------------------------------------------------
+ glib/demo/render.c | 29 +++-----------------
+ 3 files changed, 9 insertions(+), 93 deletions(-)
+
+commit 4e938c1f81add2162ced0e97b24fe588f15f178d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jan 24 19:15:06 2010 +0100
+
+ [glib] Make glib frontend unconditionally use cairo output device
+
+ Splash support has been removed.
+
+ configure.ac | 74 ++++++++-------
+ glib/Makefile.am | 20 +---
+ glib/poppler-document.cc | 9 --
+ glib/poppler-page.cc | 237
+ +--------------------------------------------
+ glib/poppler-page.h | 7 --
+ glib/poppler-private.h | 14 ---
+ glib/poppler.cc | 6 -
+ glib/test-poppler-glib.cc | 6 +-
+ poppler-glib.pc.in | 2 +-
+ 9 files changed, 51 insertions(+), 324 deletions(-)
+
+commit 59ff9d66fc3b0c9612b1c12fc1ae4dbb8dc85b39
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jan 24 17:57:48 2010 +0100
+
+ Use a small object cache in GfxResources to cache GState objects
+
+ It drastically improves performance with some documents like page
+ 742 of
+ PDF32000_2008.pdf
+
+ poppler/Gfx.cc | 19 +++++++++++++++++--
+ poppler/Gfx.h | 2 ++
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+
+commit 880a4a9a60a10f7aa7d3dc7c2802b31b7ef01e06
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jan 24 17:56:35 2010 +0100
+
+ Add a generic cache to store objects by its reference
+
+ poppler/PopplerCache.cc | 60
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PopplerCache.h | 16 ++++++++++++
+ 2 files changed, 76 insertions(+), 0 deletions(-)
+
+commit 5ad492df75c0c2394719e85db4c8b43f15b52110
+Author: mpsuzuki <mpsuzuki@hiroshima-u.ac.jp>
+Date: Sun Jan 24 13:34:41 2010 +0100
+
+ [cairo] Fix memory leak
+
+ poppler/CairoFontEngine.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 3160464b4b70c714c36234320878acab81b866cc
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Nov 26 13:17:19 2009 +0100
+
+ [cairo] Use our own implementation to scale down images instead
+ of cairo
+
+ This is a workaround for the low quality downscaling of pixman.
+ Rescaler implementation is a box filter that supports non-integer box
+ sizes written by Jeff Muizelaar.
+ Fixes bug #5589.
+
+ poppler/CairoOutputDev.cc | 89 +++++++++++
+ poppler/CairoOutputDev.h | 1 +
+ poppler/CairoRescaleBox.cc | 352
+ ++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoRescaleBox.h | 12 ++
+ poppler/Makefile.am | 4 +-
+ 5 files changed, 457 insertions(+), 1 deletions(-)
+
+commit 6825a219f0bc0ac6fd469fb8a6ebb86df774375f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jan 23 11:24:15 2010 +0100
+
+ [glib] Use TextOutputDev to get TextPage when we haven't rendered
+ the page
+
+ glib/poppler-page.cc | 27 ++++++++++++++++++---------
+ 1 files changed, 18 insertions(+), 9 deletions(-)
+
+commit 6c61a457e9a8ec10945bc1e0700c8e4d121faa58
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 20 21:59:05 2010 +0000
+
+ Fix GfxRadialShading::GfxRadialShading
+
+ Fixes crash in KDE bug 223359
+
+ poppler/GfxState.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 442894d371879a6bf2adb5a39b9dd0a49e76e4ac
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Jan 15 21:28:42 2010 +0100
+
+ [glib-demo/cmake] compile print.c
+
+ followup of b64d4bd46b052feb0b143f1348773afbd93e5e33
+
+ glib/demo/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit b64d4bd46b052feb0b143f1348773afbd93e5e33
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Nov 27 11:47:22 2009 +0100
+
+ [glib-demo] Add print demo
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/main.c | 4 +-
+ glib/demo/print.c | 135
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/print.h | 31 +++++++++++
+ 4 files changed, 171 insertions(+), 1 deletions(-)
+
+commit ba2c746f358a5785d8cbaaf03d8628ee3754c388
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Nov 27 09:52:50 2009 +0100
+
+ [glib-demo] Add render for printing option to render demo
+
+ glib/demo/render.c | 47 ++++++++++++++++++++++++++++++++++++++---------
+ 1 files changed, 38 insertions(+), 9 deletions(-)
+
+commit 9a478008ccb61641f09bd77eaa55033cca266c43
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jan 15 12:03:11 2010 +0100
+
+ Add FONTCONFIGURATION macros to poppler-config.h
+
+ They are used in a header file (GlobalParams.h). It fixes a crash
+ when opening any document.
+
+ poppler/poppler-config.h.in | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 1f80f874d8e132411816302465f04bc59d404d89
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 14 08:43:11 2010 +0000
+
+ Fix Uncover and Fade to return correct values
+
+ Bug 26034
+
+ poppler/PageTransition.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 350ff407e06a961f2a5b9d203cb8e78ce09313a0
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Jan 13 22:20:41 2010 +0000
+
+ Make poppler (optionally) relocatable on Windows
+
+ configure.ac | 26 +++++++++++++++++++++
+ poppler/GlobalParams.cc | 57
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 83 insertions(+), 0 deletions(-)
+
+commit 36b67b002db802bfad553720e2114b76b07bb614
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Jan 13 22:17:03 2010 +0000
+
+ Make fontconfig optional with mingw compiler
+
+ CMakeLists.txt | 8 +++++++-
+ config.h.cmake | 6 ++++++
+ configure.ac | 39 ++++++++++++++++++++++++++++++++++++++-
+ makefile.vc | 2 +-
+ poppler/GlobalParams.cc | 10 +++++++---
+ poppler/GlobalParams.h | 7 ++++---
+ poppler/GlobalParamsWin.cc | 5 +++++
+ 7 files changed, 68 insertions(+), 9 deletions(-)
+
+commit 9c0b20ab8c104c2f5398a5a3b8409ca554f5fa39
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 12 22:55:06 2010 +0000
+
+ Add the possibility of using float for splash variables instead
+ of double
+
+ Based on a patch by Marius Vollmer marius.vollmer@nokia.com
+ See bug 25578 for more info
+
+ CMakeLists.txt | 7 ++++++-
+ config.h.cmake | 5 ++++-
+ configure.ac | 10 +++++++++-
+ splash/SplashMath.h | 14 ++++++++++++--
+ splash/SplashTypes.h | 4 +++-
+ 5 files changed, 34 insertions(+), 6 deletions(-)
+
+commit 30e5f76e372114339fa1d37c335e6bbade8b6d8a
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jan 7 11:18:36 2010 +0100
+
+ [CMake] followup recent glib/gtk+ version requirements
+
+ - glib to 2.18, see ce9404b1999f81b3f9e5a89bcd6e715463f89024
+ - gtk+ to 2.14, see e338643f2cebb1203f7ff0646f87b3dea8318757
+
+ cmake/modules/FindGTK.cmake | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit e338643f2cebb1203f7ff0646f87b3dea8318757
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jan 7 11:08:31 2010 +0100
+
+ [tests] Bump GTK+ requirements to 2.14
+
+ Fixes bug #22090.
+
+ configure.ac | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ce9404b1999f81b3f9e5a89bcd6e715463f89024
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jan 7 11:06:19 2010 +0100
+
+ Bump glib requirements to 2.18
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 526c8871cbdfbc119e013ee96887a79f65403790
+Author: Hib Eris <hib@hiberis.nl>
+Date: Thu Dec 31 17:52:33 2009 +0100
+
+ [glib] Use PDFDoc(wchar_t *, ...) on Windows
+
+ Fixes bug #25032
+
+ glib/poppler-document.cc | 22 +++++++++++++++++++---
+ 1 files changed, 19 insertions(+), 3 deletions(-)
+
+commit e0c8188136958b853269179079efefdd3488dc22
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jan 4 18:36:01 2010 +0000
+
+ Require Qt 4.4
+
+ This updates the requirement to real requirement
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit f9accdb878b23ebd2152dd05d61cfcc71d46cd03
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Jan 4 14:13:13 2010 +0100
+
+ [Qt4/tests] use getPdfVersion() instead of the deprecated pdfVersion()
+
+ qt4/tests/stress-poppler-dir.cpp | 3 ++-
+ qt4/tests/stress-poppler-qt4.cpp | 3 ++-
+ qt4/tests/test-password-qt4.cpp | 4 +++-
+ qt4/tests/test-poppler-qt4.cpp | 4 +++-
+ 4 files changed, 10 insertions(+), 4 deletions(-)
+
+commit 898e939d8c0ac74cc7ee3f5d42d83083ed31036e
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Jan 2 02:33:58 2010 +0100
+
+ Make pdftoppm embed correct resolution in PNG and JPEG files
+
+ goo/ImgWriter.h | 3 ++-
+ goo/JpegWriter.cc | 6 +++++-
+ goo/JpegWriter.h | 3 ++-
+ goo/PNGWriter.cc | 6 +++++-
+ goo/PNGWriter.h | 3 ++-
+ splash/SplashBitmap.cc | 9 +++++----
+ splash/SplashBitmap.h | 5 +++--
+ utils/HtmlOutputDev.cc | 4 +++-
+ utils/pdftoppm.cc | 9 +++++----
+ 9 files changed, 32 insertions(+), 16 deletions(-)
+
+commit df569dc2fb89d7e0780bbf7a687ce2464ff5cb43
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Jan 2 01:19:50 2010 +0100
+
+ enable AM_SILENT_RULES by default
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f3862f7d987aae52a1fd2bb0af27d1cd803a5b84
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Dec 31 00:20:11 2009 +0100
+
+ [cpp/tests] poppler-dump: show a string for the font type
+
+ cpp/tests/poppler-dump.cpp | 23 ++++++++++++++++++++++-
+ 1 files changed, 22 insertions(+), 1 deletions(-)
+
+commit 9c343c821593ebae51ac47b58ad007a82f198652
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Dec 31 00:13:09 2009 +0100
+
+ [cpp/tests] poppler-dump: show the orientation of the pages
+
+ cpp/tests/poppler-dump.cpp | 16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+commit bc91fe3824f37cd17a38aac85c817e8ada1b2f43
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Dec 30 23:53:31 2009 +0100
+
+ [cpp/tests] poppler-dump: a bit less output in permissions lines
+
+ cpp/tests/poppler-dump.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1199de8f097a78edb831313841ac0ed3f9ec9905
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Dec 30 23:50:36 2009 +0100
+
+ [cpp/tests] poppler-dump: add --show-all to show all the information
+
+ cpp/tests/poppler-dump.cpp | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit 9522f830b59942adfc91d5f03c274415a4737ccc
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Dec 30 23:38:40 2009 +0100
+
+ [cpp] use iconv for the utf8 <-> utf16 conversions
+
+ cpp/poppler-global.cpp | 92
+ +++++++++++++++++++++++++++++++++--------------
+ 1 files changed, 64 insertions(+), 28 deletions(-)
+
+commit b156b4031f5daf658f40db8efa2a3016d95b98b5
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Dec 30 23:24:23 2009 +0100
+
+ [cpp] add the build system stuff for iconv, mandatory for cpp
+
+ CMakeLists.txt | 6 ++
+ Makefile.am | 1 +
+ cmake/modules/FindIconv.cmake | 57 +++++++++++++
+ config.h.cmake | 6 ++
+ configure.ac | 6 ++
+ cpp/CMakeLists.txt | 2 +-
+ cpp/Makefile.am | 3 +-
+ m4/iconv.m4 | 180
+ +++++++++++++++++++++++++++++++++++++++++
+ 8 files changed, 259 insertions(+), 2 deletions(-)
+
+commit a0cffb8b69e0595a2afe15ecc4928e0df1eeb063
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Dec 30 18:57:09 2009 +0100
+
+ [cpp] fixup unicode GooString <-> ustring conversions
+
+ better make them use the "hand-made" code, it is more correct for them
+
+ cpp/poppler-private.cpp | 44
+ +++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 41 insertions(+), 3 deletions(-)
+
+commit 3b6e3605209d5db453725b9ce4e6e54679d9c5da
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 27 15:30:22 2009 +0100
+
+ Do not crop the transformation matrix at an arbitrary value
+
+ Fixes bug 25763 and gave no regression on my test suite
+
+ poppler/GfxState.cc | 21 ---------------------
+ poppler/SplashOutputDev.cc | 15 +++++++++++++++
+ 2 files changed, 15 insertions(+), 21 deletions(-)
+
+commit ea44c60645001ffea7d297f8549aaa4f5ce5e16c
+Author: Ilya Gorenbein <igorenbein@finjan.com>
+Date: Sun Dec 27 15:27:00 2009 +0100
+
+ Try to work on streams without Length
+
+ We have code that finds the Length if it's wrong so let that code
+ do its job
+ instead of returning a NULL stream
+
+ poppler/Parser.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 283dd326a00c804b6332ee3ca1aaa0d86377b3f3
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Dec 19 12:50:10 2009 +0100
+
+ [cpp] fix installation of poppler-version.h with autotools and
+ builddir != srcdir
+
+ cpp/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit df0ccddb7f784b4a8564beda51b3047cb9e3611a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 18 20:23:48 2009 +0000
+
+ move the retrieval of the bitmap after rendering the page as it can
+ change on render time
+
+ utils/pdftoppm.cc | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ab88a02f7efefc950a316d7a5edf88dad8f3e4d0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Dec 17 18:24:20 2009 +0100
+
+ [annots] QuadPoints is required in Text Markup annotations
+
+ Show an error message and mark annotation as invalid when it's
+ missing.
+
+ poppler/Annot.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 39dc99431b3ea9e00f6f645dd7169c0319571dc9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Dec 17 18:17:20 2009 +0100
+
+ [annots] Create appearance stream for Sound Annotations when not
+ defined
+
+ See bug #23108.
+
+ poppler/Annot.cc | 112
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 2 +
+ 2 files changed, 114 insertions(+), 0 deletions(-)
+
+commit e4f5a78a853b88b1586ef59fc8893a321ea23736
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Dec 17 17:39:39 2009 +0100
+
+ [annots] Add Tag and Graph icons for File Attachment annotations
+
+ See bug #23108.
+
+ poppler/Annot.cc | 70
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 70 insertions(+), 0 deletions(-)
+
+commit 752b14857cfb0669fd6d7dfef2ea73c13a2369fc
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Dec 17 17:16:01 2009 +0100
+
+ simplify
+
+ cpp/poppler-toc.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a26e4b7903fabc667d7d16c23ca2c7a535dd05fa
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Dec 17 17:09:35 2009 +0100
+
+ [cpp/tests] add a simple poppler-dump test
+
+ this small test executable can dump various features of the document,
+ like the general info, permissions, metadata, toc, fonts,
+ embedded files, pages, etc
+
+ also add the necessary autotools+cmake machinery to compile it
+
+ configure.ac | 1 +
+ cpp/CMakeLists.txt | 2 +
+ cpp/Makefile.am | 1 +
+ cpp/tests/.gitignore | 1 +
+ cpp/tests/CMakeLists.txt | 24 ++++
+ cpp/tests/Makefile.am | 17 +++
+ cpp/tests/poppler-dump.cpp | 293
+ ++++++++++++++++++++++++++++++++++++++++++++
+ 7 files changed, 339 insertions(+), 0 deletions(-)
+
+commit 86c871cc625d00b8ee7f93dc8c0f9ef8462bba5a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Dec 17 17:05:45 2009 +0100
+
+ [annots] Create appearance stream for Text Markup Annotations when
+ not defined
+
+ Highlight annotations are an exception, we always ignore the
+ appearance stream to use our own, since for most of the documents the
+ appearance stream provided by the annotation is not enough. That's why
+ it's currently broken. This is what acroread does indeed and Leonard
+ Rosenthol recommended us to do the same.
+ See bug #23108.
+
+ poppler/Annot.cc | 199
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 2 +
+ 2 files changed, 201 insertions(+), 0 deletions(-)
+
+commit 904ecd929c6acbbad6d782b950c53c0a80e1f39c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Dec 17 12:49:20 2009 +0100
+
+ [annots] Fix memory leaks
+
+ poppler/Annot.cc | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit ef7954b86f9b1a762c4f77a48d5f42f8db4bbed7
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Dec 15 02:20:18 2009 +0100
+
+ [cpp] use the correct index (instead of an uninitialized variable)
+
+ cpp/poppler-page.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2547b5e53e7799cf7299838ae9bd882c21a228ae
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Dec 15 02:14:57 2009 +0100
+
+ [cpp] properly delete the children of a toc item
+
+ cpp/poppler-toc.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 771bd3594740fe16bd030dbe73928a8b1d4d113f
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Dec 15 02:04:24 2009 +0100
+
+ [cpp] actually implement toc::root()
+
+ cpp/poppler-toc.cpp | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit ca1d2ec4588b2437b58b4448ae2fc5ebd0f130d3
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Dec 15 00:54:29 2009 +0100
+
+ [cpp] fix the reference to the vector data
+
+ cpp/poppler-global.cpp | 2 +-
+ cpp/poppler-private.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 16c946e7658b0e9cff701ce1d6bbf7d3828cbe08
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Dec 15 00:35:25 2009 +0100
+
+ [cpp] fix the reference to the vector data
+
+ cpp/poppler-document.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9bb90c99b65e0e9d9b65c7dbeb5b4d66377ceb21
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 23:43:12 2009 +0100
+
+ [cpp] add destructor for 'rectangle'
+
+ cpp/poppler-rectangle.h | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 61ccdc9ab3b816174896fcae0899ff34f11eee80
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 23:40:51 2009 +0100
+
+ [cpp] add out stream operators for rect and rectf
+
+ cpp/CMakeLists.txt | 1 +
+ cpp/Makefile.am | 1 +
+ cpp/poppler-rectangle.cpp | 35 +++++++++++++++++++++++++++++++++++
+ cpp/poppler-rectangle.h | 5 +++++
+ 4 files changed, 42 insertions(+), 0 deletions(-)
+
+commit 69dd51fed3de41f8b799b811ae5ee59c0d5f59c2
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 22:24:07 2009 +0100
+
+ [cpp] add namespace to namespace functiond to link properly
+
+ cpp/poppler-global.cpp | 4 ++--
+ cpp/poppler-version.cpp | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 3923fa4890984d8616d86016f4f4a94e8ef3e992
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 22:23:15 2009 +0100
+
+ [cpp] add default empty parameters for the passwords of the document
+ loading functions
+
+ cpp/poppler-document.h | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 1d23cc677e9b0a9f61c53e0ea365537f33abe5bf
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 21:44:56 2009 +0100
+
+ [cpp] add "human friendly" output representation for byte_array
+
+ cpp/poppler-global.cpp | 23 +++++++++++++++++++++++
+ cpp/poppler-global.h | 3 +++
+ 2 files changed, 26 insertions(+), 0 deletions(-)
+
+commit 82954ea5f8ba880276328765f104690a05adbd9e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Dec 7 12:05:54 2009 +0100
+
+ [annot] Create appearance stream for Attachment Annotations when
+ not defined
+
+ See bug #23108.
+
+ poppler/Annot.cc | 94
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 2 +
+ 2 files changed, 96 insertions(+), 0 deletions(-)
+
+commit c6195472326c183fcfd8a3e9da1ee7f6fa8b7c3d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 6 17:09:23 2009 +0100
+
+ [annots] Use opacity when drawing Markup Annotations
+
+ According to the spec:
+
+ "The constant opacity value that shall be used in painting the
+ annotation. This value shall apply to all visible elements of the
+ annotation in its closed state (including its background and border)
+ but
+ not to the pop-up window that appears when the annotation is opened.
+
+ The specified value shall not used if the annotation has an appearance
+ stream in that case, the appearance stream shall specify any
+ transparency.
+
+ If no explicit appearance stream is defined for the annotation, it may
+ be painted by implementation-dependent means that do not necessarily
+ conform to the PDF imaging model; in this case, the effect of
+ this entry
+ is implementation-dependent as well."
+
+ poppler/Annot.cc | 21 +++++++++++++++------
+ poppler/Gfx.cc | 9 ++++++++-
+ poppler/Gfx.h | 2 +-
+ 3 files changed, 24 insertions(+), 8 deletions(-)
+
+commit a337c1d757d52c1c238229d2f0cd3a41694b0e08
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 16:18:22 2009 +0100
+
+ [cpp] add document metadata reading
+
+ cpp/poppler-document.cpp | 9 +++++++++
+ cpp/poppler-document.h | 1 +
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 6c4fa513e60dbdd5ab693434f239d82d95756994
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 6 16:56:22 2009 +0100
+
+ [annot] Create appearance stream for Geometry Annotations when
+ not defined
+
+ See bug #23108.
+
+ poppler/Annot.cc | 120
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 2 +
+ 2 files changed, 122 insertions(+), 0 deletions(-)
+
+commit eed94b8bd2855dce1fd39b835e3280cbd0ccd1cf
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 6 16:51:37 2009 +0100
+
+ [annot] Create appearance stream for Line Annotations when not defined
+
+ See bug #23108.
+
+ poppler/Annot.cc | 62
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 2 +
+ 2 files changed, 64 insertions(+), 0 deletions(-)
+
+commit 1c7a5f5e89c4c51e31b6de345d4862ef8dcc2bc0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 6 16:40:14 2009 +0100
+
+ [annot] Create appearance stream for Text Annotations when not defined
+
+ Streams have been created by using the svg icons created by mac_v and
+ ulisse. See bug #23108.
+
+ poppler/Annot.cc | 305
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 2 +
+ 2 files changed, 307 insertions(+), 0 deletions(-)
+
+commit c9cb6353ad5279d09615eb2c944b2b053cdf5ccc
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 15:52:25 2009 +0100
+
+ [cpp] add function to query for document "permissions"
+
+ cpp/poppler-document.cpp | 23 +++++++++++++++++++++++
+ cpp/poppler-document.h | 1 +
+ cpp/poppler-global.h | 4 ++++
+ 3 files changed, 28 insertions(+), 0 deletions(-)
+
+commit 30e90c7c1b41c62ddc21905e7ccdea4c95547e80
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 15:33:36 2009 +0100
+
+ [cpp] add is_encrypted and is_linearized for document
+
+ cpp/poppler-document.cpp | 10 ++++++++++
+ cpp/poppler-document.h | 2 ++
+ 2 files changed, 12 insertions(+), 0 deletions(-)
+
+commit 93fd588c519958a1f66231c111ea8a6b0a759be1
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 13:19:24 2009 +0100
+
+ [cpp] add the possibility to load a document from raw data
+
+ cpp/poppler-document-private.h | 5 +++++
+ cpp/poppler-document.cpp | 35 ++++++++++++++++++++++++++++++++++-
+ cpp/poppler-document.h | 3 +++
+ 3 files changed, 42 insertions(+), 1 deletions(-)
+
+commit 53996365b159cf84adf2cac56c76b8bda8dfb12e
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 12:57:41 2009 +0100
+
+ [cpp] use the byte_array typedef
+
+ cpp/poppler-embedded-file.cpp | 6 +++---
+ cpp/poppler-embedded-file.h | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit e4969c1aaed4a8eb770d8b54920f2476129bbcb7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 6 16:19:36 2009 +0100
+
+ [annots] Refactor Annot::setColor to receive an AnnotColor
+
+ Removes duplicated code since color arrays are already parsed in
+ AnnotColor
+
+ poppler/Annot.cc | 136
+ ++++++++++++++++++++++++++++--------------------------
+ poppler/Annot.h | 4 +-
+ 2 files changed, 73 insertions(+), 67 deletions(-)
+
+commit cfb4f5dfabf31de22d68aa0d5796cb7a33d8b462
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 11:06:36 2009 +0100
+
+ [cpp] add a byte_array typedef, and use it for utf8 string data
+
+ cpp/poppler-global.cpp | 12 +++---------
+ cpp/poppler-global.h | 5 ++++-
+ cpp/poppler-private.cpp | 5 ++---
+ 3 files changed, 9 insertions(+), 13 deletions(-)
+
+commit 2d13ac31671b2007e44a90f45a82cb3adfa9c80c
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 02:30:06 2009 +0100
+
+ update ignore files
+
+ .gitignore | 1 +
+ cpp/.gitignore | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 01e902e40ca15acf0319e37d39a271d6875bfce9
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 02:02:47 2009 +0100
+
+ [cpp] add a version header+functions
+
+ this way, it is possible to get (either at build time and at runtime)
+ the version of the current poppler-cpp library
+
+ poppler-config.h is generated by the build system (autotools or cmake)
+ with the correct version information
+
+ configure.ac | 2 ++
+ cpp/CMakeLists.txt | 5 +++++
+ cpp/Makefile.am | 6 ++++--
+ cpp/poppler-version.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-version.h.in | 39 +++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 91 insertions(+), 2 deletions(-)
+
+commit b3f5e5d60bc9109da961940f6216722f9db4a87b
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 00:56:15 2009 +0100
+
+ [CMake] add the configure check for the Cairo blend modes support
+ (as in autotools)
+
+ cmake/modules/FindCairo.cmake | 18 ++++++++++++++++++
+ config.h.cmake | 3 +++
+ 2 files changed, 21 insertions(+), 0 deletions(-)
+
+commit f6ba877e0c22538cfe34d32d69814f660de59d2c
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 00:44:55 2009 +0100
+
+ [CMake] add configure check for sys/mman.h (as in autotools)
+
+ ConfigureChecks.cmake | 1 +
+ config.h.cmake | 3 +++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit e12801320ae030628fc62c073983c06b39ee13d7
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 00:42:20 2009 +0100
+
+ minor spello
+
+ config.h.cmake | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6428907ebcf33d4391673aadcfa71c3061f6d352
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 00:41:49 2009 +0100
+
+ [CMake] add configure check for fcntl.h (as in autotools)
+
+ ConfigureChecks.cmake | 1 +
+ config.h.cmake | 3 +++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 916ab7163249e23bd5ba00922fdcad9caaf92c75
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 00:34:59 2009 +0100
+
+ [CMake] oops, those should have been '#cmakedefine' and not '#define'
+
+ config.h.cmake | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ea655d8c7e24e97ee710110a783ed9c209cf76e3
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 00:33:51 2009 +0100
+
+ [CMake] move and rename to match more the autotools output
+
+ config.h.cmake | 21 ++++++++++++++-------
+ 1 files changed, 14 insertions(+), 7 deletions(-)
+
+commit 9f0146c5b2f9326e834104b89791f66b18f85adc
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 14 00:28:04 2009 +0100
+
+ [CMake] add checks for gmtime_r and localtime_r
+
+ ConfigureChecks.cmake | 2 ++
+ config.h.cmake | 6 ++++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 9d0cf201e96044dd679c26bea6255d986a6cd246
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Dec 13 23:45:39 2009 +0100
+
+ [cpp] add ignore file
+
+ cpp/.gitignore | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit d783e92b863d8b22de6ca326328115fec63193ed
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Dec 13 23:42:33 2009 +0100
+
+ [cpp] don't forget the cmake stuff when packing with the autotools
+
+ Makefile.am | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 0105caefe860e7a45fc7d3a1bd1162fe56bcfe6a
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Dec 13 23:40:55 2009 +0100
+
+ [cpp] add the pkg-config stuff
+
+ CMakeLists.txt | 3 +++
+ Makefile.am | 7 +++++--
+ configure.ac | 3 ++-
+ poppler-cpp.pc.cmake | 9 +++++++++
+ poppler-cpp.pc.in | 9 +++++++++
+ 5 files changed, 28 insertions(+), 3 deletions(-)
+
+commit d5a74f78df0dca24fd537b30424fd2ebb3efe3e2
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Dec 13 23:35:06 2009 +0100
+
+ [cpp] add the (rest of the) CMake build system for it
+
+ CMakeLists.txt | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 0e41f937946e4e4c1b660406bd74e4afe8825b5f
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Dec 13 23:31:46 2009 +0100
+
+ [cpp] add the autotools buildsystem for it
+
+ Makefile.am | 6 +++++-
+ configure.ac | 15 +++++++++++++++
+ cpp/Makefile.am | 32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 52 insertions(+), 1 deletions(-)
+
+commit 9727fdc0c682742335e44ddc2f32d60e4c59983a
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Dec 13 22:55:28 2009 +0100
+
+ Start of a pure C++ frontend for Poppler.
+
+ This initial version (called 'poppler-cpp') includes preliminary
+ support for:
+ - document (loading from file name, some query methods, unlocking,
+ font listing, embedded files)
+ - page (some query methods) with page transitions
+ - TOC
+
+ Modelled a bit on the Qt4 API, it provides also an own "ustring"
+ typedef representing UTF-16 strings,
+ with methods to convert back/to UTF-8 and Latin 1.
+
+ Most probably it has bugs, but nevertheless worth testing and
+ developing.
+
+ cpp/CMakeLists.txt | 34 ++++
+ cpp/poppler-document-private.h | 55 ++++++
+ cpp/poppler-document.cpp | 316
+ +++++++++++++++++++++++++++++++++++
+ cpp/poppler-document.h | 92 ++++++++++
+ cpp/poppler-embedded-file-private.h | 40 +++++
+ cpp/poppler-embedded-file.cpp | 116 +++++++++++++
+ cpp/poppler-embedded-file.h | 55 ++++++
+ cpp/poppler-font.cpp | 166 ++++++++++++++++++
+ cpp/poppler-font.h | 91 ++++++++++
+ cpp/poppler-global.cpp | 162 ++++++++++++++++++
+ cpp/poppler-global.h | 86 ++++++++++
+ cpp/poppler-page-private.h | 44 +++++
+ cpp/poppler-page-transition.cpp | 95 +++++++++++
+ cpp/poppler-page-transition.h | 82 +++++++++
+ cpp/poppler-page.cpp | 121 +++++++++++++
+ cpp/poppler-page.h | 62 +++++++
+ cpp/poppler-private.cpp | 70 ++++++++
+ cpp/poppler-private.h | 66 ++++++++
+ cpp/poppler-rectangle.h | 60 +++++++
+ cpp/poppler-toc-private.h | 62 +++++++
+ cpp/poppler-toc.cpp | 136 +++++++++++++++
+ cpp/poppler-toc.h | 74 ++++++++
+ 22 files changed, 2085 insertions(+), 0 deletions(-)
+
+commit 62854051f4e47028147cc93a5faac39e2fa2c9fd
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Dec 12 17:22:08 2009 +0100
+
+ Initialize profileCommands in Gfx constructor
+
+ poppler/Gfx.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 4e6af25a028d16608111634c5467420e31fa399b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Dec 9 19:45:40 2009 +0100
+
+ [cairo] Update font of TextPage in CairoOutputDev::updateAll()
+
+ Fixes a crash with some documents, see Evince bug
+ https://bugzilla.gnome.org/show_bug.cgi?id=603934
+
+ poppler/CairoOutputDev.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 6798d3e52e36e91bceff3a1a96372e9d9c6f3813
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 6 15:34:36 2009 +0100
+
+ Use fixed size array in AnnotColor
+
+ glib/poppler-annot.cc | 2 +-
+ poppler/Annot.cc | 24 +++++-------------------
+ poppler/Annot.h | 5 ++---
+ poppler/Gfx.cc | 2 +-
+ qt4/src/poppler-annotation.cc | 2 +-
+ 5 files changed, 10 insertions(+), 25 deletions(-)
+
+commit 92fab93bee3748a73c09429cc8a105c16f21fed0
+Author: Axel Struebing <axel.struebing@freenet.de>
+Date: Sat Dec 5 22:31:29 2009 +0000
+
+ Add a empty space after null
+
+ Fixes bug 25465
+
+ poppler/PDFDoc.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 32103f45d0193b31e95269ea9123b8011d93e994
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Dec 5 10:14:18 2009 +0100
+
+ [annots] Add isVisible() to check whether annot is visible before
+ drawing it
+
+ It takes into account annot flags and optional content.
+
+ poppler/Annot.cc | 29 ++++++++++++++---------------
+ poppler/Annot.h | 1 +
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+commit c14dfc7102341f5e1ed67a05c0738d55befab1ec
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Dec 5 10:07:46 2009 +0100
+
+ [annots] Do not check if annot is a link in Annot::draw()
+
+ AnnotLink already implements draw()
+
+ poppler/Annot.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ddf85d4a51f605eed998c633857b8bb5c74ab590
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 4 14:59:41 2009 +0100
+
+ Make the code a bit more resilient
+
+ By checking the GooString we are going to use really exists
+
+ poppler/PSOutputDev.cc | 24 ++++++++++++++++--------
+ 1 files changed, 16 insertions(+), 8 deletions(-)
+
+commit 78b4afa0a44048b8d40438d400652dbae4cb99b1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 4 14:57:10 2009 +0100
+
+ Accept Fontname if FontName is not present
+
+ Fixes KDE bug 217013
+
+ poppler/GfxFont.cc | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit fee5cb0eec2ddb8d596289e9a6285cf04d97632e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Dec 4 13:26:42 2009 +0100
+
+ [annots] Remove redundant flags definition
+
+ poppler/Annot.cc | 22 +++++++++-------------
+ 1 files changed, 9 insertions(+), 13 deletions(-)
+
+commit 3a94e8ce90c0a4d11c5c5aa8805c167c8a0434e5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Nov 27 15:23:11 2009 +0100
+
+ [cairo] Revert commit 77c2e154c2cb57300116ecd4295f1e67b06b411f
+
+ And fix bug #24575 jut by checking pointer is not null before
+ using it.
+
+ poppler/CairoOutputDev.cc | 12 +++++-------
+ 1 files changed, 5 insertions(+), 7 deletions(-)
+
+commit a093b768e64d477ebdd5f6b519d80a6c45706e7e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 22 20:23:49 2009 +0100
+
+ Add copyrights
+
+ poppler/CairoFontEngine.cc | 2 +-
+ poppler/CairoOutputDev.cc | 4 ++--
+ poppler/CairoOutputDev.h | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 77c2e154c2cb57300116ecd4295f1e67b06b411f
+Author: David Benjamin <davidben@mit.edu>
+Date: Sun Nov 22 20:19:29 2009 +0100
+
+ Do not crash on malformed files
+
+ bug 24575
+
+ poppler/CairoOutputDev.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 1d0cb9b2cfd4d4d9aa9b0ad83ad6408544263a09
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Nov 22 19:59:34 2009 +0100
+
+ [cairo] Initialize fill_color and stroke_color
+
+ poppler/CairoOutputDev.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 32de2ac62fb87570e1a59152f37b86e571a01180
+Author: Ilya Gorenbein <igorenbein@finjan.com>
+Date: Sun Nov 22 19:51:54 2009 +0100
+
+ Improve the reconstruction of the XRef
+
+ Makes load a file Ilya can't share
+
+ poppler/XRef.cc | 165
+ +++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 95 insertions(+), 70 deletions(-)
+
+commit 039c6dffbfbed46a11e207048a3247d6921d6b02
+Author: Ilya Gorenbein <igorenbein@finjan.com>
+Date: Sun Nov 22 15:14:20 2009 +0100
+
+ Correctly initialize fileName
+
+ poppler/Link.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit b905caf1785ee207cc0480953da69be302d3d4e9
+Author: David Benjamin <davidben@mit.edu>
+Date: Sat Nov 21 02:43:21 2009 +0100
+
+ Be more lenient with /Decode key on images
+
+ The spec requires the field be [1 0] or [0 1]. Adobe accepts
+ floating point
+ values as well. This fixes bug #17439.
+
+ poppler/Gfx.cc | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+commit d99e7a88845a5f4b35e2c538c597316b2ad541ca
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Nov 20 22:09:44 2009 +0100
+
+ Check for openjpeg in the C++ part as it uses bool in the header
+
+ Bug 25103
+
+ configure.ac | 61
+ ++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 30 insertions(+), 31 deletions(-)
+
+commit 55261a2dc86241c8d132e590e76e7398b3ca5090
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 18 22:26:01 2009 +0100
+
+ replace floor with a cast to int for numbers > 0
+
+ bug-poppler13487.pdf gets a 15% faster rendering
+
+ splash/SplashMath.h | 19 +++++++++++++++++--
+ 1 files changed, 17 insertions(+), 2 deletions(-)
+
+commit 28df9fb323f14dc632c9502655abf69984b7d67e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 18 21:57:02 2009 +0100
+
+ Remove unused label
+
+ poppler/Catalog.cc | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 037979a01a6fcafc61360e758dbc4a5eb056825e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Nov 17 19:12:30 2009 +0100
+
+ [cairo] If there's a soft mask available when filling, apply the
+ mask instead of filling
+
+ Fixes bug #8474.
+
+ poppler/CairoOutputDev.cc | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 46380d36f004d71dd2c2e7bc82836af248684b51
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 17 20:48:22 2009 +0100
+
+ i didn't want to commit this
+
+ configure.ac | 60
+ ++++++++++++++++++++++++++------------------------
+ splash/SplashMath.h | 5 +--
+ utils/pdftoppm.cc | 8 ------
+ 3 files changed, 33 insertions(+), 40 deletions(-)
+
+commit 1844e0927ae89824f59b2b3378bf5e00a51a251c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 17 20:34:24 2009 +0100
+
+ do not use setAttribute with doubles
+
+ it is evil and locale dependant, we do NOT want that so use
+ QString::number
+
+ configure.ac | 60 ++++++++++++++---------------
+ qt4/src/poppler-annotation.cc | 82
+ ++++++++++++++++++++--------------------
+ splash/SplashMath.h | 5 +-
+ utils/pdftoppm.cc | 8 ++++
+ 4 files changed, 81 insertions(+), 74 deletions(-)
+
+commit 572d79f4b8a7bf1717b88dbd2609d8fa9b036dee
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 15 20:40:56 2009 +0100
+
+ Only calculate the matrix when it is really needed
+
+ That only happens when outputting to 1 bit images
+ Speeds out rendering on some pdf up to 40%
+
+ splash/SplashScreen.cc | 35 +++++++++++++++++++++++++++++++++--
+ splash/SplashScreen.h | 16 ++++++++++++++++
+ 2 files changed, 49 insertions(+), 2 deletions(-)
+
+commit 1c3113361fa376093e6fedfbf48feee7dcbc46b7
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Nov 15 19:43:18 2009 +0100
+
+ Write out fixed-content portion of Type 1 fonts in PSOutputDev
+
+ If /Length3 of a Type 1 FontFile is > 0 the fixed-content from the
+ FontFile should be used instead of adding the generic 512 zeros and
+ cleartomark.
+
+ poppler/PSOutputDev.cc | 18 +++++++++++++-----
+ 1 files changed, 13 insertions(+), 5 deletions(-)
+
+commit 2d30dc605cd984f6c32124af9aa7b877d416d141
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Nov 15 17:31:36 2009 +0100
+
+ [glib-demo] Show attachment name in FileAttachment annot properties
+ table
+
+ glib/demo/annots.c | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 6c8ae140256818401351a331787c83e043fdba09
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Nov 15 17:31:13 2009 +0100
+
+ [glib] Add poppler_annot_file_attachment_get_name()
+
+ glib/poppler-annot.cc | 36 +++++++++++++++++++++++++++++-------
+ glib/poppler-annot.h | 1 +
+ 2 files changed, 30 insertions(+), 7 deletions(-)
+
+commit ecf5173eb288187a1f076fd4b116f1212fa9e203
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Nov 15 17:14:29 2009 +0100
+
+ [glib-demo] Add properties of FileAttachment annotations
+
+ glib/demo/annots.c | 67
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 67 insertions(+), 0 deletions(-)
+
+commit 8f4fdd864d79e4fa83951a3eb006ea8287c3a1ba
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Nov 15 17:12:43 2009 +0100
+
+ [glib-demo] Add pgd_table_add_property_with_custom_widget()
+
+ To be able to add properties to a table that are not labels
+
+ glib/demo/utils.c | 31 +++++++++++++++++++++----------
+ glib/demo/utils.h | 30 +++++++++++++++++-------------
+ 2 files changed, 38 insertions(+), 23 deletions(-)
+
+commit 061b85f7a442107cda67e385bd772ec8565a936e
+Author: Thomas Viehmann <tv@beamnet.de>
+Date: Sun Nov 15 17:11:43 2009 +0100
+
+ [glib] Add support for file attachment annotations
+
+ glib/poppler-annot.cc | 69
+ +++++++++++++++++++++++++++++++++++++++++++++---
+ glib/poppler-annot.h | 8 +++++
+ glib/poppler-page.cc | 3 ++
+ glib/poppler-private.h | 1 +
+ glib/poppler.h | 49 +++++++++++++++++----------------
+ 5 files changed, 102 insertions(+), 28 deletions(-)
+
+commit 189c45332991bce51e40bcaf65da67d2d644045a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Nov 15 16:42:21 2009 +0100
+
+ [glib] Remove PopplerDocument from PopplerAttachment
+
+ Since we are duplicating the stream we don't need to hold a
+ reference of
+ PopplerDocument anymore.
+
+ glib/poppler-attachment.cc | 13 +------------
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-private.h | 3 +--
+ 3 files changed, 3 insertions(+), 15 deletions(-)
+
+commit e55bfeb1ddc60053c5ee5fef840c409891781ce6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Nov 13 00:55:37 2009 +0100
+
+ jpeg_start_decompress can fail, check it
+
+ Fixes KDE bug #214317
+
+ poppler/DCTStream.cc | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit c59d93061cf71d13916872a20aed37ecfbb3bfa4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Nov 9 18:32:55 2009 +0100
+
+ [cairo] Do nothing when image mask is 1x1 and the pixel is 0
+
+ poppler/CairoOutputDev.cc | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 448f03cfc429d33bfa5527e3dc964ef5da10ee94
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Mon Nov 9 22:52:39 2009 +1030
+
+ Don't render the color white in type 3 glyphs in the cairo backend
+
+ PDF allows the "g" operator in Type 3 charprocs but cairo user fonts
+ will render any stroke or fill in the font color.
+
+ As the only PDFs I've seen with "g" in the charprocs are only using
+ the gray values 0 or 1, a workaround is to disable strokes and fills
+ of the charproc when the gray level is > 0.5.
+
+ poppler/CairoOutputDev.cc | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 3fead2a3b53681ef95116f18f17f1a9febec6e48
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Nov 9 11:25:24 2009 +0100
+
+ Transitions dictionary can be a Ref too
+
+ poppler/Page.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ac4955d03a532cab1933698aeb667d44300e52d0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Nov 9 11:12:48 2009 +0100
+
+ [glib-demo] Explicitely add gio as dependency for GTK+ tests
+
+ configure.ac | 4 ++--
+ glib/demo/main.c | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 32ea667ec8f18311539123c7b80c7ab4767070cb
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Aug 11 19:17:52 2009 +0100
+
+ [cairo] Mark images dirty
+
+ After directly manipulating the pixel values we need to mark the
+ surface
+ as dirty. This means that cairo will refresh any caches it may
+ have taken
+ of the surface will the new data.
+
+ poppler/CairoOutputDev.cc | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 10a41150c4067bb3ab85e25dae76e0968a6cd586
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Aug 11 19:17:06 2009 +0100
+
+ [cairo] Use colToDbl() to avoid rounding error.
+
+ poppler/CairoOutputDev.cc | 37 +++++++++++++++++++------------------
+ 1 files changed, 19 insertions(+), 18 deletions(-)
+
+commit c9491319689f04edd57adda7ee85f84f17fd1c47
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Aug 11 18:07:17 2009 +0100
+
+ [cairo] Reduce the number of redundant pattern creations
+
+ poppler/CairoOutputDev.cc | 92
+ +++++++++++++++++++++++++++------------------
+ 1 files changed, 55 insertions(+), 37 deletions(-)
+
+commit ead78d9f703c8b2d556c94be3c47dbae7469eda8
+Author: Reece Dunn <msclrhd@gmail.com>
+Date: Thu Nov 5 22:25:14 2009 +0100
+
+ fontpos is never set to -1, so remove the checks in HtmlOutputDev.
+
+ utils/HtmlOutputDev.cc | 11 +++--------
+ 1 files changed, 3 insertions(+), 8 deletions(-)
+
+commit 55dd6024a4672a1787e8b1a8276bd78fff94e2cd
+Author: Ilya Gorenbein <igorenbein@finjan.com>
+Date: Wed Nov 4 22:07:18 2009 +0100
+
+ Do not error on files without "Count" and "Kids"
+
+ It is not spec compliant not to have those fields but Adobe Reader and
+ FoxIt seems to allow it so try to behave like them. See bug 24720
+ to see why one would want such file
+
+ poppler/Catalog.cc | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 58a1d42aed7352c008d201b8f355f6e4146f71e5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Oct 29 18:38:22 2009 +0100
+
+ [cairo] Don't render patterns when using CairoImageOutputDev
+
+ poppler/CairoOutputDev.h | 15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+commit 7670cc48dcf3ffd77e3ffa29056a3e13b2926709
+Author: Ilya Gorenbein <igorenbein@finjan.com>
+Date: Wed Oct 28 19:20:41 2009 +0100
+
+ There are some pdf where Aspect values are reals, use getNum
+
+ Fixes bug 24733
+
+ poppler/Annot.cc | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 4fe89e520a04a6ab6d6ec6a8294896b2f427c7da
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 25 21:55:55 2009 +0100
+
+ do not accept negative interval lengths in the page labels tree
+
+ See bug 24721
+
+ poppler/PageLabelInfo.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit b174ebd6b323c7a58a19d59c1a9e4ac4e6cba7d9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 23 21:57:42 2009 +0200
+
+ Move the iccColorSpaceCache from a static in GfxState to a member
+ of Gfx
+
+ Fixes the problem that the keys are per document but we had a static
+ that lived as much as the library. Now the cache only lives the
+ rendering
+ of a page so it's a bit slower but at least it's correct. Fixes
+ bug 24686
+
+ poppler/Gfx.cc | 49 +++++++++++++++++---------
+ poppler/Gfx.h | 13 ++++++-
+ poppler/GfxState.cc | 94
+ +++++++++++++++++++++++++--------------------------
+ poppler/GfxState.h | 33 +++++++++---------
+ poppler/Page.cc | 4 +-
+ 5 files changed, 107 insertions(+), 86 deletions(-)
+
+commit 4a9bdd30dc353865685e03eb1c1ac6093797695a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Oct 22 21:26:29 2009 +0200
+
+ initialize len at 0 when reading the font fails
+
+ See bug 24525 for more info
+
+ poppler/GfxFont.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit c839b706092583f6b12ed3cc634bf5af34b7a2bb
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Oct 20 10:09:13 2009 +0200
+
+ [glib] Fix CVE-2009-3607
+
+ glib/poppler-page.cc | 20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 44462e0ca39392e5629020226b901e4026089b46
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Oct 19 23:33:58 2009 +0200
+
+ fix memory leak
+
+ poppler/PSOutputDev.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d701aaa9eaa62567210070129f5feffe24bf1936
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 18 01:22:16 2009 +0200
+
+ This include is needed as this file uses Ref
+
+ poppler/OutputDev.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d4202536e1b62c326c301d5088fa0e176c523e85
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Oct 17 01:35:11 2009 +0200
+
+ SplashGlyphBitmap is a struct and not a class
+
+ poppler/ArthurOutputDev.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 654176dee7c9325aa5a24a2de3c070faa16e8a9c
+Author: Michael Jansen <kde@michael-jansen.biz>
+Date: Sat Oct 17 01:30:40 2009 +0200
+
+ CMake: add the possibility to pass LIB_SUFFIX.
+
+ This allows to tune the installation libdir by adding a suffix for it
+ (making it eg lib, lib32, or lib64)
+
+ CMakeLists.txt | 16 +++++++++-------
+ glib/CMakeLists.txt | 2 +-
+ poppler-cairo.pc.cmake | 2 +-
+ poppler-glib.pc.cmake | 2 +-
+ poppler-qt.pc.cmake | 2 +-
+ poppler-qt4.pc.cmake | 2 +-
+ poppler-splash.pc.cmake | 2 +-
+ poppler.pc.cmake | 2 +-
+ qt/CMakeLists.txt | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ 10 files changed, 18 insertions(+), 16 deletions(-)
+
+commit 43829ae4b25a88ace06f05fa6750e5732539f4be
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Oct 17 01:21:39 2009 +0200
+
+ put a space so MSVC won't try to see it as comment
+
+ poppler/GfxState.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f64086ea22a4e8cb3d4e7116db2a9541ac2fb19f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 17 00:48:58 2009 +0200
+
+ check the document is not locked when printing
+
+ qt4/src/poppler-ps-converter.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 85d1015480b7ab3f21cc5f78dc53d4c5efdc6e60
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 17 00:48:27 2009 +0200
+
+ fix file name comment
+
+ qt4/src/poppler-ps-converter.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 270764ad1bf2cfe95aed0b6850d2347361b4268d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 17 00:47:34 2009 +0200
+
+ Add a way for converters to return more exact errors they had when
+ converting
+
+ qt4/src/poppler-base-converter.cc | 8 +++++++-
+ qt4/src/poppler-converter-private.h | 3 ++-
+ qt4/src/poppler-pdf-converter.cc | 11 ++++++++++-
+ qt4/src/poppler-ps-converter.cc | 6 +++++-
+ qt4/src/poppler-qt4.h | 14 ++++++++++++++
+ 5 files changed, 38 insertions(+), 4 deletions(-)
+
+commit 1082e1671afd8ab91583dabc876304008acb021c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 16 23:17:22 2009 +0200
+
+ Some "security" fixes based on newly released Xpdf 3.02pl4
+
+ poppler/Stream.cc | 4 ++++
+ poppler/XRef.cc | 19 +++++++++++++++----
+ splash/Splash.cc | 7 +++++++
+ splash/SplashBitmap.cc | 37 ++++++++++++++++++++++++++++++-------
+ splash/SplashErrorCodes.h | 4 +++-
+ 5 files changed, 59 insertions(+), 12 deletions(-)
+
+commit c2458275e02f56226779b82d73c13defcbbda563
+Author: Glenn Ganz <glenn.ganz@uptime.ch>
+Date: Fri Oct 16 20:54:32 2009 +0200
+
+ fix constructor of DCTStream
+
+ poppler/Stream.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit fd91b79c053bb5cd01a766032b90981dbc5e5dd3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 10 14:53:42 2009 +0200
+
+ fix compiling with automake
+
+ goo/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c3031b4318af6f85256f2478c8678dedd0d6acd1
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Oct 9 16:17:16 2009 +0200
+
+ cmake: simplify the linking to libpng
+
+ CMakeLists.txt | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit 96688dd7a091f8fa141fad2b3d05bae04b0b86fb
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Fri Oct 9 16:09:46 2009 +0200
+
+ MSVC: add _CRT_SECURE_NO_WARNINGS to the define's
+
+ CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit f346c1f6b55f87ebd6bb0b0932462d5514aa40ff
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 9 00:29:06 2009 +0200
+
+ add -ansi flag to default warnings
+
+ cmake/modules/PopplerMacros.cmake | 2 +-
+ configure.ac | 2 +-
+ utils/parseargs.c | 30 +++++++++++++++---------------
+ utils/parseargs.h | 26 +++++++++++++-------------
+ 4 files changed, 30 insertions(+), 30 deletions(-)
+
+commit 53e0016b772f1b78d998506e2f3106011d32cef3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 9 00:15:52 2009 +0200
+
+ Add virtual destructor to ImgWriter
+
+ CMakeLists.txt | 1 +
+ goo/ImgWriter.cc | 15 +++++++++++++++
+ goo/ImgWriter.h | 2 ++
+ goo/Makefile.am | 1 +
+ 4 files changed, 19 insertions(+), 0 deletions(-)
+
+commit 699dcacced7be05b788c414c231dc2b5c07de06e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 9 00:13:11 2009 +0200
+
+ Add -Wnon-virtual-dtor flag
+
+ cmake/modules/PopplerMacros.cmake | 4 ++--
+ configure.ac | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit d1e4fca4a8602994b010fae4f4fea5cd4df9276e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 9 00:10:03 2009 +0200
+
+ build on cmake too
+
+ CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d67511c92022121066f43003f01b955962ddcd33
+Author: Stefan Thomas <thomas@eload24.com>
+Date: Fri Oct 9 00:09:23 2009 +0200
+
+ Add -jpeg to pdftoppm
+
+ goo/ImgWriter.h | 28 ++++++++++++++
+ goo/JpegWriter.cc | 92
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ goo/JpegWriter.h | 42 ++++++++++++++++++++++
+ goo/Makefile.am | 2 +
+ goo/PNGWriter.cc | 5 ++-
+ goo/PNGWriter.h | 10 +++--
+ splash/SplashBitmap.cc | 46 +++++++++++++++++-------
+ splash/SplashBitmap.h | 5 ++-
+ splash/SplashTypes.h | 11 ++++++
+ utils/pdftoppm.1 | 3 ++
+ utils/pdftoppm.cc | 22 +++++++++---
+ 11 files changed, 239 insertions(+), 27 deletions(-)
+
+commit 388196df1fb05fb2d88ae82bd81e823a23588ec1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Oct 7 17:11:58 2009 +0200
+
+ [glib-demo] Show some of the annot flags in annots treeview
+
+ glib/demo/annots.c | 35 +++++++++++++++++++++++++++++++++--
+ 1 files changed, 33 insertions(+), 2 deletions(-)
+
+commit 034907c6582c1f50782ec9c58a29b140c6fc0688
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Oct 6 00:52:10 2009 +0200
+
+ Forgot to update the year here
+
+ qt4/src/poppler-private.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fef89acebf5312324c104fb52e629563fbc2de76
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Oct 6 00:42:52 2009 +0200
+
+ Add the possibility of enabling hinting
+
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-private.h | 1 +
+ qt4/src/poppler-qt4.h | 3 ++-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 485252844b5e0964ee724b74e2a7ba2b820b259e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Oct 6 00:41:57 2009 +0200
+
+ rework how hinting is used in the splash backend
+
+ Basically we default to no hinting now with the possibility to
+ enable it
+
+ poppler/ArthurOutputDev.cc | 2 +-
+ poppler/GlobalParams.cc | 19 ------------
+ poppler/GlobalParams.h | 3 --
+ poppler/SplashOutputDev.cc | 8 ++++-
+ poppler/SplashOutputDev.h | 3 ++
+ splash/SplashFTFont.cc | 64
+ +++++++++--------------------------------
+ splash/SplashFTFont.h | 4 +-
+ splash/SplashFTFontEngine.cc | 8 ++--
+ splash/SplashFTFontEngine.h | 7 ++--
+ splash/SplashFontEngine.cc | 5 ++-
+ splash/SplashFontEngine.h | 3 +-
+ 11 files changed, 40 insertions(+), 86 deletions(-)
+
+commit 8194c156cf2167834779e1690a89b5068baf8d58
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Oct 5 00:55:55 2009 +0200
+
+ Fix includes for those using internal headers
+
+ goo/FixedPoint.h | 2 +-
+ goo/gmem.h | 2 +-
+ poppler/OutputDev.h | 2 +-
+ poppler/PSOutputDev.h | 2 +-
+ poppler/PageLabelInfo.h | 2 +-
+ utils/ImageOutputDev.h | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 091f68ccd59413d6890dfbfcf8911f112e690b50
+Author: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Mon Oct 5 00:39:36 2009 +0200
+
+ Use _WIN32 instead of WIN32
+
+ More info at http://bugs.freedesktop.org/show_bug.cgi?id=24259
+
+ goo/GooMutex.h | 16 +++++++++++++++-
+ goo/gfile.cc | 33 +++++++++++++++++----------------
+ goo/gfile.h | 5 +++--
+ msvc/poppler/poppler-config.h | 2 +-
+ poppler-config.h.cmake | 2 +-
+ poppler/ABWOutputDev.h | 3 ++-
+ poppler/FileSpec.cc | 7 ++++---
+ poppler/GlobalParams.cc | 37
+ +++++++++++++++++++------------------
+ poppler/GlobalParams.h | 4 ++--
+ poppler/Link.cc | 3 ++-
+ poppler/PDFDoc.cc | 4 ++--
+ poppler/PDFDoc.h | 3 ++-
+ poppler/PSOutputDev.cc | 5 +++--
+ poppler/TextOutputDev.cc | 5 +++--
+ poppler/XpdfPluginAPI.cc | 13 ++++++++++++-
+ poppler/poppler-config.h.in | 2 +-
+ splash/SplashFontEngine.cc | 9 +++++----
+ test/perf-test.cc | 24 ++++++++++++------------
+ utils/HtmlOutputDev.h | 3 ++-
+ 19 files changed, 108 insertions(+), 72 deletions(-)
+
+commit 7fd8bdfa450db4e323e4e5d12159359fbc47f9ed
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Oct 5 00:21:15 2009 +0200
+
+ Remove spurious ;
+
+ Found by -Wextra i think we should add more warnings to our default
+ flags
+
+ qt4/src/poppler-annotation.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d46f7343e446331489d3fe6711a7cf778e0bd902
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 2 22:04:46 2009 +0200
+
+ Strings can have 0 inside so use the length
+
+ Fixes saving some files
+
+ poppler/PDFDoc.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2bc2040081919340415f576ce8266356deadbfcd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 2 22:04:03 2009 +0200
+
+ Increase decimals from 5 to 10, a double has that precision
+
+ Makes saving more faithful for some files
+
+ poppler/PDFDoc.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 05eb7342d5234732f27c9c67b7fc1f9e40a4e075
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 2 22:03:40 2009 +0200
+
+ If the stream was wrongly formed save the correct length
+
+ Fixes saving of some files
+
+ poppler/PDFDoc.cc | 12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+commit b98faa4c162392d9416a5a93c9042b41f82d8657
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 2 22:02:13 2009 +0200
+
+ Return the save status as program status
+
+ test/pdf-fullrewrite.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit f73f59f2c7bb7c7d57eb70cdc1bc30b80a92d0b7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 2 22:01:45 2009 +0200
+
+ If the Length entry of the stream is wrong, fix it
+
+ Fixes saving some files
+
+ poppler/Parser.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 91135c7e788bc32e414e1a9c9ab43b326a07e970
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 2 22:00:12 2009 +0200
+
+ increase the range of characters we sanitize
+
+ Fixes saving of some files
+
+ goo/GooString.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 9dcb3e8be2cd52a795605548e43d6bfc149b2ea5
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Sun Sep 27 17:17:32 2009 +0200
+
+ Fix the linking not to use the .so directly but the lib
+
+ Fixes check on cygwin
+
+ m4/qt.m4 | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ed4a6f1cfc7ccd2717d939841c092347c3307547
+Author: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Sat Sep 26 19:26:19 2009 +0200
+
+ Do not crash when saving files that come from a stream without name
+
+ Bug 24090
+
+ poppler/PDFDoc.cc | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 04b232d48930af9bc614d7fef47f79ce247713a4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 26 18:30:41 2009 +0200
+
+ Write the Info into the trailer dict if there is one
+
+ Bug 24091
+
+ poppler/PDFDoc.cc | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 343e4f9aceb935eb393ad94bbef4dbb1b1a450ee
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 26 18:28:40 2009 +0200
+
+ Plug leak
+
+ test/pdf-fullrewrite.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 2ea0032283c4717f1bb285fab7956fc38f375e87
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Sat Sep 26 15:01:35 2009 +0200
+
+ Patch to make poppler work on Cygwin
+
+ Bug 4195
+
+ configure.ac | 3 +++
+ qt/Makefile.am | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 074dc5e5e39cebc1fbe9bf6a15b2cae2391006c1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 26 14:56:38 2009 +0200
+
+ Improve realibility for Streams with broken Length
+
+ Fixes bug 6841
+
+ poppler/Parser.cc | 17 +++++++++++++----
+ 1 files changed, 13 insertions(+), 4 deletions(-)
+
+commit b7702820245fb6cdbf77afba37c53c03d4362a25
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 21 21:58:26 2009 +0200
+
+ Print with a . and not with a , in all locales
+
+ This is a regression after the removal of setting LC_NUMERIC
+
+ poppler/PDFDoc.cc | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit d31080d8195694cef740d4e77484179bb38d1f26
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 20 17:21:13 2009 +0200
+
+ CharCodeToUnicode is not mandatory in fonts, don't crash one fonts
+ that do not have it
+
+ Fixes bug #24036
+
+ poppler/Annot.cc | 33 ++++++++++++++++++++-------------
+ 1 files changed, 20 insertions(+), 13 deletions(-)
+
+commit a729d005a7204791fa8415de5aa0834136073ce8
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Sep 17 20:12:20 2009 +0200
+
+ Windows32/MSVC: initialize the font list once per GlobalParams,
+ instead of once at all
+
+ this fixes the font list being empty at the second (and following)
+ GlobalParams creation
+ thanks for Christian Ehrlicher for reporting the bug and testing
+ its fix
+
+ poppler/GlobalParams.cc | 1 +
+ poppler/GlobalParams.h | 1 +
+ poppler/GlobalParamsWin.cc | 1 -
+ 3 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 68711d8494e2765c4a24ea59ce8d904981f0f917
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 9 23:24:22 2009 +0200
+
+ uint -> Guint
+
+ some compilers don't know about uint
+
+ poppler/Gfx.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 943a13c9354dec18cb023642aebbe5d3bb920ed7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 9 20:04:06 2009 +0200
+
+ poppler 0.12.0
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 18 ++++++++++++++++++
+ configure.ac | 4 ++--
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 26 insertions(+), 8 deletions(-)
+
+commit e8ed7210346cb18f6e4588ad557f993c6d42f4a3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 9 19:21:21 2009 +0200
+
+ increase library to 3.2.0
+
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e950107006a3b1889646d3705323c1b3d41eaa49
+Author: David Benjamin <davidben@mit.edu>
+Date: Wed Sep 9 01:19:38 2009 +0200
+
+ Fix infinite loop in JBIG2Decoder
+
+ Bug 23025
+ Also fixes problems in bug-poppler6881-2.pdf and bug-poppler6500.pdf
+
+ poppler/JBIG2Stream.cc | 13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+commit 1cb25a4adaaf3e2da50724312a3db6928991f425
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Sep 6 10:45:56 2009 +0200
+
+ [glib] Ignore attachments with an invalid embedded file
+
+ Fixes bug #10386
+
+ glib/poppler-document.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 842e00f3114666609ef4dec6fa613d46f330a40c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 5 15:20:35 2009 +0200
+
+ Add EmbeddedFile::isValid
+
+ Also do not crash if data() is called on an invalid file
+
+ qt4/src/poppler-embeddedfile.cc | 10 +++++++++-
+ qt4/src/poppler-qt4.h | 9 ++++++++-
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+commit 9d40b268f5a9a9a0fb79da0e1627dd8eebc4db6a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 5 15:19:27 2009 +0200
+
+ Add EmbFile::isOk
+
+ At the moment returns false if the object stream is not really
+ a stream
+
+ poppler/Catalog.h | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 642650b6f70425c8fff2df978ae71249a5ae07f3
+Author: David Benjamin <davidben@mit.edu>
+Date: Sat Sep 5 01:12:49 2009 +0200
+
+ Better fallback when there's a type mismatch
+
+ Bug #17252
+
+ poppler/GfxFont.cc | 38 ++++++++++++++++++++++++++++++++------
+ 1 files changed, 32 insertions(+), 6 deletions(-)
+
+commit bf5811f5331292ccf30f1b0f089fe43d351d96be
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Aug 26 00:43:46 2009 +0200
+
+ Improve shading color rendering
+
+ Shading is not necessarily lineal so require another bisection to
+ assume all the area in between have the same color. Fixes bug #20238
+
+ poppler/Gfx.cc | 17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+commit e94430b790fde6ce7b7cb163c2e0adf2d071c81d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Aug 26 00:42:49 2009 +0200
+
+ Make code a bit more readable
+
+ poppler/Gfx.cc | 23 +++++++++++------------
+ 1 files changed, 11 insertions(+), 12 deletions(-)
+
+commit 465212780557705fd939dfe54f96913505bfc96e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 25 21:55:45 2009 +0200
+
+ forgot to update my copyright
+
+ poppler/JPEG2000Stream.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4f6016d01ced32002bef22b9b5d5426a74e55842
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 25 21:10:07 2009 +0200
+
+ Fix format security warnings
+
+ Don't just directly print strings of unknown content; use "%s".
+
+ poppler/JPEG2000Stream.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 4616b23382b5d155f8b2f1942733037cf5730844
+Author: Christian Persch <chpe@gnome.org>
+Date: Tue Aug 25 21:09:40 2009 +0200
+
+ Fix format security warnings
+
+ Don't just directly print strings of unknown content; use "%s".
+
+ poppler/GfxState.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 6c5c8d008456d1e4f3d60bc182209747c2a175dc
+Author: Christian Persch <chpe@gnome.org>
+Date: Tue Aug 25 21:03:16 2009 +0200
+
+ Support AM_SILENT_RULES
+
+ When using automake 1.11, should support silent build rules.
+
+ Makefile.am | 2 +-
+ configure.ac | 1 +
+ glib/Makefile.am | 4 ++--
+ qt4/demos/Makefile.am | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ qt4/tests/Makefile.am | 2 +-
+ 6 files changed, 7 insertions(+), 6 deletions(-)
+
+commit e7dd1c47b01d8f31599ee686eafbe7c54d7c023a
+Author: Christian Persch <chpe@gnome.org>
+Date: Tue Aug 25 21:01:13 2009 +0200
+
+ Fix automake check, and add automake 1.11 support
+
+ Fix the automake checks to take the *newest* version available,
+ not the
+ oldest one. Add support for automake 1.11. FDO#23473.
+
+ autogen.sh | 13 +++++++------
+ 1 files changed, 7 insertions(+), 6 deletions(-)
+
+commit 493d2c5aa78a3241e70108c5d7eccba9ac72f834
+Author: Rex Dieter <rdieter@math.unl.edu>
+Date: Mon Aug 24 20:08:46 2009 +0200
+
+ Use Requires.private if available
+
+ The following patch minimizes pkg-config deps similar to how the
+ glib-related pkg-config deps are done.
+
+ poppler-qt.pc.cmake | 3 ++-
+ poppler-qt.pc.in | 3 ++-
+ poppler-qt4.pc.cmake | 3 ++-
+ poppler-qt4.pc.in | 3 ++-
+ 4 files changed, 8 insertions(+), 4 deletions(-)
+
+commit 341cd3ecd08a39cd146c1c57f356b50a2881c03f
+Author: Jakub Wilk <ubanus@users.sf.net>
+Date: Mon Aug 24 19:51:34 2009 +0200
+
+ common options for pdftoabw
+
+ The attached patch fixes command line handling for pdftoabw and
+ implements some
+ common options (e.g., --help) that are already found in other
+ pdftosomething
+ utilities.
+
+ utils/pdftoabw.cc | 39 ++++++++++++++++++++++++++++++++-------
+ 1 files changed, 32 insertions(+), 7 deletions(-)
+
+commit 365683d5faea6e0a7570b139d1f3366c22271f8e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 18 21:18:13 2009 +0200
+
+ 0.11.3
+
+ CMakeLists.txt | 2 +-
+ NEWS | 22 ++++++++++++++++++++++
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 28 insertions(+), 6 deletions(-)
+
+commit cb28bc8a637d300664b3c7569263445275333878
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Aug 17 14:14:03 2009 +0200
+
+ [glib] Add FORMAT_MAJOR/MINOR properties to get the PDF version
+
+ See bug #23076.
+
+ glib/poppler-document.cc | 26 ++++++++++++++++++++++++++
+ 1 files changed, 26 insertions(+), 0 deletions(-)
+
+commit 1b5612841b0c663f6d391d4581f65f68a2975db0
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Aug 17 01:04:04 2009 +0200
+
+ [Qt] add Document::getPdfVersion(int *major, int *minor) for the
+ document PDF version numbers
+
+ This new function reads the version of the PDF specification of the
+ document, putting major and minor numbers in own variables.
+
+ qt/poppler-document.cc | 8 ++++++++
+ qt/poppler-qt.h | 12 ++++++++++++
+ 2 files changed, 20 insertions(+), 0 deletions(-)
+
+commit aef8ecda1e80b921228f415a53c9c5a52df87d94
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Aug 17 00:57:08 2009 +0200
+
+ [Qt4] deprecate Document::pdfVersion()
+
+ ... in favour of getPdfVersion()
+
+ qt4/src/poppler-qt4.h | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 830140f70e48e8033ad4411b6bd405d5ad7358a3
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Aug 17 00:51:13 2009 +0200
+
+ [Qt4] add Document::getPdfVersion(int *major, int *minor) for the
+ document PDF version numbers
+
+ This new function reads the version of the PDF specification of the
+ document, putting major and minor numbers in own variables.
+ Add them to the relative unit test.
+
+ qt4/src/poppler-document.cc | 8 ++++++++
+ qt4/src/poppler-qt4.h | 13 +++++++++++++
+ qt4/tests/check_metadata.cpp | 4 ++++
+ 3 files changed, 25 insertions(+), 0 deletions(-)
+
+commit 5491d16dfbd73f0256c62e49d02622dc3185012e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 17 00:24:41 2009 +0200
+
+ Move poppler core away from using a double as PDF file version
+
+ Frontends are yet to come
+
+ glib/poppler-document.cc | 2 +-
+ poppler/PDFDoc.cc | 7 ++++---
+ poppler/PDFDoc.h | 8 +++++---
+ qt/poppler-document.cc | 4 ++--
+ qt4/src/poppler-document.cc | 4 ++--
+ utils/pdfinfo.cc | 4 ++--
+ 6 files changed, 16 insertions(+), 13 deletions(-)
+
+commit efd5dd63a5b08249529d9a9f5906aefe806fb3aa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 17 00:21:22 2009 +0200
+
+ Forgot to update copyright info
+
+ fofi/FoFiType1C.cc | 14 ++++++++++++++
+ poppler/PDFDoc.cc | 2 +-
+ utils/parseargs.c | 2 +-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+commit 25ff4be0b4521cc3d2de386cdeb589beb245d435
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 17 00:15:10 2009 +0200
+
+ No need to change the locale since we use gatof that does the
+ right thing
+
+ poppler/PDFDoc.cc | 6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+commit a6f698b4edc42c0414dd4690e1e037088321db2c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 17 00:14:35 2009 +0200
+
+ Use gatof instead of atof
+
+ fofi/FoFiType1C.cc | 3 ++-
+ poppler/Annot.cc | 5 +++--
+ poppler/Function.cc | 3 ++-
+ poppler/PDFDoc.cc | 3 ++-
+ utils/parseargs.c | 4 +++-
+ 5 files changed, 12 insertions(+), 6 deletions(-)
+
+commit 807b121cae45832d2e5832bad19c31e77420bfec
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 17 00:10:30 2009 +0200
+
+ Add a custom strtod that comes from libspectre
+
+ Works over C locale integers without changing locale settings
+
+ CMakeLists.txt | 2 +
+ goo/Makefile.am | 6 ++-
+ goo/gstrtod.cc | 147
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ goo/gstrtod.h | 43 ++++++++++++++++
+ 4 files changed, 196 insertions(+), 2 deletions(-)
+
+commit 914bf7677a14494b69857b1d8070092a9999fe79
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 16 20:50:02 2009 +0200
+
+ When writing the cm matrix write 4 significant digits not 4 decimals
+
+ This fixes bug 23332
+ Maybe we want to make this the default behaviour of 'g' instead of
+ a new 'gs' case, but i prefer to be on the safe side for the moment
+
+ goo/GooString.cc | 27 +++++++++++++++++++++++++--
+ goo/GooString.h | 4 +++-
+ poppler/PSOutputDev.cc | 4 ++--
+ 3 files changed, 30 insertions(+), 5 deletions(-)
+
+commit b7dfca1aa52b825eb3b8f1cc0470398c31615b30
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Aug 16 19:28:37 2009 +0200
+
+ [cairo] CairoImageOutputDev doesn't implement patterns
+
+ poppler/CairoOutputDev.h | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit d20d65111aee2ee4b8cdea2962ed1bb149122ba9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Aug 16 17:36:14 2009 +0200
+
+ [cairo] Implement tiling patterns in cairo backend
+
+ Fixes bug #13518 for the cairo backend.
+
+ poppler/CairoOutputDev.cc | 56
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 10 ++++++++
+ 2 files changed, 66 insertions(+), 0 deletions(-)
+
+commit e965d0686d979c775b64a93f8e2f775f81885417
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Aug 13 14:48:10 2009 +0200
+
+ Change OutputDev::tilingPatternFill to return a GBool
+
+ It allows outputdevs to decide whether render the pattern or not
+ depending
+ on the parameters, like shaded patterns currently do.
+
+ poppler/Gfx.cc | 37 +++++++++++++++++++------------------
+ poppler/OutputDev.h | 11 ++++++-----
+ poppler/PSOutputDev.cc | 12 +++++++-----
+ poppler/PSOutputDev.h | 10 +++++-----
+ 4 files changed, 37 insertions(+), 33 deletions(-)
+
+commit ce70ef7d6afc800e24031dae43da301e9e542f0e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 15 17:45:57 2009 +0200
+
+ Fix backwards search
+
+ qt4/src/poppler-page.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5b7b1cdc5c3b8652d3ae583b4d7b8b6de625adc2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 15 17:45:05 2009 +0200
+
+ Add an autotest showing previousresult fails
+
+ qt4/tests/check_search.cpp | 51
+ ++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 51 insertions(+), 0 deletions(-)
+
+commit 2484b0dcb8eb62f8e2c147498c58871ec04630b5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 14 11:47:11 2009 +0200
+
+ Implement the alpha path
+
+ I wonder if this is the correct fix why it was not implemented
+ but if fixes rendering of files in KDE bug 145868, KDE bug 193657,
+ poppler bug 17473.pdf, poppler bug 21651, poppler bug 22143 and
+ poppler bug 22152 and causes no regression in all the other files
+ i have in my test dir so i'm commiting it
+
+ poppler/SplashOutputDev.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 03970d8b6d7624444664320470baa6d1b1299622
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Aug 11 12:01:07 2009 +0200
+
+ [build] Fix build with autotools
+
+ utils/Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 15752b7cd5c94620e3ad3b6afd9c70ccc754c9b3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Aug 10 20:02:13 2009 +0200
+
+ [cairo] Add empty updateBlendMode to CairoImageOutputDev
+
+ Fixes a crash when using CairoImageOutputDev with a document with
+ blend
+ modes.
+
+ poppler/CairoOutputDev.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 45dae4e66b2b833f95656850b5f1b0ffd1d96f1d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Aug 10 20:00:04 2009 +0200
+
+ [cairo] Use current fill_opacity when drawing images
+
+ Fixes launchpad bug #342282 (page 2 of the attached document)
+
+ poppler/CairoOutputDev.cc | 16 +++++++++++++---
+ 1 files changed, 13 insertions(+), 3 deletions(-)
+
+commit b1cd54546844f2f7cd6bf7cc14b7584c84c3fc14
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Aug 10 19:55:44 2009 +0200
+
+ [cairo] Do not save the font file twice for FreeType fonts
+
+ Fixes bug #20491.
+
+ poppler/CairoFontEngine.cc | 19 ++-----------------
+ 1 files changed, 2 insertions(+), 17 deletions(-)
+
+commit 4181a0ff11195eb7a56d76be23994b843e20b483
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 10 19:58:09 2009 +0200
+
+ this branch is unlikely to happen
+
+ poppler/Lexer.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2a3025f32951ce7b7343aeef111902615d71595e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 10 19:55:40 2009 +0200
+
+ fix overflow calculation not to depend on the variable overflowing
+
+ poppler/Lexer.cc | 12 ++++++++----
+ 1 files changed, 8 insertions(+), 4 deletions(-)
+
+commit a38001f724f78231c2fdadd28e647a35b41bab74
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 9 23:26:02 2009 +0200
+
+ Check for overflow when parsing integers
+
+ Fixes bug 23078
+
+ poppler/Lexer.cc | 28 ++++++++++++++++++++++------
+ 1 files changed, 22 insertions(+), 6 deletions(-)
+
+commit 4c4c0e44452d07bea88d98b7df0c01fadd7693cc
+Author: Jakub Wilk <ubanus@users.sf.net>
+Date: Sat Aug 8 17:26:14 2009 +0200
+
+ Silence some warnings when using internal headers and not compiling
+ with -Wno-write-strings
+
+ People should not be using internal headers but it's just two lines
+
+ poppler/Object.h | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit e2c319ba18ab473fd969db9519a9231be67538c3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 8 00:48:18 2009 +0200
+
+ Also implement mono so that -mono in pdftoppm -png works
+
+ Totally not optimized
+
+ splash/SplashBitmap.cc | 23 ++++++++++++++++++++++-
+ 1 files changed, 22 insertions(+), 1 deletions(-)
+
+commit c669e7f3ca421265e78161cc3fdecd2a0c7510c9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 8 00:38:50 2009 +0200
+
+ Support splashModeMono8 in writePNGFile
+
+ Works though is non optimal
+
+ splash/SplashBitmap.cc | 55
+ ++++++++++++++++++++++++++++++++++--------------
+ 1 files changed, 39 insertions(+), 16 deletions(-)
+
+commit 92744b72df9084fd2d69ba78406898378884aed8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 8 00:20:52 2009 +0200
+
+ Add the -png flag to pdftoppm to output to PNG
+
+ Based on a patch by Shen Liang <shenzhuxi@gmail.com>
+ Also factored common PNG code from HtmlOutputDev to PNGWriter
+
+ CMakeLists.txt | 5 ++
+ goo/Makefile.am | 9 +++-
+ goo/PNGWriter.cc | 110
+ +++++++++++++++++++++++++++++++++++++++++++++
+ goo/PNGWriter.h | 43 +++++++++++++++++
+ poppler/Makefile.am | 8 +++
+ splash/SplashBitmap.cc | 70 ++++++++++++++++++++++++++++
+ splash/SplashBitmap.h | 5 ++
+ splash/SplashErrorCodes.h | 4 +-
+ utils/CMakeLists.txt | 4 --
+ utils/HtmlOutputDev.cc | 66 +++++----------------------
+ utils/Makefile.am | 4 --
+ utils/pdftoppm.1 | 3 +
+ utils/pdftoppm.cc | 21 +++++++--
+ 13 files changed, 283 insertions(+), 69 deletions(-)
+
+commit e4439ff527bb202d0239f78e647452983b733411
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Aug 7 15:23:57 2009 +0200
+
+ [cairo] Don't apply masks when fill color space mode is csPattern
+
+ In that case the mask is used for clipping when drawing images. Fixes
+ bug #22216.
+
+ poppler/CairoOutputDev.cc | 59
+ +++++++++++++++++++++++++++++----------------
+ 1 files changed, 38 insertions(+), 21 deletions(-)
+
+commit 7194f59a18e4f6997ae560af3db1bd101d6f726e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Aug 6 11:24:22 2009 +0100
+
+ [cairo] Use FT_New_Memory_Face() for mmapped fonts
+
+ If we hold a mapping for the font, then we can pass that memory to
+ FreeType for it to use as well. This saves on FreeType having to
+ read the
+ file into a fresh block of memory.
+
+ poppler/CairoFontEngine.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 7e2bbcf6f85111d1006b0d5bc1503cadaba83c9f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 4 00:10:58 2009 +0200
+
+ Set KDAB via gamaral copyright
+
+ poppler/Form.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit ed5918e16dafebc9ecf6db8ce0186f407ecbf7d5
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 1 20:00:22 2009 +0200
+
+ [Qt4 apidox] make example for FontIterator... not leak ;)
+
+ qt4/src/poppler-qt4.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit f3b36d9c992491e614e88dbf1a84b5433a7647f4
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 1 19:54:52 2009 +0200
+
+ [Qt4] Add color management API.
+
+ Add few wrapper functions to get/set color profiles.
+ Add a function to know whether the color management functions actually
+ do anything (ie support compiled or not).
+ Add few basic API docs for the new functions.
+ Based on an initial patch by Hal V. Engel <hvengel@astound.net>,
+ heavily reindented, polished and massaged in its API by me.
+
+ qt4/src/poppler-document.cc | 52
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 50
+ +++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 102 insertions(+), 0 deletions(-)
+
+commit 78a1969d040018c0c2bb74c94f5507f786e4666e
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 1 18:00:06 2009 +0200
+
+ [Qt] add unhandled cases and remove unused code
+
+ qt/poppler-page.cc | 12 ++----------
+ 1 files changed, 2 insertions(+), 10 deletions(-)
+
+commit bddebec0712e92e13b57d3d05d652673fe737866
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 1 17:12:22 2009 +0200
+
+ 0.11.2
+
+ CMakeLists.txt | 2 +-
+ NEWS | 30 ++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 36 insertions(+), 6 deletions(-)
+
+commit 87e2af3454348f5568d155c15af5d85268e47f1b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Aug 1 15:48:02 2009 +0200
+
+ [glib-demo] Add cast to make sure the comparison is always valid
+
+ glib/demo/attachments.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 464e95ef451103daddc9a30cd26b986291f02176
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Aug 1 15:47:25 2009 +0200
+
+ [glib-demo] Add missing return
+
+ glib/demo/attachments.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 7f48369e4d29b2a71abffa9e1966e3a2252de895
+Author: Guillermo Antonio Amaral Bastidas <gamaral@amaral.com.mx>
+Date: Sat Aug 1 15:41:34 2009 +0200
+
+ Call fillChildrenSiblingsID in fillChildrenSiblingsID instaed of
+ loadChildrenDefaults
+
+ poppler/Form.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e21a3e40bf6f4365064cea751ae186580d8f81f5
+Author: William Bader <williambader@hotmail.com>
+Date: Sat Aug 1 15:23:03 2009 +0200
+
+ Add the possibility of disabling font substitution in pdftops
+
+ Bug #23030
+
+ poppler/GlobalParams.cc | 17 +++++++++++++
+ poppler/GlobalParams.h | 4 +++
+ poppler/PSOutputDev.cc | 59
+ ++++++++++++++++++++++++++--------------------
+ poppler/PSOutputDev.h | 2 +
+ utils/pdftops.1 | 8 +++++-
+ utils/pdftops.cc | 7 +++++
+ 6 files changed, 70 insertions(+), 27 deletions(-)
+
+commit bd68c90338cbf16f468e5db59722610300a629e1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 1 15:19:48 2009 +0200
+
+ Forgot to add my copyright
+
+ poppler/GfxState.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 173451730948c320f16a0f5924a58302603eca0b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 1 15:13:35 2009 +0200
+
+ Try to workaround some incorrect PDF
+
+ Fixes rendering of PDF where forms/patterns have more q than Q. Fixes
+ rendering in splash of pdf in bugs #22835, #21899 and #16402
+
+ poppler/Gfx.cc | 13 +++++++++++++
+ poppler/GfxState.h | 1 +
+ 2 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 35c408ca49be08144bcf14aa112505fd556725d2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 31 23:27:02 2009 +0200
+
+ add the overloaded virtual warning also the autotools based build
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1c32bd2d101e5dfb37e28276ecad699f121b27b7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 31 23:22:25 2009 +0200
+
+ Add my copyright to files i just edited
+
+ poppler/OutputDev.cc | 1 +
+ poppler/OutputDev.h | 1 +
+ utils/HtmlOutputDev.h | 2 +-
+ 3 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 10717a48c85f1dbeff1c6bcd094006a9ecc92efc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 31 23:22:10 2009 +0200
+
+ Add -Woverloaded-virtual as default CXX flag
+
+ cmake/modules/PopplerMacros.cmake | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit db5f736655f01575ac5d7c524cbf131924ae91fa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 31 23:12:00 2009 +0200
+
+ rename the function
+
+ That way the name is different from the OutputDev function and does
+ not seem like a wrong overload
+
+ utils/HtmlOutputDev.cc | 4 ++--
+ utils/HtmlOutputDev.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 4be87f87509b93c4fe4025f9bd788e9412416663
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 31 23:11:32 2009 +0200
+
+ Remove Outputdev::beginMarkedContent as noone uses it
+
+ poppler/Gfx.cc | 2 --
+ poppler/OutputDev.cc | 3 ---
+ poppler/OutputDev.h | 1 -
+ 3 files changed, 0 insertions(+), 6 deletions(-)
+
+commit 6ab2ec8a89519d2bd1576c8d62f8aec51b04479a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 31 23:10:56 2009 +0200
+
+ Warning--
+
+ poppler/PSOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 53c3d636ad645a350b576160e1498726238a7bd1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 31 18:23:57 2009 +0200
+
+ [cairo] Implement radialShadedFill in cairo backend using cairo
+ gradients
+
+ Fixes bugs #10942, #14160
+
+ poppler/CairoOutputDev.cc | 28 +++++++++
+ poppler/CairoOutputDev.h | 2 +
+ poppler/Gfx.cc | 141
+ +++++++++++++++++++++++++++------------------
+ poppler/OutputDev.h | 2 +-
+ poppler/PSOutputDev.cc | 3 +-
+ poppler/PSOutputDev.h | 2 +-
+ 6 files changed, 117 insertions(+), 61 deletions(-)
+
+commit 2ba937545d1a2b9fa798f04fee755ccdf0e74ec7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 31 17:49:18 2009 +0200
+
+ [cairo] Use cairo_pattern_set_extend for linear gradients
+
+ poppler/CairoOutputDev.cc | 9 +++++++++
+ poppler/CairoOutputDev.h | 1 +
+ poppler/Gfx.cc | 34 ++++++++++++++++++++++++++++------
+ poppler/OutputDev.h | 4 ++++
+ 4 files changed, 42 insertions(+), 6 deletions(-)
+
+commit b054756113f0df6b59935823882f412486e96db5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jun 17 11:10:15 2009 +0200
+
+ [cairo] Implement blend mdoes in cairo backend
+
+ It requires cairo from git master to work at the moment. Fixes bugs
+ #22384, #12979, #13603, #17919, #22255
+
+ configure.ac | 27 ++++++++++++++++++++
+ poppler/CairoOutputDev.cc | 59
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 1 +
+ 3 files changed, 87 insertions(+), 0 deletions(-)
+
+commit bf8964726c9311e7e82b1faf49cc2272e5c1e339
+Author: William Bader <williambader@hotmail.com>
+Date: Thu Jul 30 22:08:43 2009 +0200
+
+ Fix some double to int warnings by explicit casting
+
+ poppler/Gfx.cc | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit fdbd0c548e963461b2bc4bdf1beaa1577cafcea7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 30 21:05:18 2009 +0200
+
+ Update gtk-doc build files
+
+ gtk-doc.make | 102
+ ++++++++++++++++++++++++++++++++++++++------------------
+ m4/gtk-doc.m4 | 74 +++++++++++++++++++++++------------------
+ 2 files changed, 110 insertions(+), 66 deletions(-)
+
+commit ae84dce5cea4d249526a6ed5b2feb2d3f241da1b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 30 20:45:39 2009 +0200
+
+ Revert "Remove unneeded files from repo"
+
+ This reverts commit 4cc9dee35e03d7b295a476f937ec0f2c43bb6592.
+
+ See bug #22697.
+
+ configure.ac | 2 +-
+ glib/reference/Makefile.am | 4 +-
+ gtk-doc.make | 155
+ ++++++++++++++++++++++++++++++++++++++++++++
+ m4/gtk-doc.m4 | 53 +++++++++++++++
+ 4 files changed, 211 insertions(+), 3 deletions(-)
+
+commit 7e14516a78b16453c747eb92b08665632e5f6844
+Author: Sanjoy Mahajan <sanjoy@mit.edu>
+Date: Mon Jul 27 23:20:50 2009 +0200
+
+ Fix displayPages call
+
+ Parameters are outputdev, first, last, dpi, dpi, rotate, usemediabox,
+ crop, printing
+ and we were doing
+ usemediabox = !noCrop
+ crop = gFasle
+ the correct is
+ usemediabox = noCrop
+ crop = !noCrop
+
+ utils/pdftops.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 3d53a0eb14420d54c0ebf8590e34c018b8da105d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jul 19 16:02:33 2009 +0200
+
+ Copy byte_lookup in copy constructor
+
+ poppler/GfxState.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 8f7271acf17c46e663cd48d90c382b04a834fba2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jul 19 15:53:49 2009 +0200
+
+ Don't use byte_lookup table when color space doesn't support getLine
+ methods
+
+ For color spaces that don't implement getRGBLine or getGrayLine
+ methods,
+ getRGB or getGray are called for every pixel, however we were
+ allocating
+ the byte_lookup table and converting colors in those cases
+ too. Instead
+ of falling back to generic methods in the base class, the new methods
+ useGetRGBLine and useGetGrayLine have been added to he base class,
+ so that
+ when they are not suopported in the current color space byte_lookup
+ table is
+ not used at all.
+
+ Fixes bug #11027.
+
+ poppler/GfxState.cc | 125
+ ++++++++++++++++++++++++++++++---------------------
+ poppler/GfxState.h | 21 +++++++-
+ 2 files changed, 91 insertions(+), 55 deletions(-)
+
+commit 1bc737796bef1c65289a101b2d4c367267b9c974
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jul 19 15:51:43 2009 +0200
+
+ Remove unused variable
+
+ poppler/GfxState.h | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 512b2c654fd80c83b82e7adc828a478a18de17ab
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jul 26 19:35:06 2009 +0200
+
+ [cairo] Use CAIRO_EXTEND_PAD in drawImageMaskPrescaled too
+
+ poppler/CairoOutputDev.cc | 32 +++++++++++++++-----------------
+ 1 files changed, 15 insertions(+), 17 deletions(-)
+
+commit ad26e34bede53cb6300bc463cbdcc2b5adf101c2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jul 26 18:36:06 2009 +0200
+
+ [cairo] Use rectangle + clip instead of invert + tranform
+
+ This is just for consistency of drawImage methods
+
+ poppler/CairoOutputDev.cc | 30 ++++++++++++++----------------
+ 1 files changed, 14 insertions(+), 16 deletions(-)
+
+commit ee6b761a55baef4c3bbe4614b0c3b3d761a3111f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jul 26 16:19:15 2009 +0200
+
+ [cairo] Apply a clip for masked drawImage
+
+ In order to use EXTEND_PAD with a mask, we need to apply a clip (to
+ constrain the image to the appropriate region). The complicating
+ factor for
+ drawSoftImage() is that mask size is independent of the image size,
+ so we
+ need to compute the intersection of the mask with in the image
+ in userspace.
+
+ poppler/CairoOutputDev.cc | 21 ++++++++++++++-------
+ 1 files changed, 14 insertions(+), 7 deletions(-)
+
+commit 499c6c972bac14936b5370276da723a6e98861b3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jul 26 11:30:08 2009 +0200
+
+ [cairo] Use CAIRO_EXTEND_PAD when drawing images
+
+ poppler/CairoOutputDev.cc | 306
+ +++++++++++++++++++++------------------------
+ 1 files changed, 140 insertions(+), 166 deletions(-)
+
+commit f91eb7d01cef0897727c63267db309bc92297d37
+Author: Koji Otani <sho@bbr.jp>
+Date: Sat Jul 25 16:34:12 2009 +0200
+
+ Fix generation of ps for some files
+
+ For example fixes second pdf in bug 18908
+
+ poppler/PSOutputDev.cc | 68
+ ++++++++++++++++++++++++++++++++++++------------
+ 1 files changed, 51 insertions(+), 17 deletions(-)
+
+commit f93f5e17d8f23f3e2862f3411f43a95b334e6c91
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jul 20 17:10:37 2009 +0200
+
+ [cairo] Improve performance when rendering one-channel images
+
+ It implements the same idea already used in SplashOutputDev, for
+ one-channel (monochrome/gray/separation) images we build a lookup
+ table
+ so that we won't need to call colorMap->getRGBLine when filling the
+ image buffer. Fixes bug #18017.
+
+ poppler/CairoOutputDev.cc | 36 ++++++++++++++++++++++++++++++++++--
+ 1 files changed, 34 insertions(+), 2 deletions(-)
+
+commit e7475062b6ae5c495fa72faaf8fb3d97391f8544
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 14 17:22:52 2009 +0200
+
+ [cairo] Handle fontType1COT fonts in CairoFontEngine
+
+ poppler/CairoFontEngine.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit d42b9425fb2f98fa79e7a60e4f71ef14f5bacfe9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 12 19:55:14 2009 +0200
+
+ glade is not used anymore
+
+ cmake/modules/FindGTK.cmake | 9 ++++-----
+ 1 files changed, 4 insertions(+), 5 deletions(-)
+
+commit 454f7468c6a6a442a5064b5daa24d65ebf4fc6b6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 9 10:43:00 2009 +0100
+
+ [cairo] Fix drawImage() for non-1x1 images
+
+ Carlos noticed a nasty bug with converting drawImage() to use PAD
+ + fill,
+ instead of NONE + paint. That is the image was being padded out
+ far beyond
+ the correct output extents. The cause is that the caller pre-scales
+ the
+ context for the image, so the output rectangle was many times the true
+ image size - obliterating large amounts of the page. The temporary
+ fix is
+ to counter-act the scaling on the context. Longer term, after
+ fixing all
+ painters to use PAD correctly, we need to review the callers to remove
+ unnecessary pre-scaling.
+
+ poppler/CairoOutputDev.cc | 16 ++++++++++++----
+ 1 files changed, 12 insertions(+), 4 deletions(-)
+
+commit f8d93eae3c7b9388feabac71f2380d0b42a855e7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 8 20:14:35 2009 +0200
+
+ Lookup UF and F entries before Unix, MAC and DOS in getFileSpec
+
+ poppler/FileSpec.cc | 24 ++++++++++++------------
+ 1 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 767c534f5fdf6ccbccfd85a0086d72c215c278f1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 8 19:13:54 2009 +0200
+
+ Use UF entry when present in dict in getFileSpecName() too
+
+ poppler/FileSpec.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 569627ac4d56ddd58e109ce2a37179a85e042030
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 8 13:02:16 2009 +0200
+
+ Implement axialShadedFill in cairo backend using cairo gradients
+
+ See bug #10942.
+
+ poppler/CairoOutputDev.cc | 29 +++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 10 ++++++++++
+ poppler/Gfx.cc | 29 ++++++++++++++++++++---------
+ poppler/OutputDev.h | 6 +++++-
+ poppler/PSOutputDev.cc | 2 +-
+ poppler/PSOutputDev.h | 2 +-
+ 6 files changed, 66 insertions(+), 12 deletions(-)
+
+commit 6ae0a6c0044713affa23eb1ee6a070785ed6c2f3
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 8 16:48:26 2009 +0100
+
+ [cairo] premultiply image mask
+
+ Cairo uses a premultiplied colour-space, so when creating the
+ image mask
+ in drawImage() we need to remember to multiply by the alpha. In
+ this case
+ it just requires zeroing out the masked pixels.
+
+ poppler/CairoOutputDev.cc | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 646e5884e748ecce7094c673400484aa1d902bdd
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 8 17:00:34 2009 +0100
+
+ [cairo] maskColors is an array of ints, no scaling required
+
+ drawImage() was erroneously scaling the maskColors from what it
+ believed
+ to be [0:1] to [0:255]. However maskColors is already an integer
+ array,
+ [0:255].
+
+ poppler/CairoOutputDev.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d75feb1ee84385a9f94308cf47a43f4583092ddf
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jul 8 16:37:19 2009 +0100
+
+ [cairo] cleanse DrawImage()
+
+ Just a small bit of code rearrangement to reduce repetition and
+ invalid checks.
+
+ poppler/CairoOutputDev.cc | 102
+ ++++++++++++++++++---------------------------
+ 1 files changed, 41 insertions(+), 61 deletions(-)
+
+commit 52f3704fed16cfc1e9dd85f72dde7922371e4099
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 8 11:40:52 2009 +0200
+
+ [TODO] Update TODO file
+
+ TODO | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit ef261f5f72d37a0aa2709611ee2bad7d55340ed8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 7 10:57:31 2009 +0200
+
+ Do not use F and UF entries if Unix or DOS are present in FileSpec
+ dict
+
+ poppler/FileSpec.cc | 114
+ +++++++++++++++++++++++----------------------------
+ 1 files changed, 51 insertions(+), 63 deletions(-)
+
+commit cafd4653dc6c7574214e80aa09489dcd24e347a6
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 1 11:41:32 2009 +0200
+
+ [glib-demo] Fix a typo
+
+ glib/demo/utils.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a3c9c6d0c0ee55dccd2d03f20d5683ae300cdc6b
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Jul 8 02:01:39 2009 +0200
+
+ start updating the TODO file
+
+ TODO file had quite some rust and dust in it, making quite "difficult"
+ for others to understand what can be done for helping.
+ First step has been removing all the items done.
+ Next is grouping items by areas, so it is more clear what should be
+ done in what area; current areas are:
+ - general items: for general stuff to be done, not specific to some
+ area; an example could have been "use littlecms for color management?"
+ - core: stuff which is specific to the core library
+ - Qt4/Qt/glib/etc frontend: stuff specific for that frontend
+ - new frontends: ideas for possible new frontends
+
+ I was not sure about some items and Jeff Muizelaar's TODO, so I left
+ them there.
+
+ TODO | 47 +++++++++++++++--------------------------------
+ 1 files changed, 15 insertions(+), 32 deletions(-)
+
+commit 92ad0ef89fe7690d83854b4821178dfdb2e22897
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Jul 4 00:19:23 2009 +0200
+
+ [Qt4 demo] hopefully fix the page size on zoom change
+
+ qt4/demos/pageview.cpp | 5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+commit 97094d13bc0f144b25e13c1de7a5328608ab13e3
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Jul 4 00:07:12 2009 +0200
+
+ [Qt4 demo] show a list of checked/unchecked items for the document
+ permissions
+
+ qt4/demos/permissions.cpp | 25 ++++++++-----------------
+ qt4/demos/permissions.h | 6 +++---
+ 2 files changed, 11 insertions(+), 20 deletions(-)
+
+commit 0d8f2ee0f03a14e7b8477c4b787c3441a758f26b
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Jul 3 23:55:42 2009 +0200
+
+ [Qt4 demo] show page numbers in the toolbar as 1..n
+
+ qt4/demos/navigationtoolbar.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b0d48df9121c55f8162ddf0ee63832f9adebf37b
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Jul 3 17:55:31 2009 +0200
+
+ [Qt4 demo] correctly use DPI values for the page sizes
+
+ qt4/demos/pageview.cpp | 12 +++++++++---
+ qt4/demos/pageview.h | 2 ++
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+commit dcc3c384919f1562b8f312ad3ac847e23f3e83ab
+Author: Sebastien Bacher <seb128@ubuntu.com>
+Date: Wed Jul 1 10:09:12 2009 +0200
+
+ [test] Use gtkbuilder rather than libglade
+
+ Fixes bug #21673
+
+ cmake/modules/FindGTK.cmake | 1 -
+ configure.ac | 4 +-
+ test/Makefile.am | 2 +-
+ test/pdf-inspector.cc | 34 ++--
+ test/pdf-inspector.glade | 434
+ -------------------------------------------
+ test/pdf-inspector.ui | 416
+ +++++++++++++++++++++++++++++++++++++++++
+ 6 files changed, 439 insertions(+), 452 deletions(-)
+
+commit 28208d1c9b8afbb769a5f4d9b0655b99fd4af16e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 1 09:52:12 2009 +0200
+
+ [glib-demo] Do not use gio if glib < 2.15
+
+ Fixes bug #22530.
+
+ glib/demo/main.c | 33 +++++++++++++++++++++++++++++++--
+ 1 files changed, 31 insertions(+), 2 deletions(-)
+
+commit 6ef83414ab55294cf46b6b05813927bb04066986
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 30 23:07:00 2009 +0200
+
+ Check getFileSpecNameForPlatform succeeded before using it's return
+ value
+
+ Fixes crash on bug 22551
+
+ poppler/Annot.cc | 7 ++++---
+ poppler/Link.cc | 30 +++++++++++++++++-------------
+ poppler/Sound.cc | 8 +++++---
+ 3 files changed, 26 insertions(+), 19 deletions(-)
+
+commit 4b9db83841a8b97df1e0991c1b853897b7095777
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 30 11:24:29 2009 +0200
+
+ [glib-demo] Do not fill the surface before rendering
+
+ The surface is guaranteed to be cleared
+
+ glib/demo/render.c | 11 ++---------
+ 1 files changed, 2 insertions(+), 9 deletions(-)
+
+commit 5deb6db5d340c08f337d2ba67aa1fd690e4eedd8
+Author: William Bader <williambader@hotmail.com>
+Date: Mon Jun 29 21:55:49 2009 +0200
+
+ Fix interpolate parameter position
+
+ poppler/SplashOutputDev.cc | 3 ++-
+ utils/ImageOutputDev.cc | 5 +++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit e1e9ae2826eff1665d798b4b50b5c63e8282246b
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Jun 28 20:11:42 2009 +0200
+
+ [Qt4 demo] do not crash when changing the zoom with no document
+
+ qt4/demos/pageview.cpp | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit a98de97137cb343182bd03c443fc08ff4e0fd9a5
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Jun 28 19:08:02 2009 +0200
+
+ [Qt4 demo] add a zoom combobox
+
+ qt4/demos/navigationtoolbar.cpp | 33 ++++++++++++++++++++++++++++++++-
+ qt4/demos/navigationtoolbar.h | 7 ++++++-
+ qt4/demos/pageview.cpp | 14 ++++++++++++--
+ qt4/demos/pageview.h | 6 +++++-
+ qt4/demos/viewer.cpp | 2 ++
+ 5 files changed, 57 insertions(+), 5 deletions(-)
+
+commit 40002d2c765398869a3b7d8d92715f0608e39ab3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 28 16:45:19 2009 +0200
+
+ Make sure the array is big enough to read from it
+
+ poppler/Gfx.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0a1b41ff6de5a41e3450ecbcb1ba754dc06c29d9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 26 19:31:22 2009 +0200
+
+ Do not crash when we can't find onStr
+
+ Fixes crash in bug #22485
+ Not sure this is the best solution, but Adobe doesn't even open
+ the file
+
+ poppler/Form.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 6cb846664e57b02c99f1e6ad2b4e9128c9622e0a
+Author: Ilya Gorenbein <igorenbein@finjan.com>
+Date: Thu Jun 25 20:13:29 2009 +0200
+
+ Initilize AnnotColot properly when the Array is not correct
+
+ poppler/Annot.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 5fdc3acb8dded2e7d08e6ef30f4c5ae1a4a11b5e
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Mon Jun 22 21:38:23 2009 +0200
+
+ Only change the page size when it really changes, otherwise duplex
+ commands are lost
+
+ poppler/PSOutputDev.cc | 10 +++++++++-
+ poppler/PSOutputDev.h | 4 ++++
+ 2 files changed, 13 insertions(+), 1 deletions(-)
+
+commit bf69beeb257cfd750c6ddc8b68aeb859b36380b2
+Author: David Benjamin <davidben@mit.edu>
+Date: Sat Jun 20 23:51:09 2009 +0200
+
+ Make DecryptStream return sane values for getPos()
+
+ Many streams (notably JBIG2Stream) expect wrapped streams to return
+ correct
+ values for getPos(), i.e. increments by 1 when readChar() called, etc.
+ Fixes bug #19706.
+
+ poppler/Decrypt.cc | 8 ++++++++
+ poppler/Decrypt.h | 3 +++
+ 2 files changed, 11 insertions(+), 0 deletions(-)
+
+commit 5ee4ff2aaf98e2eaa1ec2dc9f7e659b3b01ba7bf
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jun 20 15:00:16 2009 +0200
+
+ [glib-demo] Allow using relative paths in demo application
+
+ glib/demo/main.c | 17 +++++------------
+ 1 files changed, 5 insertions(+), 12 deletions(-)
+
+commit a568248d3255407fcaa7368c4925c20e95619d20
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 19 21:07:39 2009 +0200
+
+ 0.11.1
+
+ CMakeLists.txt | 2 +-
+ NEWS | 50
+ ++++++++++++++++++++++++++++++++++++++++++++++++--
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 54 insertions(+), 8 deletions(-)
+
+commit ac99e239f2726db32617ff03174a6ce74361ea1b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 19 21:03:29 2009 +0200
+
+ ship PopplerCache.h
+
+ CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 84984d2aa25917d68c9971cefe636e626eada13d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 19 20:54:15 2009 +0200
+
+ Ship PopplerCache.h too
+
+ poppler/Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 3a52d46e5df8eb926b550d7f7a82f316dbf6808f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jun 19 17:45:44 2009 +0200
+
+ [glib-demo] Destroy pattern after using it
+
+ glib/demo/render.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 2e97524e5d82a4c33a4e6410fead444681db6749
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jun 19 14:20:16 2009 +0200
+
+ [glib-demo] Use a transparent surface and fill it in white after
+ rendering
+
+ glib/demo/render.c | 12 +++++++++---
+ 1 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 009937842d5a8bfc12394e9e3ab71b7c33340a85
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jun 19 14:10:05 2009 +0200
+
+ [glib-demo] Use cairo_paint instead of rectangle + fill
+
+ glib/demo/render.c | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 7248da095f67d57c3999cee7d980e62fd8a7cf49
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jun 19 09:37:02 2009 +0200
+
+ Use Interpolate flag to decide whether applying image interpolation
+ during rendering
+
+ Fixes bug #9860
+
+ poppler/ArthurOutputDev.cc | 4 +-
+ poppler/ArthurOutputDev.h | 5 +-
+ poppler/CairoOutputDev.cc | 92
+ +++++++++++++++++++++++++------------------
+ poppler/CairoOutputDev.h | 48 +++++++++++++----------
+ poppler/Gfx.cc | 49 +++++++++++++++++++---
+ poppler/OutputDev.cc | 17 +++++---
+ poppler/OutputDev.h | 13 ++++--
+ poppler/PSOutputDev.cc | 8 ++-
+ poppler/PSOutputDev.h | 8 ++-
+ poppler/PreScanOutputDev.cc | 25 ++++++++++--
+ poppler/PreScanOutputDev.h | 25 ++++++++++--
+ poppler/SplashOutputDev.cc | 16 +++++--
+ poppler/SplashOutputDev.h | 12 ++++--
+ utils/HtmlOutputDev.cc | 16 ++++----
+ utils/HtmlOutputDev.h | 7 ++-
+ utils/ImageOutputDev.cc | 20 +++++-----
+ utils/ImageOutputDev.h | 12 ++++--
+ 17 files changed, 248 insertions(+), 129 deletions(-)
+
+commit 37e3f877ee725648734ff41e1e83870a210bcbd7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 19 00:37:21 2009 +0200
+
+ Handle Streams in CMap definitions
+
+ Fixes bug 22334
+
+ poppler/CMap.cc | 50
+ +++++++++++++++++++++++++++++-----------------
+ poppler/CMap.h | 17 +++++++++++----
+ poppler/GfxFont.cc | 41 ++++++++++++++++++++++++++------------
+ poppler/GlobalParams.cc | 6 ++--
+ poppler/GlobalParams.h | 5 ++-
+ 5 files changed, 77 insertions(+), 42 deletions(-)
+
+commit 47de8eef46300832556ce5ed869e391e477fd843
+Author: David Benjamin <davidben@mit.edu>
+Date: Fri Jun 19 00:30:35 2009 +0200
+
+ Fix some bugs in JBIG2Stream handling
+
+ For more info see bug 12014 and [poppler] Bug in JBIG2Stream from
+ 08-June-2009
+
+ poppler/JBIG2Stream.cc | 88
+ ++++++++++++++++++++++++++----------------------
+ poppler/JBIG2Stream.h | 15 ++++++++
+ 2 files changed, 63 insertions(+), 40 deletions(-)
+
+commit d30b1013ea3ce45b5ea942fe7357c0fd07ff47f4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 2 11:44:08 2009 +0200
+
+ Add setOpen() and setIcon() in AnnotText
+
+ poppler/Annot.cc | 25 +++++++++++++++++++++++++
+ poppler/Annot.h | 3 +++
+ 2 files changed, 28 insertions(+), 0 deletions(-)
+
+commit 287feffc1c1c0aa42a398fc071b489acef9ef22e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 2 11:26:40 2009 +0200
+
+ Add setLabel() and setPopup() to AnnotMarkup
+
+ poppler/Annot.cc | 36 ++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 4 ++++
+ 2 files changed, 40 insertions(+), 0 deletions(-)
+
+commit 2a938af5624fbc79316dd6bee5e550f2b4270a76
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 2 10:59:44 2009 +0200
+
+ Add setParent() and setOpen() to AnnotPopup
+
+ poppler/Annot.cc | 19 +++++++++++++++++++
+ poppler/Annot.h | 4 ++++
+ 2 files changed, 23 insertions(+), 0 deletions(-)
+
+commit 0af5464352dfa51f0458c57a3590c847a45964c7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 2 10:37:49 2009 +0200
+
+ Save parent reference of popup annotations
+
+ poppler/Annot.cc | 16 +++++-----------
+ poppler/Annot.h | 4 ++--
+ 2 files changed, 7 insertions(+), 13 deletions(-)
+
+commit fc4bc43dcd6f6871a47b9198e8c2571a5d448c3e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jun 1 14:52:21 2009 +0200
+
+ Fix a crash in pdf-inspector
+
+ test/pdf-inspector.cc | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+commit 3da7a2657892fde52b62e1f73476cb33d6c75e96
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 29 13:35:39 2009 +0200
+
+ Add Annot::setColor()
+
+ poppler/Annot.cc | 19 ++++++++++++++++++-
+ poppler/Annot.h | 6 +++++-
+ 2 files changed, 23 insertions(+), 2 deletions(-)
+
+commit 3eabdf57729852205855cf74ff2d2f9d7bc03f73
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 29 13:23:26 2009 +0200
+
+ Add construtors to create AnnotColor objects directly from color
+ values
+
+ poppler/Annot.cc | 26 ++++++++++++++++++++++++++
+ poppler/Annot.h | 3 +++
+ 2 files changed, 29 insertions(+), 0 deletions(-)
+
+commit 8045e7a1a84a3d54a1c9415ac63b5b9df5ecc349
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 29 13:06:40 2009 +0200
+
+ Add Page::addAnnot() to add a new annotation to the page
+
+ poppler/Page.cc | 28 ++++++++++++++++++++++++++++
+ poppler/Page.h | 2 ++
+ 2 files changed, 30 insertions(+), 0 deletions(-)
+
+commit fe80eb84ec711b7400cef95e791a74c8fd259af7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 29 13:00:19 2009 +0200
+
+ Add getRef() to get the annotation reference
+
+ poppler/Annot.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 1c92657be72c44dba7185808ffb00dd85c5ab289
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 29 12:14:02 2009 +0200
+
+ Save page object and ref in Page class
+
+ This is needed to be able to modify the page object.
+
+ poppler/Catalog.cc | 2 +-
+ poppler/Page.cc | 6 +++++-
+ poppler/Page.h | 4 +++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 4ad2d663262008e4b97342c4ed67c686ff5abd13
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 29 11:43:30 2009 +0200
+
+ Add annot constructors to create annot objects without a dict
+
+ This allows to create annotation objects to be added to the document.
+ Required fields on the annotation dictionary are constructor
+ arguments,
+ setters will be added for the other fields.
+
+ poppler/Annot.cc | 300
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h | 22 ++++-
+ 2 files changed, 315 insertions(+), 7 deletions(-)
+
+commit e5c4862b0c1b08a0fab47070cb9c862026e93567
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 10 23:28:03 2009 +0200
+
+ ignore++
+
+ m4/.gitignore | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 572779f8037763c1e0ee64c47a3dad6df0d3b693
+Author: Koji Otani <sho@bbr.jp>
+Date: Wed Jun 10 22:55:26 2009 +0200
+
+ Fix dashed line in page 1 of bug 20011
+
+ poppler/Gfx.cc | 6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+commit b97591672e0d9c31a3d044fe52e34cc80a491221
+Author: Koji Otani <sho@bbr.jp>
+Date: Wed Jun 10 22:54:57 2009 +0200
+
+ Fix "Conditional jump or move depends on uninitialised value"
+
+ When stroking with a pattern, set strokeColor with a copy of
+ fillColor.
+ This is wrong and the fillColor may be uninitialized.
+ See bug 20011
+
+ poppler/Gfx.cc | 13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 deletions(-)
+
+commit a92b38836b1e4475d5a7a1b9cb8f3e9429cef275
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 9 22:39:19 2009 +0200
+
+ Correctly duplicate the cache on PostScriptFunction(PostScriptFunction
+ *func)
+
+ poppler/Function.cc | 28 ++++++++++++++++++++++++++++
+ poppler/PopplerCache.cc | 20 ++++++++++++++++++++
+ poppler/PopplerCache.h | 14 ++++++++++++++
+ 3 files changed, 62 insertions(+), 0 deletions(-)
+
+commit 2cecdf922f4c8178b0e55d3ddf86c31f8be3313a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jun 9 11:04:39 2009 +0200
+
+ [glib] Fix a crash when a destination points to an invalid page
+
+ glib/poppler-action.cc | 21 +++++++++++++--------
+ 1 files changed, 13 insertions(+), 8 deletions(-)
+
+commit 831288c13c3a7502bbccd1313c6e376283be367c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 7 18:37:20 2009 +0200
+
+ Optimize roll() a bit
+
+ If the number of times to roll is > than half the number of items
+ rotate in the reverse direction
+ Makes it be 33% of exec() instead of 42%
+
+ poppler/Function.cc | 19 ++++++++++++++-----
+ 1 files changed, 14 insertions(+), 5 deletions(-)
+
+commit 3d40dcad850a2bc0e28845a15722db0c79920135
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 7 13:38:50 2009 +0200
+
+ Move the GfxState cache to the new poppler cache class
+
+ poppler/GfxState.cc | 97
+ ++++++++++++++++++++++++---------------------------
+ poppler/GfxState.h | 19 ++--------
+ 2 files changed, 49 insertions(+), 67 deletions(-)
+
+commit 2619e09833f421fb3d8cc68d41d15081ae6824e4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 7 13:37:40 2009 +0200
+
+ Implement a cache for PostscriptFunction transforms
+
+ Makes time of rendering of bug 21562 go down from 24 to 8 seconds
+
+ poppler/Function.cc | 76
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Function.h | 2 +
+ 2 files changed, 78 insertions(+), 0 deletions(-)
+
+commit 588bfe3c14f42be492066c2a98e30482475a6926
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 7 13:36:39 2009 +0200
+
+ Add a code to a generic cache based on Koji's code for GfxState cache
+
+ CMakeLists.txt | 1 +
+ poppler/Makefile.am | 1 +
+ poppler/PopplerCache.cc | 82
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PopplerCache.h | 47 +++++++++++++++++++++++++++
+ 4 files changed, 131 insertions(+), 0 deletions(-)
+
+commit d09478fcc44b5c594f1803fc24654af5e10fa129
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 7 01:34:01 2009 +0200
+
+ Move index and pop to class definition too
+
+ poppler/Function.cc | 32 +++++++++++++++-----------------
+ 1 files changed, 15 insertions(+), 17 deletions(-)
+
+commit 2083264e8ab0fd9976294de08a18de615d5a1168
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 7 01:21:19 2009 +0200
+
+ Move the implementations to the class definition
+
+ Make gcc inline the functions and time to render a heavy PSFunction
+ doc goes from 28 to 20 secs
+
+ poppler/Function.cc | 151
+ ++++++++++++++++++++++++---------------------------
+ 1 files changed, 71 insertions(+), 80 deletions(-)
+
+commit 24580fcd2be74db5f3140bdb2ebff8431b7d3f1e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jun 6 16:17:26 2009 +0200
+
+ Add a debug saying how much rendering took
+
+ qt4/tests/test-poppler-qt4.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 50cf7cffff760e41774957ad8f1f92803142438e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jun 6 16:04:54 2009 +0200
+
+ Use g_path_get_basename instead of g_basename in gtk-cairo-test
+
+ Fixes bug #21361.
+
+ test/gtk-cairo-test.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 4cc9dee35e03d7b295a476f937ec0f2c43bb6592
+Author: Christian Persch <chpe@gnome.org>
+Date: Sat Jun 6 12:13:48 2009 +0200
+
+ Remove unneeded files from repo
+
+ See bug #22094
+
+ configure.ac | 2 +-
+ glib/reference/Makefile.am | 4 +-
+ gtk-doc.make | 155
+ --------------------------------------------
+ m4/gtk-doc.m4 | 53 ---------------
+ 4 files changed, 3 insertions(+), 211 deletions(-)
+
+commit c94e476dbff9e527c72e52377d830f35f29ba3d6
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Jun 5 11:09:44 2009 +0200
+
+ when showing the tooltip for a text rect, show also its index in
+ the page text boxes list
+
+ qt4/tests/test-poppler-qt4.cpp | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 2298acac267257b1916c802bdb902428e69e683b
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Jun 5 11:08:51 2009 +0200
+
+ [Qt4 apidox] FontInterator is new in 0.12
+
+ qt4/src/poppler-qt4.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 37c48c2521c623c485841472c4a174a1841aea33
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Jun 5 10:54:30 2009 +0200
+
+ [CMake] Add poppler version defines and version check macro
+
+ Add POPPLER_[MAJOR|MINOR|MICRO]_VERSION defines and
+ POPPLER_CHECK_VERSION macro. FDO bug #22091.
+
+ CMakeLists.txt | 5 ++++-
+ glib/poppler-features.h.cmake | 9 +++++++++
+ 2 files changed, 13 insertions(+), 1 deletions(-)
+
+commit 26f6fb1d79c2589829cd896d57da63d16641f307
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Jun 5 10:51:26 2009 +0200
+
+ [CMake] switch poppler-features.h.cmake to a more autotools-like
+ syntax
+
+ glib/CMakeLists.txt | 2 +-
+ glib/poppler-features.h.cmake | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 89704635b727db42f6c72ba101091eb7eddb967a
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Jun 5 10:39:17 2009 +0200
+
+ [Qt4 demo] compile the new thumbnail module with autotools as well
+
+ qt4/demos/Makefile.am | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 291bafe64c8755fe5f85a51b184ac6e3d3170e1d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jun 5 10:07:16 2009 +0200
+
+ [glib] Use g_strerror instead of strerror
+
+ Fixes bug #22095.
+
+ glib/poppler-document.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0ca7e214fb5f9c9fb59792149bd23c1617d38cac
+Author: Christian Persch <chpe@gnome.org>
+Date: Thu Jun 4 22:35:40 2009 +0200
+
+ Add poppler version defines and version check macro
+
+ Add POPPLER_[MAJOR|MINOR|MICRO]_VERSION defines and
+ POPPLER_CHECK_VERSION macro. FDO bug #22091.
+
+ configure.ac | 11 ++++-
+ glib/poppler-features.h.in | 9 +++
+ glib/reference/poppler-docs.sgml | 1 +
+ glib/reference/poppler-sections.txt | 10 ++++
+ glib/reference/tmpl/poppler-features.sgml | 80
+ +++++++++++++++++++++++++++++
+ 5 files changed, 110 insertions(+), 1 deletions(-)
+
+commit 4ce04da0040e5a2626c110f94a128e2d272401b9
+Author: Matthias Drochner <M.Drochner@fz-juelich.de>
+Date: Thu Jun 4 23:05:22 2009 +0200
+
+ Use the correct value when creating the V field
+
+ PDF Spec says:
+ For items represented in the Opt array by a two-element array,
+ the name string is the second of the two array elements.
+
+ poppler/Form.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 7e01e37a834bfdd75d739ea2b48e9127ca7f259e
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Thu Jun 4 20:25:55 2009 +0200
+
+ Add part of fix for bug 20420, the other part was checked in with
+ Thomas patches
+
+ poppler/PSOutputDev.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 50a7b4bcaa6e5f56cc25fe6936f9dc537a1b4b37
+Author: Jeremy C. Reed <reed@reedmedia.net>
+Date: Thu Jun 4 20:19:03 2009 +0200
+
+ [glib] Hyphenate UTF-8 and UTF-16BE
+
+ Fixes bug #21953.
+
+ where iconv() is called to fill in a text field, use "UTF-8" and
+ "UTF-16BE" as encoding names rather than the less portable
+ "UTF8" and "UTF16BE" -- this makes it work on NetBSD.
+
+ glib/poppler-annot.cc | 2 +-
+ glib/poppler-form-field.cc | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 2cf9e6a2318b770ae62572944c687576d1801d31
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Thu Jun 4 19:48:42 2009 +0200
+
+ Support multiple page sizes when converting to PS
+
+ Fixes byg #19777
+
+ poppler/PSOutputDev.cc | 31 +++++++++++++++++++++++++++++--
+ poppler/PSOutputDev.h | 4 +++-
+ utils/pdftops.1 | 26 +++++++++++++++++++++-----
+ utils/pdftops.cc | 17 ++++++++++++-----
+ 4 files changed, 65 insertions(+), 13 deletions(-)
+
+commit 30fb7cb7e47cf6a8008c5083c8d0978fdfdf8e62
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jun 4 19:25:22 2009 +0200
+
+ Add missing { }
+
+ poppler/Gfx.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1beec21ed3a016998fee3849d460166895db9047
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 3 22:37:43 2009 +0200
+
+ Give an error when using level1sep without having CMYK support
+
+ Fixes bug #22026
+
+ poppler/PSOutputDev.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit e80d645c34c7d44d1f35da0a25669d1c4cde6e7f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 3 22:00:49 2009 +0200
+
+ Also accept tokens with to leading 00
+
+ Fixes bug 22025, based on a patch by William Bader
+
+ poppler/CharCodeToUnicode.cc | 9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+commit e521c1efaeba3f35d10e46bca3d9650dabd2d889
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Wed Jun 3 22:08:57 2009 +0930
+
+ Implement text in pattern colorspace for the cairo backend
+
+ poppler/CairoOutputDev.cc | 47
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 19 ++++++++++++++++++
+ 2 files changed, 66 insertions(+), 0 deletions(-)
+
+commit a87978b09a026b2db6b0f80271d87b44b336a121
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Jun 3 13:49:56 2009 +0200
+
+ [Qt4 demo] show the checksum for embedded files
+
+ qt4/demos/embeddedfiles.cpp | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit db5102842494a124d813db1696bb60820db3442b
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Jun 3 13:21:22 2009 +0200
+
+ [Qt4 demo] remove checks for Qt >= 4.2
+
+ poppler-qt4 requires Qt 4.3, so checking for 4.2 is no more needed
+
+ qt4/demos/embeddedfiles.cpp | 2 --
+ qt4/demos/fonts.cpp | 2 --
+ qt4/demos/info.cpp | 2 --
+ qt4/demos/optcontent.cpp | 2 --
+ qt4/demos/permissions.cpp | 2 --
+ qt4/demos/toc.cpp | 2 --
+ 6 files changed, 0 insertions(+), 12 deletions(-)
+
+commit e8d897581656ee4a20e9bb87dd999425663ace3b
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Jun 3 02:54:29 2009 +0200
+
+ [Qt4 demo] simplier way to change page from the thumbnail view
+
+ qt4/demos/pageview.cpp | 5 -----
+ qt4/demos/pageview.h | 3 ---
+ qt4/demos/thumbnails.cpp | 2 +-
+ qt4/demos/thumbnails.h | 3 ---
+ qt4/demos/viewer.cpp | 1 -
+ 5 files changed, 1 insertions(+), 13 deletions(-)
+
+commit f69a4fe47d3478cccbc03e4ac0929c7eada681c0
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Jun 3 01:24:21 2009 +0200
+
+ [Qt4 demo] Add a thumbnail dock widget
+
+ Useful to show the embedded page thumbnails in the document, if any.
+ Based on a patch by Shawn Rutledge <shawn.t.rutledge@gmail.com>,
+ reworked by me to be a QListWidget showing the page items at their
+ full size.
+
+ qt4/demos/CMakeLists.txt | 1 +
+ qt4/demos/thumbnails.cpp | 84
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/thumbnails.h | 51 ++++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 11 +++++-
+ 4 files changed, 146 insertions(+), 1 deletions(-)
+
+commit 2f24ac0f4bbd6de1c9f137110b3ac2bd3b23b0b9
+Author: Shawn Rutledge <shawn.t.rutledge@gmail.com>
+Date: Wed Jun 3 01:22:31 2009 +0200
+
+ [Qt4 demo] add a public slot to set the current page
+
+ qt4/demos/pageview.cpp | 5 +++++
+ qt4/demos/pageview.h | 3 +++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 1f1baf186f9e37606765e51ec5b9893ddfbfa893
+Author: Shawn Rutledge <shawn.t.rutledge@gmail.com>
+Date: Wed Jun 3 01:19:16 2009 +0200
+
+ [Qt4] Add Page::thumbnail()
+
+ This function can be used to get the embedded thumbnail of the page,
+ present in the document.
+ Reindented by me, and avoid a memory leak because of non-freed data.
+
+ qt4/src/poppler-page.cc | 21 ++++++++++++++++++++-
+ qt4/src/poppler-qt4.h | 11 +++++++++++
+ 2 files changed, 31 insertions(+), 1 deletions(-)
+
+commit 5cc24be1e9af0a27ab88ffa719bcabc2378868e4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 3 00:05:54 2009 +0200
+
+ Remove unused variables
+
+ poppler/SplashOutputDev.cc | 3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+commit 45823bf8f4abacbbf257f6708264de074eda3cf4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 3 00:02:54 2009 +0200
+
+ Make it compile :-/
+
+ poppler/SplashOutputDev.cc | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit f5ae14907261a46c121f3ed7aea9d7ad9b9c55de
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 2 23:52:59 2009 +0200
+
+ Really fix the typo
+
+ README | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5d4b1995cdd57db7cef3d88704850aaf66ed7fff
+Author: William Bader <williambader@hotmail.com>
+Date: Tue Jun 2 23:10:53 2009 +0200
+
+ Fix three typos in README
+
+ README | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 104f9286ceb5fcb5f4795bca7633029142d5f6a4
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Tue Jun 2 22:59:42 2009 +0200
+
+ Support colorizing text in pattern colorspace
+
+ This implements commits the final patches for bug 19670 and 19994
+ Also fixes bugs 15819 and 2807
+ Also implements blending for SPLASH_CMYK in Splash
+ It's a quite big change but i've done regression testing over my whole
+ pdf suite and did not fit anything that went worse, just improvements
+ Missing the Cairo support
+
+ CMakeLists.txt | 1 +
+ poppler/Gfx.cc | 135 ++++++++++++---
+ poppler/Gfx.h | 7 +
+ poppler/GfxState.cc | 58 +------
+ poppler/GfxState_helpers.h | 80 +++++++++
+ poppler/Makefile.am | 1 +
+ poppler/OutputDev.h | 14 ++
+ poppler/PSOutputDev.cc | 285 +++++++++++++++++++-------------
+ poppler/PSOutputDev.h | 18 ++
+ poppler/SplashOutputDev.cc | 404
+ +++++++++++++++++++++++++++++++++++++-------
+ poppler/SplashOutputDev.h | 19 ++
+ 11 files changed, 766 insertions(+), 256 deletions(-)
+
+commit d3e4563146cbff4cb507522783e60462461c7524
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Sun May 31 23:23:07 2009 +0200
+
+ Set memory to 0 after allocation, fixes problems on Sun machines,
+ should not hurt for others
+
+ poppler/GfxState.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 78a58931b4347ecb505bad5a51104382ef5f91c7
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Sun May 31 22:52:23 2009 +0200
+
+ Add splashClearColor that assigns white to the given colorptr
+
+ splash/SplashTypes.h | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 47c26747b32c242ec8ac60e7b93150a67eb22e31
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Sun May 31 22:51:22 2009 +0200
+
+ Fix splashColorModeNComps to correctly include all values for each
+ SplashColorMode
+
+ splash/SplashState.cc | 17 +++++++++++++++++
+ 1 files changed, 17 insertions(+), 0 deletions(-)
+
+commit 41775d8c0b44bf591d8ff5ede7fad276e8fa9eef
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jun 1 15:24:24 2009 +0200
+
+ [glib-demo] Use poppler_annot_markup_has_popup()
+
+ glib/demo/annots.c | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit f542c5294394e837298cb7e7d1d94bb336bfd09d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jun 1 15:24:04 2009 +0200
+
+ [glib] Add poppler_annot_markup_has_popup()
+
+ glib/poppler-annot.cc | 20 ++++++++++++++++++++
+ glib/poppler-annot.h | 1 +
+ 2 files changed, 21 insertions(+), 0 deletions(-)
+
+commit af32d56af779edcc539b680e634755941d1bf45c
+Author: Petr Gajdos <pgajdos@novell.com>
+Date: Thu May 21 00:37:18 2009 +0200
+
+ Add the possibility of forcing no hinting of fonts
+
+ poppler/ArthurOutputDev.cc | 2 +
+ poppler/GlobalParams.cc | 20 +++++++++++
+ poppler/GlobalParams.h | 4 ++
+ poppler/SplashOutputDev.cc | 2 +
+ splash/SplashFTFont.cc | 76
+ ++++++++++++++++++++++++++----------------
+ splash/SplashFTFont.h | 2 +
+ splash/SplashFTFontEngine.cc | 8 +++--
+ splash/SplashFTFontEngine.h | 6 ++-
+ splash/SplashFontEngine.cc | 4 ++-
+ splash/SplashFontEngine.h | 2 +
+ 10 files changed, 91 insertions(+), 35 deletions(-)
+
+commit 1a69d9638214943b3c2278f570694d9722a5de15
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 20 23:58:44 2009 +0200
+
+ Do not create the GfxColorTransform if the lcms could not be created
+
+ Fixes crash on pdf from bug 20108
+
+ poppler/GfxState.cc | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 95246d39c1289111a4ba3eb2ffbec50d7702e5eb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 20 23:20:20 2009 +0200
+
+ Check Mask entries are int before using them, also if they are real
+ cast to int and try to use them
+
+ Fixes bug #21841
+
+ poppler/Gfx.cc | 11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+commit 0c3517bfb4e1e1a28962f8d490ad69ec5766b6a1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 20 23:08:41 2009 +0200
+
+ Fix pdftops crash on file from KDE bug 174899
+
+ Still does not generate a correct ps file, but at least the program
+ does not crash now
+
+ fofi/FoFiTrueType.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 548c72600b8a5e076647041660ed5031feedc7cc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 20 22:43:11 2009 +0200
+
+ Do not exit(1) on a pdf i have lying around
+
+ PDF is 0f03b3539a436a9f18d7e4e29d410f89 6607907.pdf
+
+ poppler/JBIG2Stream.cc | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit f78d3a7ff5ef4b500d76d84ebc45aac3be162dab
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 18 20:44:40 2009 +0200
+
+ Move lcms.h include to GfxState.cc, replace lcms typedefs by void *
+
+ poppler/GfxState.cc | 70
+ ++++++++++++++++++++++++++++++++++++++++++++------
+ poppler/GfxState.h | 64 ++++++++++------------------------------------
+ 2 files changed, 75 insertions(+), 59 deletions(-)
+
+commit ec2467f9981b7e7c23d5dcd8eabf2e7c8cdf8930
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun May 17 20:00:53 2009 +0200
+
+ Use the lcms include dir
+
+ CMakeLists.txt | 3 +++
+ poppler/Makefile.am | 2 ++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit e0fcf7055af480498a81a000dcd9f977a783df66
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun May 17 12:07:05 2009 +0200
+
+ Use pkgconfig for autotools cms check
+
+ configure.ac | 12 +++++++-----
+ poppler/Makefile.am | 2 +-
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+commit 657734c19274ab281328cba9297eca45e48777aa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun May 17 12:06:47 2009 +0200
+
+ Better lcms check comming from kdelibs
+
+ cmake/modules/FindLCMS.cmake | 95
+ +++++++++++++++++++++++++++++++-----------
+ 1 files changed, 71 insertions(+), 24 deletions(-)
+
+commit 0974b7b4bfe3f8cf3a1408741ddf01c667c28044
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Thu May 14 16:15:22 2009 +0200
+
+ [Win32] Build fix for MSVC.
+
+ poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d1c0e8a6c63361304cd453bb4c51e84a1aab7efa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu May 14 00:29:18 2009 +0200
+
+ Kill support for specifying extension in openTmpFile
+
+ We don't use it and it would not work anyway, see bug #21713
+
+ goo/gfile.cc | 58
+ +++++++++--------------------------------
+ goo/gfile.h | 3 +-
+ poppler/CairoFontEngine.cc | 6 ++--
+ splash/SplashFTFontEngine.cc | 3 +-
+ splash/SplashT1FontEngine.cc | 3 +-
+ splash/SplashT1FontFile.cc | 3 +-
+ 6 files changed, 24 insertions(+), 52 deletions(-)
+
+commit e237d8b5c2ae8805487a0790d9fb218263686712
+Author: Pino Toscano <pino@kde.org>
+Date: Wed May 13 18:37:07 2009 +0200
+
+ [Qt4] we don't need an output device anymore (since long, even)
+ for resolving destinations
+
+ qt4/src/poppler-document.cc | 3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+commit 9a2a851da93ef1a0c291fc9523a468e808ffd08e
+Author: Pino Toscano <pino@kde.org>
+Date: Wed May 13 18:19:11 2009 +0200
+
+ [Qt4] Do not try to resolve named destinations for GoTo links pointing
+ to external documents.
+
+ In such cases, the named destination is a destination in the external
+ document, so we would try to look up a destination which is not in
+ the current document (thus the look up is unuseful).
+ It is task of the users of poppler-qt4 detect such
+ situations, and resolve the named when necessary, using
+ Document::linkDestination(QString).
+
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-link.cc | 2 +-
+ qt4/src/poppler-page.cc | 6 ++++--
+ qt4/src/poppler-private.cc | 4 ++--
+ qt4/src/poppler-private.h | 5 +++--
+ 5 files changed, 11 insertions(+), 8 deletions(-)
+
+commit 51f6cc26fc5fdccce1ba4d4816dec374ce85d67a
+Author: Pino Toscano <pino@kde.org>
+Date: Wed May 13 17:38:00 2009 +0200
+
+ [Qt4] start a (basic) unit test for links & destinations
+
+ qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/Makefile.am | 5 ++
+ qt4/tests/check_links.cpp | 96
+ +++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 102 insertions(+), 0 deletions(-)
+
+commit 174f8087f5e09c5d1915de128b7a15acf47c1e13
+Author: Pino Toscano <pino@kde.org>
+Date: Wed May 13 16:44:59 2009 +0200
+
+ [Qt4] set the destination name only when it is not resolved
+
+ qt4/src/poppler-link.cc | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+commit fb0cb2add9443992f166acdf744fbec875faaabf
+Author: Pino Toscano <pino@kde.org>
+Date: Tue May 12 01:53:43 2009 +0200
+
+ [Qt4] Add LinkDestination::destinationName() that returns the name
+ of the current destination.
+
+ qt4/src/poppler-link.cc | 10 ++++++++++
+ qt4/src/poppler-link.h | 7 +++++++
+ 2 files changed, 17 insertions(+), 0 deletions(-)
+
+commit b8bd44f1302f7b6a6923d41c98ec74c118a5abb8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 11 20:49:34 2009 +0200
+
+ Poppler 0.11.0 aka 0.12 Alpha 1
+
+ CMakeLists.txt | 4 +-
+ NEWS | 142
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ msvc/config.h | 6 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 6 files changed, 150 insertions(+), 8 deletions(-)
+
+commit 79bcedd5602729b959f21aed222445de621e7ecb
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon May 11 19:59:57 2009 +0200
+
+ Update copyright headers for previous patches
+
+ poppler/ArthurOutputDev.cc | 1 +
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/Page.cc | 2 +-
+ poppler/Stream.cc | 1 +
+ poppler/Stream.h | 1 +
+ utils/HtmlOutputDev.cc | 1 +
+ utils/ImageOutputDev.cc | 1 +
+ 7 files changed, 7 insertions(+), 2 deletions(-)
+
+commit f16e36df3a74e1adf14513a6340be2e8665f8d65
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun May 10 19:24:32 2009 +0200
+
+ Don't include popups annots with a parent in annots list
+
+ poppler/Annot.cc | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit 5051ebed1477ff3f7721606f79d66d56a80c1145
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun May 10 19:10:51 2009 +0200
+
+ Make sure ImageStream::close() is called after ImageStream::reset()
+
+ poppler/ArthurOutputDev.cc | 1 +
+ poppler/CairoOutputDev.cc | 20 +++++++++++++++++---
+ poppler/Page.cc | 1 +
+ poppler/Stream.cc | 4 ++++
+ poppler/Stream.h | 3 +++
+ utils/HtmlOutputDev.cc | 1 +
+ utils/ImageOutputDev.cc | 1 +
+ 7 files changed, 28 insertions(+), 3 deletions(-)
+
+commit 829ed964374676ddfa4a9048c940dc20a309ca47
+Author: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
+Date: Sun May 10 23:39:11 2009 +0200
+
+ Fix axial shading fix to ensure the painting passes by the four
+ edges of the bbox
+
+ When j and teoricalj are the same, just change the value of ta[]
+ not the next[] ones
+
+ poppler/Gfx.cc | 23 ++++++++++++++++-------
+ 1 files changed, 16 insertions(+), 7 deletions(-)
+
+commit 68d9644499676ed1553b2bfcdbfc9a5677c75345
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 9 22:25:12 2009 +0200
+
+ Hidden property depends on parent being hidden, not only yourself
+
+ Fixes bug #16093
+
+ poppler/Gfx.cc | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 810a71ea66f0e07d9849a5e9bf28911472482d1b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 8 09:36:31 2009 +0200
+
+ [glib] Add poppler_annot_markup_get_popup_rectangle
+
+ glib/demo/annots.c | 8 ++++++++
+ glib/poppler-annot.cc | 35 +++++++++++++++++++++++++++++++++++
+ glib/poppler-annot.h | 2 ++
+ 3 files changed, 45 insertions(+), 0 deletions(-)
+
+commit 5d328282da4713356fbe4283bd992ac2fc9010a2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu May 7 23:11:55 2009 +0200
+
+ bitmap->h can be 0, move to _checkoverflow variant, code already
+ knows how to deal with NULL
+
+ splash/SplashFTFont.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5b0fb6f94d6d54b1b0c97762db61e2ab0dd07c85
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 6 22:59:55 2009 +0200
+
+ Fix format printing
+
+ poppler/JBIG2Stream.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c21b08a254f42f53d4b59ad4fb308c7c68c32d15
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed May 6 15:56:21 2009 +0200
+
+ [glib] Several fixes in poppler_annot_get_color()
+
+ PopplerColor is compatible with GdkColor where every component is
+ in the
+ range of 0 to 65535, we were returning values between 0 and 1 but
+ converted to guint16.
+ We were also showing a warning when AnnotColor::colorTransparent is
+ used, but we decided to return a PopplerColor * to be able to
+ represent
+ transparent color returning NULL, so it's actually supported.
+
+ glib/demo/annots.c | 25 +++++++++++--------------
+ glib/poppler-annot.cc | 36 +++++++++++++++++++++---------------
+ 2 files changed, 32 insertions(+), 29 deletions(-)
+
+commit 63cc40ec02498e1ec249d5f74e23f574c665872e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 2 14:08:23 2009 +0200
+
+ Link pdftoabw to abiword libs
+
+ Fixes bug #21520
+
+ utils/Makefile.am | 22 ++++++++++++----------
+ 1 files changed, 12 insertions(+), 10 deletions(-)
+
+commit 70e06e9ae28d08bb7495a7f2eb03b0b5714a1e54
+Author: Kouhei Sutou <kou@cozmixng.org>
+Date: Wed Apr 29 09:52:21 2009 +0900
+
+ PopplerAttachment refers its document.
+
+ glib/poppler-attachment.cc | 41
+ +++++++++++++++++++++++++++++++++++------
+ 1 files changed, 35 insertions(+), 6 deletions(-)
+
+commit 977a13f1091700bf7e7b31859e0e6632dc323462
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Apr 25 19:07:01 2009 +0200
+
+ [glib] Only create checksum string for valid checksums
+
+ glib/poppler-attachment.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit fb6e7141e3008ae230ae5819e2c7a0425296d8d2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Apr 24 10:13:53 2009 +0200
+
+ Update copyright headers
+
+ glib/poppler-annot.cc | 1 +
+ glib/poppler-annot.h | 1 +
+ poppler/Annot.cc | 2 +-
+ poppler/Annot.h | 2 +-
+ poppler/DateInfo.cc | 1 +
+ poppler/DateInfo.h | 1 +
+ 6 files changed, 6 insertions(+), 2 deletions(-)
+
+commit fc7e52fef0317f9c85ead2c4f8a0e9b688decca3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Apr 24 09:53:41 2009 +0200
+
+ Fix typos in Annot::setContents() documentation
+
+ poppler/Annot.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit df0032cf5f6e5dc44bad056c659180e4065d32e2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Apr 23 13:19:25 2009 +0200
+
+ Document Annot::setContents() method
+
+ poppler/Annot.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 86a37a8f3f93e3378b446f8d81d80571267c7660
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Apr 23 13:16:04 2009 +0200
+
+ Update the annotation last modified time when it's modified
+
+ poppler/Annot.cc | 26 ++++++++++++++++----------
+ poppler/Annot.h | 7 ++++---
+ 2 files changed, 20 insertions(+), 13 deletions(-)
+
+commit 9662bfa2b4b2282d0fc29d2a327b62d8bde56ff2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Apr 23 13:13:07 2009 +0200
+
+ Add timeToDateString() to DateInfo
+
+ This function converts a time_t into a string in PDF date format.
+
+ configure.ac | 1 +
+ poppler/DateInfo.cc | 47
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/DateInfo.h | 7 +++++++
+ 3 files changed, 55 insertions(+), 0 deletions(-)
+
+commit dc4cf0c29b53cda5c1c2badc5026af3429502e3a
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Apr 21 21:51:52 2009 +0200
+
+ add poppler-date.{cc,h}
+
+ glib/CMakeLists.txt | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 0750c6502faeabff571f5730b567097e793dca64
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 21 20:04:27 2009 +0200
+
+ [glib-demo] Fix dates handling in annots demo
+
+ glib/demo/annots.c | 69
+ ++++++++++-----------------------------------------
+ 1 files changed, 14 insertions(+), 55 deletions(-)
+
+commit fe73bf9771e8294af4c8a11ec4c2891ff8f8d859
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 21 20:02:25 2009 +0200
+
+ [glib-demo] GTime is deprecated, use time_t instead
+
+ glib/demo/utils.c | 2 +-
+ glib/demo/utils.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 6d468cfa0cb89760e5d6cca43521cde6d99aa52e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 21 20:00:20 2009 +0200
+
+ [glib-demo] Use format_date from utils and remove duplicated code
+
+ glib/demo/info.cc | 27 ++-------------------------
+ 1 files changed, 2 insertions(+), 25 deletions(-)
+
+commit e5f5ea01d0da4c4d877b93755523dc2a7f2ec049
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 21 19:57:11 2009 +0200
+
+ [glib] Fix poppler_annot_markup_get_date()
+
+ Date field in Markup annots is also a PDF format date string, so it
+ should be parsed and the resulting time_t used to create a correct
+ GDate.
+
+ glib/poppler-annot.cc | 22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+commit 876ad1bcc8a7b2f37656bf15cee7eb888fd46ed4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 21 19:36:33 2009 +0200
+
+ [glib] Add info about the return value in poppler_annot_get_modified()
+ doc
+
+ glib/poppler-annot.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 8c54a15e1715721ee7af7e82c90b8dda3689c65f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 21 19:35:14 2009 +0200
+
+ [glib] Fix a typo in poppler_date_parse documentation
+
+ glib/poppler-date.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 39d09fa237d06fa93b02eb916d2c0242c4e8fe85
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 21 19:29:32 2009 +0200
+
+ [glib] Add poppler_date_parse to parse PDF format date strings
+
+ We need to make this public because the field M in the Annot
+ dictionary
+ might be a Date string (in PDF date format) or a text
+ string. According
+ to the PDF spec: "The preferred format is a date string as described
+ in
+ Section 3.8.3, “Dates,†but viewer applications should be
+ prepared to
+ accept and display a string in any format". The only way to know
+ whether
+ it's a PDF date string or not, is by trying to parse it. For this
+ reason
+ poppler_annot_get_modified() returns a gchar * instead of a
+ time_t. So,
+ viewers should try to parse the string in order to convert it to a
+ time_t, and if it fails to parse, use the date string as provided
+ by the
+ document.
+
+ glib/Makefile.am | 2 +
+ glib/poppler-attachment.cc | 4 +-
+ glib/poppler-date.cc | 66
+ ++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-date.h | 30 ++++++++++++++++++++
+ glib/poppler-document.cc | 45 +++++------------------------
+ glib/poppler-private.h | 2 +-
+ glib/poppler.h | 1 +
+ 7 files changed, 110 insertions(+), 40 deletions(-)
+
+commit 9c2714a3e1c02f445661618e24bcd27f1392b2b7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 21 18:08:06 2009 +0200
+
+ [glib] Implement poppler_annot_set_contents()
+
+ glib/poppler-annot.cc | 25 +++++++++++++++++++++++++
+ glib/poppler-annot.h | 2 ++
+ 2 files changed, 27 insertions(+), 0 deletions(-)
+
+commit eec550e8b3cf96aefed9b03a78d365c2848fb8f2
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Apr 21 18:06:34 2009 +0200
+
+ Add setContents() to modify the annot contents
+
+ poppler/Annot.cc | 26 +++++++++++++++++++++++++-
+ poppler/Annot.h | 4 ++++
+ 2 files changed, 29 insertions(+), 1 deletions(-)
+
+commit 047a8870a8cea9b680080e0d3bf68d0685431233
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Apr 20 23:38:53 2009 +0200
+
+ In case of err3 or err2 in readPageTree we need to free kidRef too
+
+ poppler/Catalog.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit cb61b555f2c4db8685dec5491ca86570c962aab6
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Apr 18 18:30:04 2009 +0200
+
+ Extend test-poppler-glib to show more page annotations and actions
+
+ Based on path by Thomas Viehmann <tv@beamnet.de>
+
+ glib/test-poppler-glib.cc | 68
+ +++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 68 insertions(+), 0 deletions(-)
+
+commit 2221b8a9ae5e986c79ea3f6c9f3b0246d328c7ab
+Author: Matthias Franz <matthias@ktug.or.kr>
+Date: Sun Apr 19 23:29:18 2009 +0200
+
+ Fix decryption using owner password on some pdf
+
+ See bug #21270
+
+ poppler/Decrypt.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit e20efbf6cc676758b8ef7d2ad607560fcdbbf89e
+Author: Peter Kerzum <kerzum@yandex-team.ru>
+Date: Fri Apr 17 22:14:26 2009 +0200
+
+ Fix typo in GfxFont.cc
+
+ poppler/GfxFont.cc | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit b760debea03380280d72cd39d792cbc1a380a87c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Apr 17 21:04:26 2009 +0200
+
+ Fix rendering of axial shadings
+
+ Fixes bug #19896
+
+ poppler/Gfx.cc | 102
+ ++++++++++++++++++++++++++++++++++----------------------
+ 1 files changed, 62 insertions(+), 40 deletions(-)
+
+commit 9f1312f3d7dfa7e536606a7c7296b7c876b11c00
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Apr 16 22:13:26 2009 +0200
+
+ Fix problems that happen when parsing broken JBIG2 files
+
+ Fixes
+ CVE-2009-0799 xpdf OOB Read
+ CVE-2009-0800 xpdf Multiple Input Validation Flaws
+ CVE-2009-1179 xpdf Integer Overflow
+ CVE-2009-1180 xpdf Invalid free()
+ CVE-2009-1181 xpdf NULL dereference DoS
+ CVE-2009-1182 xpdf MMR Decoder Buffer Overflows
+ CVE-2009-1183 xpdf MMR Infinite Loop DoS
+
+ Patch based on a patch by Derek Noonburg
+ Some files still hit the exit(1) in goo.c but at least none is
+ really crashing
+
+ poppler/JBIG2Stream.cc | 447
+ ++++++++++++++++++++++++++++++++++--------------
+ poppler/JBIG2Stream.h | 4 +
+ 2 files changed, 324 insertions(+), 127 deletions(-)
+
+commit 284a92899602daa4a7f429e61849e794569310b5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Apr 13 21:51:12 2009 +0200
+
+ Did a mistake in the gmalloc -> gmallocn commit, it's a 4 here not a 3
+
+ poppler/SplashOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9cf2325fb22f812b31858e519411f57747d39bd8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 11 00:31:57 2009 +0200
+
+ More gmalloc → gmallocn
+
+ glib/poppler-page.cc | 2 +-
+ splash/Splash.cc | 8 ++++----
+ splash/SplashBitmap.cc | 6 +++---
+ splash/SplashFTFont.cc | 2 +-
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+
+commit c399b2d512aa073b0d7cd8eb5413a4b43f0d6aef
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 11 00:26:23 2009 +0200
+
+ Revert part of last commit, i need more math classes :D
+
+ poppler/JBIG2Stream.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7b2d314a61fd0e12f47c62996cb49ec0d1ba747a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 11 00:23:04 2009 +0200
+
+ Be paranoid, use gmallocn or gmallocn3 in all gmalloc with *
+
+ poppler/ArthurOutputDev.cc | 4 ++--
+ poppler/CairoOutputDev.cc | 14 +++++++-------
+ poppler/GfxState.cc | 8 ++++----
+ poppler/JBIG2Stream.cc | 4 ++--
+ poppler/PSOutputDev.cc | 6 +++---
+ poppler/SplashOutputDev.cc | 20 ++++++++++----------
+ 6 files changed, 28 insertions(+), 28 deletions(-)
+
+commit 0131f0a01cba8691d10a18de1137a4744988b346
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 11 00:20:55 2009 +0200
+
+ Add gmallocn3 that does the same as gmallocn but with 3 arguments
+
+ goo/gmem.cc | 22 ++++++++++++++++++++++
+ goo/gmem.h | 2 ++
+ 2 files changed, 24 insertions(+), 0 deletions(-)
+
+commit 75c3466ba2e4980802e80b939495981240261cd5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Apr 10 18:05:54 2009 +0200
+
+ Make it compile in Solaris
+
+ See bug #21080
+
+ poppler/CairoFontEngine.cc | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 3210970dc1d6faf51bce59bb7ecb6b881f9c0fe6
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Apr 10 13:09:37 2009 +0200
+
+ [glib] Print annotations with the print flag enabled
+
+ glib/poppler-page.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit b0b9798c85c7c6d6f336f73135a98974897b9f60
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Mar 30 23:26:39 2009 +0200
+
+ Fix clip test for fonts
+
+ Fixes bug 20950
+ I really don't remember why i put that -1 maybe i got mislead by
+ SplashClip::testRect
+ having a +1, but the idea of the +1 is correct because it's ints
+ vs floats
+
+ splash/SplashFTFont.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5c08f57aa80092954746d722bb13655aee3f162c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 29 23:52:31 2009 +0200
+
+ Forgot Ross copyright
+
+ poppler/TextOutputDev.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit c6d3e7884010ebdcc961d81ca8c692870fc9b139
+Author: Ross Moore <ross@maths.mq.edu.au>
+Date: Sun Mar 29 23:46:09 2009 +0200
+
+ Fix extraction of some ActualText content
+
+ Fixes bug #20013
+
+ poppler/TextOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e4b3f7cbcb6ccdfa8b18d8da5f7074f4140b776a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 25 22:16:07 2009 +0100
+
+ Fix getGlyphAdvance to behave correctly on font size changes
+
+ Fixes bug #20769
+
+ splash/SplashFTFont.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 4acde05ac4d0b03466c949138321cc3445a14158
+Author: Eric Toombs <ewtoombs@uwaterloo.ca>
+Date: Wed Mar 25 21:11:03 2009 +0100
+
+ Remove case-insensitive matching of filenames in PDFDoc constructor
+
+ poppler/PDFDoc.cc | 39 ++++++++++-----------------------------
+ 1 files changed, 10 insertions(+), 29 deletions(-)
+
+commit 120c7f6697ed1edaff6e17ae1ed202c69f03a73c
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 24 22:56:33 2009 +0100
+
+ declare the matrix at the beginning
+
+ poppler/ArthurOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 441a9cd56935bfe2d8fddc5d3bc2c0104aeffaca
+Author: Eric Toombs <ewtoombs@uwaterloo.ca>
+Date: Sun Mar 22 22:50:14 2009 +0100
+
+ Improved error reporting of ErrOpenFile errors
+
+ See bug #20660 for more information
+
+ glib/poppler-document.cc | 14 +++++++++--
+ poppler/PDFDoc.cc | 54
+ +++++++++++++++++++++++++++------------------
+ poppler/PDFDoc.h | 8 ++++++
+ 3 files changed, 51 insertions(+), 25 deletions(-)
+
+commit 16af0ced4a0762f2f538135bd8dd72b469f6fdca
+Author: Michael K. Johnson <a1237@danlj.org>
+Date: Sat Mar 21 16:14:06 2009 +0100
+
+ Support rendering non-square pixels in pdftoppm
+
+ Bug #20702
+
+ utils/pdftoppm.1 | 16 ++++++++++++++--
+ utils/pdftoppm.cc | 37 ++++++++++++++++++++++++++++++++-----
+ 2 files changed, 46 insertions(+), 7 deletions(-)
+
+commit a103c60abd5fe4c721b099c005daf22d6350c355
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 21 15:47:12 2009 +0100
+
+ Update version we need of Qt4
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit c4b1754fdd3a4649551556de2655c8291daafddf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 21 13:29:38 2009 +0100
+
+ Bump cairo dependency to 1.8.4
+
+ Cairo 1.8.4 fixes and important bug that affects the Type 3 font
+ rendering
+
+ CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 50c4ee413929e5a70133839e3cde039da738fab2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 18 22:00:05 2009 +0100
+
+ Add more _checkoverflow variants, rework internals
+
+ goo/gmem.cc | 92
+ +++++++++++++++++++++++++++++------------------------------
+ goo/gmem.h | 4 ++-
+ 2 files changed, 48 insertions(+), 48 deletions(-)
+
+commit 121c44db0884f0d70ba1470a66aa78441257c421
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Mar 20 23:25:19 2009 +1030
+
+ Fix cairo luminosity smask when cairo ctm != identity
+
+ poppler/CairoOutputDev.cc | 16 +++++++++++++++-
+ 1 files changed, 15 insertions(+), 1 deletions(-)
+
+commit 3f55aff56a1d2002ba79f3efba5eb77e94575439
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Thu Mar 19 22:34:23 2009 +1030
+
+ Fix bug in cairo backend with nested masks
+
+ The previous smask was not restored after a q/Q pair or form xobject.
+
+ poppler/CairoOutputDev.cc | 18 +++++++++++++++++-
+ poppler/CairoOutputDev.h | 5 +++++
+ 2 files changed, 22 insertions(+), 1 deletions(-)
+
+commit 4cc3cb8992ac554352d68e97563823b9bbd556ce
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Mar 20 12:38:28 2009 +0100
+
+ Bump cairo dependency to 1.8.4
+
+ Cairo 1.8.4 fixes and important bug that affects the Type 3 font
+ rendering
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit da94fe717a1ab60fb074fae61d582d1ee7151fc2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Mar 16 22:54:27 2009 +0100
+
+ Fix parsing of border arrays
+
+ Fixes 19761
+
+ poppler/Annot.cc | 54
+ ++++++++++++++++++++++++++++++++++++------------------
+ 1 files changed, 36 insertions(+), 18 deletions(-)
+
+commit 8df0323f1ca4548a5d5824ece8736b356ce7ca42
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 12 00:09:03 2009 +0100
+
+ Really fix jpeg lib init order?
+
+ poppler/DCTStream.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 12aac6774fc6f92def3d5567051117951cc32223
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 11 23:00:37 2009 +0100
+
+ fontCIDType2OT fonts can also have a CIDToGIDMap
+
+ Fixes bug #20605
+
+ poppler/GfxFont.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 0ca9ae2848808d15e7a2b00f5eb33bb8f990c887
+Author: Vincent Torri <vtorri@univ-evry.fr>
+Date: Wed Mar 11 00:39:59 2009 +0100
+
+ remove the fortran check during the initialisation of libtool
+
+ configure.ac | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 710e329a3a6a9ee2eed997c9eeaea21c44237423
+Author: Vincent Torri <vtorri@univ-evry.fr>
+Date: Wed Mar 11 00:37:11 2009 +0100
+
+ Add AC_CONFIG_MACRO_DIR([m4])
+
+ It is used by autoreconf to trace changes in m4 macros that are in
+ the m4/ subdirectory.
+
+ configure.ac | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d15e47158ae31909212d3875159046afb208de97
+Author: Vincent Torri <vtorri@univ-evry.fr>
+Date: Wed Mar 11 00:36:27 2009 +0100
+
+ Better check for pkg-config
+
+ configure.ac | 5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+commit b3f569f9a6c117c097acac52ae6552209fcd2101
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 11 00:25:07 2009 +0100
+
+ Check there is an optional content config before using it
+
+ Fixes bug #20587
+
+ poppler/Gfx.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 7a5d1e57b2757c986da17f7238415b927e73127f
+Author: Brian Ewins <Brian.Ewins@gmail.com>
+Date: Mon Mar 9 22:54:58 2009 +0100
+
+ Check for pkgconfig before using it
+
+ At the moment if pkgconfig is not installed, an unhelpful syntax
+ error appears when testing for freetype. Identify the problem
+ earlier on
+
+ configure.ac | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 8dc9e4d57a4759de2b56a87d9bace80d5d563fef
+Author: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sun Mar 8 15:29:02 2009 +0100
+
+ use AC_CHECK_HEADER to find headers
+
+ The original m4/libjpeg.m4 used AC_FIND_FILE to look for jpeg
+ header file.
+ This test is not cross-compiling save. This patch uses the autoconf
+ function
+ AC_CHECK_HEADER to look for the jpeg header, which works in the
+ native and
+ the cross compiling scenaria.
+ Bug #20538
+
+ m4/libjpeg.m4 | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit bf2e2f056cadbc488cd3e9576b44beb34689ec81
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 8 13:44:44 2009 +0100
+
+ Add the new croptting options explanations
+
+ utils/pdftotext.1 | 15 +++++++++++++++
+ 1 files changed, 15 insertions(+), 0 deletions(-)
+
+commit 663d9e5a448641421d290dd228be692a0f236b9c
+Author: Jan Jockusch <jan@jockusch.de>
+Date: Sun Mar 8 13:44:20 2009 +0100
+
+ Make pdftotext to accept cropping options like pdftoppm
+
+ Bug #20331
+
+ utils/pdftotext.cc | 29 ++++++++++++++++++++++++++++-
+ 1 files changed, 28 insertions(+), 1 deletions(-)
+
+commit cc4b61f19b69c31d9a73ae7361c4b6a94345d1c2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 8 12:55:45 2009 +0100
+
+ Fix the previous fix
+
+ I should stop listening to people without checking that what they
+ say is
+ correct
+
+ poppler/DCTStream.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit a4a73cd9f9ee9767d74fbb44ffe083d2057a9d61
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 8 12:44:06 2009 +0100
+
+ I should compile before commiting :-/
+
+ poppler/DCTStream.cc | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 6a6b3cc91053e771a67dffa979076d130f87ff11
+Author: Ryszard Trojnacki <rysiek@menel.com>
+Date: Sun Mar 8 12:38:42 2009 +0100
+
+ set up the error-manager before calling jpeg_create_decompress
+
+ Bug #20484
+
+ poppler/DCTStream.cc | 11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 4dfa7460ddc4b5684d5ef8db17efa50b95b7b735
+Author: Nick Jones <nick.jones@network-box.com>
+Date: Tue Mar 3 00:55:53 2009 +0100
+
+ Do not blindly follow loops parsing OutlineItem
+
+ More details in bug 18364
+
+ poppler/Outline.cc | 15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+commit de3131ae38fc9442b198d4d7b0c57c6939ad66ce
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 2 15:20:07 2009 +0100
+
+ [Qt4] adapt to the new PDFDoc saving API
+
+ store the error code instead of the bool
+
+ qt4/src/poppler-pdf-converter.cc | 12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+commit dac0542eb793603090416f1b7712ca08253f1e7f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 2 09:54:22 2009 +0100
+
+ [glib] Correctly handle doc->saveAs() error code.
+
+ Fixes bug #19915.
+
+ glib/poppler-document.cc | 37 +++++++++++++++++++++++++++++++++----
+ 1 files changed, 33 insertions(+), 4 deletions(-)
+
+commit bfc6572614727565d883b9545d4b6665f3c2fdfe
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 28 13:16:49 2009 +0100
+
+ Return an error code instead of a GBool when saving
+
+ poppler/PDFDoc.cc | 22 +++++++++++-----------
+ poppler/PDFDoc.h | 8 ++++----
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+commit f7c88148fdb671736d81dd5f01a3fb68f944510c
+Author: Koji Otani <sho@bbr.jp>
+Date: Wed Feb 25 23:38:35 2009 +0100
+
+ Fix cache shifting
+
+ poppler/GfxState.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 305af8cdb6822858e152e1f930bba2ce3904bf1b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 25 22:40:24 2009 +0100
+
+ Make JBIG2Stream not crash in 2009-41414141.pdf
+
+ poppler/JBIG2Stream.cc | 151
+ +++++++++++++++++++++++++++---------------------
+ 1 files changed, 85 insertions(+), 66 deletions(-)
+
+commit 26a8217160c1eaeeadb92023b27e68f402e38dd0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 22 18:14:15 2009 +0100
+
+ Check if cairo_shape is not NULL before using it.
+
+ We were checking shape instead. It fixes a crash with some documents.
+ See bug #17337.
+
+ poppler/CairoOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5e68e52da65b4d8c3817e5fbb6f1a937da321d48
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 21 18:03:15 2009 +0100
+
+ [Qt4] do not assume the destination file name for links is ASCII
+
+ qt4/src/poppler-page.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 439cb397fed33df627a09c70788d72bef20dc872
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 21 18:02:36 2009 +0100
+
+ [Qt] do not assume the destination file name for links is ASCII
+
+ qt/poppler-page.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3ea5f45ad3e5a55e577a2e45f61b55932ed17013
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 21 17:46:30 2009 +0100
+
+ [glib] Make sure filename is valid utf-8 for remote dests
+
+ glib/poppler-action.cc | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit b5989e4ffece6c1831610ee163d05fd80386a001
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 21 17:45:18 2009 +0100
+
+ Use the UF entry when present in Filespec dictionary
+
+ poppler/FileSpec.cc | 14 +++++++-------
+ 1 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 943fca42b5fa815fad650e42da4ad6e806adc3b1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 21 12:08:00 2009 +0100
+
+ [glib] Add a macro to define boxed types
+
+ glib/poppler-action.cc | 26 +-----------
+ glib/poppler-annot.cc | 15 +------
+ glib/poppler-document.cc | 44 ++++----------------
+ glib/poppler-page.cc | 99
+ +++++++++-------------------------------------
+ glib/poppler-private.h | 20 +++++++++
+ 5 files changed, 53 insertions(+), 151 deletions(-)
+
+commit 7406337ed2d38a86308f20f8273a152538e524de
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 21 11:11:20 2009 +0100
+
+ [glib] Use template files to create poppler-enums
+
+ glib/Makefile.am | 43
+ ++++++++++++---------------------------
+ glib/poppler-enums.c.template | 44
+ +++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-enums.h.template | 25 +++++++++++++++++++++++
+ 3 files changed, 82 insertions(+), 30 deletions(-)
+
+commit 29bc9d1dd115b5d400975533c3924993c3adae30
+Author: Thomas Viehmann <tv@beamnet.de>
+Date: Sat Jan 17 13:16:38 2009 +0100
+
+ glib small doc comment corrections
+
+ glib/poppler-attachment.cc | 2 +-
+ glib/poppler-layer.cc | 2 ++
+ glib/poppler.cc | 2 --
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit a06e715d89a99b909b8e7b73b733066c67b1ade3
+Author: Thomas Viehmann <tv@beamnet.de>
+Date: Sat Jan 17 12:58:20 2009 +0100
+
+ Make glib API reference more complete
+
+ glib/reference/poppler-docs.sgml | 2 +
+ glib/reference/poppler-sections.txt | 55 +++++
+ glib/reference/tmpl/poppler-action.sgml | 9 +-
+ glib/reference/tmpl/poppler-annot.sgml | 368
+ +++++++++++++++++++++++++++++++
+ glib/reference/tmpl/poppler-layer.sgml | 79 +++++++
+ 5 files changed, 511 insertions(+), 2 deletions(-)
+
+commit 3a21dafa46d42d86daec440a85b9d63b292a3c88
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 3 21:33:00 2009 +0100
+
+ Fix cache shifting
+
+ If we do
+ for (i = 0;i < GFX_ICCBASED_CACHE_SIZE-1 && cache[i].num > 0;i++) {
+ cache[i+1] = cache[i];
+ what we do at the end is copy position 0 to all others so
+ we need to do it in the reverse order
+
+ poppler/GfxState.cc | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 0ed3fd52bb2d3375ed302285b18f076721b8028e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 1 10:37:25 2009 +0100
+
+ [glib-demo] Fix a typo in format string
+
+ glib/demo/page.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2df6d530cd9acd8648a6196031218ef10e7b3891
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 29 00:51:13 2009 +0100
+
+ Add line that for some reason was not imported from xpdf file
+
+ Fixes bug 19789
+
+ utils/ImageOutputDev.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 1fc342eadcbbb41302f190b215c5daf23c9ec9b1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 28 22:53:43 2009 +0100
+
+ Fix crash on unexepcted Form Opt value
+
+ Fixes crash on bug 19790
+
+ poppler/Form.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit b1d4efb082ac3dadd7752a557e5aeb6651e17471
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 27 00:26:08 2009 +0100
+
+ PostScriptFunction::transform optimization
+
+ Do not create and destroy a PSStack each time
+ PostScriptFunction::transform is called gives a 7% speedup on heavy
+ PostScriptFunction::transform pdf like nytimes firefox ad
+
+ poppler/Function.cc | 12 ++++++++----
+ poppler/Function.h | 15 +++++++++++++++
+ 2 files changed, 23 insertions(+), 4 deletions(-)
+
+commit 90f95127d8d89cfcadeb7d701437ab07ce4a8a61
+Author: Koji Otani <sho@bbr.jp>
+Date: Sun Jan 25 23:17:39 2009 +0100
+
+ Cache last 5 GfxICCBasedColorSpace
+
+ poppler/GfxState.cc | 60
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/GfxState.h | 15 ++++++++++++
+ 2 files changed, 75 insertions(+), 0 deletions(-)
+
+commit d3f04f537fb3e963c149a7e2d8d83c7cb19da8c0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jan 23 23:08:46 2009 +0100
+
+ Do not crash in some PDF we don't parse correctly
+
+ Fixes bug 19702
+
+ poppler/JBIG2Stream.cc | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 3990c9e52da7b17215506857c792c90a37ebac79
+Author: Koji Otani <sho@bbr.jp>
+Date: Mon Jan 19 09:53:00 2009 +0100
+
+ Fix a problem in cairo backend when using a CMYK Profile
+
+ poppler/GfxState.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6e51ae7fe8b9dc8ad52b735f2fe056f8ea8f1dcb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 15 22:33:04 2009 +0100
+
+ calculate the limit in a way that one does not access an invalid
+ index of the matrix
+
+ poppler/DCTStream.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ea2aa7bd1ceb0e3282398f52683e4f52ef401f74
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 15 22:18:48 2009 +0100
+
+ Forgot my copyrights
+
+ poppler/DCTStream.cc | 2 +-
+ poppler/DCTStream.h | 2 +-
+ poppler/Stream.cc | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit d65dd23752ec14635d0d224afa7dd605f98a10a4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 15 22:17:14 2009 +0100
+
+ Minor optimizations
+
+ poppler/DCTStream.cc | 17 ++++++++---------
+ poppler/DCTStream.h | 3 ++-
+ poppler/Stream.cc | 3 ++-
+ 3 files changed, 12 insertions(+), 11 deletions(-)
+
+commit d3d2910f757dfc3e141aed62aa970136f9d7186f
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Jan 11 00:40:46 2009 +0100
+
+ fix a (relatively small) memory leak when asking for a document-level
+ JS
+
+ poppler/Catalog.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 869584a84eed507775ff1c3183fe484c14b6f77b
+Author: Jonathan Kew <jonathan_kew@sil.org>
+Date: Sat Jan 10 18:28:47 2009 +0100
+
+ Add the possibility of setting the datadir on runtime
+
+ poppler/GlobalParams.cc | 27 ++++++++++++++++++++-------
+ poppler/GlobalParams.h | 5 ++++-
+ 2 files changed, 24 insertions(+), 8 deletions(-)
+
+commit cf112dceb1d6653beae73ce2fac6fb5eee48ff33
+Author: Koji Otani <sho@bbr.jp>
+Date: Sat Jan 10 18:11:20 2009 +0100
+
+ Fix some problems with color management in CMYK Color Profile.
+
+ Fixes bug 19483
+
+ poppler/GfxState.cc | 106
+ +++++++++++++++++++++++++-------------------------
+ 1 files changed, 53 insertions(+), 53 deletions(-)
+
+commit 6dd77338d16f80760ae32ff9f3e2be9768fc0c49
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jan 8 11:49:45 2009 +0100
+
+ [Qt4] use the cropbox for the annotations coordinates
+
+ Fixes bug #18558.
+
+ qt4/src/poppler-page.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 69c07c031159d36dde52609bffa6d48c3c56cef5
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jan 8 00:59:19 2009 +0100
+
+ update Poppler copyright to 2009
+
+ msvc/poppler/poppler-config.h | 2 +-
+ poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 79e0eea85cf063c6323caafbec97f3d71fc04ca2
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jan 8 00:57:03 2009 +0100
+
+ remove old cmake modules, add a new one
+
+ Makefile.am | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 0e6420ece2d6fcc046d5814b48a2754fb86771e2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 7 23:33:02 2009 +0100
+
+ Require cmake 2.6.0, remove two cmake files provided upstream
+
+ CMakeLists.txt | 4 +-
+ cmake/modules/FindFreetype.cmake | 74
+ ---------------------
+ cmake/modules/FindPackageHandleStandardArgs.cmake | 58 ----------------
+ glib/CMakeLists.txt | 2 +-
+ 4 files changed, 3 insertions(+), 135 deletions(-)
+
+commit a69add73bf7bef17c677c735db77934ba67188a5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 7 19:06:13 2009 +0100
+
+ Update copyright notices
+
+ poppler/FontInfo.cc | 1 +
+ poppler/FontInfo.h | 1 +
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-fontinfo.cc | 2 +-
+ qt4/src/poppler-form.cc | 1 +
+ qt4/src/poppler-form.h | 1 +
+ qt4/src/poppler-private.h | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
+ 8 files changed, 8 insertions(+), 4 deletions(-)
+
+commit 18d584158a781fecb4f696b01fb4d17803ce7d7a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 7 17:55:48 2009 +0100
+
+ Add lcms option to cmake buildsystem
+
+ CMakeLists.txt | 9 +++++++++
+ cmake/modules/FindLCMS.cmake | 37 +++++++++++++++++++++++++++++++++++++
+ config.h.cmake | 3 +++
+ 3 files changed, 49 insertions(+), 0 deletions(-)
+
+commit 140b8ed97416f9c2ec02eb749ca45ca50bd651a8
+Author: Koji Otani <sho@bbr.jp>
+Date: Wed Jan 7 17:43:44 2009 +0100
+
+ Add initial support for color management
+
+ configure.ac | 19 ++
+ poppler/GfxState.cc | 697
+ +++++++++++++++++++++++++++++++++++++++++++++++----
+ poppler/GfxState.h | 74 +++++-
+ poppler/Makefile.am | 5 +
+ 4 files changed, 738 insertions(+), 57 deletions(-)
+
+commit bdc76dc811a6e4d5fd929bbdc8cd3300aeaea31f
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Jan 6 15:45:37 2009 +0100
+
+ [Qt4] apidox improvements for the font functions of Document; mark
+ scanForFonts() as deprecated
+
+ qt4/src/poppler-qt4.h | 22 ++++++++++++++++++----
+ 1 files changed, 18 insertions(+), 4 deletions(-)
+
+commit 6630e715714161cd803fc064f5d3cf880f42b0a5
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Jan 6 15:36:19 2009 +0100
+
+ tell Doxygen to consider Q_DECL_DEPRECATED as empty
+
+ qt4/src/Doxyfile | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d748d430b106580b8be29ca3ec75caf05b55812e
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Jan 6 15:24:25 2009 +0100
+
+ [Qt4] Add a FontIterator for iterating through the fonts of the
+ document, page by page.
+
+ This new iterator class is the new preferred way for getting the
+ fonts of a document in a page-by-page mode.
+ * Document::fonts() is adapted to use it, instead of relying on
+ scanForFonts()
+ * scanForFonts() is ported to FontIterator, but keeping the old
+ behaviour ("i can scan the document only once")
+ * added unit tests for fonts(), scanForFonts() and FontIterator
+
+ qt4/src/poppler-document.cc | 27 +++++---
+ qt4/src/poppler-fontinfo.cc | 36 ++++++++++
+ qt4/src/poppler-private.h | 27 +++++++-
+ qt4/src/poppler-qt4.h | 65 +++++++++++++++++++
+ qt4/tests/check_fonts.cpp | 149
+ +++++++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 291 insertions(+), 13 deletions(-)
+
+commit b9804542bb50216786dc11ca16efd84304f4b832
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Jan 6 15:16:53 2009 +0100
+
+ Add the possibility to set the first page to scan.
+
+ The default value is 0 (= first page), so it should be compatible
+ with any usage so far.
+
+ poppler/FontInfo.cc | 4 ++--
+ poppler/FontInfo.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit af74fef03bfbd79334da5612c63c7793952542f9
+Author: Warren Toomey <poppler@tuhs.org>
+Date: Tue Jan 6 01:36:31 2009 +0100
+
+ Add forgotten file to let the autotools based system build
+
+ m4/libpng.m4 | 99
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 99 insertions(+), 0 deletions(-)
+
+commit ae588500f62bab5666174ff3b1564c414c5a76c5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 6 01:35:38 2009 +0100
+
+ Fix the cmake buildsystem
+
+ CMakeLists.txt | 6 ++++++
+ config.h.cmake | 3 +++
+ utils/CMakeLists.txt | 4 ++++
+ 3 files changed, 13 insertions(+), 0 deletions(-)
+
+commit 940d060a14712c09da427e2fac4ec579f7291b0f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 6 01:27:06 2009 +0100
+
+ do not leak fName if fopen fails
+
+ utils/HtmlOutputDev.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 7be9198adb940ad7c5fffc6db0158cf7042e1b8f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 6 01:24:15 2009 +0100
+
+ Do not leak pgNum and imgnum if fopen fails
+
+ utils/HtmlOutputDev.cc | 16 +++++++++-------
+ 1 files changed, 9 insertions(+), 7 deletions(-)
+
+commit dfba6c022b150553cb2b18b027e661b3b4625ce7
+Author: Warren Toomey <poppler@tuhs.org>
+Date: Tue Jan 6 01:16:31 2009 +0100
+
+ Make pdftohtml output png images when the image stream is not a jpeg
+
+ configure.ac | 14 +++++
+ utils/HtmlOutputDev.cc | 126
+ +++++++++++++++++++++++++++++++++++++++++++++--
+ utils/HtmlOutputDev.h | 3 +-
+ utils/Makefile.am | 4 ++
+ 4 files changed, 140 insertions(+), 7 deletions(-)
+
+commit 0963c276ba972a36c2895e4fe1c7475acd489738
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 4 16:54:32 2009 +0100
+
+ Fix some checked checkboxes not rendering correctly
+
+ If we are forcing ZaDb/ZapfDingbats to correctly draw a checkmark
+ in the checkbox, but the file does not have such font defined we
+ need to create a fake one so the system really renders it
+ Fixes bug 19359
+
+ poppler/Annot.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/Annot.h | 2 ++
+ poppler/Gfx.h | 7 ++++---
+ 3 files changed, 53 insertions(+), 5 deletions(-)
+
+commit 46128cf83b322c112eb0c409c20052bdb2ea4a37
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 4 14:21:15 2009 +0100
+
+ Remove wrong and unused FormWidget(FormWidget *dest) contructor
+
+ poppler/Form.cc | 11 -----------
+ poppler/Form.h | 3 +--
+ 2 files changed, 1 insertions(+), 13 deletions(-)
+
+commit 5203aefc41fa47c461812cc46f28281edd226515
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 4 14:03:16 2009 +0100
+
+ Plug some memory leaks
+
+ poppler/Annot.cc | 5 ++++-
+ poppler/Form.cc | 4 +++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 5fb7ec7e6af4cfb2b256a5b9b9752e68330b4aec
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Dec 30 23:46:59 2008 +0100
+
+ If Length2 is zero just write until we find EOF of the stream
+
+ Fixes exporting to PS of the two pdf i have that have fonts with
+ Length2 set to 0
+
+ poppler/PSOutputDev.cc | 26 +++++++++++++++++++++-----
+ 1 files changed, 21 insertions(+), 5 deletions(-)
+
+commit ca35fdbc7c31dae432d775b6c087a83fa9b897fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Dec 30 23:03:57 2008 +0100
+
+ We need spaces here too to satify other consumer parsers
+
+ poppler/PDFDoc.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3c07c73e07a9cb59ee4c23ca60d2adce92de45f7
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Dec 30 22:21:27 2008 +0100
+
+ [Qt4-demo] load a document when passed via command line
+
+ qt4/demos/main_viewer.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit aba0aaa896d634a51fbb3a3e6eae411be462f930
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 29 00:31:18 2008 +0100
+
+ More improvements in document writing
+
+ Dictionary keys are names so need to be sanitized
+ Add a space after num gen obj
+
+ poppler/PDFDoc.cc | 7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit e5b93a847ae4e20a77fecef0938da4f14dfbe3eb
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Dec 28 22:59:14 2008 +0100
+
+ Let compiler figure out CDECL
+
+ CDECL is a compiler specific macro to specify C calling convention.
+
+ On Windows, some functions must be forced to use this calling
+ convention.
+ To do this, you can use the macro CDECL, which is defined in windef.h.
+
+ Poppler should not try to be smarter than the compiler and try
+ to guess
+ the correct definition for CDECL. Instead it should rely on the
+ definitions in the windef.h file provided by the compiler.
+
+ On Unix, specifying a calling convention is not nescessary, so
+ CDECL can
+ be an empty definition.
+
+ poppler-config.h.cmake | 8 ++------
+ poppler/poppler-config.h.in | 8 ++------
+ 2 files changed, 4 insertions(+), 12 deletions(-)
+
+commit de70c0aeb37d788f595b0574796844f51ddedec1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 28 21:21:12 2008 +0100
+
+ [qt4] improve doc a bit
+
+ qt4/src/poppler-form.h | 2 +-
+ qt4/src/poppler-qt4.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit effb32658019e09dc86c017e39154fd554fc94f8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 28 02:56:30 2008 +0100
+
+ Form Rects are against the cropbox, not the media box
+
+ Fixes second pdf at kde bug 161327
+
+ qt4/src/poppler-form.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0f10561f3b1c90acc030d973399316bfca5f495e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 28 01:44:25 2008 +0100
+
+ Fix my last commit, copy&paste is really evil
+
+ goo/GooString.cc | 9 +++++----
+ goo/GooString.h | 2 +-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 217b46484ff56bfd5906b293ebee70b82cc0263d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 28 01:29:41 2008 +0100
+
+ Move PSOutputDev::filterPSName to GooString::sanitizedName so i can
+ use it from PDFDoc::writeObject
+
+ goo/GooString.cc | 36 +++++++++++++++++++++++++++++++++++
+ goo/GooString.h | 7 ++++++
+ poppler/PDFDoc.cc | 7 +++++-
+ poppler/PSOutputDev.cc | 49
+ ++++++++---------------------------------------
+ poppler/PSOutputDev.h | 3 +-
+ 5 files changed, 59 insertions(+), 43 deletions(-)
+
+commit f41fa9ee71aef5539cf9976c79b32bf1713c8167
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 26 22:56:12 2008 +0100
+
+ Change the overflow check to the same used in gmem.cc, much more
+ easy to understand
+
+ poppler/XRef.cc | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit b8ae7d91dedc9a75200b6050628ec2740af84b98
+Author: Hib Eris <hib@hiberis.nl>
+Date: Fri Dec 26 22:28:09 2008 +0100
+
+ Fix compile warnings on auto imports for mingw32
+
+ configure.ac | 3 +++
+ glib/Makefile.am | 2 +-
+ glib/demo/Makefile.am | 2 ++
+ test/Makefile.am | 2 ++
+ utils/Makefile.am | 2 ++
+ 5 files changed, 10 insertions(+), 1 deletions(-)
+
+commit ba47bd2ba05f883306606eda30bff17bd4a8eec6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 26 19:47:42 2008 +0100
+
+ BaseFile.h has never been used and it fact it's not part of xpdf
+ sources
+
+ Fixes bug 19298
+
+ CMakeLists.txt | 1 -
+ poppler/BaseFile.h | 82
+ ---------------------------------------------------
+ poppler/Makefile.am | 1 -
+ 3 files changed, 0 insertions(+), 84 deletions(-)
+
+commit 84366d9e63b0d6a5ee1aae2463648cfc2ff5e1b8
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Dec 24 19:27:19 2008 +0100
+
+ Let libtool build DLLs on windows too
+
+ configure.ac | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 08cef528f2e51cc62cff4125f179021ad9555317
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Dec 24 17:48:46 2008 +0100
+
+ Fix compile warning on string literal format
+
+ test/pdf-inspector.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0606b4bba8e889204c7b7c9d376f63b659f83a4f
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Dec 24 17:48:10 2008 +0100
+
+ Fix compile warnings on parentheses and/or
+
+ poppler/CairoOutputDev.cc | 13 +++++++------
+ 1 files changed, 7 insertions(+), 6 deletions(-)
+
+commit eba2232cabd5fb1e177db2a6053f0d1a0aee882b
+Author: Hib Eris <hib@hiberis.nl>
+Date: Wed Dec 24 17:46:32 2008 +0100
+
+ Fix some more warnings
+
+ test/gtk-cairo-test.cc | 11 -----------
+ test/pdf-inspector.cc | 9 +++++----
+ 2 files changed, 5 insertions(+), 15 deletions(-)
+
+commit c80431eb1626d89e7b615e5a5149d3436b554b66
+Author: Hib Eris <hib@hiberis.nl>
+Date: Mon Dec 22 09:28:47 2008 +0100
+
+ Fix compile warning on format type
+
+ glib/test-poppler-glib.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fda181c35b7c7500b6d3c6ca9d454addd54929c5
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 22 00:53:44 2008 +0100
+
+ group condition within brackets
+
+ poppler/ArthurOutputDev.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c1beeecbd6cbf82811d70c75cb24059b4b492abe
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 22 00:46:49 2008 +0100
+
+ [demo] use the proper format field for gsize types
+
+ glib/demo/attachments.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bfb975466f0ff78e9e292b6af7cac66e4c331456
+Merge: 3e27892 ea3546f
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 22 00:29:38 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 3e2789257f5fc4ae0573a0c62ea380d8e83a5bb5
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 22 00:24:23 2008 +0100
+
+ [Qt] deserialize also the value of 'right'
+
+ qt/poppler-link.cc | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 7c053ab7623cea1ac650d3e960d2d91a1ef21557
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Dec 22 00:19:02 2008 +0100
+
+ [Qt] move in a .cc file the implementation of the QString<->GooString
+ functions and DocumentData::addTocChildren()
+
+ qt/CMakeLists.txt | 1 +
+ qt/Makefile.am | 1 +
+ qt/poppler-document.cc | 10 ---
+ qt/poppler-page.cc | 1 +
+ qt/poppler-private.cc | 147
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt/poppler-private.h | 106 ++--------------------------------
+ 6 files changed, 157 insertions(+), 109 deletions(-)
+
+commit ea3546f84c5335c58cdb2906b1a1a4656be9c8ea
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Dec 21 23:33:49 2008 +0100
+
+ Fix compile warnings on signed/unsigned comparison
+
+ goo/gfile.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit ca672ae51d2c1fa59a891717b418ba86b5e7345c
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Dec 21 23:33:00 2008 +0100
+
+ Fix compile warnings on ignored pragma with mingw compiler
+
+ poppler/Gfx.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 86cfe8ab2b4e0b600f3f6682701c2fcfbe5d0ca9
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Dec 21 23:08:56 2008 +0100
+
+ Fix compile warnings on signed/unsigned comparison
+
+ poppler/GfxFont.cc | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit e34af7ffe0a4024e2eb39314bdb09eb9a662e53e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 21 22:16:39 2008 +0100
+
+ Update copyright of last commits
+
+ poppler/TextOutputDev.cc | 1 +
+ poppler/TextOutputDev.h | 2 +-
+ qt4/src/poppler-page.cc | 1 +
+ 3 files changed, 3 insertions(+), 1 deletions(-)
+
+commit f6d84dcfc9cc587c7408af79b1ee7658d456f8d8
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Dec 21 22:09:00 2008 +0100
+
+ Fix compile warning to suggest parentheses and/or
+
+ poppler/TextOutputDev.cc | 14 ++++++++------
+ 1 files changed, 8 insertions(+), 6 deletions(-)
+
+commit 15205403eaa95d6fba0e36983de993877dd3a983
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Dec 21 21:59:45 2008 +0100
+
+ Fix warning to suggest parentheses inside shift
+
+ poppler/PSOutputDev.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit cc24f37e582bfc0069faf286da97a48fe4794db1
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Dec 21 21:35:29 2008 +0100
+
+ Fix compile warning on ambiguous else
+
+ test/perf-test.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit a8cc4ad8c2da804f25db8cca1c85433d5a63307c
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Dec 21 21:34:28 2008 +0100
+
+ Fix compile warning on format not a string literal
+
+ test/perf-test.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 3cbbf8226730aa7ee6273e154e4a9d58670a3cda
+Author: Hib Eris <hib@hiberis.nl>
+Date: Sun Dec 21 21:30:54 2008 +0100
+
+ Fix compile warning about uninitialized variable
+
+ poppler/ABWOutputDev.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit f675916277cb76cd1293225a1271f835a02148fb
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Dec 20 23:23:10 2008 +0100
+
+ reset to NULL after being deleted
+
+ found with poppler-qt4 unit tests =)
+
+ poppler/TextOutputDev.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit c976770c64e4c991fff27e413414473583b6fd86
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Dec 20 22:25:55 2008 +0100
+
+ [Qt4] use QHash instead of QMap where applicable
+
+ using a hash table instead of a map mapes lookup faster;
+ in these cases we don't need the sorting a map gives
+
+ qt4/src/poppler-page.cc | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 944f6049a50eb3be9fb29174d67adc4ad1d0b9fe
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Dec 20 20:13:43 2008 +0100
+
+ add find.c and text.c
+
+ glib/demo/CMakeLists.txt | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit ba91b889c3b50239e339938f3c9d31fffcd87d44
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Dec 20 19:29:40 2008 +0100
+
+ Make destructor private in TextPage
+
+ poppler/TextOutputDev.h | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 0da16537aa83f6ed6d8895c7e54266263a71c1cf
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Dec 19 19:08:21 2008 +0100
+
+ Refactor actual text code adding a new ActualText class
+
+ It's used by both Text and Cairo ouput devices avoiding duplicated
+ code
+ in such classes.
+
+ poppler/CairoOutputDev.cc | 108 +++---------------------
+ poppler/CairoOutputDev.h | 7 +--
+ poppler/TextOutputDev.cc | 206
+ ++++++++++++++++++++++++++-------------------
+ poppler/TextOutputDev.h | 34 ++++++--
+ 4 files changed, 160 insertions(+), 195 deletions(-)
+
+commit 0f8ab301c633133eea3dbd4f2254f31c50e3c4a9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 14 13:12:34 2008 +0100
+
+ [glib-demo] Add find demo
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/find.c | 282
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/find.h | 31 ++++++
+ glib/demo/main.c | 4 +-
+ 4 files changed, 318 insertions(+), 1 deletions(-)
+
+commit 88df9e9aa9adb53f0a9714ea404d46f111495df3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 14 11:54:35 2008 +0100
+
+ [glib-demo] Add Text demo
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/main.c | 4 +-
+ glib/demo/text.c | 175
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/text.h | 31 +++++++++
+ 4 files changed, 211 insertions(+), 1 deletions(-)
+
+commit 5b0f2355d55a5104820fd0bf16b4e76b25959de4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 14 11:49:00 2008 +0100
+
+ [glib] Use TextPage instead of TextOutputDev when cairo is enabled
+
+ glib/poppler-page.cc | 148
+ +++++++++++++++++++++++++++++++++---------------
+ glib/poppler-private.h | 4 +
+ 2 files changed, 107 insertions(+), 45 deletions(-)
+
+commit 3ced71fb68d62308db7b9535367eafefb55d1cde
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 14 11:18:00 2008 +0100
+
+ Add optionally text support to CairoOutputDev
+
+ If a TextPage is set, it'll be used when rendering so that we
+ don't need
+ to use TextOutputDev and render again.
+
+ poppler/CairoOutputDev.cc | 144
+ +++++++++++++++++++++++++++++++++++++++++++--
+ poppler/CairoOutputDev.h | 19 +++++-
+ 2 files changed, 155 insertions(+), 8 deletions(-)
+
+commit 0bdad35cc4cfdb8da5acaf44678920b7a0025f99
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 14 11:14:12 2008 +0100
+
+ Add refcount support to TextPage
+
+ poppler/TextOutputDev.cc | 12 +++++++++++-
+ poppler/TextOutputDev.h | 5 +++++
+ qt4/src/poppler-page.cc | 2 +-
+ 3 files changed, 17 insertions(+), 2 deletions(-)
+
+commit f86514c3fbc867fc6457feacba23451e89993524
+Author: Koji Otani <sho@bbr.jp>
+Date: Wed Dec 17 00:36:39 2008 +0100
+
+ Fix wrong PS generation when a large image is in Patterns
+
+ Bug 18908
+
+ poppler/PSOutputDev.cc | 114
+ ++++++++++++++++++++++++++++++------------------
+ 1 files changed, 72 insertions(+), 42 deletions(-)
+
+commit fc395eb90b418e43453acefb42cd04baf0b7ad40
+Author: Richard Airlie <richard.airlie@maglabs.net>
+Date: Tue Dec 16 21:11:53 2008 +0100
+
+ Allow the use of cropbox in pdftoppm
+
+ utils/pdftoppm.cc | 16 +++++++++++++---
+ 1 files changed, 13 insertions(+), 3 deletions(-)
+
+commit 80f415176952635a485356cf36048eee53396c25
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Dec 16 20:37:39 2008 +0100
+
+ Make destructors private/protected since you are not supposed to
+ use them
+
+ poppler/GfxFont.cc | 2 +-
+ poppler/GfxFont.h | 11 +++++------
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+commit dbcebda953cb36a45a125aada68e85249fb73f43
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 15 20:10:31 2008 +0100
+
+ Do not leak on AnnotScreen destructor
+
+ Fixes bug 19095
+
+ poppler/Annot.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit aaeb0d137232bf1cb11dc5e37b8b45b50c6f9c6a
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Dec 12 00:43:19 2008 +0100
+
+ update the xpdf headers installation
+
+ CMakeLists.txt | 32 +++++++++++++++++++++-----------
+ 1 files changed, 21 insertions(+), 11 deletions(-)
+
+commit 7c6527fa05389f705872aaaaff12e739b5d1577e
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Dec 12 00:41:21 2008 +0100
+
+ don't install Function.cc, as it is not an header
+
+ poppler/Makefile.am | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 0179e21b128ffccb5afd13203137ab8435197609
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 12 00:16:38 2008 +0100
+
+ Be more helpful with bad boys that want to use poppler core directly
+
+ fofi/Makefile.am | 10 ++++++++++
+ splash/SplashClip.h | 2 +-
+ splash/SplashPath.h | 2 +-
+ splash/SplashXPath.h | 2 +-
+ 4 files changed, 13 insertions(+), 3 deletions(-)
+
+commit 401632e4eeb4b10b1183a820f32461da77e8e4f2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 12 00:14:04 2008 +0100
+
+ Try harder to look for openjpeg
+
+ cmake/modules/FindLIBOPENJPEG.cmake | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ab539f46089702f60b96b1ba2b2bc1544173c264
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 11 23:15:45 2008 +0100
+
+ Fix crash when reading outline
+
+ Fixes bug 19024. Last as reference is required if the item has
+ children (Table 8.4) so if there is no last reference, don't try to
+ read children.
+
+ poppler/Outline.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit c9a755f9fd14511f43a2ca7fcda36bdd64bb1d87
+Author: Ilya Gorenbein <igorenbein@finjan.com>
+Date: Sun Dec 7 17:59:19 2008 +0100
+
+ Fix memory leak
+
+ Bug 18924
+
+ poppler/Page.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 4cd364c179ae91ed383a8237ba1ad263952fd7aa
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Nov 30 16:57:52 2008 +0100
+
+ add my copyright here
+
+ qt4/src/poppler-private.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 6b1676deb773675d90469adc84c3de8dcdaf174c
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Nov 30 16:56:43 2008 +0100
+
+ [Qt4] support URI actions for TOC items
+
+ qt4/src/poppler-private.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit b5cd58b5565055fd0c13771461245ddcd80edfcf
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Nov 30 16:34:57 2008 +0100
+
+ extract the LinkAction "serialization" in an own function, and make
+ it more safe
+
+ qt4/src/poppler-private.cc | 85
+ ++++++++++++++++++++++++++++++-------------
+ 1 files changed, 59 insertions(+), 26 deletions(-)
+
+commit ee191363e22940ae7b06945e68c4738b17c78348
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Nov 30 16:17:32 2008 +0100
+
+ move the addTocChildren() implementation in the cpp
+
+ qt4/src/poppler-form.cc | 1 +
+ qt4/src/poppler-page.cc | 1 +
+ qt4/src/poppler-private.cc | 65
+ ++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-private.h | 64
+ +-----------------------------------------
+ 4 files changed, 69 insertions(+), 62 deletions(-)
+
+commit f8eaabf1aa7e384619129a7509be85d0c3bfb825
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 30 13:33:12 2008 +0100
+
+ Update copyrights of the last commits
+
+ poppler/TextOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5f4fedfae6098e25644ffe5d4b1ed0bac043841d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 29 19:51:27 2008 +0100
+
+ Use the Length specified in the Stream as initial bufSize
+
+ This is a optimization to save a few reallocations, if the Length
+ value is incorrect it will still work
+
+ poppler/JPEG2000Stream.cc | 10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 12f6d6ba2052fbdc8ea4ba7c7c9277e75bf170a5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Nov 23 18:20:14 2008 +0100
+
+ Fix a crash when the second argument of opMarkPoint is not a
+ dictionary
+
+ According to the spec "If any of the values are indirect references to
+ objects outside the content stream, the property list dictionary must
+ instead be defined as a named resource.
+
+ poppler/Gfx.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 817e123a28e9f6b7e5be23f7ac2ba3bcec5e3f3f
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Nov 22 21:48:37 2008 +1030
+
+ Don't compare print flag for non Type 3 fonts in cairo font cache
+
+ poppler/CairoFontEngine.cc | 7 ++++++-
+ poppler/CairoFontEngine.h | 4 +++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+commit 68f8ade28764855d4f663607c50c8202b1268296
+Author: Albert Astals Cid <tsdgeos@samsung.localdomain>
+Date: Sun Nov 23 10:54:46 2008 +0100
+
+ Compile with -pedantic
+
+ Thanks to Bernard Leak for notifying
+
+ test/pdf-inspector.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4a4fa7ed44a87e47a6078a1f7bb6f41071672ea7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Nov 18 20:11:07 2008 +0100
+
+ Fix a crash when selecting text in word mode
+
+ poppler/TextOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a6f5032ab0d6edbf3879f39efff7916b1f7233da
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Nov 16 18:24:06 2008 +0100
+
+ optContentConfig is not actually stored in PDFDoc but in Catalog
+
+ poppler/PDFDoc.h | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit b843ac34c6c4ca1580f99fa2220c59dfcd91f026
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Nov 15 14:49:02 2008 +0100
+
+ [Qt4] deserialize the value of the 'right' coordinate, too
+
+ qt4/src/poppler-link.cc | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 03061fdae49842556c9ff48e61914fc88502e1d8
+Author: Tim Mooney <enchanter@users.sourceforge.net>
+Date: Thu Nov 13 22:32:22 2008 +0100
+
+ Fix build on Solaris 10 + Sun Studio 12.
+
+ Fixes bug 17496
+
+ configure.ac | 14 ++++++++++++++
+ test/Makefile.am | 6 ++++--
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+commit 17b18be4fd25f2ca2b4ed7382d9fda50410c44f1
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Wed Nov 12 20:40:57 2008 +1030
+
+ Ensure cairo font matrix is invertable
+
+ Fixes bugs #18254 and #18429
+
+ poppler/CairoOutputDev.cc | 15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+commit e2257e6916cd1067d43db9ed45f944413c61ed64
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 9 22:44:48 2008 +0100
+
+ Update copyrights of the last commits
+
+ poppler/CairoFontEngine.cc | 1 +
+ poppler/CairoFontEngine.h | 1 +
+ poppler/Form.cc | 2 +-
+ poppler/Gfx.h | 1 +
+ poppler/OptionalContent.h | 1 +
+ qt4/src/poppler-optcontent.cc | 1 +
+ 6 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 069f8ad9453e612e907b561aa50983c34400193d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 9 20:36:06 2008 +0100
+
+ MakeItBuild
+
+ glib/CMakeLists.txt | 1 +
+ glib/demo/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 04025c4f65bbb7e4330f6d17d917a035c0906f3d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Nov 9 17:03:20 2008 +0100
+
+ Fix a crash when initializing an Annot with a null catalog
+
+ Forms crate a temp annot just to get the font size of the form field
+ passing a NULL catalog.
+
+ poppler/Annot.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 471255c5a3850984997d91c7850759eb0c7e8a9c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Nov 8 20:58:57 2008 +0100
+
+ [glib-demo] Add Optional Content demo
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/layers.c | 511
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/layers.h | 31 +++
+ glib/demo/main.c | 4 +-
+ 4 files changed, 547 insertions(+), 1 deletions(-)
+
+commit 7363c25e1d83332932d9b4fe16d7fb4e364da628
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 26 19:47:35 2008 +0100
+
+ [glib] Add Optional Content support
+
+ glib/Makefile.am | 2 +
+ glib/poppler-document.cc | 377
+ +++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h | 12 ++
+ glib/poppler-layer.cc | 201 ++++++++++++++++++++++++
+ glib/poppler-layer.h | 43 +++++
+ glib/poppler-private.h | 21 +++
+ glib/poppler.h | 3 +
+ glib/test-poppler-glib.cc | 52 ++++++-
+ 8 files changed, 710 insertions(+), 1 deletions(-)
+
+commit c674566f458b54097f21aae0d4bf8637146565c5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 26 19:42:53 2008 +0100
+
+ Fix memory leaks in OptionalContent
+
+ poppler/OptionalContent.cc | 13 +++----------
+ poppler/OptionalContent.h | 10 ++++++----
+ 2 files changed, 9 insertions(+), 14 deletions(-)
+
+commit 06ca313b8ecb8abb8dec3b418d118525b7bb0fdf
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 26 19:11:45 2008 +0100
+
+ Check annotation optional content properties before drawing it
+
+ poppler/Annot.cc | 20 ++++++++++++--------
+ poppler/Annot.h | 4 ++--
+ 2 files changed, 14 insertions(+), 10 deletions(-)
+
+commit a6d58927b048aa043cb6b6ed3ee9aeb213578924
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Nov 8 20:50:40 2008 +0100
+
+ Do not show hidden optional content
+
+ Before any draw operation we first check whether we are inside an
+ optional marked content element that is currently hidden.
+
+ poppler/Gfx.cc | 113
+ +++++++++++++++++++++++++++++++++++++++-----------------
+ poppler/Gfx.h | 7 ++-
+ 2 files changed, 84 insertions(+), 36 deletions(-)
+
+commit 5f168f991477e291290350a28f4a60a565e187b9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Oct 20 17:56:11 2008 +0200
+
+ [glib] Show action titles when printing the index in test program
+
+ glib/test-poppler-glib.cc | 13 ++++++++-----
+ 1 files changed, 8 insertions(+), 5 deletions(-)
+
+commit a906d12e16748d9a40c0db4043a576fd3d004341
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Nov 8 20:20:00 2008 +0100
+
+ Minor code cleanup and consistency issues
+
+ poppler/OptionalContent.cc | 22 +++++++++++-----------
+ poppler/OptionalContent.h | 8 ++++----
+ qt4/src/poppler-optcontent.cc | 6 +++---
+ qt4/tests/check_optcontent.cpp | 8 ++++----
+ 4 files changed, 22 insertions(+), 22 deletions(-)
+
+commit e73c2ce906b7e1f06d641f7e0733aad6336b4091
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Oct 19 12:44:13 2008 +0200
+
+ Delete the optContent object if it's invalid
+
+ poppler/Catalog.cc | 4 ++++
+ poppler/OptionalContent.cc | 3 +++
+ poppler/OptionalContent.h | 5 +++++
+ 3 files changed, 12 insertions(+), 0 deletions(-)
+
+commit 2900e7e4c920d735d5a727e9e39f71df97bd7b93
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 8 18:12:47 2008 +0100
+
+ A new cairo is needed
+
+ CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit aaaecd2e86769d3a99e21577448a193711985958
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 5 22:47:30 2008 +0100
+
+ Do not abort if indexHighA is 'invalid', move it to the closest
+ valid value and try with it
+
+ For the bug 18374 it works and does not seem a security problem
+
+ poppler/GfxState.cc | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 82f4228a50efe6447c68f7f6d34a7805b7e4b75e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 5 20:57:17 2008 +0100
+
+ Add myself here
+
+ qt4/demos/viewer.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 8df7d83439f0e9ab200840f912f1c08bbf44bd6e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 5 20:49:01 2008 +0100
+
+ [Qt4Demo] Fix leak
+
+ qt4/demos/viewer.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d3c424e0362f53bda5c4e2e415823d78ace76253
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 5 20:14:17 2008 +0100
+
+ Rename i to j so that code is more clear by not shadowing the
+ function parameter
+
+ poppler/Catalog.cc | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 9d12de9b59de4336eabb423f7bf0363b6a35e2a8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 5 20:00:01 2008 +0100
+
+ Fix crash in case indices is NULL
+
+ Putting more than one "logical line" per "real line" is evil, we
+ think if will group it, but does not
+
+ poppler/UnicodeTypeTable.cc | 7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+commit fc61dad9daa15f83802ffa5c3cd9b59d80bb310b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 5 19:52:00 2008 +0100
+
+ [Qt] Fix leak
+
+ qt/poppler-link.cc | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 981fb857b0afb1cda7836744dcf37906285512b4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 5 19:49:18 2008 +0100
+
+ [Qt] Fix memory leak
+
+ qt/poppler-document.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit e925e92d5cbfc009c138ece117227a3b0894ead6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 5 19:44:40 2008 +0100
+
+ Do not leak uBuf in the error case
+
+ poppler/CharCodeToUnicode.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 0741a402632ec5a8641ff11707142bf2731c1833
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Nov 1 22:27:48 2008 +1030
+
+ Restore the cairo Type3 font image prescaling funtionality
+
+ poppler/CairoFontEngine.cc | 49
+ ++++++++++++++++++++++++++------------------
+ poppler/CairoFontEngine.h | 20 ++++++++++-------
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h | 2 +-
+ 4 files changed, 43 insertions(+), 30 deletions(-)
+
+commit 91a7c3fdd44f30b0b50ed05a3313bbb1b5c86e71
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Nov 1 20:57:24 2008 +1030
+
+ Remove cairo font matrix y flip when inside a Type 3 char
+
+ Not sure why this was previously required but it now produces
+ incorrect results.
+
+ poppler/CairoOutputDev.cc | 5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+commit 3bf4d7d75b455a9a0b5ee3a8c78b218e5af5185a
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Nov 1 20:50:07 2008 +1030
+
+ Transform the glyph advance by the font matrix
+
+ poppler/CairoFontEngine.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 4aa32bad61d008a854fdc9e902d6834bb1687d7e
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Nov 1 20:49:04 2008 +1030
+
+ Use the font BBox, not the font matrix to set the Gfx BBox
+
+ poppler/CairoFontEngine.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 987955440c7711f440c3d2b5cc8c05ec07228a77
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Nov 1 20:47:05 2008 +1030
+
+ Ensure both the font matrix and y-axis flip are in the matrix
+
+ we use for transforming the glyph metrics.
+
+ poppler/CairoFontEngine.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 5c051aa117477cba5d350adfc539acb4b5f2a56a
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Nov 1 01:59:07 2008 +1030
+
+ Require cairo 1.8.2 for user-font support
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a3edfa30680864b95a5196c5619846de42980857
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Nov 1 01:57:32 2008 +1030
+
+ Implement Type 3 fonts in cairo backend using cairo user-fonts
+
+ poppler/CairoFontEngine.cc | 174
+ ++++++++++++++++++++++++++++++++++++++++++--
+ poppler/CairoFontEngine.h | 18 +++++
+ poppler/CairoOutputDev.cc | 9 ++-
+ poppler/CairoOutputDev.h | 4 +-
+ 4 files changed, 194 insertions(+), 11 deletions(-)
+
+commit feab1e982a2ee39bb372d593633a06b6a499822f
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Nov 1 01:21:39 2008 +1030
+
+ Add CairoOutputDev functions for getting Type 3 glyph metrics
+
+ poppler/CairoOutputDev.cc | 10 ++++++++++
+ poppler/CairoOutputDev.h | 7 +++++++
+ 2 files changed, 17 insertions(+), 0 deletions(-)
+
+commit a75efe208d899d4a23d5e2fcef200e4225721636
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sat Nov 1 00:26:40 2008 +1030
+
+ Make the catalog available to CairoFontEngine
+
+ glib/poppler-document.cc | 3 ++-
+ poppler/CairoFontEngine.cc | 2 +-
+ poppler/CairoFontEngine.h | 3 ++-
+ poppler/CairoOutputDev.cc | 7 +++++--
+ poppler/CairoOutputDev.h | 3 ++-
+ test/pdf-inspector.cc | 2 +-
+ 6 files changed, 13 insertions(+), 7 deletions(-)
+
+commit 941d3976c496b75a3c5a9d19b80044fc2b57bd98
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Oct 31 22:44:41 2008 +1030
+
+ Allow multiple instances of CairoOutputDev to be created
+
+ for the same document that shares the same CairoFontEngine.
+
+ poppler/CairoOutputDev.cc | 16 +++++++++++-----
+ poppler/CairoOutputDev.h | 4 +++-
+ 2 files changed, 14 insertions(+), 6 deletions(-)
+
+commit 94cff513d8589f51b243fcb078f82cb931bb6d35
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Oct 31 21:11:01 2008 +1030
+
+ Use correct return type in _ft_new_face
+
+ poppler/CairoFontEngine.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0b5ee897a24ce1edfca19a3b843f9b7ee7026d07
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri Oct 31 20:55:14 2008 +1030
+
+ Refactor CairoFont
+
+ Create a CairoFreeType subclass and move the FreeType specific code
+ into it.
+
+ poppler/CairoFontEngine.cc | 197
+ +++++++++++++++++++++++++-------------------
+ poppler/CairoFontEngine.h | 26 +++++--
+ 2 files changed, 131 insertions(+), 92 deletions(-)
+
+commit a5865dae5b414de5f6dbda2a512101050c374e06
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Oct 28 10:30:59 2008 +0100
+
+ [glib] Add DISABLE_SINGLE_INCLUDES flags and fix glib-demo
+
+ configure.ac | 4 ++++
+ glib/Makefile.am | 3 ++-
+ glib/demo/Makefile.am | 3 ++-
+ glib/demo/annots.h | 2 +-
+ glib/demo/attachments.h | 2 +-
+ glib/demo/fonts.h | 2 +-
+ glib/demo/forms.h | 2 +-
+ glib/demo/images.h | 2 +-
+ glib/demo/info.h | 2 +-
+ glib/demo/links.h | 2 +-
+ glib/demo/outline.h | 2 +-
+ glib/demo/page.h | 2 +-
+ glib/demo/render.h | 2 +-
+ glib/demo/transitions.h | 2 +-
+ glib/demo/utils.h | 2 +-
+ 15 files changed, 20 insertions(+), 14 deletions(-)
+
+commit e07bfb54b77430e10e50c33151cf0afc9854006c
+Author: Christian Persch <chpe@gnome.org>
+Date: Tue Oct 28 10:29:51 2008 +0100
+
+ [glib] Fix build when compiling with GTK_DISABLE_SINGLE_INCLUDES
+
+ glib/poppler-page.h | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit a84d272ffd2b593ac98148e71b83fba299c60fea
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Oct 28 10:01:00 2008 +0100
+
+ [glib] Add disable deprecated compile flags and fix compile warnings
+
+ configure.ac | 6 ++++++
+ glib/Makefile.am | 3 ++-
+ glib/demo/Makefile.am | 4 +++-
+ glib/demo/attachments.c | 4 ++--
+ 4 files changed, 13 insertions(+), 4 deletions(-)
+
+commit 43f2b84a81625abee84c93cdced7fb92c99cd944
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Oct 21 23:00:55 2008 +0200
+
+ [Qt4] Small docu improvement
+
+ qt4/src/poppler-qt4.h | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 00f9995b4960575cd1f392474c585f2140c8e587
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 12 14:20:01 2008 +0200
+
+ Do not crash if there is not font
+
+ See bug 18023 for more info
+
+ poppler/TextOutputDev.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 084cc4335cfe2c0e66219eba4c1177ee7ff018c5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Oct 10 23:15:35 2008 +0200
+
+ obj4 should be the index 1 on the Array, not the 0, that's already
+ obj3
+
+ poppler/Form.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d7442c90206d4b7a8ebc58f995647eb87ac35f42
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Oct 9 22:53:00 2008 +0200
+
+ If Name is a Ref we want to get the String it references, not the Ref
+
+ poppler/OptionalContent.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 93f8dd9e837557bbfc0f058a664c356e3d6e82c0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Oct 9 21:28:27 2008 +0200
+
+ Poppler 0.10.0
+
+ CMakeLists.txt | 2 +-
+ NEWS | 16 ++++++++++++++++
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 22 insertions(+), 6 deletions(-)
+
+commit cdd9bf016de0d3f96b1d5e304c9d02f2bf71ff18
+Author: Mark Kaplan <mkaplan@finjan.com>
+Date: Wed Oct 8 22:29:11 2008 +0200
+
+ Initialize properly OptionalContentGroup::m_name
+
+ poppler/OptionalContent.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit c7b87f3b8cbbcca29a1974debc2233f621a2e33b
+Author: Carlo Bramini <carlo.bramix@libero.it>
+Date: Mon Oct 6 19:32:27 2008 +0200
+
+ Fix link on Mingw+Msys
+
+ test/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e92255296511cae9cbbac8de800d8b26e5f681f1
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Oct 5 15:57:06 2008 +0200
+
+ [Qt4] when the PDF exporting fails, delete the file if it was
+ created by
+ the (failed) exporting
+
+ qt4/src/poppler-pdf-converter.cc | 13 +++++++++++++
+ 1 files changed, 13 insertions(+), 0 deletions(-)
+
+commit 360f470b852e37d400949343763a18bf598820e8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 4 20:04:44 2008 +0200
+
+ Remove unused var
+
+ poppler/Annot.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit df7317f1320513b4f66cb6618d753b82042671f5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 4 19:48:57 2008 +0200
+
+ free the object
+
+ poppler/PDFDoc.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 9946d9af9dd5d5b96d5c777413a3e253dfd1f291
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 4 19:39:46 2008 +0200
+
+ If we try saving a document that was encrypted, we break everything,
+ so just fail early
+
+ poppler/PDFDoc.cc | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 108959432af7714cb8ffe42d98d40c97f936a2e6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 4 19:39:24 2008 +0200
+
+ Correctly return wheter it was saved or not
+
+ qt4/src/poppler-pdf-converter.cc | 8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 4c6cb1c204d782e2ac2113b57f6d372b4716017d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 4 01:46:58 2008 +0200
+
+ Remove spurious //
+
+ fofi/FoFiType1.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e8e7809ab4b115cbe67251da12989fc024912514
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 4 01:43:02 2008 +0200
+
+ There are files that have more than one encoding definition per line,
+ make them work
+
+ Fixes bug 17018, while at it, i've added some comments and some
+ error() to make things a bit clearer
+
+ fofi/FoFiType1.cc | 28 ++++++++++++++++++++++++----
+ 1 files changed, 24 insertions(+), 4 deletions(-)
+
+commit 7604e025038fee24c2cb3001f2100d5d1e48efe1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Oct 4 00:35:46 2008 +0200
+
+ Fix Poppler::Link::linkArea for rotated pages
+
+ we suck :-( Fixes kde bug 172105
+
+ qt4/src/poppler-link-extractor.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 450b21e4528a8e890d3dda37ecb0a68602f8efaa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Oct 1 00:46:29 2008 +0200
+
+ I've changed these files this year too, update copyright
+
+ goo/gmem.cc | 2 +-
+ goo/gmem.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 98310ca24841789cf53b10d34e271ceb4e054001
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 30 23:59:43 2008 +0200
+
+ Fix StitchingFunction(StitchingFunction *func) and
+ GfxAxialShading(GfxAxialShading *shading)
+
+ Fixes bug 17852
+
+ poppler/Function.cc | 2 ++
+ poppler/GfxState.cc | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit d12f5f4395eb18f8d29182e24acddd3e2b5cfe88
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 30 23:20:26 2008 +0200
+
+ 0.9.3
+
+ CMakeLists.txt | 2 +-
+ NEWS | 17 +++++++++++++++++
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 23 insertions(+), 6 deletions(-)
+
+commit d61e464754521555a06ed0901955f49be4def29a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 30 19:26:17 2008 +0200
+
+ Timothy also agreed, now Ed Catmur is the last one missing to answer
+
+ utils/ImageOutputDev.cc | 3 +++
+ utils/ImageOutputDev.h | 3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 3225f54fea7cbb6b25d7223268cdeccfdd823375
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 30 00:27:49 2008 +0200
+
+ And Marco said yes to GPLv2+
+
+ Only Timothy Lee and Ed Catmur left :-)
+
+ poppler/Catalog.cc | 3 +++
+ poppler/Outline.cc | 3 +++
+ poppler/Outline.h | 3 +++
+ splash/Splash.cc | 3 +++
+ splash/Splash.h | 3 +++
+ 5 files changed, 15 insertions(+), 0 deletions(-)
+
+commit 268d803c9dd67b7f78f8dcdc3c7653c8b2c2d08f
+Author: Warren Toomey <wkt@tuhs.org>
+Date: Mon Sep 29 21:14:40 2008 +0200
+
+ Let HmtlOutputDev process images
+
+ utils/HtmlOutputDev.h | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit a29984ab777c64a1cb286b667a6a91ad9b191f40
+Merge: f399afe 6865872
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Sep 28 23:39:08 2008 +0200
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit f399afe6f6b9c250327d0e4c5b3f2839889d7095
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Sep 28 23:38:34 2008 +0200
+
+ [Qt4] various apidox improvements
+
+ qt4/src/Mainpage.dox | 10 +---
+ qt4/src/poppler-link.h | 92 +++++++++++++++++++++++++++++++++---
+ qt4/src/poppler-qt4.h | 121
+ ++++++++++++++++++++++++++++++++---------------
+ 3 files changed, 168 insertions(+), 55 deletions(-)
+
+commit 68658721583b05ebacb1165ac36e91d49735bbd9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 28 19:29:06 2008 +0200
+
+ If tables is null, don't try to write to file as it'll crash, fixes
+ crash on 17811 when using cairooutputdev
+
+ fofi/FoFiTrueType.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 3cb5b7fc5ae168ef58fd1905f61c1b9abe6cb86c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 28 19:25:53 2008 +0200
+
+ Introduce greallocn_checkoverflow and use it in FoFiTrueType::parse
+
+ Fixes the other part of bug 17811
+
+ fofi/FoFiTrueType.cc | 4 ++--
+ goo/gmem.cc | 21 +++++++++++++++++++++
+ goo/gmem.h | 1 +
+ 3 files changed, 24 insertions(+), 2 deletions(-)
+
+commit aa7ef03af49f74ed558dcbab8ad4c594bb2b7d53
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 28 19:24:43 2008 +0200
+
+ If libjpeg tells us to abort, let's abort :D
+
+ Fixes part of bug 17811
+
+ poppler/DCTStream.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit e2461c9aa4d74b5511621d7222979948e31541ad
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Sep 28 18:07:25 2008 +0200
+
+ [Qt4] Activate the 'printing' flag by default in the PSConverter.
+
+ qt4/src/poppler-ps-converter.cc | 2 +-
+ qt4/src/poppler-qt4.h | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 957d7acb66635e9748c6bc7a31cdbbcbb8da9011
+Author: Carlo Bramini <carlo.bramix@libero.it>
+Date: Sat Sep 27 17:23:20 2008 +0200
+
+ Misc mingw fixes
+
+ configure.ac | 2 +-
+ glib/Makefile.am | 2 +-
+ glib/demo/info.cc | 1 +
+ m4/libjpeg.m4 | 2 +-
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+
+commit b3828203c4e594754957033ea826e8e22164fd5b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 26 23:08:14 2008 +0200
+
+ Carl agreed too, so CairoOutputDev.cc is done
+
+ Only miss, Marco Pesenti Gritti, Timothy Lee and Ed Catmur
+
+ poppler/CairoOutputDev.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit a197a07728d19abc2708979c95b4ef53e88fcb55
+Author: Carlo Bramini <carlo.bramix@libero.it>
+Date: Fri Sep 26 18:42:05 2008 +0200
+
+ Compile where localtime_r is not available
+
+ glib/demo/info.cc | 10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 38884e1722ac7e15c62cece20035c5fb0020f4b3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 24 14:18:38 2008 +0200
+
+ Do what Jeff really want to do, mark the font as invalid if it matches
+ any of the known collections that Identity is not a good fallback
+
+ Fixes pdf on KDE bug 171365
+
+ poppler/GfxFont.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0e080aaf44816e5d5b9008f3c2fb54868932f0ac
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 24 13:12:13 2008 +0200
+
+ Remove non-needed X includes
+
+ Spotted by Carlo Bramini
+
+ test/gtk-cairo-test.cc | 3 ---
+ test/pdf-inspector.cc | 3 ---
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+commit 6888b023fdb199d3c5fb705bd928aedf68eeffdb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 23 23:28:04 2008 +0200
+
+ Only do the scale to 'm' size trick on non embedded fonts as it was
+ meant to be
+
+ Fixes bug 17744
+
+ poppler/SplashOutputDev.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 539d29f4f3b24b98c9fc5f88d3477e427fbe409d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 23 22:39:50 2008 +0200
+
+ 0.9.2
+
+ CMakeLists.txt | 2 +-
+ NEWS | 19 +++++++++++++++++++
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 25 insertions(+), 6 deletions(-)
+
+commit abd070a79d8345bda3853395a39e4e2882c4ff8a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 22 20:23:11 2008 +0200
+
+ Check the types here too
+
+ Benchmarking in release mode, both in "human feel" and callgrind
+ the benefit/lost is almost inexistant
+
+ poppler/Object.h | 36 ++++++++++++++++++++++--------------
+ 1 files changed, 22 insertions(+), 14 deletions(-)
+
+commit df47e4c441e4ec79b1bb40de7044c9501f243b76
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Sep 16 12:56:04 2008 +0100
+
+ Check for duplicate open fonts.
+
+ Before creating a new FT_Face for a font, check to see if there is a
+ duplicate amongst the list of open fonts, kept alive by either
+ Poppler's
+ or Cairo's font cache .
+
+ A quick example of the benefit of this check is that it reduces the
+ RSS of
+ the Poppler converter in the Cairo test suite from over 900 MiB to
+ just 90
+ MiB.
+
+ configure.ac | 1 +
+ poppler/CairoFontEngine.cc | 214
+ ++++++++++++++++++++++++++++++++++++++-----
+ 2 files changed, 190 insertions(+), 25 deletions(-)
+
+commit 41d1edddcf84ca23c0fc39c5f4f3a49e408a9f1a
+Author: Kouhei Sutou <kou@cozmixng.org>
+Date: Sun Sep 21 16:33:33 2008 +0200
+
+ [glib-demo] Fix a crash in forms demo
+
+ glib/demo/forms.c | 12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+commit fe26075353226be9a02c8cf1a6a29586de15ce86
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Sep 21 12:03:21 2008 +0200
+
+ really use the key passed to it
+
+ poppler/Form.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 8aa531cb478d6ae838a94f9f31e6a0bbd0dd957c
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Sep 21 11:18:22 2008 +0200
+
+ Read the 'readOnly' attribute directly in the FormField constructor.
+
+ poppler/Form.cc | 12 +++---------
+ 1 files changed, 3 insertions(+), 9 deletions(-)
+
+commit b56f64d676bdabd4a3ebe0eb2237f4c202a3707d
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Sep 21 00:53:54 2008 +0200
+
+ Handle streams as entries for the catalog JS name tree.
+
+ poppler/Catalog.cc | 18 +++++++++++++-----
+ 1 files changed, 13 insertions(+), 5 deletions(-)
+
+commit 93386d67b3d7adbd87547e9742e4df1c10eadbc1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 20 16:20:03 2008 +0200
+
+ Compile with -pedantic
+
+ poppler/Form.h | 4 ++--
+ qt4/src/poppler-embeddedfile.cc | 4 ++--
+ qt4/src/poppler-movie.cc | 3 ++-
+ qt4/src/poppler-sound.cc | 3 ++-
+ qt4/src/poppler-textbox.cc | 2 +-
+ 5 files changed, 9 insertions(+), 7 deletions(-)
+
+commit 6961fd8efe3db6ee7077dc2ed072498696dae31a
+Author: Tomas Are Haavet <tomasare@gmail.com>
+Date: Sat Sep 20 16:13:37 2008 +0200
+
+ Remove some warnings and errors when compiling with gcc and -pedantic
+
+ fofi/FoFiTrueType.cc | 3 ++-
+ glib/poppler-annot.cc | 8 ++++----
+ glib/poppler-attachment.cc | 2 +-
+ glib/poppler-document.cc | 6 +++---
+ glib/poppler-form-field.cc | 2 +-
+ glib/poppler-page.cc | 2 +-
+ poppler/Annot.h | 5 +++--
+ splash/SplashTypes.h | 3 ++-
+ 8 files changed, 17 insertions(+), 14 deletions(-)
+
+commit 4e9a04da358b1527a08102e601a52f07930532f2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 20 16:10:50 2008 +0200
+
+ Add mention of GPLv2 or later in poppler changes to all files except
+ Splash.cc and Splash.h, i've still no answer from Marco :-(
+
+ splash/SplashBitmap.cc | 3 +++
+ splash/SplashBitmap.h | 3 +++
+ splash/SplashErrorCodes.h | 3 +++
+ splash/SplashFTFont.cc | 3 +++
+ splash/SplashFTFont.h | 3 +++
+ splash/SplashFTFontEngine.cc | 3 +++
+ splash/SplashFTFontEngine.h | 3 +++
+ splash/SplashFTFontFile.cc | 3 +++
+ splash/SplashFTFontFile.h | 3 +++
+ splash/SplashFont.cc | 3 +++
+ splash/SplashFont.h | 3 +++
+ splash/SplashFontEngine.cc | 3 +++
+ splash/SplashFontEngine.h | 3 +++
+ splash/SplashFontFile.cc | 3 +++
+ splash/SplashFontFile.h | 3 +++
+ splash/SplashT1Font.cc | 3 +++
+ splash/SplashT1Font.h | 3 +++
+ splash/SplashT1FontEngine.cc | 3 +++
+ splash/SplashT1FontFile.cc | 3 +++
+ splash/SplashT1FontFile.h | 3 +++
+ splash/SplashTypes.h | 3 +++
+ splash/SplashXPathScanner.cc | 3 +++
+ 22 files changed, 66 insertions(+), 0 deletions(-)
+
+commit beb87362072d5b480cf6b2c02445ec17c119ff56
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 20 15:47:25 2008 +0200
+
+ Add Tomas' Copyright
+
+ utils/HtmlFonts.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 8ccb1bb651b129875ef802356c4a229b2ce31973
+Author: Tomas Are Haavet <tomasare@gmail.com>
+Date: Sat Sep 20 15:45:47 2008 +0200
+
+ Initialize pos the correct value to not have crashes
+
+ utils/HtmlFonts.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 77bf8ec94e36fef7e120f1dc4bb1390be71cfb97
+Author: Tomas Are Haavet <tomasare@gmail.com>
+Date: Sat Sep 20 14:17:06 2008 +0200
+
+ Fix memory leak
+
+ utils/HtmlOutputDev.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit b22be54dc2205269974315ca748d835d0990d6da
+Author: Tomas Are Haavet <tomasare@gmail.com>
+Date: Sat Sep 20 14:16:26 2008 +0200
+
+ Fix mismatched free/delete
+
+ utils/HtmlOutputDev.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit ac16174da1d6f19445f78e7cd7c4a18cb9524dde
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 20 00:52:19 2008 +0200
+
+ make sure the image is setup before using it, otherwise some things
+ don't print correctly like PDF from bug 17645
+
+ poppler/PSOutputDev.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit ffa4ffdf7fe83035c72addd8c4c8ee566621ba06
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 17 23:27:30 2008 +0200
+
+ 0.9.1
+
+ CMakeLists.txt | 2 +-
+ NEWS | 13 +++++++++++++
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 19 insertions(+), 6 deletions(-)
+
+commit f57cbe32bcde0808943b9be2456dd69fa5b6dd27
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 14 22:18:38 2008 +0200
+
+ If when looking for an object we get objSomeNumberAfter assume it
+ was an int of SomeNumberAfter
+
+ Fixes bug 17568 and i don't see how it can break existing things
+ because it's already on an error path
+
+ poppler/XRef.cc | 25 +++++++++++++++++++++++++
+ 1 files changed, 25 insertions(+), 0 deletions(-)
+
+commit 1a852064ff5a1a15bc315ddca472a0ad74292581
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Sep 13 12:11:41 2008 +0200
+
+ [glib-demo] Do not try to get info about remote destinations
+
+ glib/demo/utils.c | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 951cffeb2cbff4e179043033b5ac7f5eb764d6dc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 12 12:05:53 2008 +0200
+
+ Make sure DecryptAESState::bufIdx is never bigger than 16, otherwise
+ we crash
+
+ I am not sure this is the correct fix, but fixes crash on files of
+ bugs 13972, 16092 and 17523 and they seem to work ok
+
+ poppler/Decrypt.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 491109edbe827860e764b5fcb67456867923858d
+Author: Haruyuki Kawabe <Haruyuki.Kawabe@unisys.co.jp>
+Date: Wed Sep 10 23:00:32 2008 +0200
+
+ Generate the outline file at the same place the other files are
+ generated
+
+ Fixes bug 17504
+
+ utils/HtmlOutputDev.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 7dfc1e4c9348d537896bda7b0f2ae591afc72866
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 10 00:03:50 2008 +0200
+
+ we want to distribute this file too
+
+ qt4/src/Makefile.am | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit ddb73e8dc1ccbddf3b170e12c7153ccaf716d7cc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 9 23:47:33 2008 +0200
+
+ We want to distribute cmake/modules/FindLIBOPENJPEG.cmake too
+
+ Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 646ccc2bb8563d411dc25bdbab53725ae08572ba
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 9 23:22:17 2008 +0200
+
+ m_doc->doc->getOptContentConfig() can be null, so check for it
+
+ qt4/src/poppler-document.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d7f0bce67101f37f8d3e69d7d701388bcdc7200f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 9 23:18:49 2008 +0200
+
+ Qt4 frontend had timezone parsing that got lost when moving to the
+ common function, i suck
+
+ glib/poppler-document.cc | 6 ++++--
+ poppler/DateInfo.cc | 20 ++++++++++++++------
+ poppler/DateInfo.h | 2 +-
+ qt/poppler-document.cc | 6 ++++--
+ qt4/src/poppler-document.cc | 22 +++++++++++++++++++---
+ utils/pdfinfo.cc | 6 ++++--
+ utils/pdftohtml.cc | 6 ++++--
+ 7 files changed, 50 insertions(+), 18 deletions(-)
+
+commit 0af8609e6c932de2d85168cc9147854ee84b3a1b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 9 20:55:27 2008 +0200
+
+ i want this packaged too
+
+ utils/Makefile.am | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit dd0f4c1510382e17cf33d3fe163e384da1d6d289
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 9 20:48:04 2008 +0200
+
+ Fix includepath
+
+ fofi/FoFiTrueType.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 16c0842c3e01608a72709af55cc5cb8b567efedf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 9 20:36:18 2008 +0200
+
+ API changed, so increase soname
+
+ glib/CMakeLists.txt | 2 +-
+ glib/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 217c0d1f80a78713977a7bfbe680fce90f1c6b36
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 8 23:56:28 2008 +0200
+
+ change version to 0.9.0
+
+ Now only need to wait for Carlos and Iñigo's answer to a BIC change
+ in glib/ and we'll have 0.9.0 :-)
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+commit e34022a8fcfb9fe211dd6b561377d855972b2087
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 8 23:36:04 2008 +0200
+
+ Increase soname for libpoppler, i'm almost sure we broke BC there
+
+ CMakeLists.txt | 2 +-
+ poppler/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit bc275049d6ef083daf71a043ccf23fd0634f5c4d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 8 23:33:24 2008 +0200
+
+ soname 3.1.0 for qt4 libs, we are BC/SC but got new API
+
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 06743a25a73adc3fba95f7b4ad74a6dde1a54ead
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 8 23:23:06 2008 +0200
+
+ added news for 0.9.0
+
+ NEWS | 115
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 115 insertions(+), 0 deletions(-)
+
+commit d35ca2ce5df12d40e295873e44b1f18ea40ba897
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Sep 7 01:13:33 2008 +0200
+
+ [Qt4] apidox improvements
+
+ qt4/src/poppler-annotation.h | 70
+ +++++++++++++++++++++++++++++++++++++++--
+ qt4/src/poppler-link.h | 12 +++++--
+ qt4/src/poppler-qt4.h | 22 +++++++++++--
+ 3 files changed, 93 insertions(+), 11 deletions(-)
+
+commit 796d4c002d47c85716775d173eddfb2ae8866eaf
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Sep 6 22:48:13 2008 +0200
+
+ no more need for including the qt3 paths
+
+ qt4/demos/CMakeLists.txt | 1 -
+ qt4/src/CMakeLists.txt | 1 -
+ qt4/tests/CMakeLists.txt | 1 -
+ 3 files changed, 0 insertions(+), 3 deletions(-)
+
+commit db7ee3b3ae0f42155f9245691e4bfdef98a8ed6f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 6 23:16:05 2008 +0200
+
+ [Qt4] Fix docu
+
+ qt4/src/poppler-qt4.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3366059a25611f19ab592cda18c5efe0b9359771
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Sep 6 16:34:58 2008 +0200
+
+ [Qt4] add option flags for the PS converter
+
+ - map the 'strictMargins' and 'forceRasterize' bool options as flags
+ - add a flag for setting the "printing" mode
+
+ qt4/src/poppler-ps-converter.cc | 34 ++++++++++++++++++++++++++--------
+ qt4/src/poppler-qt4.h | 26 ++++++++++++++++++++++++++
+ 2 files changed, 52 insertions(+), 8 deletions(-)
+
+commit afa26d5c9ac9feb61aad30eb65dc00c9854d7f2e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 6 15:46:12 2008 +0200
+
+ we are printing so pass the print flag as true
+
+ qt/poppler-document.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f5d1eb5eaabaf3ab4bb87b8b4b901bbf30b20b29
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 6 15:43:32 2008 +0200
+
+ We are pringint here, so pass the printing flag as true
+
+ Fixes KDE bug 170459, you'd wonder how many times i've made the
+ same mistake...
+
+ qt4/src/poppler-ps-converter.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 58e828d732f06bae9133dd518d89fa4348f1cca8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 5 18:45:23 2008 +0200
+
+ Only like QtTest to the tests, not to the lib itself
+
+ configure.ac | 13 +++++++++++--
+ qt4/tests/Makefile.am | 22 +++++++++++-----------
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+commit 49b3e4560f62a9a7db350d94d50e229f5e1208bf
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Sep 5 18:17:45 2008 +0200
+
+ Movie filename is not a string, but a File Specification
+
+ Fixes a crash when filename is a dictionary
+
+ poppler/Annot.cc | 8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 996d2e176057e22acbc374cff7a712ce6fd92d93
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Sep 5 18:17:25 2008 +0200
+
+ Unify multiple File Specification parsers
+
+ CMakeLists.txt | 2 +
+ poppler/FileSpec.cc | 146
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/FileSpec.h | 24 ++++++++
+ poppler/Link.cc | 104 +++++-----------------------------
+ poppler/Link.h | 4 -
+ poppler/Makefile.am | 2 +
+ poppler/PSOutputDev.cc | 35 +-----------
+ poppler/PSOutputDev.h | 1 -
+ poppler/Sound.cc | 7 ++-
+ 9 files changed, 197 insertions(+), 128 deletions(-)
+
+commit 31f3eb2d6b43f7fbf4d978730d109b08b1563989
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 3 21:49:23 2008 +0200
+
+ Only set the state to true if the AS value is the same as parent's V
+
+ Fixes bug 16121 and 15535
+
+ poppler/Form.cc | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit c75abac7ba07990ef54a46fa0d429eea580a71ef
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 2 19:16:55 2008 +0200
+
+ Kjartan was missing and just agreed
+
+ utils/HtmlOutputDev.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 630aa133017d15ddc7bf96c79f43c5b60fa9749a
+Merge: b2bc9b3 de82255
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Sep 2 01:25:55 2008 +0200
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit b2bc9b3f59ef8e5fea18f0bc91b71fc9eb9a4157
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Sep 2 01:24:39 2008 +0200
+
+ [Qt4] small apidox improvements
+
+ mostly the start of the \since marker addition, plus few other
+ documentation addition/improvements
+
+ qt4/src/poppler-annotation.h | 9 ++++++
+ qt4/src/poppler-form.h | 8 +++++
+ qt4/src/poppler-link.h | 14 ++++++++--
+ qt4/src/poppler-optcontent.h | 11 ++++++++
+ qt4/src/poppler-qt4.h | 59
+ ++++++++++++++++++++++++++++++++++++-----
+ 5 files changed, 90 insertions(+), 11 deletions(-)
+
+commit 6bc4881477ea15d70d420e57b5663052f2f9df76
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Sep 2 00:47:56 2008 +0200
+
+ expand the macros, extract poppler-optcontent.h
+
+ enable the macro expansion and define POPPLER_QT4_EXPORT to be
+ empty, so
+ we don't have it in the apidox
+
+ qt4/src/Doxyfile | 8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+commit de822554acdb1b2bc9e70c0668c43a10c0ec129a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 1 23:50:37 2008 +0200
+
+ Initialize widget to null before calling initialize not after :-(
+
+ poppler/Annot.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1a7b7199112d97e816a099cbc1a5672c83e64156
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 1 20:42:06 2008 +0200
+
+ Add my copyright
+
+ poppler/Dict.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 1fef34782a003f46fceab0d3bed36212bbf32c4c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 1 20:35:37 2008 +0200
+
+ Find reverse way in Dict
+
+ This fixes Greg Stolze - Marriage Of Virtue & Viciousness.pdf
+ The issue with this pdf is that has a Dict with two entries with
+ the same key
+ The pdf spec says if that happens, results are undefined, but Acroread
+ uses the
+ second key while we were using the first, searching backwards we
+ use the second now too and the pdf works
+
+ poppler/Dict.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bb7996eaaad6a70404891bb2ff530160737ea3d7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 1 20:29:25 2008 +0200
+
+ Do not crash on documents with no pages
+
+ qt4/tests/test-poppler-qt4.cpp | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 0c11d390e4b0e3765ae20968359c7562c9857db7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 1 20:13:33 2008 +0200
+
+ All poppler commiters to these files agreed to GPLv2+
+
+ Still missing to answer
+ Marco Pesenti Gritti
+ Catalog.cc
+ Outline.cc
+ Outline.h
+
+ Kjartan Maraas
+ HtmlOutputDev.cc
+
+ Timothy Lee
+ ImageOutputDev.h
+ ImageOutputDev.cc
+
+ Carl Worth
+ CairoOutputDev.cc
+
+ Ed Catmur
+ GfxFont.cc
+ GlobalParams.cc
+ TextOutputDev.cc
+ TextOutputDev.h
+ UnicodeTypeTable.cc
+ UnicodeTypeTable.h
+
+ poppler/Annot.cc | 3 +++
+ poppler/Annot.h | 3 +++
+ poppler/Array.cc | 3 +++
+ poppler/Array.h | 3 +++
+ poppler/ArthurOutputDev.cc | 3 +++
+ poppler/ArthurOutputDev.h | 3 +++
+ poppler/CMap.cc | 3 +++
+ poppler/CMap.h | 3 +++
+ poppler/CairoFontEngine.cc | 3 +++
+ poppler/CairoFontEngine.h | 3 +++
+ poppler/CairoOutputDev.h | 3 +++
+ poppler/Catalog.h | 3 +++
+ poppler/CharCodeToUnicode.cc | 3 +++
+ poppler/CharCodeToUnicode.h | 3 +++
+ poppler/Decrypt.cc | 3 +++
+ poppler/Decrypt.h | 3 +++
+ poppler/Dict.cc | 3 +++
+ poppler/Dict.h | 3 +++
+ poppler/Error.cc | 3 +++
+ poppler/Error.h | 3 +++
+ poppler/Function.cc | 3 +++
+ poppler/Gfx.cc | 3 +++
+ poppler/Gfx.h | 3 +++
+ poppler/GfxFont.h | 3 +++
+ poppler/GfxState.cc | 3 +++
+ poppler/GfxState.h | 3 +++
+ poppler/GlobalParams.h | 3 +++
+ poppler/JBIG2Stream.cc | 3 +++
+ poppler/JPXStream.cc | 3 +++
+ poppler/Lexer.cc | 3 +++
+ poppler/Lexer.h | 3 +++
+ poppler/Link.cc | 3 +++
+ poppler/Link.h | 3 +++
+ poppler/Object.cc | 3 +++
+ poppler/Object.h | 3 +++
+ poppler/OutputDev.cc | 3 +++
+ poppler/OutputDev.h | 3 +++
+ poppler/PDFDoc.cc | 3 +++
+ poppler/PDFDoc.h | 3 +++
+ poppler/PDFDocEncoding.cc | 3 +++
+ poppler/PDFDocEncoding.h | 3 +++
+ poppler/PSOutputDev.cc | 3 +++
+ poppler/PSOutputDev.h | 3 +++
+ poppler/PSTokenizer.cc | 3 +++
+ poppler/PSTokenizer.h | 3 +++
+ poppler/Page.cc | 3 +++
+ poppler/Page.h | 3 +++
+ poppler/Parser.cc | 3 +++
+ poppler/Parser.h | 3 +++
+ poppler/SplashOutputDev.cc | 3 +++
+ poppler/SplashOutputDev.h | 3 +++
+ poppler/Stream-CCITT.h | 3 +++
+ poppler/Stream.cc | 3 +++
+ poppler/Stream.h | 3 +++
+ poppler/UTF8.h | 3 +++
+ poppler/XRef.cc | 3 +++
+ poppler/XRef.h | 3 +++
+ utils/HtmlFonts.cc | 3 +++
+ utils/HtmlLinks.cc | 3 +++
+ utils/HtmlOutputDev.h | 3 +++
+ utils/parseargs.c | 3 +++
+ utils/parseargs.h | 3 +++
+ utils/pdffonts.cc | 3 +++
+ utils/pdfimages.cc | 3 +++
+ utils/pdfinfo.cc | 3 +++
+ utils/pdftohtml.cc | 3 +++
+ utils/pdftoppm.cc | 3 +++
+ utils/pdftops.cc | 3 +++
+ utils/pdftotext.cc | 3 +++
+ 69 files changed, 207 insertions(+), 0 deletions(-)
+
+commit 8670bfed7900586725b30e3af67f6849acc6efda
+Author: Vasile Gaburici <gaburici@cs.umd.edu>
+Date: Sat Aug 30 12:47:13 2008 +0200
+
+ Fix extraction of images
+
+ See bug 16999 for more info
+
+ utils/ImageOutputDev.cc | 12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+commit 1c98f197664b1a2c06e2caf32116a8487f4054bf
+Author: Vasile Gaburici <gaburici@cs.umd.edu>
+Date: Sat Aug 30 12:44:02 2008 +0200
+
+ Read sMap reverse so CMap entries take precedence
+
+ See bug 17321 for a more in depth explanation
+
+ poppler/CharCodeToUnicode.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 8f1deb3f8000bdeb845a6c786a654bc7eb684f0a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 29 23:06:19 2008 +0200
+
+ Are we a lib or aren't we? Unify String to Date parsing so we all
+ behave the same way
+
+ CMakeLists.txt | 2 +
+ glib/poppler-document.cc | 29 ++--------------
+ poppler/DateInfo.cc | 62
+ +++++++++++++++++++++++++++++++++++
+ poppler/DateInfo.h | 27 +++++++++++++++
+ poppler/Makefile.am | 2 +
+ qt/poppler-document.cc | 22 +-----------
+ qt4/src/poppler-annotation-helper.h | 16 +--------
+ qt4/src/poppler-document.cc | 52 +++--------------------------
+ utils/pdfinfo.cc | 16 ++-------
+ utils/pdftohtml.cc | 9 ++---
+ 10 files changed, 111 insertions(+), 126 deletions(-)
+
+commit c39f23dca98d3efe8d094c9a3e1bd460ba57d1ce
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 29 20:50:57 2008 +0200
+
+ Add a readme for contributors with licensing and misc info
+
+ README.contributors | 20 ++++++++++++++++++++
+ 1 files changed, 20 insertions(+), 0 deletions(-)
+
+commit 35a72590ffd3284e63601af79599e5fa025e567f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Aug 28 00:58:11 2008 +0200
+
+ Be more protective against huge font sizes in bogus documents like
+ the one in http://bugs.freedesktop.org/show_bug.cgi?id=17326
+
+ 10 MB in size is a font of 3200x3200, huge enough to be discarted
+
+ poppler/SplashOutputDev.cc | 20 +++++++++++++++++++-
+ 1 files changed, 19 insertions(+), 1 deletions(-)
+
+commit 33727cf6773b12d736ba245fdd146559ce93102d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 24 20:36:13 2008 +0200
+
+ fix location of the comment
+
+ fofi/FoFiType1.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit abe29b4fdb33f449649fdea5d7af2deeb702f0bb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 24 20:24:35 2008 +0200
+
+ All changes made to fofi/ files under the poppler project are by
+ people that accepts to license the code under GPLv2+
+
+ fofi/FoFiBase.cc | 3 +++
+ fofi/FoFiTrueType.cc | 3 +++
+ fofi/FoFiTrueType.h | 3 +++
+ fofi/FoFiType1.cc | 3 +++
+ fofi/FoFiType1C.h | 3 +++
+ 5 files changed, 15 insertions(+), 0 deletions(-)
+
+commit 6346d7050a03935c71336c65d5f8f0fe2860d321
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 24 20:23:50 2008 +0200
+
+ All changes made to goo/ files under the poppler project are by
+ people that accepts to license the code under GPLv2+
+
+ goo/GooString.cc | 3 +++
+ goo/GooString.h | 3 +++
+ goo/gfile.cc | 3 +++
+ goo/gfile.h | 3 +++
+ goo/gmem.cc | 3 +++
+ goo/gmem.h | 3 +++
+ 6 files changed, 18 insertions(+), 0 deletions(-)
+
+commit d6e1f1fb4e83527d3ece51d98fa20262713b7da1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 24 20:22:06 2008 +0200
+
+ .cc -> .h
+
+ poppler/FontInfo.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9f0ac70f7ad806cadce379d4fabb90eff697ad52
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 24 19:25:27 2008 +0200
+
+ Add missing addresses
+
+ poppler/ABWOutputDev.cc | 4 ++--
+ poppler/ABWOutputDev.h | 2 +-
+ poppler/FlateStream.cc | 2 +-
+ poppler/FlateStream.h | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 22f6af73961686895f207fe13022a21333455862
+Merge: 12a9e42 6d6913a
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Aug 24 19:03:24 2008 +0200
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 12a9e427fb487165b1797f81d52d733c27bfa2e1
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Aug 24 18:57:52 2008 +0200
+
+ [Qt4] add showControl and playMode properties of MovieObject's
+
+ qt4/src/poppler-movie.cc | 14 ++++++++++++++
+ qt4/src/poppler-qt4.h | 20 ++++++++++++++++++++
+ 2 files changed, 34 insertions(+), 0 deletions(-)
+
+commit c444c652859b6e52160e5571e84f8eb1292d65f1
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Aug 24 18:47:58 2008 +0200
+
+ [Qt4] make the MovieObject ctor private, with only Page able to use it
+
+ qt4/src/poppler-qt4.h | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 6d6913a79779769ce0fe2f0b516a90a50e51b947
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 24 18:45:45 2008 +0200
+
+ fix Jeff's entry
+
+ poppler/DCTStream.cc | 2 +-
+ poppler/DCTStream.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 25bd5967f9f550a32e20eea91cd00cbeff98249e
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Aug 24 18:45:25 2008 +0200
+
+ [Qt4] initialize the MovieObject from an AnnotMovie
+
+ the annotation has all the data we need, so just init from that
+
+ qt4/src/poppler-movie.cc | 8 ++++----
+ qt4/src/poppler-page.cc | 4 +---
+ qt4/src/poppler-qt4.h | 4 ++--
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+
+commit 47f54ad4de111f62a5b8c25520ef6b2bca6026d2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 24 18:18:13 2008 +0200
+
+ Add more correct copyright statements on fofi, goo, poppler and
+ util directories to be more compliant with GPL that requires such
+ modification statements to be present. Meanwhile i did that, i did
+ qt and qt4 dirs too, glib is missing if someone wants to fix it,
+ but it's not crucial as it's not a fork of some other GPL software
+
+ AUTHORS | 4 +++-
+ fofi/FoFiBase.cc | 11 +++++++++++
+ fofi/FoFiTrueType.cc | 14 ++++++++++++++
+ fofi/FoFiTrueType.h | 12 ++++++++++++
+ fofi/FoFiType1.cc | 12 ++++++++++++
+ fofi/FoFiType1C.h | 11 +++++++++++
+ goo/GooString.cc | 13 +++++++++++++
+ goo/GooString.h | 12 ++++++++++++
+ goo/GooTimer.cc | 3 +++
+ goo/GooTimer.h | 8 ++++++--
+ goo/GooVector.h | 12 ++++++++++++
+ goo/gfile.cc | 13 +++++++++++++
+ goo/gfile.h | 11 +++++++++++
+ goo/gmem.cc | 13 +++++++++++++
+ goo/gmem.h | 13 +++++++++++++
+ poppler/ABWOutputDev.cc | 3 ++-
+ poppler/ABWOutputDev.h | 2 +-
+ poppler/Annot.cc | 19 +++++++++++++++++++
+ poppler/Annot.h | 17 +++++++++++++++++
+ poppler/Array.cc | 11 +++++++++++
+ poppler/Array.h | 11 +++++++++++
+ poppler/ArthurOutputDev.cc | 14 +++++++++++++-
+ poppler/ArthurOutputDev.h | 13 ++++++++++++-
+ poppler/CMap.cc | 12 ++++++++++++
+ poppler/CMap.h | 11 +++++++++++
+ poppler/CairoFontEngine.cc | 17 +++++++++++++++++
+ poppler/CairoFontEngine.h | 17 +++++++++++++++++
+ poppler/CairoOutputDev.cc | 19 +++++++++++++++++++
+ poppler/CairoOutputDev.h | 16 ++++++++++++++++
+ poppler/Catalog.cc | 19 +++++++++++++++++++
+ poppler/Catalog.h | 16 ++++++++++++++++
+ poppler/CharCodeToUnicode.cc | 14 ++++++++++++++
+ poppler/CharCodeToUnicode.h | 13 +++++++++++++
+ poppler/DCTStream.cc | 5 ++++-
+ poppler/DCTStream.h | 6 +++++-
+ poppler/Decrypt.cc | 12 ++++++++++++
+ poppler/Decrypt.h | 11 +++++++++++
+ poppler/Dict.cc | 13 +++++++++++++
+ poppler/Dict.h | 13 +++++++++++++
+ poppler/Error.cc | 13 +++++++++++++
+ poppler/Error.h | 13 +++++++++++++
+ poppler/FlateStream.cc | 2 ++
+ poppler/FlateStream.h | 2 ++
+ poppler/FontInfo.cc | 22 ++++++++++++++++++++++
+ poppler/FontInfo.h | 21 +++++++++++++++++++++
+ poppler/Form.cc | 10 +++++++++-
+ poppler/Form.h | 6 +++++-
+ poppler/Function.cc | 12 ++++++++++++
+ poppler/Gfx.cc | 23 +++++++++++++++++++++++
+ poppler/Gfx.h | 13 +++++++++++++
+ poppler/GfxFont.cc | 19 +++++++++++++++++++
+ poppler/GfxFont.h | 16 ++++++++++++++++
+ poppler/GfxState.cc | 14 ++++++++++++++
+ poppler/GfxState.h | 13 +++++++++++++
+ poppler/GlobalParams.cc | 19 +++++++++++++++++++
+ poppler/GlobalParams.h | 15 +++++++++++++++
+ poppler/JBIG2Stream.cc | 13 +++++++++++++
+ poppler/JPXStream.cc | 11 +++++++++++
+ poppler/Lexer.cc | 12 ++++++++++++
+ poppler/Lexer.h | 12 ++++++++++++
+ poppler/Link.cc | 14 ++++++++++++++
+ poppler/Link.h | 12 ++++++++++++
+ poppler/Movie.cc | 17 ++++++++++++++++-
+ poppler/Object.cc | 11 +++++++++++
+ poppler/Object.h | 12 ++++++++++++
+ poppler/OptionalContent.cc | 5 ++++-
+ poppler/Outline.cc | 11 +++++++++++
+ poppler/Outline.h | 11 +++++++++++
+ poppler/OutputDev.cc | 13 +++++++++++++
+ poppler/OutputDev.h | 14 ++++++++++++++
+ poppler/PDFDoc.cc | 15 +++++++++++++++
+ poppler/PDFDoc.h | 15 +++++++++++++++
+ poppler/PDFDocEncoding.cc | 13 ++++++++++++-
+ poppler/PDFDocEncoding.h | 11 +++++++++++
+ poppler/PSOutputDev.cc | 15 +++++++++++++++
+ poppler/PSOutputDev.h | 14 ++++++++++++++
+ poppler/PSTokenizer.cc | 12 ++++++++++++
+ poppler/PSTokenizer.h | 11 +++++++++++
+ poppler/Page.cc | 20 ++++++++++++++++++++
+ poppler/Page.h | 16 ++++++++++++++++
+ poppler/PageLabelInfo.cc | 12 ++++++++++++
+ poppler/PageLabelInfo.h | 12 ++++++++++++
+ poppler/PageTransition.h | 18 ++++++++++++++++++
+ poppler/Parser.cc | 12 ++++++++++++
+ poppler/Parser.h | 11 +++++++++++
+ poppler/SplashOutputDev.cc | 16 ++++++++++++++++
+ poppler/SplashOutputDev.h | 11 +++++++++++
+ poppler/Stream-CCITT.h | 11 +++++++++++
+ poppler/Stream.cc | 14 ++++++++++++++
+ poppler/Stream.h | 13 +++++++++++++
+ poppler/TextOutputDev.cc | 18 ++++++++++++++++++
+ poppler/TextOutputDev.h | 15 +++++++++++++++
+ poppler/UTF8.h | 11 +++++++++++
+ poppler/UnicodeTypeTable.cc | 13 +++++++++++++
+ poppler/UnicodeTypeTable.h | 11 +++++++++++
+ poppler/XRef.cc | 17 ++++++++++++++++-
+ poppler/XRef.h | 14 ++++++++++++++
+ qt/poppler-document.cc | 3 +++
+ qt/poppler-fontinfo.cc | 3 +--
+ qt/poppler-page.cc | 7 ++++++-
+ qt/poppler-private.h | 4 ++++
+ qt/poppler-qt.h | 5 ++++-
+ qt4/src/poppler-annotation-helper.h | 1 +
+ qt4/src/poppler-annotation.cc | 3 ++-
+ qt4/src/poppler-annotation.h | 4 +++-
+ qt4/src/poppler-document.cc | 4 +++-
+ qt4/src/poppler-embeddedfile.cc | 1 +
+ qt4/src/poppler-fontinfo.cc | 5 ++++-
+ qt4/src/poppler-form.cc | 2 +-
+ qt4/src/poppler-form.h | 2 +-
+ qt4/src/poppler-link-extractor-private.h | 2 +-
+ qt4/src/poppler-link-extractor.cc | 2 +-
+ qt4/src/poppler-link.cc | 3 ++-
+ qt4/src/poppler-link.h | 1 +
+ qt4/src/poppler-optcontent-private.h | 1 +
+ qt4/src/poppler-optcontent.cc | 1 +
+ qt4/src/poppler-optcontent.h | 1 +
+ qt4/src/poppler-page-private.h | 2 ++
+ qt4/src/poppler-page.cc | 4 ++++
+ qt4/src/poppler-private.h | 4 +++-
+ qt4/src/poppler-ps-converter.cc | 1 +
+ qt4/src/poppler-qt4.h | 5 ++++-
+ qt4/src/poppler-textbox.cc | 2 ++
+ splash/Splash.cc | 12 ++++++++++++
+ splash/Splash.h | 12 ++++++++++++
+ splash/SplashBitmap.cc | 12 ++++++++++++
+ splash/SplashBitmap.h | 11 +++++++++++
+ splash/SplashErrorCodes.h | 11 +++++++++++
+ splash/SplashFTFont.cc | 12 ++++++++++++
+ splash/SplashFTFont.h | 11 +++++++++++
+ splash/SplashFTFontEngine.cc | 11 +++++++++++
+ splash/SplashFTFontEngine.h | 11 +++++++++++
+ splash/SplashFTFontFile.cc | 11 +++++++++++
+ splash/SplashFTFontFile.h | 11 +++++++++++
+ splash/SplashFont.cc | 11 +++++++++++
+ splash/SplashFont.h | 11 +++++++++++
+ splash/SplashFontEngine.cc | 11 +++++++++++
+ splash/SplashFontEngine.h | 11 +++++++++++
+ splash/SplashFontFile.cc | 12 ++++++++++++
+ splash/SplashFontFile.h | 12 ++++++++++++
+ splash/SplashT1Font.cc | 11 +++++++++++
+ splash/SplashT1Font.h | 11 +++++++++++
+ splash/SplashT1FontEngine.cc | 11 +++++++++++
+ splash/SplashT1FontFile.cc | 11 +++++++++++
+ splash/SplashT1FontFile.h | 11 +++++++++++
+ splash/SplashTypes.h | 11 +++++++++++
+ splash/SplashXPathScanner.cc | 11 +++++++++++
+ utils/HtmlFonts.cc | 24 ++++++++++++++++++++++++
+ utils/HtmlFonts.h | 12 ++++++++++++
+ utils/HtmlLinks.cc | 23 +++++++++++++++++++++++
+ utils/HtmlLinks.h | 12 ++++++++++++
+ utils/HtmlOutputDev.cc | 13 +++++++++++++
+ utils/HtmlOutputDev.h | 11 +++++++++++
+ utils/ImageOutputDev.cc | 13 +++++++++++++
+ utils/ImageOutputDev.h | 12 ++++++++++++
+ utils/parseargs.c | 13 +++++++++++++
+ utils/parseargs.h | 11 +++++++++++
+ utils/pdffonts.cc | 12 ++++++++++++
+ utils/pdfimages.cc | 11 +++++++++++
+ utils/pdfinfo.cc | 12 ++++++++++++
+ utils/pdftoabw.cc | 26
+ +++++++++++++++++++-------
+ utils/pdftohtml.cc | 11 +++++++++++
+ utils/pdftoppm.cc | 11 +++++++++++
+ utils/pdftops.cc | 12 ++++++++++++
+ utils/pdftotext.cc | 12 ++++++++++++
+ 165 files changed, 1795 insertions(+), 37 deletions(-)
+
+commit 0dfbb8996ee91aa044eb2bdf2859ef64005116f8
+Author: Loïc Minier <lool@dooz.org>
+Date: Wed Aug 20 22:10:07 2008 +0200
+
+ Fixes escaping of hyphens in man pages
+
+ utils/pdfinfo.1 | 2 +-
+ utils/pdftops.1 | 16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+commit 6cfa0e598a81460e5d0a7d60d8584366d2a70165
+Author: Loïc Minier <lool@dooz.org>
+Date: Wed Aug 20 19:57:42 2008 +0200
+
+ Fix synopsis of pdftops in man page to clarify that a PDF file is
+ required in all cases
+
+ utils/pdftops.1 | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 48a73cc709a8bed9d2d0f9cbd2a9d2b6c0dad05b
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 23 19:26:01 2008 +0200
+
+ [Qt4] convert the title of movie annotations
+
+ qt4/src/poppler-page.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 419ec15ac825f2e0052b411462f00ac57fed030e
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 23 19:25:04 2008 +0200
+
+ [Qt4] get/set the title for movie annotations
+
+ qt4/src/poppler-annotation.cc | 13 +++++++++++++
+ qt4/src/poppler-annotation.h | 3 +++
+ 2 files changed, 16 insertions(+), 0 deletions(-)
+
+commit 63bcaf113fcb5a4a9e5c120df2c3dafb2977c90a
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 23 01:58:30 2008 +0200
+
+ [Qt4] convert the movie annotation from the core type to the Qt4 one
+
+ qt4/src/poppler-page.cc | 18 +++++++++++++++---
+ 1 files changed, 15 insertions(+), 3 deletions(-)
+
+commit 5cc490de74af12726bdeb9b5a6a0f0d1d79383b5
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 23 01:55:41 2008 +0200
+
+ [Qt4] first version of a MovieAnnotation
+
+ right mow it just holds the movie object
+
+ qt4/src/poppler-annotation.cc | 74
+ +++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.h | 26 ++++++++++++++-
+ 2 files changed, 99 insertions(+), 1 deletions(-)
+
+commit 3d5c2e22d790d7c139e1cd28aebb21cfe76b8b6b
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 23 01:54:30 2008 +0200
+
+ compile the new poppler-movie.cc
+
+ qt4/src/CMakeLists.txt | 1 +
+ qt4/src/Makefile.am | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 599698a9b133999f1f0bb0548489111e9d7b6f05
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 23 01:52:58 2008 +0200
+
+ [Qt4] first version of a MovieObject object for movies
+
+ slightly differs from the version in core
+
+ qt4/src/poppler-movie.cc | 73
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 34 +++++++++++++++++++++
+ 2 files changed, 107 insertions(+), 0 deletions(-)
+
+commit 820f15009845870701e1f4e7f4fc4fb93312ab3e
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 23 01:45:07 2008 +0200
+
+ fix Movie::copy()
+
+ the default copy ctor already does the vertbatim copies, so no need to
+ do them on our own; what needs to be done is checking whether
+ an object
+ is valid before either doing a "smart copy" or "postprocessing" it
+
+ poppler/Movie.cc | 14 ++++++++------
+ 1 files changed, 8 insertions(+), 6 deletions(-)
+
+commit c3a006ae35250e9a5638c2ce713b7470380751c7
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Aug 23 01:04:34 2008 +0200
+
+ compile attachments.c in the demo with cmake as well
+
+ glib/demo/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit b5a7987a50b3d28fbfa219e2cef85b9e53aaf079
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Aug 21 20:40:18 2008 +0200
+
+ [glib-demo] Fix attachments demo with documents that don't contain
+ attachments
+
+ glib/demo/attachments.c | 27 ++++++++++++++++++++-------
+ 1 files changed, 20 insertions(+), 7 deletions(-)
+
+commit a2b0aefedbdb20ce0ef8398a700202021fcf00db
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Aug 21 20:14:50 2008 +0200
+
+ [glib-demo] Fix typo
+
+ glib/demo/attachments.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 9e563d6d877624b1caf82ac30c5ae30a1eb48f21
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Aug 21 20:12:33 2008 +0200
+
+ [glib-demo] Add checksum validation to attachments demo
+
+ glib/demo/attachments.c | 101
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 101 insertions(+), 0 deletions(-)
+
+commit e233325e6f13d8b232bf68a2812fe755e7fccd4d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Aug 21 19:03:32 2008 +0200
+
+ [glib-demo] Add demo for attachments
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/attachments.c | 242
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/attachments.h | 31 ++++++
+ glib/demo/main.c | 4 +-
+ glib/demo/utils.c | 23 +++++
+ glib/demo/utils.h | 1 +
+ 6 files changed, 302 insertions(+), 1 deletions(-)
+
+commit 0e2efa0fce5bf059ce85d3e3bec2293b405ec3c9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Aug 21 19:02:24 2008 +0200
+
+ [glib] Make sure name and descripction are valid utf8 strings
+
+ glib/poppler-attachment.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 15a73704ab6b009ca5e07c08f0b12d970adc387d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Aug 19 09:18:03 2008 +0100
+
+ Memleak and invalid free.
+
+ CairoOutputDev::setSoftMask() fails to free the cairo_t and mask
+ it uses
+ to draw the opaque soft mask and attempts to destroy a reference to a
+ surface it does not own (this bug was masked by the fact that
+ a reference
+ was still being held by the unfreed cairo_t).
+
+ poppler/CairoOutputDev.cc | 11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+commit d3110e392097db54e9ee59300213e490dee39126
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 19 19:19:09 2008 +0200
+
+ Fix include so it can be used in the unsupported way of installing
+ internal poppler/ headers
+
+ Notified by Caolan McNamara <caolanm@redhat.com>
+
+ poppler/PreScanOutputDev.h | 2 +-
+ poppler/SecurityHandler.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 303249e5548bfbf6823e97850e498970d802b4a0
+Author: Albert Astals Cid <tsdgeos@samsung.localdomain>
+Date: Fri Aug 15 01:52:52 2008 +0200
+
+ Revert 123a87aff2e35b10efe6a1d715585b427e4a9afa it creates problems
+ with some pdf files
+
+ poppler/Gfx.cc | 14 ++------------
+ poppler/Gfx.h | 3 ---
+ 2 files changed, 2 insertions(+), 15 deletions(-)
+
+commit 27ddf3c5e839358c8553d41743faa8ee304767bf
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Aug 13 13:55:57 2008 +0200
+
+ [Qt4] make sure to use the correct page width/height for form
+ widgets coordinates
+
+ qt4/src/poppler-form.cc | 12 +++++++++---
+ 1 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 2e7b0eb4af8cf5938833e5659d01b77096e7b7f7
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Aug 12 13:49:52 2008 +0200
+
+ [Qt4] add a method to get the activation action of a FormField
+
+ qt4/src/poppler-form.cc | 19 +++++++++++++++++++
+ qt4/src/poppler-form.h | 8 ++++++++
+ 2 files changed, 27 insertions(+), 0 deletions(-)
+
+commit f9e679adbd6830da26eb9909bcb16e3bdf0da6b4
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Aug 12 13:47:15 2008 +0200
+
+ create a static version of PageData::convertLinkActionToLink()
+
+ qt4/src/poppler-page-private.h | 2 ++
+ qt4/src/poppler-page.cc | 5 +++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit a6ecc864ea3e94d7232cff6a2e8f49919d8f24ff
+Author: Albert Astals Cid <tsdgeos@samsung.localdomain>
+Date: Tue Aug 12 01:23:21 2008 +0200
+
+ initialize widget, fixes crash on EC2006.pdf
+
+ poppler/Annot.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 123a87aff2e35b10efe6a1d715585b427e4a9afa
+Author: Albert Astals Cid <tsdgeos@samsung.localdomain>
+Date: Tue Aug 12 00:37:09 2008 +0200
+
+ Cache the last created GfxResource, very useful because some pdf
+ created by pstopdf push and pop the same GfxResource all the time
+
+ This brings us a speedup of 16 times (from 11 seconds to about 600
+ msec) in kde bug 168663
+
+ poppler/Gfx.cc | 14 ++++++++++++--
+ poppler/Gfx.h | 3 +++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+commit 5ad1a12183f4b8e328f32386a74b5616e7e59070
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 4 20:34:42 2008 +0200
+
+ Be less strict when parsing TTF tables
+
+ With this change and freetype from CVS i can render Bug 16940 using
+ the splash renderer
+
+ fofi/FoFiTrueType.cc | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+commit d322720428fa416b7d5f23acc72d1d4b4f74d041
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 4 20:16:50 2008 +0200
+
+ Report an error when FoFiTrueType::load or FoFiTrueType::make fail
+
+ poppler/SplashOutputDev.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 901ebc84ff7c0872c3f9f5e6eaf418ba6400fa10
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Aug 3 10:54:09 2008 +0200
+
+ [Qt4] Make the paper color setting working as it should.
+
+ A BGR colorspace means that colors should be set as blue,green,red,
+ and
+ not red,green,blue.
+
+ qt4/src/poppler-private.h | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 66b34c78943be598778a3ef438b0cefac668c6a2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 2 13:54:34 2008 +0200
+
+ This should not be here, breaks jpeg rendering when not using libjpeg
+
+ That was included erroneously when the file writing code was added
+
+ poppler/Stream.cc | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit fd8d71ea8b12393201ece9c09372fd69c7573025
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 1 23:47:51 2008 +0200
+
+ These defines are unneeded too
+
+ msvc/poppler/poppler-config.h | 30 ------------------------------
+ poppler-config.h.cmake | 30 ------------------------------
+ poppler/poppler-config.h.in | 30 ------------------------------
+ 3 files changed, 0 insertions(+), 90 deletions(-)
+
+commit 391b5d5cdd9f63fe90229f88cdad628fb63c0206
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 1 23:36:09 2008 +0200
+
+ Get rid of more defines, say our version on command line tools,
+ also say our copyright
+
+ Did not modify PSOutputDev.cc output as PS is too fragile
+
+ msvc/poppler/poppler-config.h | 9 +--------
+ poppler-config.h.cmake | 9 +--------
+ poppler/PSOutputDev.cc | 2 +-
+ poppler/poppler-config.h.in | 9 +--------
+ utils/pdffonts.cc | 3 ++-
+ utils/pdfimages.cc | 3 ++-
+ utils/pdfinfo.cc | 3 ++-
+ utils/pdftohtml.cc | 3 ++-
+ utils/pdftoppm.cc | 3 ++-
+ utils/pdftops.cc | 3 ++-
+ utils/pdftotext.cc | 3 ++-
+ 11 files changed, 18 insertions(+), 32 deletions(-)
+
+commit d14fb1513be045363f7edec21cee04fd4937ede2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 1 23:14:28 2008 +0200
+
+ Add GooList *getEncodingNames();
+
+ Forgot to commit this earlier :-(
+
+ poppler/GlobalParams.cc | 19 +++++++++++++++++++
+ poppler/GlobalParams.h | 2 ++
+ 2 files changed, 21 insertions(+), 0 deletions(-)
+
+commit 9fd34443d765ccd61864d18bceadc049d905b957
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 1 23:09:39 2008 +0200
+
+ remove defines we don't use at all
+
+ msvc/poppler/poppler-config.h | 4 ----
+ poppler-config.h.cmake | 4 ----
+ poppler/poppler-config.h.in | 4 ----
+ 3 files changed, 0 insertions(+), 12 deletions(-)
+
+commit 0f13013dc3079915572b6b002dac8d01d2dbde04
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 1 23:06:50 2008 +0200
+
+ xpdfrc has been dead for a while
+
+ msvc/poppler/poppler-config.h | 25 -------------------------
+ poppler-config.h.cmake | 25 -------------------------
+ poppler/poppler-config.h.in | 25 -------------------------
+ 3 files changed, 0 insertions(+), 75 deletions(-)
+
+commit 96392667d1331d2f8750f27c116e34bbf9282dca
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 1 22:20:55 2008 +0200
+
+ Provide a default constructor for FontInfo so you can use it as
+ metatype for qvariant
+
+ qt4/src/poppler-fontinfo.cc | 5 +++++
+ qt4/src/poppler-private.h | 7 +++++++
+ qt4/src/poppler-qt4.h | 5 +++++
+ 3 files changed, 17 insertions(+), 0 deletions(-)
+
+commit 9fd1077e63d97a316380b8df4821bf4c9434fb52
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 1 17:47:51 2008 +0200
+
+ Build with cmake too
+
+ utils/CMakeLists.txt | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d8d6a3f46620d45c279b7ca1a4a2fa3a36285cde
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 1 17:44:07 2008 +0200
+
+ Improve manpages and add -listenc to pdfinfo and pdftotext in the way
+
+ Our manpages listed things like xpdfrc and -cfg options we don't
+ support at all.
+ Also some options were missing from the man pages
+ Finally there was the -enc option you completely had to guess which
+ string to pass,
+ so i've added the -listenc option to get the user the list of
+ encodings he can use
+
+ utils/Makefile.am | 2 ++
+ utils/pdffonts.1 | 18 ------------------
+ utils/pdfimages.1 | 14 --------------
+ utils/pdfinfo.1 | 28 ++++------------------------
+ utils/pdfinfo.cc | 16 ++++++++++++++--
+ utils/pdftoppm.1 | 42 +++++++++++++++++++++---------------------
+ utils/pdftops.1 | 41 +++--------------------------------------
+ utils/pdftotext.1 | 32 ++++----------------------------
+ utils/pdftotext.cc | 16 ++++++++++++++--
+ utils/printencodings.cc | 34 ++++++++++++++++++++++++++++++++++
+ utils/printencodings.h | 24 ++++++++++++++++++++++++
+ 11 files changed, 120 insertions(+), 147 deletions(-)
+
+commit f5b0ca794b0879e3d239bf1d6138b15ead27d9ca
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue Jul 29 20:18:33 2008 +0930
+
+ Fix ActualText string length check in TextOutputDev.cc
+
+ poppler/TextOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 21bbdc9d663995336900f1ce97cf294f04464e01
+Author: Boris Toloknov <tlknv@yandex.ru>
+Date: Mon Jul 28 21:02:07 2008 +0200
+
+ make xml output valid xml
+
+ utils/HtmlLinks.cc | 33 +++++++++++++++++-
+ utils/HtmlOutputDev.cc | 85
+ ++++++++++++++++++++++++++++++-----------------
+ 2 files changed, 85 insertions(+), 33 deletions(-)
+
+commit dccfc4c2910b47a77cd7b6019d9365f1684ffd0c
+Author: Boris Toloknov <tlknv@yandex.ru>
+Date: Mon Jul 28 20:58:13 2008 +0200
+
+ Limit ascent and descent are to reasonable values.
+
+ See bug 16592 to cases where this helps
+
+ utils/HtmlOutputDev.cc | 14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+commit 0fd5a3db1ddad447d44b64eff9abfb077a7853a0
+Author: Boris Toloknov <tlknv@yandex.ru>
+Date: Mon Jul 28 20:52:19 2008 +0200
+
+ Make html output to keep all the spaces with &nbsp;
+
+ utils/HtmlFonts.cc | 2 ++
+ utils/HtmlOutputDev.cc | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 650c73fa0f570f699d907e33060fb23290940b42
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jul 28 20:44:13 2008 +0200
+
+ findDest crashes on null goostrings so rework the ifs a bit
+
+ utils/HtmlOutputDev.cc | 16 +++++++++-------
+ 1 files changed, 9 insertions(+), 7 deletions(-)
+
+commit adee9c0e9e8b2de20309b3ae6eb8e6d6ed05cf85
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jul 26 00:04:03 2008 +0200
+
+ We are not storing the ctu, so decref and leak-- :-)
+
+ poppler/Annot.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit e7b3e3ae3080bd6f239f7d96761729ad30b075ae
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 25 23:52:28 2008 +0200
+
+ Fix leak
+
+ qt4/src/poppler-form.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 006b974d4faae53e6bd51a4281dd923ab1c2d4e8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 25 23:15:11 2008 +0200
+
+ Fix memory leak
+
+ poppler/Annot.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 3a549d75acceedfa25dcf79074d0cdfb643c746e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 25 23:08:21 2008 +0200
+
+ Free the previous modified object in case it exists
+
+ poppler/XRef.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 040d244b97a554342061c777a286e99dbb9acabd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 25 21:31:55 2008 +0200
+
+ Need this or otherwise it crashes on complete overwrite
+
+ poppler/PDFDoc.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 11ebceeef938a7e6fa9b5437e65b5b4b822f3018
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 25 21:30:24 2008 +0200
+
+ Fix my last fix about saving, i think this is the correct one
+
+ - One incremental update only write the modified entries xref,
+ not all
+ - Update gen to 0 when resizing entries
+ - On XRef::add correctly initialize all newly allocated entries
+
+ poppler/PDFDoc.cc | 4 +-
+ poppler/XRef.cc | 57
+ ++++++++++++++++++++++++++++++++++++++++++----------
+ poppler/XRef.h | 2 +-
+ 3 files changed, 49 insertions(+), 14 deletions(-)
+
+commit 03d445f485f90972ab1c05d79b2999b763ab7377
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 25 20:16:54 2008 +0200
+
+ Fix XRef::writeToFile after my change
+
+ poppler/XRef.cc | 10 +++-------
+ 1 files changed, 3 insertions(+), 7 deletions(-)
+
+commit 136fa97576f2df0d7a7563b34651ca222927ea57
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 25 20:12:51 2008 +0200
+
+ Fix XRef::add and XRef::addIndirectObject, also remove num from
+ XRefEntry
+
+ Previous code was under some incorrect assumptions:
+ * our XRef does not maintain the free link list so if you want to
+ find a free entry you have to go though all of them
+ * our XRefEntry does not need a num because the index itself is
+ the num
+
+ Conflicts:
+
+ poppler/XRef.cc
+
+ poppler/XRef.cc | 70
+ +++++++++++++++++++-----------------------------------
+ poppler/XRef.h | 1 -
+ 2 files changed, 25 insertions(+), 46 deletions(-)
+
+commit 55572b77da95c47393b78f3aff804ea9c5ae17e5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 22 22:50:00 2008 +0200
+
+ Really do what the comment says and also init changeLeft, changeTop
+ and changeZoom
+
+ poppler/Link.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 8dc7afaeea08183de331ecfd41ce1971e7772fd0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 22 21:05:03 2008 +0200
+
+ Some documents have loops in XObject dictionaries, make sure we
+ don't get in an infinite loop while traversing them
+
+ Fixes infinite loop on http://bugs.kde.org/show_bug.cgi?id=166145
+
+ poppler/FontInfo.cc | 44 ++++++++++++++++++++++++++++++++++++--------
+ poppler/FontInfo.h | 4 ++++
+ 2 files changed, 40 insertions(+), 8 deletions(-)
+
+commit 9fb17c952dcff798e45280eeb9c718680147e766
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 20 13:47:11 2008 +0200
+
+ Fix condition, we want thumb to be a Stream, not to be non null
+
+ Fixes bug 16579
+
+ glib/poppler-page.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3696025977fd345b12767f75a2de6ed7e9467365
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Jul 18 23:32:25 2008 +0200
+
+ initialize pageWidgets, otherwise it can be a rubbish pointer
+ is Annots
+ is not a valid object
+
+ poppler/Page.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 0189ff8b86de18486f7397076f7a0fbf133a1a33
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 1 20:16:50 2008 +0200
+
+ Fix condition, we want fetched_thumb to be a Stream, not to be
+ non null
+
+ Fixes bug 16579
+
+ poppler/Page.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5bd77dcdd5220d63934f4b3e78d85a936947a53d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 1 00:49:01 2008 +0200
+
+ forgot about we use autofoo too
+
+ qt4/tests/Makefile.am | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 5ed2503003d973b5461594af15485af49591451d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 1 00:43:26 2008 +0200
+
+ unittesting about ActualText
+
+ qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/check_actualtext.cpp | 33 +++++++++++++++++++++++++++++++++
+ 2 files changed, 34 insertions(+), 0 deletions(-)
+
+commit f3bb2eb556f5248242f6db85052ef045fcb697c6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 1 00:41:35 2008 +0200
+
+ Unbreak ActualText extraction
+
+ poppler/Gfx.cc | 10 +---------
+ 1 files changed, 1 insertions(+), 9 deletions(-)
+
+commit 9e9543b105b39f8b0048c00fc94741e43ad615e9
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jun 26 20:19:06 2008 +0200
+
+ use FindPackageHandleStandardArgs
+
+ cmake/modules/FindLIBOPENJPEG.cmake | 11 ++---------
+ 1 files changed, 2 insertions(+), 9 deletions(-)
+
+commit fec41ceddebe194f139bcc5b2f3fa74e7d1ae502
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jun 26 20:18:27 2008 +0200
+
+ need to use LIBOPENJPEG_FOUND, as it really represents whether
+ libopenjpeg was found or not
+
+ CMakeLists.txt | 18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+commit 5498d93e59a0b79e5add3dc6181d5e98ba689217
+Author: Michael Vrable <mvrable@cs.ucsd.edu>
+Date: Fri Jun 20 21:42:34 2008 -0700
+
+ Use a single global FT_Library in CairoOutputDev
+
+ Cairo may internally keep references to the FreeType fonts loaded in
+ CairoFontEngine even after poppler is done with them. Commit
+ 42db4890e829
+ ("Do not call FT_Done_Face on a live cairo_font_face_t") introduced
+ a fix
+ for one use-after-free bug, by delaying deleting an FT_Face objects
+ until
+ cairo is done with it.
+
+ That fix doesn't correct all the bugs. An FT_Library object is
+ created for
+ each CairoOutputDev object, and deleted when the CairoOutputDev
+ goes away.
+ But the FT_Library object should not be deleted while fonts loaded
+ using it
+ are still in use. And cairo can keep references to fonts around
+ more or
+ less indefinitely.
+
+ To more fully fix the problem, we can either:
+ 1. Keep a count of not-yet-deleted fonts associated with each
+ FT_Library,
+ and wait to call FT_Done_FreeType until it drops to zero.
+ 2. Never call FT_Done_FreeType.
+
+ The second option is the simplest. To avoid leaking memory FT_Library
+ objects, use a single global FT_Library instead of a
+ per-CairoOutputDev
+ copy.
+
+ poppler/CairoOutputDev.cc | 18 +++++++++++++++---
+ poppler/CairoOutputDev.h | 4 +++-
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+commit c75632d62a052d3c3739b96f5586f97c68baf25b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 24 02:31:43 2008 +0200
+
+ Open in WriteOnly mode, fixes the fact that when writing to an
+ existing file, the contents beyond what we wrote were still there
+
+ qt4/src/poppler-base-converter.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9810fdfc54aac80aa99561a9d820d11b062e4637
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 24 02:12:21 2008 +0200
+
+ the entry is not updated here either, fix uninitialized variable use
+
+ poppler/XRef.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 2da15db4751d3cb93d40b48e348dbc51f6e7a29f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jun 20 11:39:08 2008 +0200
+
+ Do not create an OCGs object if there isn't an OCProperties dictionary
+ in the Catalog
+
+ poppler/Catalog.cc | 5 +++--
+ poppler/Gfx.cc | 12 +++++++++++-
+ poppler/OptionalContent.cc | 25 +++++--------------------
+ 3 files changed, 19 insertions(+), 23 deletions(-)
+
+commit d6fb5dcb7b7596961800d9744d17b6adb8d9a2ad
+Author: Michael Vrable <mvrable@cs.ucsd.edu>
+Date: Wed Jun 18 11:24:05 2008 -0700
+
+ Fix a crash in the cairo backend with Type 3 glyphs
+
+ Commit 86b7e8a3bee7 ("Ensure cairo renders Type 3 glyphs with only
+ the fill
+ color") introduced a bug into the Cairo backend, causing evince
+ to crash
+ with the message
+ evince: cairo-pattern.c:679: cairo_pattern_destroy: Assertion
+ `((*&(&pattern->ref_count)->ref_count) > 0)' failed.
+ Fix this by updating reference counts to the fill and stroke
+ patterns when
+ modifying them in beginType3Char.
+
+ Simplify the code as well by not saving the old stroke pattern before
+ overriding it; this is already done since beginType3Char/endType3Char
+ is
+ wrapped by calls to saveState/restoreState in Gfx::doShowText.
+
+ poppler/CairoOutputDev.cc | 4 ++--
+ poppler/CairoOutputDev.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit c3a00c83f1d24c1f88e7ed3b3f772460e578f3cc
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Jun 15 02:39:31 2008 +0200
+
+ poppler-page-transition.h is here now
+
+ qt4/src/Doxyfile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2affed0fc97b958ae46f531c471a3cf0b04c0f55
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jun 14 01:24:49 2008 +0200
+
+ Give warnings if the build configuration for stream decoders is
+ different from default one
+
+ configure.ac | 20 +++++++++++++++++---
+ 1 files changed, 17 insertions(+), 3 deletions(-)
+
+commit 8e74bc612cb4102891324ffdbfcdb47293ecb95e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jun 14 01:13:53 2008 +0200
+
+ Warn the user if he does not have any enabled rendering backend
+
+ configure.ac | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 99d2361032cbaafd69bd796170757ed6482f208d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jun 14 00:53:38 2008 +0200
+
+ Add a JPEG2000 decoder based on OpenJPEG
+
+ Enabled by default since it's generally better than xpdf one
+ See
+ http://lists.freedesktop.org/archives/poppler/2008-June/003874.html
+ for more information
+
+ CMakeLists.txt | 30 ++++++-
+ cmake/modules/FindLIBOPENJPEG.cmake | 44 +++++++++
+ configure.ac | 33 +++++++
+ poppler/JPEG2000Stream.cc | 181
+ +++++++++++++++++++++++++++++++++++
+ poppler/JPEG2000Stream.h | 48 +++++++++
+ poppler/Makefile.am | 22 ++++-
+ poppler/Stream.cc | 7 +-
+ 7 files changed, 360 insertions(+), 5 deletions(-)
+
+commit e368838d7f9691c7b1adf7d7f62f65abed91eea7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 11 00:48:53 2008 +0200
+
+ [Qt4] Add the possibility of getting a QByteArray with the data of
+ an embedded font
+
+ qt4/src/poppler-document.cc | 23 +++++++++++++++++++++++
+ qt4/src/poppler-private.h | 3 +++
+ qt4/src/poppler-qt4.h | 5 +++++
+ 3 files changed, 31 insertions(+), 0 deletions(-)
+
+commit 184292ffb8fef5aa5a72bdbfcc0c95b663f452bd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 10 23:00:11 2008 +0200
+
+ Make the fontRef and the embRef accessible to FontInfo users
+
+ poppler/FontInfo.cc | 2 +-
+ poppler/FontInfo.h | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 86b7e8a3bee74c5b89c451137cf9c2758ba6913f
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Jun 8 18:00:05 2008 +0930
+
+ Ensure cairo renders Type 3 glyphs with only the fill color
+
+ poppler/CairoOutputDev.cc | 3 +++
+ poppler/CairoOutputDev.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 99e2d95728f41c91ab59a01c62d82b19a7a2e083
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Jun 1 00:49:32 2008 +0930
+
+ glib: save/restore cairo state when rendering a page
+
+ glib/poppler-page.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 6f40ee4af6b59f9d2c326adc8d2574e45f4d4d29
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 8 23:46:04 2008 +0200
+
+ Make sure we use Qt4 moc to generate moc files of the qt4 frontend
+
+ configure.ac | 20 ++++++++++++++++++++
+ qt4/demos/Makefile.am | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ qt4/tests/Makefile.am | 2 +-
+ 4 files changed, 23 insertions(+), 3 deletions(-)
+
+commit 86aa8fc0708f7da4a907a8bdb1845e53d29892b7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jun 5 19:21:08 2008 +0200
+
+ Fix leak on ABWOutputDev.cc
+
+ poppler/ABWOutputDev.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 979ef1cafa968d776a2b804ce555b11212212397
+Author: Koji Otani <sho@bbr.jp>
+Date: Tue Jun 3 21:07:15 2008 +0200
+
+ Support for surrogates outside the BMP plane
+
+ poppler/TextOutputDev.cc | 19 ++++++++++++++++++-
+ poppler/UTF8.h | 14 ++++++++++++++
+ 2 files changed, 32 insertions(+), 1 deletions(-)
+
+commit 1614ab3036cf25c9b94967163996678d386ce0ac
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 1 16:32:55 2008 +0200
+
+ Do not limit CharCodeToUnicodeString to 8 characters
+
+ poppler/Annot.cc | 10 ++++----
+ poppler/CharCodeToUnicode.cc | 37 ++++++++++++++++++++---------------
+ poppler/CharCodeToUnicode.h | 2 +-
+ poppler/Gfx.cc | 8 +++---
+ poppler/GfxFont.cc | 43
+ +++++++++++++++++++++++------------------
+ poppler/GfxFont.h | 6 ++--
+ poppler/PSOutputDev.cc | 4 +-
+ 7 files changed, 60 insertions(+), 50 deletions(-)
+
+commit bf95c6970dacaa62512de858cf60ff6cf0c1bf7c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 1 00:07:11 2008 +0200
+
+ [Qt] Fix leak when calling Poppler::Document::scanForFonts
+
+ qt/poppler-document.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d21d7271fc74ab78cd157549138d0027cf179471
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 31 23:57:31 2008 +0200
+
+ Make sure file exists before printing it
+
+ utils/HtmlOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0480a788c0f25af1bc09360b599debb37f831e10
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue May 27 23:20:32 2008 +0200
+
+ require gthread-2.0
+
+ cmake/modules/FindGTK.cmake | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+commit 2e40ef652eb9fca7fe947acb2adfecc96ad3c50e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 26 22:13:38 2008 +0200
+
+ Do not shadow a paramer with a local variable name
+
+ qt4/src/poppler-page.cc | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 1fd856aa1fb48869111e5b86f263bfd94fa7af17
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 26 20:52:53 2008 +0200
+
+ Do not leak tSplash if transpGroupStack->blendingColorSpace is NULL
+
+ poppler/SplashOutputDev.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 492209ec8648342a3a5447611f3f1ce63b63e8e9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 26 20:51:06 2008 +0200
+
+ Move variables only used inside the loop inside the loop, fix delete
+ of uninitialized data due to my previous patch
+
+ poppler/Page.cc | 16 ++++++----------
+ 1 files changed, 6 insertions(+), 10 deletions(-)
+
+commit 79ab8cceb318f3bb5ebad431824e3ae593aea340
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 26 20:38:59 2008 +0200
+
+ Do not leak memory if data_out is NULL
+
+ poppler/Page.cc | 35 ++++++++++++++++++-----------------
+ 1 files changed, 18 insertions(+), 17 deletions(-)
+
+commit f44c33344d4af31ee008826179bcd92db445f35a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun May 25 19:16:12 2008 +0200
+
+ [glib] Init glib threads in demo app as required by g_timer
+
+ configure.ac | 4 ++--
+ glib/demo/main.c | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 58d5b7b9ab9ac245481299c4765f3bd305580d2e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 21 22:18:29 2008 +0200
+
+ [Qt4] Fix text() method
+
+ I'm not sure this is the real and correct fix, but it works more
+ than previous code so it's and improvement
+
+ qt4/src/poppler-page.cc | 6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+commit e3e4113c73128f49f99289b592446d4382b5d65c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 12 15:39:43 2008 +0200
+
+ Add getters to some TextBlock members.
+
+ Needed by some reader using poppler internals, bad you!
+
+ poppler/TextOutputDev.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit ff699e64bd1de78915aad4ddb79d6f529aef2b87
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun May 11 23:44:50 2008 +0200
+
+ Check the OC we found exists before using it
+
+ Fixes crash http://bugs.freedesktop.org/show_bug.cgi?id=15899
+
+ poppler/OptionalContent.cc | 33 ++++++++++++++++++---------------
+ 1 files changed, 18 insertions(+), 15 deletions(-)
+
+commit ac26ba5148b99a03a56e37ba201ad420b8619943
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri May 9 20:17:37 2008 +0200
+
+ Do not crash on unlock with wrong password
+
+ qt/poppler-private.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 19ec5a531cb03a7bee1cfcc9c7d5c4390fbd069d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu May 8 23:15:58 2008 +0200
+
+ Fix build with --enable-fixedpoint
+
+ splash/Splash.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1cf5f0fda542efef575a123622637d81b9c42053
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 7 18:49:28 2008 +0200
+
+ [Qt] Fix Document::unlock
+
+ qt/poppler-document.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit b5041924eb023cc095f2445935ff713cf65dacce
+Author: Pino Toscano <pino@kde.org>
+Date: Wed May 7 16:44:03 2008 +0200
+
+ do not delete the GooString owned by an Object
+
+ poppler/Annot.cc | 4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+commit 546a7b700862db00240de9fd50bdba1dd347765b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun May 4 15:26:26 2008 +0200
+
+ Fix leaks on error conditions
+
+ poppler/Annot.cc | 6 ++++++
+ poppler/ArthurOutputDev.cc | 1 +
+ poppler/JBIG2Stream.cc | 1 +
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 914f1b1d814ab3d958aa0ca21ad73ef5aed20b89
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 3 18:21:28 2008 +0200
+
+ A widget annot does not always belong to a form, so check before
+ accessing the widget member
+
+ poppler/Annot.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c907e41ab18dda10cd3c9789bd0e7fe71b6402a8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 30 00:42:34 2008 +0200
+
+ findSegment can return NULL check for it
+
+ poppler/JBIG2Stream.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 8b7f29b577bca3295e99fea4a5cf4a6bb7ba2617
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 30 00:26:28 2008 +0200
+
+ new[] implies delete[]
+
+ poppler/ABWOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 926c13825d5f7364286975db8ffa507b92f4b3ab
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 23:44:51 2008 +0200
+
+ add lost return when adding kees patch
+
+ poppler/Object.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ba9283f6bc78e97006e52ef5de20c958ee9e1a37
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 23:42:00 2008 +0200
+
+ make the function static
+
+ utils/pdftoppm.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 931a8272f556ba8a35342f0c5bf53bdb57ea7a31
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 23:41:31 2008 +0200
+
+ make the variable static
+
+ utils/pdftoabw.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1887d2910d2006c7fc3ecc95db0150f1537e9d0a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 23:35:17 2008 +0200
+
+ constify some static arrays
+
+ poppler/CompactFontTables.h | 2 +-
+ poppler/Decrypt.cc | 8 ++++----
+ poppler/Function.cc | 2 +-
+ poppler/GfxFont.cc | 6 +++---
+ poppler/GfxState.cc | 4 ++--
+ poppler/JBIG2Stream.cc | 10 +++++-----
+ poppler/JPXStream.cc | 4 ++--
+ poppler/Lexer.cc | 2 +-
+ poppler/PSOutputDev.cc | 6 +++---
+ poppler/PSTokenizer.cc | 2 +-
+ poppler/SplashOutputDev.cc | 2 +-
+ poppler/Stream-CCITT.h | 12 ++++++------
+ poppler/Stream.cc | 10 +++++-----
+ poppler/UnicodeTypeTable.cc | 2 +-
+ 14 files changed, 36 insertions(+), 36 deletions(-)
+
+commit 51140e2d9490696d716f77d3225da0bfdfc212b4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 23:14:59 2008 +0200
+
+ more static markers
+
+ poppler/Annot.cc | 2 +-
+ poppler/DCTStream.cc | 2 +-
+ poppler/Object.cc | 2 +-
+ poppler/SplashOutputDev.cc | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 893703cb9eee879f728db329f7ee1fc19e7f980e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 23:03:51 2008 +0200
+
+ add static
+
+ poppler/XRef.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 7333bc913111e56ee241b7ef2bf6e9fea68b7da2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 23:01:13 2008 +0200
+
+ add static
+
+ poppler/JBIG2Stream.cc | 30 +++++++++++++++---------------
+ 1 files changed, 15 insertions(+), 15 deletions(-)
+
+commit 1ea36507f9c9f163b6772268046e7560d0c00dbc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 22:47:19 2008 +0200
+
+ make findModifier static
+
+ poppler/GlobalParams.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit be9961571dbfabb982e6f69abd3bbc98fa971864
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 21:48:09 2008 +0200
+
+ make variables not used outside static
+
+ utils/pdftohtml.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b157064a85350da6ea9c4f46e965e45ebc59d227
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 21:43:23 2008 +0200
+
+ constify setPSPaperSize
+
+ utils/pdftops.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ee57ead8a6f34fa8de044399e5912395e0f3a425
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 21:37:57 2008 +0200
+
+ constify argDesc arrays
+
+ Gives me binaries 2KB smaller (in total) in release build
+
+ utils/parseargs.c | 18 +++++++++---------
+ utils/parseargs.h | 4 ++--
+ utils/pdffonts.cc | 2 +-
+ utils/pdfimages.cc | 2 +-
+ utils/pdfinfo.cc | 2 +-
+ utils/pdftoabw.cc | 2 +-
+ utils/pdftohtml.cc | 2 +-
+ utils/pdftoppm.cc | 2 +-
+ utils/pdftops.cc | 2 +-
+ utils/pdftotext.cc | 2 +-
+ 10 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 9f93d9eb464877e0d23dcf205295da9162f03253
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 29 20:45:01 2008 +0200
+
+ make psOpNames static
+
+ Makes my release build 64 bytes smaller
+
+ poppler/Function.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 29e3e779c68371b7c4aadcf68ee0712046f39c6d
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 26 23:47:01 2008 +0200
+
+ remember to call the base implementation here
+
+ qt4/demos/optcontent.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit a188f3cd36775d78ace5b5d62c8ab7c059b3b2b1
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 26 23:42:09 2008 +0200
+
+ reset the current page to 0, when closing a document
+
+ qt4/demos/viewer.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 7eca6da6436ffc1c41cfed1a07be4dafa1172463
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 26 23:41:45 2008 +0200
+
+ no need to manually disconnect from the model, as it will be deleted
+ by the document anyway
+
+ qt4/demos/optcontent.cpp | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 6cddda7f3c3b8ddb95e6aba1b234a27c4454c23d
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 26 22:41:59 2008 +0200
+
+ sync updateFont() with SplashOutputDev
+
+ poppler/ArthurOutputDev.cc | 75
+ ++++++++++++++++++++++++++++++++++---------
+ 1 files changed, 59 insertions(+), 16 deletions(-)
+
+commit ddc7c1f8c24762bae615e7dec92e92a58c827478
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 26 18:12:51 2008 +0200
+
+ construct AnnotPolygon for Polygon and PolyLine annotations
+
+ poppler/Annot.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f9c7e8037b7165b6271ce7aea0d315053c4d66a5
+Merge: 59d33d8 f5fec4f
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 26 18:09:59 2008 +0200
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 59d33d8e99673f73ccf2ad9a62bd25fca51f0eb8
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 26 17:56:42 2008 +0200
+
+ use the base implementation to update all the states
+
+ poppler/ArthurOutputDev.cc | 11 +----------
+ 1 files changed, 1 insertions(+), 10 deletions(-)
+
+commit 45d2a9529bf241554c59437118cb8c705554dc27
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 26 17:55:39 2008 +0200
+
+ Set the font antialiasing from the painter settings, instead of the
+ global settings.
+
+ poppler/ArthurOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5faa72fd70e0d85268e807a8b870d80dda9189a9
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 26 17:53:28 2008 +0200
+
+ Get the font and painter matrices, and reenable the font drawing.
+
+ poppler/ArthurOutputDev.cc | 28 +++++++++++++++++++++-------
+ 1 files changed, 21 insertions(+), 7 deletions(-)
+
+commit f5fec4fdedd8d316b19968545e447e2036a1bb47
+Author: Kees Cook <kees@outflux.net>
+Date: Wed Apr 23 19:53:03 2008 +0200
+
+ provide type-checking for union pointer accesses
+
+ poppler/Object.h | 68
+ ++++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 43 insertions(+), 25 deletions(-)
+
+commit a567c921ce538616f4ba0b7933086ef5a8ab0f55
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Tue Apr 22 23:09:10 2008 +0200
+
+ Little change to avoid AnnotWidget crashing when they aren't related
+ to FormWidgets.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 19 ++++++++++---------
+ 1 files changed, 10 insertions(+), 9 deletions(-)
+
+commit 73798c95b8a4c0504e9246e6f73fd31f812ad6fa
+Author: Albert Astals Cid <tsdgeos@bluebox.(none)>
+Date: Mon Apr 21 19:56:52 2008 +0200
+
+ Link to pthread when needed
+
+ Should fix bug 15625
+
+ configure.ac | 2 +
+ m4/acx_pthread.m4 | 280
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Makefile.am | 4 +
+ 3 files changed, 286 insertions(+), 0 deletions(-)
+
+commit 6c248bdad77235a45402d9693a0b822cc208b6b9
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 20 18:32:59 2008 +0200
+
+ the dtor should be virtual
+
+ qt4/src/poppler-converter-private.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 68dba1a452ca70add5b05ab8e2adab838bc2cb73
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Apr 20 16:21:10 2008 +0200
+
+ if ncand is a Guint cand should be one too
+
+ poppler/CMap.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0b91eb19f5a3d07b625ee5188f1fcb4b4b1544ea
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Apr 20 16:17:50 2008 +0200
+
+ Unused var--
+
+ poppler/GfxFont.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1ed3cc40987b691319fd9f1a30296d80de5732fd
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Apr 16 15:45:45 2008 +0200
+
+ fix border style conversion
+
+ qt4/src/poppler-page.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 7c8feb4e3627bde2052a7e536d2d49d1cbbce8ee
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 15 21:57:31 2008 +0200
+
+ Hack to "support" 16 bits images
+
+ Everywhere we assume a component fits in 8 bits, with this hack
+ we treat 16 bit images as 8 bit ones until it's fixed correctly.
+ Fixes http://bugs.kde.org/show_bug.cgi?id=158165
+
+ poppler/GfxState.cc | 6 ++++++
+ poppler/Stream.cc | 9 +++++++++
+ 2 files changed, 15 insertions(+), 0 deletions(-)
+
+commit f338a9ded5d42dd65853c5c7bbe27f6724096416
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 13 21:41:51 2008 +0200
+
+ [Qt4] convert the sound annotations
+
+ qt4/src/poppler-page.cc | 16 ++++++++++++++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+
+commit 733d51fca04ee682fed2242f868edd545f3755fa
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 13 21:38:25 2008 +0200
+
+ [Qt4] First version of a SoundAnnotation.
+
+ qt4/src/poppler-annotation.cc | 87
+ +++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.h | 30 ++++++++++++++-
+ 2 files changed, 116 insertions(+), 1 deletions(-)
+
+commit feb1ea091111bd7292879c465590acfd7671c876
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 13 21:36:26 2008 +0200
+
+ First version of AnnotSound.
+
+ poppler/Annot.cc | 37 ++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h | 26 ++++++++++++++++++++++++++
+ 2 files changed, 62 insertions(+), 1 deletions(-)
+
+commit ec2cf81edf1b2c6707de4d30316ff5f5e24534d4
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 13 18:31:21 2008 +0200
+
+ [Qt4] convert the file attachment annotations
+
+ qt4/src/poppler-page.cc | 15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+commit 9fa2e96c96d365ae67859545ebd635d726784fca
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 13 18:29:00 2008 +0200
+
+ [Qt4] Initial version of FileAttachmentAnnotation
+
+ qt4/src/poppler-annotation.cc | 88
+ +++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.h | 29 +++++++++++++-
+ 2 files changed, 116 insertions(+), 1 deletions(-)
+
+commit 5899aff11f94e707654574e830e0757b1df558d4
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 13 10:50:39 2008 +0200
+
+ [Qt4] Read the annotations from the core, instead of own parsing.
+
+ Almost all the data are converted correctly, the results seem to be
+ the same.
+ Added TODOs in the few parts (not essential) I was not able to figure
+ out how to convert, yet.
+ Covert also the Caret annotations.
+
+ qt4/src/poppler-annotation-helper.h | 2 +-
+ qt4/src/poppler-page.cc | 851
+ ++++++++++++++++-------------------
+ 2 files changed, 393 insertions(+), 460 deletions(-)
+
+commit 40a12793c5ccea206d79e0c17e2f2d0cf74bb4f3
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 13 02:21:55 2008 +0200
+
+ add getters for the AnnotPolygon properties
+
+ poppler/Annot.h | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 9311f75d4c3da991efb8afd00701a0ce1cbae1b0
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sun Apr 13 01:52:36 2008 +0200
+
+ Almost full AnnotPolygon support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 99
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 37 ++++++++++++++++++++
+ 2 files changed, 136 insertions(+), 0 deletions(-)
+
+commit 01aa052ed761a4ada471d196985825986bb58627
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sun Apr 13 01:13:49 2008 +0200
+
+ Extend AnnotPath behaviour to include cooordinate array parsing.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 96
+ +++++++++++++++++++++++++++++------------------------
+ poppler/Annot.h | 4 ++-
+ 2 files changed, 55 insertions(+), 45 deletions(-)
+
+commit ca52830e9519ae7b778f98e5c2547daef7da5f09
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sun Apr 13 00:54:13 2008 +0200
+
+ Added OptionalContent support to Annots.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 9 +++------
+ poppler/Annot.h | 5 +++--
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+commit 4b87196b7829c87d15af4e8b4138ca97548fb519
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 13 00:18:24 2008 +0200
+
+ Isolate the embedded file reading logic into a new EmbFile
+ constructor.
+
+ This way, it can be shared and reused in various places (Catalog,
+ AnnotFileAttachment, etc).
+
+ poppler/Catalog.cc | 205
+ ++++++++++++++++++++++++++++------------------------
+ poppler/Catalog.h | 1 +
+ 2 files changed, 112 insertions(+), 94 deletions(-)
+
+commit 45b407e51905948690065749085a4af1cbb29a8e
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 13 00:14:38 2008 +0200
+
+ correctly get the FileSpec dictionary
+
+ poppler/Annot.cc | 4 +++-
+ poppler/Annot.h | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit c3aa3a97d9c553ea7976741d798901352fb5381c
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 12 22:45:57 2008 +0200
+
+ properly initialize an AnnotPath
+
+ poppler/Annot.cc | 9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+commit a3406fb2ace1390db1c181823a7bfc66c9174d98
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 12 22:40:42 2008 +0200
+
+ properly dispose the memory of the ink lists
+
+ poppler/Annot.cc | 13 ++++++++++++-
+ poppler/Annot.h | 1 +
+ 2 files changed, 13 insertions(+), 1 deletions(-)
+
+commit 0dad70e2d12e8b587cab8ce2d914c81c6897a1d1
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 12 22:15:35 2008 +0200
+
+ make AnnotInk working.
+
+ - get the point indexes in the correct way
+ - dispose with free what you allocate with malloc
+ - fix logic when checking for an even number of points
+
+ poppler/Annot.cc | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 77404e24ea1e175fc9b55097dc5b35cc34760659
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 12 21:08:54 2008 +0200
+
+ a length is an int
+
+ poppler/Annot.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bc2b2ffd2144f951c311e968fba4bc50b7c43ff3
+Merge: cd5afe6 bacc1dd
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sat Apr 12 17:40:49 2008 +0200
+
+ Fixed merging conflict.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+commit cd5afe6d9eca687ee224ff7680a8cba28d81a36d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 12 00:44:08 2008 +0200
+
+ Do not take into account Colorspace resource subdictionary for
+ image XObjects
+
+ Fixes bug 15125
+ The motivation under that change is on section 4.5.2 of the spec:
+ Certain objects, such as image XObjects, specify a
+ color space as an explicit parameter, often associated with the
+ key ColorSpace.
+ In this case, the color space array or name is always defined
+ directly as a PDF
+ object, not by an entry in the ColorSpace resource
+ subdictionary. This conven-
+ tion also applies when color spaces are defined in terms of other
+ color spaces.
+
+ poppler/Gfx.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bacc1dd9f37ff19c5e54878a5b08e7d734584bbf
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 12 17:20:09 2008 +0200
+
+ Read the "in reply to" reference as such, without reading the
+ associated annotation dictionary.
+
+ poppler/Annot.cc | 10 ++++------
+ poppler/Annot.h | 4 ++--
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+commit ffe09454a0948a6107bcc38f23ba2068151c547d
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sat Apr 12 17:17:59 2008 +0200
+
+ Initial Annot3D parsing a few general improvements.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 130
+ ++++++++++++++++++++++++++++++++++++++++++++++++++---
+ poppler/Annot.h | 84 +++++++++++++++++++++++++++++-----
+ 2 files changed, 193 insertions(+), 21 deletions(-)
+
+commit 8757c577241dda31bc59c7d1c208c159ad428877
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sat Apr 12 10:38:07 2008 +0200
+
+ AnnotFileAttachment support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 38 ++++++++++++++++++++++++++++++++++++--
+ poppler/Annot.h | 25 +++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+), 2 deletions(-)
+
+commit 36989658149fc9e5e8a049ce070a102f35b7bddc
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sat Apr 12 09:55:26 2008 +0200
+
+ AnnotInk support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 113
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 45 +++++++++++++++++++++
+ 2 files changed, 158 insertions(+), 0 deletions(-)
+
+commit 464b171d0e9b989196c287f2ee4dfbbc14212aa9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 12 00:44:08 2008 +0200
+
+ Do not take into account Colorspace resource subdictionary for
+ image XObjects
+
+ Fixes bug 15125
+ The motivation under that change is on section 4.5.2 of the spec:
+ Certain objects, such as image XObjects, specify a
+ color space as an explicit parameter, often associated with the
+ key ColorSpace.
+ In this case, the color space array or name is always defined
+ directly as a PDF
+ object, not by an entry in the ColorSpace resource
+ subdictionary. This conven-
+ tion also applies when color spaces are defined in terms of other
+ color spaces.
+
+ poppler/Gfx.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 42db4890e8295aaec5a1be12d1414fc0a9048550
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Mar 27 10:52:22 2008 +0000
+
+ Do not call FT_Done_Face on a live cairo_font_face_t.
+
+ Currently CairoFont calls FT_Done_Face on its deletion, but the
+ FT_Face
+ is usually still in use within cairo. This causes a failure later when
+ cairo tries to create a glyph from its cairo_font_face_t.
+
+ From http://bugs.freedesktop.org/show_bug.cgi?id=15216:
+ ==13745== Invalid read of size 4
+ ==13745== at 0x51BE572: FT_Load_Glyph (ftobjs.c:549)
+ ==13745== by 0x4A24921: _cairo_ft_scaled_glyph_init
+ (cairo-ft-font.c:1922)
+ ==13745== by 0x4A117AB: _cairo_scaled_glyph_lookup
+ (cairo-scaled-font.c:1674)
+ ==13745== by 0x4A12A5A: _cairo_scaled_font_glyph_device_extents
+ (cairo-scaled-font.c:1124)
+ ==13745== by 0x4A21ECD: _cairo_analysis_surface_show_glyphs
+ (cairo-analysis-surface.c:516)
+ ==13745== by 0x4A144DC: _cairo_surface_show_glyphs
+ (cairo-surface.c:2086)
+ ==13745== by 0x4A1FCC8: _cairo_meta_surface_replay_internal
+ (cairo-meta-surface.c:816)
+ ==13745== by 0x4A214B1: _paint_page (cairo-paginated-surface.c:299)
+ ==13745== by 0x4A2171E: _cairo_paginated_surface_show_page
+ (cairo-paginated-surface.c:445)
+ ==13745== by 0x4A14BDF: cairo_surface_show_page
+ (cairo-surface.c:1702)
+ ==13745== by 0x49FF661: cairo_show_page (cairo.c:2155)
+ ==13745== by 0xA267D97:
+ pdf_document_file_exporter_end_page(_EvFileExporter*)
+ (ev-poppler.cc:1753)
+ ==13745== Address 0x55c5630 is 88 bytes inside a block of size
+ 552 free'd
+ ==13745== at 0x402269C: free (vg_replace_malloc.c:326)
+ ==13745== by 0x51B7ABC: ft_free (ftsystem.c:158)
+ ==13745== by 0x51BB319: ft_mem_free (ftutil.c:171)
+ ==13745== by 0x51BC318: destroy_face (ftobjs.c:856)
+ ==13745== by 0x51BC3B2: FT_Done_Face (ftobjs.c:1972)
+ ==13745== by 0x4363704: CairoFont::~CairoFont()
+ (CairoFontEngine.cc:251)
+ ==13745== by 0x436401D: CairoFontEngine::getFont(GfxFont*, XRef*)
+ (CairoFontEngine.cc:335)
+ ==13745== by 0x4366915: CairoOutputDev::updateFont(GfxState*)
+ (CairoOutputDev.cc:318)
+ ==13745== by 0x5093BF1: Gfx::opShowText(Object*, int) (Gfx.cc:3073)
+ ==13745== by 0x508F901: Gfx::execOp(Object*, Object*, int)
+ (Gfx.cc:726)
+ ==13745== by 0x50906FF: Gfx::go(int) (Gfx.cc:594)
+ ==13745== by 0x5090C96: Gfx::display(Object*, int) (Gfx.cc:557)
+
+ The solution is to release the reference to the cairo_font_face_t upon
+ destruction of the CairoFont, and then to release the FT_Face from the
+ destroy notify of the cairo_font_face_t.
+
+ poppler/CairoFontEngine.cc | 19 +++++++++----------
+ 1 files changed, 9 insertions(+), 10 deletions(-)
+
+commit 5f60843824582ece36d806508ec388330ddee854
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Tue Apr 8 00:30:57 2008 +0200
+
+ Added AnnotCoord support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 64 +++++++++++++++++--------------------------------
+ poppler/Annot.h | 69
+ +++++++++++++++++++++++++-----------------------------
+ 2 files changed, 54 insertions(+), 79 deletions(-)
+
+commit a6f70f465a3e6719d63cefbe3c27bae015be43c1
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 6 13:12:01 2008 +0200
+
+ add getters for the coordinates in an AnnotLine
+
+ poppler/Annot.h | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 1d83d6edf9a843335e37a4d1e0e0dd71eb23d93b
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 6 12:24:42 2008 +0200
+
+ [Qt4] the caret symbol is an enum value, now
+
+ qt4/src/poppler-annotation.cc | 35 ++++++++++++++++++++++++++++-------
+ qt4/src/poppler-annotation.h | 7 +++++--
+ 2 files changed, 33 insertions(+), 9 deletions(-)
+
+commit 229d991a3258cb9b56f5e00f2deb3c976253cf68
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 6 12:23:04 2008 +0200
+
+ the caret symbol does not seem to allow additional values, so convert
+ it to an enum
+
+ poppler/Annot.cc | 11 +++++++----
+ poppler/Annot.h | 9 +++++++--
+ 2 files changed, 14 insertions(+), 6 deletions(-)
+
+commit fc24500ddd9182f97d23c46eaafc6be79a6721eb
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Apr 6 11:43:49 2008 +0200
+
+ propetly initialise a couple of members; leak less
+
+ poppler/ArthurOutputDev.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 9409de1e7c5b3770c7ef00c01ee376953dd532a5
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sun Apr 6 01:38:25 2008 +0200
+
+ Changed AnnotFreeText RD field to the new parseDiffRectangle.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 35 ++---------------------------------
+ 1 files changed, 2 insertions(+), 33 deletions(-)
+
+commit 28c5ee2e9fc2a24d2f2efb3d74d5cf882a106239
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 23:19:33 2008 +0200
+
+ typo fix
+
+ poppler/Annot.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ed02769688466ca72bf35d4223c3822a1245604b
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 19:36:21 2008 +0200
+
+ read the destination of a link annotation
+
+ poppler/Annot.cc | 5 ++++-
+ poppler/Annot.h | 4 ++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+commit ca31bf12a9d70bac88e457f7799e9935aba58640
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 16:48:53 2008 +0200
+
+ variable forgotten in the copy&paste...
+
+ qt4/src/poppler-annotation.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 4168daa141b76e5fcd07d046aca8dac2f3037ff9
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 16:34:12 2008 +0200
+
+ [Qt4] deserialize also CaretAnnotation's
+
+ qt4/src/poppler-annotation.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit b55bcc2aa95825863bef23ab96364b350a49949d
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 16:31:31 2008 +0200
+
+ [Qt4] first version of a CaretAnnotation.
+
+ qt4/src/poppler-annotation.cc | 80
+ +++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.h | 25 ++++++++++++-
+ 2 files changed, 104 insertions(+), 1 deletions(-)
+
+commit 4c9a02b7e49666efe10fdc16e7a03d8d520b65ec
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 16:01:58 2008 +0200
+
+ First version of AnnotCaret.
+
+ poppler/Annot.cc | 36 +++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h | 22 ++++++++++++++++++++++
+ 2 files changed, 57 insertions(+), 1 deletions(-)
+
+commit d260fe9e514c667b66969b982119429cc922eb07
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 15:54:29 2008 +0200
+
+ isolate the code for parsing a "difference rectangle" in an own
+ function
+
+ poppler/Annot.cc | 54
+ +++++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 31 insertions(+), 23 deletions(-)
+
+commit 760833e409c122c0a61f7c87fd3133eebc10b402
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 15:36:43 2008 +0200
+
+ First version of AnnotGeometry.
+
+ poppler/Annot.cc | 77
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h | 24 +++++++++++++++++
+ 2 files changed, 99 insertions(+), 2 deletions(-)
+
+commit 95d9d2362534c0524ad0448818b2d69b0909d482
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 03:23:00 2008 +0200
+
+ finally, load the QuadPoints correctly
+
+ when checking the validity of the coordinate, do the comparison just
+ with the proper one (either X or Y);
+ free the "point" object after each iteration
+
+ poppler/Annot.cc | 11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+commit af1ffcbcec1730332d11f8da4a7ddac833b22408
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 02:54:00 2008 +0200
+
+ More robust reading of QuadPoints (reset the allocated memory,
+ use the heap)
+
+ poppler/Annot.cc | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit 68fd98d69bac20282665cf6b824da30c3b310f0b
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 02:51:41 2008 +0200
+
+ Really implement AnnotTextMarkup.
+
+ poppler/Annot.cc | 29 +++++++++++++++++++++++++----
+ poppler/Annot.h | 2 +-
+ 2 files changed, 26 insertions(+), 5 deletions(-)
+
+commit 69a2ecfaf8f8cffd3027db5c3cc88c41413e42f1
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Apr 5 01:38:28 2008 +0200
+
+ Add the Stamp annotation type.
+
+ poppler/Annot.cc | 28 +++++++++++++++++++++++++++-
+ poppler/Annot.h | 20 ++++++++++++++++++++
+ 2 files changed, 47 insertions(+), 1 deletions(-)
+
+commit 97be4332818bcf58461816be995d88926809a4e5
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Fri Apr 4 23:49:12 2008 +0200
+
+ Updated glib bindings.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ glib/demo/annots.c | 32 +++++---------------------------
+ glib/poppler-annot.cc | 27 +++++----------------------
+ glib/poppler-annot.h | 13 +------------
+ 3 files changed, 11 insertions(+), 61 deletions(-)
+
+commit 5caac407cdaf58621ac27e5561b31a995404ccb3
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Fri Apr 4 23:36:46 2008 +0200
+
+ Fixed icon name in AnnotText.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 25 ++++++-------------------
+ poppler/Annot.h | 15 +++------------
+ 2 files changed, 9 insertions(+), 31 deletions(-)
+
+commit 0b714a61383da1b62daf2a60e3f6fcda09b4e9f2
+Author: Adam Batkin <adam@batkin.net>
+Date: Thu Apr 3 20:02:52 2008 +0200
+
+ FindFirstFile returns INVALID_HANDLE_VALUE and not NULL on error
+
+ goo/gfile.cc | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+commit be765f27cc5430d9bb2a3e113eb245d67c20a376
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Mar 31 12:37:33 2008 +0200
+
+ [glib] Fix a crash in outline demo due to page_num == dest_page_num
+ - 1
+
+ glib/demo/utils.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e991e9ac6fcc0b6928b96fe8326eebcf3cb720ca
+Author: Albert Astals Cid <tsdgeos@localhost.(none)>
+Date: Sat Mar 29 13:25:52 2008 +0100
+
+ Add the export macro
+
+ qt4/src/poppler-page-transition.h | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit b70ca35dce6da6efdff254c11a63de4f44228278
+Author: Albert Astals Cid <tsdgeos@localhost.(none)>
+Date: Sat Mar 29 00:30:31 2008 +0100
+
+ Duplicate page-transition files on qt4
+
+ qt4/src/CMakeLists.txt | 4 +-
+ qt4/src/Makefile.am | 4 +-
+ qt4/src/poppler-page-transition-private.h | 28 ++++++
+ qt4/src/poppler-page-transition.cc | 95 +++++++++++++++++++
+ qt4/src/poppler-page-transition.h | 146
+ +++++++++++++++++++++++++++++
+ 5 files changed, 273 insertions(+), 4 deletions(-)
+
+commit b5312785063235cef7584ab6a5d198fb72de0988
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Wed Mar 26 23:56:49 2008 +0100
+
+ Improved glib annot demo.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ glib/demo/annots.c | 314
+ +++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 files changed, 289 insertions(+), 25 deletions(-)
+
+commit 7cc8fd70f68d2cdab7ab83a0ecf6c8896c971d62
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 26 21:03:34 2008 +0100
+
+ remove damn error
+
+ qt4/src/poppler-page.cc.orig | 1317
+ ------------------------------------------
+ 1 files changed, 0 insertions(+), 1317 deletions(-)
+
+commit 7a47ff3b54678a3de6964d25050e02186484f39a
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 26 21:00:32 2008 +0100
+
+ [Qt4] Add support for JavaScript links, and create them when present.
+
+ qt4/src/poppler-link.cc | 36 ++
+ qt4/src/poppler-link.h | 32 +-
+ qt4/src/poppler-page.cc | 7 +
+ qt4/src/poppler-page.cc.orig | 1317
+ ++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 1391 insertions(+), 1 deletions(-)
+
+commit a6f2c10ee01ee62ae945b50f6b6eae380377fe03
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 26 20:59:21 2008 +0100
+
+ [Qt4] Read the document-level JavaScript scripts.
+
+ qt4/src/poppler-document.cc | 15 +++++++++++++++
+ qt4/src/poppler-qt4.h | 8 ++++++++
+ 2 files changed, 23 insertions(+), 0 deletions(-)
+
+commit b8a471e55b998836c09c65ff736afdef8ac55189
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 26 20:56:01 2008 +0100
+
+ Add support for JavaScript actions, and read them when found.
+
+ poppler/Link.cc | 33 +++++++++++++++++++++++++++++++++
+ poppler/Link.h | 23 +++++++++++++++++++++++
+ 2 files changed, 56 insertions(+), 0 deletions(-)
+
+commit 2fd85dc1b8b2ababadfc60e285c08a844737e4bb
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 26 20:53:42 2008 +0100
+
+ Read the JavaScript codes in the NameTree of the Catalog.
+
+ poppler/Catalog.cc | 39 +++++++++++++++++++++++++++++++++++++++
+ poppler/Catalog.h | 7 +++++++
+ 2 files changed, 46 insertions(+), 0 deletions(-)
+
+commit 312f14f5b7be1f0d62620477222919423c3869e0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 26 20:05:31 2008 +0100
+
+ compile++
+
+ fofi/FoFiBase.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5bd750062e1fb136f77a55d1f35b2d6fabaad1b3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 26 19:42:43 2008 +0100
+
+ update version
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 10d4a8b9aed51902157c04d9deea0e99d829c4f6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 26 19:42:36 2008 +0100
+
+ fill news
+
+ NEWS | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 2069826d61ebd527768b6455689276c0a8288085
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 26 16:05:06 2008 +0100
+
+ missing break
+
+ qt4/src/poppler-page.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d6a0c6a6803a03f402c2dcde41c6195e951470ba
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Mar 26 15:50:39 2008 +0100
+
+ initialize posterStream to avoid crashing later
+
+ poppler/Movie.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 0be811b3ad86b1cb14be94a017e70c65b8e64730
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 25 22:59:22 2008 +0100
+
+ Don't end up in an infinite recursive loop in case resObj dict is
+ the same we are already in
+
+ poppler/FontInfo.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0222c6ceb0fcf1d7c4422691a68a035a558ad614
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Mar 24 17:14:07 2008 +0100
+
+ fix build when using cmake, not sure it's completely ok, but at
+ least i can compile
+
+ CMakeLists.txt | 1 +
+ cmake/modules/FindGTK.cmake | 23 ++++++++++++++++-------
+ config.h.cmake | 3 +++
+ glib/CMakeLists.txt | 17 +++++++++++------
+ glib/poppler-page.cc | 2 +-
+ glib/test-poppler-glib.cc | 2 +-
+ 6 files changed, 33 insertions(+), 15 deletions(-)
+
+commit 3e4164f2db69358adf07596195842dd00458b621
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Mar 24 15:10:31 2008 +0100
+
+ fix some cmake HAVE_foo
+
+ CMakeLists.txt | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 22f615aee488cc363a078330861e80f389f47061
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sun Mar 23 13:22:07 2008 +0100
+
+ Fixed wrong functions.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ glib/poppler-annot.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit cccfe42ed9c53d27cf6a1403ae55bf34a053012d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 22 19:12:05 2008 +0100
+
+ Fix rm line not to error when no *moc file is present
+
+ qt4/src/Makefile.am | 2 +-
+ qt4/tests/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit e60d39ba0e8b9742106a0c9b1385b1c907729c3f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 22 19:11:17 2008 +0100
+
+ Fix rm line not to error if no *moc file is present
+
+ qt4/demos/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit d9d52e622c6b28a9941168bb73839ec335ca7232
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 22 19:10:40 2008 +0100
+
+ Fix configure to not require gdk when we are on try mode
+
+ configure.ac | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 9b8809298dd16cdbffcc12b6db8e274578934063
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 22 15:49:02 2008 +0100
+
+ It's really only an error if < 0
+
+ poppler/PDFDoc.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0fb1e697cc4100ce23298141c8b5829273872423
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 22 15:46:44 2008 +0100
+
+ remove unneeded variable
+
+ poppler/PDFDoc.cc | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 3404cb626ee9b4520d6fe601e07560745a4cb42a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 22 15:44:50 2008 +0100
+
+ Remove OutStream::reset since noone uses it
+
+ This way we have a fseek less to care about if worked or not
+
+ poppler/Stream.cc | 5 -----
+ poppler/Stream.h | 5 -----
+ qt4/src/poppler-qiodeviceoutstream-private.h | 1 -
+ qt4/src/poppler-qiodeviceoutstream.cc | 5 -----
+ 4 files changed, 0 insertions(+), 16 deletions(-)
+
+commit 066595dd06c930997d5ec65a06c822616af9baa0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 22 15:43:07 2008 +0100
+
+ Check the document stream is seekable when opening it
+
+ Fixes bug 14126
+
+ poppler/PDFDoc.cc | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 23b6475463f8973b5ac83bb21a6b7b6000cc435b
+Author: Ed Avis <eda@waniasset.com>
+Date: Sat Mar 22 13:55:59 2008 +0100
+
+ Check for fseek return values
+
+ fofi/FoFiBase.cc | 14 ++++++++++++--
+ poppler/GfxFont.cc | 12 ++++++++++--
+ 2 files changed, 22 insertions(+), 4 deletions(-)
+
+commit b33bb282e45cf1a083cfbb13603ac465d386c28d
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Fri Mar 21 13:53:21 2008 +0100
+
+ Fixed poppler glib public api.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ glib/poppler-annot.cc | 4 ++--
+ glib/poppler-annot.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 371932f413d570d7784c668f30834d3d92d7aa80
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 20 11:44:32 2008 +0100
+
+ [glib] Remove unused variable.
+
+ glib/poppler-document.cc | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 21fa476ac384256c15a954b708e009f2b336b06f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Mar 20 11:42:32 2008 +0100
+
+ [glib] Do not cache image_dev in poppler page.
+
+ Thanks to Kouhei Sutou who caught the problem.
+
+ glib/poppler-page.cc | 60
+ ++++++++++++++++++++++++++------------------
+ glib/poppler-private.h | 3 --
+ glib/test-poppler-glib.cc | 9 ++++++-
+ 3 files changed, 43 insertions(+), 29 deletions(-)
+
+commit 22cd70d8fc308fb8b19d36d0172014ba532230fb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 19 21:52:14 2008 +0100
+
+ poppler_annot_markup_get_opacity returns a double so use %f
+
+ glib/demo/annots.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b9a5fd4671638caa91f8a389be278d993391f499
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 19 21:28:49 2008 +0100
+
+ updated by gtk-doc
+
+ glib/reference/tmpl/poppler-action.sgml | 1 +
+ glib/reference/tmpl/poppler.sgml | 3 +++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit b7e0b740578ea1e84ac0ef850b5a03c66b2863e3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 19 21:28:01 2008 +0100
+
+ Fill 0.7.3 news
+
+ NEWS | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 3adaff1dad8127fdd06653cf49196027ad414a08
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 19 21:27:46 2008 +0100
+
+ Bump version to 0.7.3
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 52dd710b63911be2d8c960de0232c497c35ecac8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 19 18:35:35 2008 +0100
+
+ [glib] Update outline and links demos to the new POPPLER_ACTION_NONE
+
+ glib/demo/utils.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 6a22f0a20df38156c06e8ba10649e0828a1da102
+Author: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
+Date: Wed Mar 19 18:32:48 2008 +0100
+
+ [glib] Consider no action as an action of type None instead of Unknown
+
+ glib/poppler-action.cc | 2 +-
+ glib/poppler-action.h | 1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 185d5818fd546f85934b041d5b0cdcdf1849b1dc
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Mar 18 20:08:21 2008 +0100
+
+ Improve error handling when creating a document
+
+ glib/poppler-document.cc | 40 ++++++++++++++++++++++++++++------------
+ glib/poppler.h | 5 ++++-
+ 2 files changed, 32 insertions(+), 13 deletions(-)
+
+commit 9bba2748985049515bfd9c9b44f26b92fa704078
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Mar 15 01:11:39 2008 +0100
+
+ Some more free
+
+ poppler/OptionalContent.cc | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit bfc308935fa138e27c4d2ad0e1c1cad20eba8e8a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Mar 15 01:05:32 2008 +0100
+
+ Use error instead of printf
+
+ poppler/OptionalContent.cc | 15 ++++++++-------
+ 1 files changed, 8 insertions(+), 7 deletions(-)
+
+commit 998b1523ee653c1585f03b4a580e0d95ba694aca
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Mar 15 01:02:31 2008 +0100
+
+ Some free
+
+ poppler/OptionalContent.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit c65a66a82259f547927cbb918611bcf4a8e264b2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Mar 14 20:29:53 2008 +0100
+
+ xx0 is non exclusive so that should be < not <=
+
+ Fixes several warnings about writes on bad places
+
+ splash/SplashXPathScanner.cc | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit bd2272f3079319d1c05ca93f7fb6eb0a5370b938
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Mar 14 19:52:04 2008 +0100
+
+ Fix "Make sure we don't draw outside the bitmap on Splash::fillGlyph2"
+ when painting with no aa
+
+ Fixes bug 15009
+
+ splash/Splash.cc | 12 ++++++++----
+ 1 files changed, 8 insertions(+), 4 deletions(-)
+
+commit 5bf8d864e68854f0855e07fb67aa124e06c739cd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 12 22:48:07 2008 +0100
+
+ fix build
+
+ glib/reference/Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit d0be5c86dcd3310062d820b3515c31e4720af2ca
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 12 22:40:59 2008 +0100
+
+ Update version to 0.7.2 and fill NEWS
+
+ CMakeLists.txt | 2 +-
+ NEWS | 20 ++++++++++++++++++++
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 26 insertions(+), 6 deletions(-)
+
+commit 0b2ecf39572821a99374e6acec7c1bd438911bbc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 12 22:38:57 2008 +0100
+
+ update soname here too
+
+ glib/CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f5065016b168e4896e2fe774cd22bbd900849b52
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Mar 12 22:06:53 2008 +0100
+
+ Make GDK dependency option for glib bindings
+
+ Fixes bug #13719.
+
+ configure.ac | 45 +++-
+ glib/Makefile.am | 7 +-
+ glib/demo/page.c | 88 ++++++-
+ glib/demo/render.c | 4 +
+ glib/poppler-action.h | 1 -
+ glib/poppler-annot.cc | 26 +-
+ glib/poppler-annot.h | 2 +-
+ glib/poppler-document.h | 2 -
+ glib/poppler-features.h.in | 1 +
+ glib/poppler-page.cc | 695
+ ++++++++++++++++++++++++++------------------
+ glib/poppler-page.h | 76 +++--
+ glib/poppler.h | 2 +-
+ glib/test-poppler-glib.cc | 2 +-
+ 13 files changed, 610 insertions(+), 341 deletions(-)
+
+commit 46d4fab82332e71d0b68c0a8deeac78f2201ed14
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 12 20:35:33 2008 +0100
+
+ Increment version of libpoppler and libpoppler-qt4
+
+ CMakeLists.txt | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 550c1fc73a6d2af65728751fd0b59ccc7110fa8b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 12 20:34:48 2008 +0100
+
+ Init to false updated field of XRefEntries plus indenting fixes
+
+ poppler/XRef.cc | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 6a671686c6265ecdb4c48f04392de9c56d4e0936
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Wed Mar 12 21:43:12 2008 +1030
+
+ Fix regression in cairo output when transforming ctm
+
+ The commit:
+ ec01926e5a9dc16e200060497c43e79a1623698d "Avoid setting a singular
+ ctm"
+ introduced a regression in the output when using a ctm.
+
+ The check for an invertable matrix had the side effect of inverting
+ the matrix. Instead, make a copy of the matrix before testing if it is
+ invertable.
+
+ poppler/CairoOutputDev.cc | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 0b2c3bb25c908b07e760d824dbfe93c6051812aa
+Merge: 362fe01 9c472f7
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Wed Mar 12 00:23:58 2008 +0100
+
+ Merge branch 'master' of
+ ssh://inigomartinez@git.freedesktop.org/git/poppler/poppler
+
+commit 362fe013c0d96698b52d70cf5226cddca7fe52d4
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Wed Mar 12 00:07:12 2008 +0100
+
+ Enabled back the AnnotWidget support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9c472f76d2462d0e775c851fdbac6ca2bc9812ea
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 12 00:00:20 2008 +0100
+
+ cmake build
+
+ glib/demo/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 821858f5c36786955d9475044bfee57f5060ad2f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 11 23:58:05 2008 +0100
+
+ Return char bounding box instead of edge, it's much more useful for
+ character positioning
+
+ qt4/src/poppler-page.cc | 8 ++++++--
+ qt4/src/poppler-private.h | 3 +--
+ qt4/src/poppler-qt4.h | 6 ++----
+ qt4/src/poppler-textbox.cc | 4 ++--
+ 4 files changed, 11 insertions(+), 10 deletions(-)
+
+commit d7e642732ced592362d9787bddadb7a110dcc5a5
+Merge: 3642f0c 2d6c605
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Tue Mar 11 23:41:59 2008 +0100
+
+ Merge branch 'master' of
+ ssh://inigomartinez@git.freedesktop.org/git/poppler/poppler
+
+commit 3642f0c48bc49cd4d698e769544c1d8604c6482f
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Tue Mar 11 23:13:33 2008 +0100
+
+ glib annots demo.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/annots.c | 468
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/annots.h | 31 ++++
+ glib/demo/main.c | 4 +-
+ 4 files changed, 504 insertions(+), 1 deletions(-)
+
+commit 2d6c60537317bd3ac9e0582e0da09e7365729097
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Mar 11 22:54:44 2008 +0100
+
+ For now we cannot handle MovieLink's, so comment them out.
+
+ qt4/src/poppler-annotation.cc | 2 ++
+ qt4/src/poppler-link.cc | 4 ++++
+ qt4/src/poppler-link.h | 2 ++
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+
+commit a354f7198c493990613a1db131c662ec27948863
+Author: Hugo Mercier <hmercier31@gmail.com>
+Date: Tue Mar 11 22:49:00 2008 +0100
+
+ Initial Movie support (2)
+
+ Now with the forgotten files
+
+ poppler/Movie.cc | 443
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Movie.h | 177 ++++++++++++++++++++++
+ 2 files changed, 620 insertions(+), 0 deletions(-)
+
+commit 43e5dd941d4bc35c4eebbad66c13235639e0c1a0
+Merge: aab1768 4fdd254
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 11 22:31:22 2008 +0100
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit 4fdd254370ea6055e95c8ebee51b69e06c501714
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Mar 11 22:31:00 2008 +0100
+
+ Fix build
+
+ glib/poppler-page.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit aab17684dc3f21ff2b1ee6eacdc0c565d368df78
+Author: Hugo Mercier <hmercier31@gmail.com>
+Date: Tue Mar 11 22:28:28 2008 +0100
+
+ Initial Movie support
+
+ CMakeLists.txt | 2 +
+ poppler/Annot.cc | 316
+ ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h | 125 ++++++++++++++++++++
+ poppler/Link.cc | 108 +++++++++++++++---
+ poppler/Link.h | 64 ++++++++++-
+ poppler/Makefile.am | 2 +
+ 6 files changed, 591 insertions(+), 26 deletions(-)
+
+commit 13a0d2390b9e4684af070c213f385485715353df
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 11 22:27:38 2008 +0100
+
+ Add poppler-annot to the cmake build system
+
+ glib/CMakeLists.txt | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 19f0e3b40bce4d8157d8c8bd04eaf6bacbef38b8
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Tue Mar 11 22:09:04 2008 +0100
+
+ Add preliminary annotations support in the glib frontend
+
+ glib/Makefile.am | 2 +
+ glib/poppler-annot.cc | 776
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-annot.h | 181 +++++++++++
+ glib/poppler-page.cc | 166 +++++++++++
+ glib/poppler-page.h | 15 +
+ glib/poppler-private.h | 5 +-
+ glib/poppler.h | 7 +
+ 7 files changed, 1151 insertions(+), 1 deletions(-)
+
+commit 6fa3ab20fee311b4aff92be18870fd0e1730a81f
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Tue Mar 11 18:44:27 2008 +0100
+
+ Changed AnnotMarkup inheritance
+
+ poppler/Annot.cc | 9 +++++----
+ poppler/Annot.h | 10 +++++-----
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+commit 3111cfe2ccb32f9680baaad0c3f0678dd5969f8b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Mar 10 22:12:36 2008 +0100
+
+ And free the memory
+
+ qt4/tests/test-poppler-qt4.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 58f88c23402ac2e678dc655f64d93d89bb1812be
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Mar 10 22:08:43 2008 +0100
+
+ Add the -textRects option to the test app so we can check text rects
+ are correct
+
+ qt4/tests/test-poppler-qt4.cpp | 45
+ +++++++++++++++++++++++++++++++++++----
+ 1 files changed, 40 insertions(+), 5 deletions(-)
+
+commit 94ceb3cae79dc7786fa59fd889a87160780ed5df
+Merge: 0f9e843 35f34bd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 9 23:34:11 2008 +0100
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit 0f9e84302ac2108f05bdbb10e7e57ae19ad1e9f3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 9 23:33:11 2008 +0100
+
+ Do not force default values to fontconfig patterns as fontconfig
+ already fills in default values for us
+
+ Fixes bug 14883
+
+ poppler/GlobalParams.cc | 17 +++++++++--------
+ 1 files changed, 9 insertions(+), 8 deletions(-)
+
+commit 35f34bd44c74eeb76a58b30acfbb0303d7285f06
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Mar 9 17:38:54 2008 +0100
+
+ Fix build when compiling without cairo support
+
+ glib/demo/images.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 32637db19dd80a9b8452f86eb677b10e77290627
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 9 00:57:08 2008 +0100
+
+ proper lib64 Qt detection
+
+ Fixes bug 14583
+
+ m4/qt.m4 | 15 ++++++++++++---
+ 1 files changed, 12 insertions(+), 3 deletions(-)
+
+commit 65a88a95a5c54c890048e8a986df361585d601dd
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 8 03:11:36 2008 +0100
+
+ Provide the mime type for an embedded file, if known.
+
+ Adapt the unit test for that.
+
+ qt4/src/poppler-embeddedfile.cc | 5 +++++
+ qt4/src/poppler-qt4.h | 5 +++++
+ qt4/tests/check_attachments.cpp | 7 +++++++
+ 3 files changed, 17 insertions(+), 0 deletions(-)
+
+commit 23da27a229c8b3cc2a0a0dd6354c40723934390c
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Mar 8 03:10:58 2008 +0100
+
+ Optionally read the mimetype for the embedded files.
+
+ poppler/Catalog.cc | 17 +++++++++--------
+ poppler/Catalog.h | 7 ++++++-
+ 2 files changed, 15 insertions(+), 9 deletions(-)
+
+commit 42c254b978c61e2ccfda083dfeffec9fc35a5fe7
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 3 16:56:09 2008 +0100
+
+ be safe about out-of-range values
+
+ qt4/src/poppler-textbox.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5db75df77938eb7620867d0618058be52ed2d3cb
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 3 16:53:39 2008 +0100
+
+ initialize nicely
+
+ qt4/src/poppler-private.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 3ad0ab7e4abd37528284269c69be3cdfb8d31d2e
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Mar 3 16:49:23 2008 +0100
+
+ apidox
+
+ qt4/src/poppler-link.h | 17 +++++++++++++++++
+ qt4/src/poppler-qt4.h | 23 ++++++++++++++++++++++-
+ 2 files changed, 39 insertions(+), 1 deletions(-)
+
+commit ec01926e5a9dc16e200060497c43e79a1623698d
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Mar 2 20:15:20 2008 -0500
+
+ Avoid setting a singular ctm
+
+ Ignoring singular ctm's gives a better result than having
+ our cairo context error and turn off. Related to #14398.
+
+ poppler/CairoOutputDev.cc | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+commit 4882d7a118b93fdb5c441d70757e485be7ee25d7
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 28 15:12:23 2008 +0100
+
+ printf -> qDebug
+
+ qt4/src/poppler-optcontent.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 31ce4049bf12c2716be7ec0fb8eda502d989f66e
+Author: Brad Hards <bradh@saxicola.cuneata.net>
+Date: Thu Feb 28 22:09:30 2008 +1100
+
+ Respect PageMode for optional content and embedded files.
+
+ This makes the PDF 1.7 spec open with the embedded files showing.
+
+ qt4/demos/embeddedfiles.cpp | 7 +++++++
+ qt4/demos/embeddedfiles.h | 1 +
+ qt4/demos/optcontent.cpp | 8 ++++++++
+ qt4/demos/optcontent.h | 1 +
+ 4 files changed, 17 insertions(+), 0 deletions(-)
+
+commit ff938c431799d49325c0f46f1e6cbe1033993a83
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 27 23:12:53 2008 +0100
+
+ do not forget to distribute GlobalParamsWin.cc next time
+
+ poppler/Makefile.am | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 277382b8186d137a9f2a62bc2d22e9f0cda7d923
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 27 22:56:33 2008 +0100
+
+ fix typo
+
+ glib/demo/images.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5b2f8f21fca63508570a0c77c6f7221a322e6e57
+Merge: 7e65118 4254f12
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 22:10:12 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 7e651186f483976f9833de245b6c7add38e77a16
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 22:03:17 2008 +0100
+
+ Properly enable/disable the contents when their parents are changed.
+
+ Now, the children maintain the "checked state" they had, when their
+ parent is unchecked;
+ but, they are really disabled, both in the possibility to be checked
+ and in the drawing of their associated content [applying the same
+ to their children, and so on].
+
+ qt4/src/poppler-optcontent-private.h | 8 ++++++-
+ qt4/src/poppler-optcontent.cc | 37
+ +++++++++++++++++++++++++++++----
+ 2 files changed, 39 insertions(+), 6 deletions(-)
+
+commit 4254f1237ebed09b8e1c85f935a20bde3d8f36ff
+Merge: ed6c0c2 0569ae7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 27 20:44:27 2008 +0100
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit 8d384c06f96ba8cb3e73c275b3c708c64da4595d
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 20:39:09 2008 +0100
+
+ small header cleanup
+
+ qt4/src/poppler-optcontent-private.h | 9 +++++++--
+ qt4/src/poppler-optcontent.cc | 7 ++++---
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+commit ed6c0c260837a0025279765ef7778b83d6ee2209
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 27 20:43:45 2008 +0100
+
+ fix build and distcheck with autools
+
+ qt4/demos/Makefile.am | 3 +++
+ qt4/src/Makefile.am | 5 ++++-
+ qt4/tests/Makefile.am | 3 +++
+ 3 files changed, 10 insertions(+), 1 deletions(-)
+
+commit 344d55539b1b6bcabec609fd828db372a07491b4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 27 20:43:13 2008 +0100
+
+ fill the NEWS for 0.7.1
+
+ NEWS | 15 +++++++++++++++
+ 1 files changed, 15 insertions(+), 0 deletions(-)
+
+commit 1c47633ba782021978fa34d41a4ab0badf3af9d3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 27 20:42:55 2008 +0100
+
+ Increase version number to 0.7.1
+
+ CMakeLists.txt | 2 +-
+ configure.ac | 2 +-
+ msvc/config.h | 6 +++---
+ qt4/src/Doxyfile | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 0569ae76b6af1723b4606af189242a23199f387d
+Merge: f395531 d8eba8c
+Author: Brad Hards <bradh@kde.org>
+Date: Thu Feb 28 06:26:09 2008 +1100
+
+ Merge branch 'master' of
+ ssh://bradh@git.freedesktop.org/git/poppler/poppler
+
+commit d8eba8c10834116b4f0f295375805172f5216993
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 19:07:46 2008 +0100
+
+ export the OptContentModel
+
+ qt4/src/poppler-optcontent.h | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 0445e64a4124af7c1b84673f237022e133eb8542
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 19:04:03 2008 +0100
+
+ make only the Document able to create OptContentsModel's
+
+ qt4/src/poppler-optcontent.h | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+commit c965437b67a4f97ee8365a217bd10406fba3767a
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 18:58:31 2008 +0100
+
+ setRootNode() is private (and unused) API
+
+ qt4/src/poppler-optcontent-private.h | 2 ++
+ qt4/src/poppler-optcontent.cc | 8 ++++----
+ qt4/src/poppler-optcontent.h | 4 ----
+ 3 files changed, 6 insertions(+), 8 deletions(-)
+
+commit e293bfc384e2dfc4ef04582053ce18d8c0bcb7b3
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 18:50:35 2008 +0100
+
+ small cleanup
+
+ qt4/src/poppler-optcontent.cc | 11 ++++-------
+ 1 files changed, 4 insertions(+), 7 deletions(-)
+
+commit f11aa0008585e845ce509172d76f72f941be497d
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 18:44:09 2008 +0100
+
+ adapt the tests to the new layout of the contents model
+
+ qt4/tests/check_optcontent.cpp | 66
+ ++++++++++++++--------------------------
+ 1 files changed, 23 insertions(+), 43 deletions(-)
+
+commit 4a324484b5c77ddc348746e7bcf6051ade28e389
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 18:04:52 2008 +0100
+
+ free some objects (thus leak less)
+
+ poppler/Gfx.cc | 2 ++
+ poppler/OptionalContent.cc | 2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 0f4e7791ab6884072a1aee56e9cec212d8cea263
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 15:58:21 2008 +0100
+
+ ignore any generated .moc here
+
+ qt4/src/.gitignore | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 136ae44f155b17d9e8b041b67f75531d8544337c
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 15:56:09 2008 +0100
+
+ keep track of the items changed when toggling an item, so we can
+ update them properly
+
+ qt4/src/poppler-optcontent-private.h | 4 +-
+ qt4/src/poppler-optcontent.cc | 38
+ ++++++++++++++++++++++++++-------
+ 2 files changed, 32 insertions(+), 10 deletions(-)
+
+commit b73e2afef7e5e1b68d82a10c94bca3c201c5f8b3
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 15:52:06 2008 +0100
+
+ fix indexFromItem once again, and make parent() call it with the
+ right node
+
+ qt4/src/poppler-optcontent-private.h | 2 +-
+ qt4/src/poppler-optcontent.cc | 19 +++++++++----------
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+
+commit 803787f763578320aa5f405ed49c64e6b924bad3
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 15:30:18 2008 +0100
+
+ compile with the autotools
+
+ (second patch I forgot to apply with the first)
+
+ qt4/src/Makefile.am | 9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 0b527a8ed62677bb09df4587f072a310c2959750
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 14:34:13 2008 +0100
+
+ Extract the OptContentItem -> QModelIndex creation in an own function.
+
+ qt4/src/poppler-optcontent-private.h | 1 +
+ qt4/src/poppler-optcontent.cc | 7 ++++++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit c94d6cc95c6838f31e27832cb3090389bf4d8227
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 14:30:26 2008 +0100
+
+ Make index(), data() and setData() more safe.
+
+ Errors spotted using ModelTest.
+
+ qt4/src/poppler-optcontent-private.h | 2 +-
+ qt4/src/poppler-optcontent.cc | 15 +++++++++------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+commit b8e833733d84eaa93d6bae522710feb3075ca329
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 14:05:19 2008 +0100
+
+ fix build with the autotools
+
+ qt4/src/Makefile.am | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit f89ba474bae281f1cdeddb72ac8425dee1087e35
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 13:28:50 2008 +0100
+
+ Put the check states of the optional contents in the same column as
+ the name.
+
+ This feels a bit more elegant than changing a value in a different
+ column.
+ Cleanup data()/setData() so they can be extended easily.
+
+ qt4/src/poppler-optcontent.cc | 74
+ +++++++++++++++++++++--------------------
+ 1 files changed, 38 insertions(+), 36 deletions(-)
+
+commit defa0ecb2790402a4069fea3b3c285a50675682d
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 12:24:16 2008 +0100
+
+ Add a skeleton of OptContentModel::headerData().
+
+ It does nothing yet, but we can add stuff later on w/o breaking BC.
+
+ qt4/src/poppler-optcontent.cc | 5 +++++
+ qt4/src/poppler-optcontent.h | 2 ++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit f395531a3e8f71a46b3c942f8f437ade1d9fdb57
+Author: Brad Hards <bradh@kde.org>
+Date: Wed Feb 27 22:22:51 2008 +1100
+
+ Minor cleanup.
+
+ qt4/src/poppler-optcontent.cc | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+commit 0a19486cb4de57c0c987cc4ce2434a96bbd18338
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 12:15:44 2008 +0100
+
+ refresh the current page when the data of the content model change
+
+ qt4/demos/optcontent.cpp | 8 ++++++++
+ qt4/demos/optcontent.h | 3 +++
+ 2 files changed, 11 insertions(+), 0 deletions(-)
+
+commit 09b7cc2efb7d21fa4dabd23d2d2de877cc7d86ee
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 12:15:18 2008 +0100
+
+ optional method to reload the current page
+
+ qt4/demos/documentobserver.cpp | 5 +++++
+ qt4/demos/documentobserver.h | 1 +
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 39fe905be8f2ae79d9c26cd87547f3ea2608411e
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 12:00:29 2008 +0100
+
+ Add a dock for showing the optional content tree.
+
+ qt4/demos/CMakeLists.txt | 1 +
+ qt4/demos/Makefile.am | 3 ++
+ qt4/demos/optcontent.cpp | 55
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/optcontent.h | 43 ++++++++++++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 7 ++++++
+ 5 files changed, 109 insertions(+), 0 deletions(-)
+
+commit f17dd5539501a996479b903ac9b8aceb3c4cfafe
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 11:53:32 2008 +0100
+
+ cleanup
+
+ qt4/src/poppler-optcontent-private.h | 3 ++-
+ qt4/src/poppler-optcontent.h | 4 +---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+commit f3cc894559f10dbd4277fa9f30de9931ed69dfd4
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 11:43:34 2008 +0100
+
+ OptContentModel::itemFromRef() and OptContentItem are private API.
+
+ Hide them in the implementation.
+
+ qt4/src/poppler-optcontent-private.h | 43
+ ++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-optcontent.cc | 8 +++---
+ qt4/src/poppler-optcontent.h | 42
+ ---------------------------------
+ 3 files changed, 47 insertions(+), 46 deletions(-)
+
+commit 48e8b2105cf8f177ca655b969470e45e2407db82
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 11:28:16 2008 +0100
+
+ move all the private stuff of OptContentModel into its d-pointer
+
+ qt4/src/poppler-optcontent-private.h | 9 +++++++--
+ qt4/src/poppler-optcontent.cc | 29 +++++++++++++++--------------
+ qt4/src/poppler-optcontent.h | 4 ----
+ 3 files changed, 22 insertions(+), 20 deletions(-)
+
+commit b78a7f7a0e8d5a9c22014d34754090d863030e0d
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 27 11:06:57 2008 +0100
+
+ use a QPointer for the OptContentModel, so we are safe about
+ ownership.
+
+ qt4/src/poppler-document.cc | 4 ++--
+ qt4/src/poppler-private.h | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 48557da71adb0fe6bd4da2fb32433796a96c3576
+Author: Brad Hards <bradh@kde.org>
+Date: Wed Feb 27 19:39:18 2008 +1100
+
+ We need to install the optional content header.
+
+ qt4/src/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 6e2bb03b5ef256c03a8da1cbf9bbc87c593942ad
+Author: Brad Hards <bradh@kde.org>
+Date: Wed Feb 27 19:23:49 2008 +1100
+
+ Partial d-pointer implementation.
+
+ qt4/src/poppler-optcontent-private.h | 57
+ ++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-optcontent.cc | 49 ++++++++++++++++++-----------
+ qt4/src/poppler-optcontent.h | 24 +++-----------
+ 3 files changed, 92 insertions(+), 38 deletions(-)
+
+commit c627b7aa10ae9cdceb78b751a7e826170f402af0
+Author: Brad Hards <bradh@kde.org>
+Date: Wed Feb 27 16:12:38 2008 +1100
+
+ A couple of cleanups suggested by Pino.
+
+ qt4/src/poppler-document.cc | 6 +++---
+ qt4/src/poppler-qt4.h | 8 +++++---
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+commit 81891667e18fcf164af02f5f366de07f78d67c8f
+Author: Brad Hards <bradh@kde.org>
+Date: Wed Feb 27 15:47:03 2008 +1100
+
+ Add in the initial part of the optional content support.
+
+ To see this work, compare ClarityOCGs.pdf with and
+ without this change.
+
+ Right now we only handle optional content using
+ XObjects. Optional content using Marked Content has
+ infrastructure, but is not implemented. That will be
+ quite invasive in Gfx, and I'm not confident enough
+ to do it this late in the process.
+
+ CMakeLists.txt | 1 +
+ poppler/Catalog.cc | 9 +
+ poppler/Catalog.h | 4 +
+ poppler/Gfx.cc | 65 +++++-
+ poppler/Gfx.h | 12 +-
+ poppler/Makefile.am | 2 +
+ poppler/OptionalContent.cc | 322 ++++++++++++++++++++++++++
+ poppler/OptionalContent.h | 85 +++++++
+ poppler/PDFDoc.h | 5 +
+ poppler/PSOutputDev.cc | 6 +-
+ poppler/Page.cc | 2 +-
+ qt4/src/.gitignore | 1 +
+ qt4/src/CMakeLists.txt | 3 +
+ qt4/src/Makefile.am | 6 +
+ qt4/src/poppler-document.cc | 13 +
+ qt4/src/poppler-optcontent.cc | 354 ++++++++++++++++++++++++++++
+ qt4/src/poppler-optcontent.h | 122 ++++++++++
+ qt4/src/poppler-private.h | 4 +
+ qt4/src/poppler-qt4.h | 18 ++
+ qt4/tests/.gitignore | 1 +
+ qt4/tests/CMakeLists.txt | 1 +
+ qt4/tests/Makefile.am | 5 +
+ qt4/tests/check_optcontent.cpp | 499
+ ++++++++++++++++++++++++++++++++++++++++
+ 23 files changed, 1532 insertions(+), 8 deletions(-)
+
+commit 11b70bcda905e618c199a067db6b0246612e101d
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 26 23:01:27 2008 +0100
+
+ fixup the default export macro name (added by cmake); _WIN32 is
+ defined only on win32 (remove a plethora of warnings)
+
+ qt4/src/poppler-export.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit d4d6c14cd83d04c61daa6618c3148a0bb47dc292
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 26 22:57:02 2008 +0100
+
+ install the export header
+
+ qt4/src/CMakeLists.txt | 1 +
+ qt4/src/Makefile.am | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 4ba2e2d21710135656adbf93c5994cfb46502308
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 26 22:55:30 2008 +0100
+
+ no need to include the export header in private headers
+
+ qt4/src/poppler-annotation-helper.h | 1 -
+ qt4/src/poppler-annotation-private.h | 1 -
+ qt4/src/poppler-converter-private.h | 1 -
+ qt4/src/poppler-link-extractor-private.h | 1 -
+ qt4/src/poppler-page-private.h | 1 -
+ qt4/src/poppler-private.h | 1 -
+ qt4/src/poppler-qiodeviceoutstream-private.h | 1 -
+ 7 files changed, 0 insertions(+), 7 deletions(-)
+
+commit 0a466c09fb70b92f39df19bc315b6575e419ad5b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 26 22:47:31 2008 +0100
+
+ We also need to distribute poppler-export.h
+
+ qt4/src/Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 2034d57c700049bc9a6565bbb818e1c9f4467784
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 26 22:46:29 2008 +0100
+
+ Now for real: Add special casing in cmake buildsystem for MSVC,
+ also add Export markers to qt4 classes, although symbol visibility
+ is only used on MSVC at the moment
+
+ CMakeLists.txt | 5 +++++
+ qt4/src/CMakeLists.txt | 3 +++
+ qt4/src/poppler-annotation-helper.h | 1 +
+ qt4/src/poppler-annotation-private.h | 1 +
+ qt4/src/poppler-annotation.h | 19 ++++++++++---------
+ qt4/src/poppler-converter-private.h | 1 +
+ qt4/src/poppler-export.h | 6 +++---
+ qt4/src/poppler-form.h | 9 +++++----
+ qt4/src/poppler-link-extractor-private.h | 1 +
+ qt4/src/poppler-link.h | 17 +++++++++--------
+ qt4/src/poppler-page-private.h | 1 +
+ qt4/src/poppler-private.h | 1 +
+ qt4/src/poppler-qiodeviceoutstream-private.h | 1 +
+ qt4/src/poppler-qt4.h | 21 +++++++++++----------
+ qt4/tests/CMakeLists.txt | 6 ++++++
+ 15 files changed, 59 insertions(+), 34 deletions(-)
+
+commit b931920f63f4276ec355118faa061bafa5ac5244
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 26 22:42:16 2008 +0100
+
+ Add special casing in cmake buildsystem for MSVC, also add Export
+ markers to qt4 classes, although symbol visibility is only used on
+ MSVC at the moment
+
+ qt4/src/poppler-export.h | 17 +++++++++++++++++
+ 1 files changed, 17 insertions(+), 0 deletions(-)
+
+commit 1778fddb36d6cb2c7f7848bee06189158f69f16e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 24 23:02:08 2008 +0100
+
+ Add the cmake files to EXTRA_DIST so they get added when i do make
+ dist to get the release tarball
+
+ Makefile.am | 39 +++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 39 insertions(+), 0 deletions(-)
+
+commit 51f171e10a42d492c8c32a5e2578d05b73d89238
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 24 22:47:46 2008 +0100
+
+ ignore more
+
+ qt4/demos/.gitignore | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit adb1ccdb9265f0583cb348c456a39efac610aff1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 24 22:46:33 2008 +0100
+
+ ignore
+
+ qt4/demos/.gitignore | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 101e526c63175ffc1a75e1b68da7bb4fff9cd530
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Sun Feb 24 20:52:41 2008 +0100
+
+ define snprintf to _snprintf if we are building on MSVC
+
+ config.h.cmake | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit f7f8ab488257c3979d20e5c0690ec5d7c2cd831b
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Sun Feb 24 20:43:11 2008 +0100
+
+ define M_PI in case it is not defined
+
+ poppler/Function.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit f00436b63bf9a42dcb2728a07db9c20f1f23d0bc
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Sun Feb 24 20:39:42 2008 +0100
+
+ Add proper dirent.h guards
+
+ utils/pdftoabw.cc | 2 ++
+ utils/pdftohtml.cc | 2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit e1463451c584181f918265438cf6ddcb408bf731
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 21 20:43:56 2008 +0100
+
+ Code uses if USE_EXCEPTIONS, so we need to defined it to 1, not just
+ define it
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 88d4bbbcf828e3247454c8ba3c2fb0fb58207b6a
+Author: Michael Vrable <mvrable@cs.ucsd.edu>
+Date: Thu Feb 21 19:53:03 2008 +0100
+
+ If a bitmap's dimensions are invalid, do not try to display it.
+
+ poppler/Gfx.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 452ae6f5674b00b43955952961f7ca0583f73e27
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 21 19:46:19 2008 +0100
+
+ Make sure we don't draw outside the bitmap on Splash::fillGlyph2
+
+ splash/Splash.cc | 76
+ ++++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 49 insertions(+), 27 deletions(-)
+
+commit 7f60fa806bd6d3d28917f349a2a19b52f97f593a
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Feb 21 13:00:05 2008 -0500
+
+ Fix typo
+
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+ qt4/demos/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 053ecae534a4522d152b0139b6aed6da2059d760
+Author: Carl Worth <cworth@cworth.org>
+Date: Wed Feb 20 17:21:27 2008 -0800
+
+ Keep cairo and cairo_shape consistent
+
+ The 'cairo_shape' state was not always being modified at the same
+ time as 'cairo'. In some cases this led to a sequence of ever
+ larger matrix scale factors until things just blew up.
+
+ poppler/CairoOutputDev.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit bf6dd890994150406b4464e45355a4a99870fc60
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 21 01:23:07 2008 +0100
+
+ Add a dock for showing the document metadata.
+
+ qt4/demos/CMakeLists.txt | 1 +
+ qt4/demos/Makefile.am | 3 ++
+ qt4/demos/metadata.cpp | 50
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/metadata.h | 43 +++++++++++++++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 7 ++++++
+ 5 files changed, 104 insertions(+), 0 deletions(-)
+
+commit b6f0c8f83924c08be20b602b128651bf018172a3
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 21 00:54:26 2008 +0100
+
+ Do not assign conflicting accelerators.
+
+ qt4/demos/viewer.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e0c27a968c7e7a0f6a89a050ddbfe328229f431d
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 21 00:53:24 2008 +0100
+
+ Apply the antialias settings w/o notify the observers.
+
+ qt4/demos/viewer.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 2c6149abcecda15c6f73a1dee537072240ddd545
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 21 00:51:21 2008 +0100
+
+ Add a settings menu to choose the render backend.
+
+ qt4/demos/viewer.cpp | 28 ++++++++++++++++++++++++++++
+ qt4/demos/viewer.h | 3 +++
+ 2 files changed, 31 insertions(+), 0 deletions(-)
+
+commit db2b0778dca364751a1d22294be29f8c7799e2e9
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 21 00:33:23 2008 +0100
+
+ Add a dock for showing the embedded files.
+
+ TODO: show the checksum in a pretty format.
+
+ qt4/demos/CMakeLists.txt | 1 +
+ qt4/demos/Makefile.am | 3 ++
+ qt4/demos/embeddedfiles.cpp | 75
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/embeddedfiles.h | 43 ++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 7 ++++
+ 5 files changed, 129 insertions(+), 0 deletions(-)
+
+commit 51fba47ccb12a66282769fc504bac4c9f5123f75
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 17 01:49:59 2008 +0100
+
+ clear the page label when the document is closed
+
+ qt4/demos/pageview.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit e964e2b9fbbe9b52b137ecd06729a06530835227
+Author: Michael Vrable <mvrable@cs.ucsd.edu>
+Date: Tue Feb 19 23:22:55 2008 +0100
+
+ Allow grouped checkboxes to be selected individually.
+
+ When checkboxes are in a group, they ought to behave like a
+ collection of
+ radio buttons. However, when deciding whether to draw a checkbox as
+ selected or not, the checkbox-drawing code was looking up the value
+ of the
+ V field in the form dictionary, which is shared among all checkboxes
+ in the
+ group. Thus, checkboxes would either all be on or off in unison.
+
+ Instead, look up the AS (appearance state) value in each checkbox's
+ annotation dictionary, so that different checkboxes can be drawn
+ differently.
+
+ poppler/Annot.cc | 6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+commit 702fdd6c56b5369554c683d8c8e0e2c66e80886c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 19 00:18:04 2008 +0100
+
+ changes from gtk-doc
+
+ glib/reference/tmpl/poppler-document.sgml | 1 +
+ glib/reference/tmpl/poppler-page.sgml | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 9e13b91ba38c20989d283588e73490a1601f5bb0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Feb 19 00:10:24 2008 +0100
+
+ distribute the headers too
+
+ qt4/demos/Makefile.am | 11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+commit 194e0ced7c38514ec3126666531862e3b29b4b77
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 18 23:34:06 2008 +0100
+
+ Fill NEWS and increase version number to 0.7
+
+ CMakeLists.txt | 2 +-
+ NEWS | 96
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 2 +-
+ msvc/config.h | 6 ++--
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 102 insertions(+), 6 deletions(-)
+
+commit 3c407efe9f1f0cc3f6366d3a2b6e9b687656cc95
+Merge: 51f0cea 7f4acb8
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 18 21:30:42 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 51f0cea0e3ba1acfc63877752e950fdd8c07e258
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 18 21:29:41 2008 +0100
+
+ make the poppler_qt4viewer compile with the auto"tools"
+
+ qt4/demos/Makefile.am | 16 ++++++++++++----
+ 1 files changed, 12 insertions(+), 4 deletions(-)
+
+commit 7f4acb879d300e18dfaff768027c88195d7d8f1b
+Author: Timothy Lee <timothy.lee@siriushk.com>
+Date: Mon Feb 18 20:56:35 2008 +0100
+
+ Implement ImageOutputDev::drawMaskedImage and
+ ImageOutputDev::drawSoftMaskedImage so all images are exported when
+ using pdfimages
+
+ utils/ImageOutputDev.cc | 19 +++++++++++++++++++
+ utils/ImageOutputDev.h | 11 +++++++++++
+ 2 files changed, 30 insertions(+), 0 deletions(-)
+
+commit 064b316648e35416bb49336639da1d8d288d1ecf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 18 20:17:37 2008 +0100
+
+ xref can be null so check for it before checking we went out of bounds
+
+ Fixes bug 14549
+
+ poppler/Lexer.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit b287b611b1c7b7dd00e12518cee3a6c35044e161
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 17 01:21:07 2008 +0100
+
+ Really niptick: help menu with about dialog for us and Qt.
+
+ qt4/demos/viewer.cpp | 15 +++++++++++++++
+ qt4/demos/viewer.h | 2 ++
+ 2 files changed, 17 insertions(+), 0 deletions(-)
+
+commit 6400254fdabf3d0d32f27ebd00faa6958be62019
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 17 01:12:27 2008 +0100
+
+ Add a title to the viewer :)
+
+ qt4/demos/viewer.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit b363c0568c9c61e7ee8ed86d808f0eed0b93b525
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 17 01:09:57 2008 +0100
+
+ Add the possibility to save a copy of the file.
+
+ qt4/demos/viewer.cpp | 29 +++++++++++++++++++++++++++++
+ qt4/demos/viewer.h | 2 ++
+ 2 files changed, 31 insertions(+), 0 deletions(-)
+
+commit 42987dcdd8d7432145f78cfc550f0c099e6e7311
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 17 00:33:01 2008 +0100
+
+ Add a Permissions dock.
+
+ qt4/demos/CMakeLists.txt | 1 +
+ qt4/demos/Makefile.am | 1 +
+ qt4/demos/permissions.cpp | 77
+ +++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/permissions.h | 43 +++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 7 ++++
+ 5 files changed, 129 insertions(+), 0 deletions(-)
+
+commit 9d1dda64de1d9e3f6fc81e40a0c2246a6270dfa8
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 23:56:17 2008 +0100
+
+ Add settings for antialias.
+
+ qt4/demos/viewer.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/viewer.h | 4 ++++
+ 2 files changed, 45 insertions(+), 0 deletions(-)
+
+commit 3abb8703d7d8b7a5fbcbb3c19d8e84d640abe88c
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 22:25:11 2008 +0100
+
+ Add a TOC info dock.
+
+ qt4/demos/CMakeLists.txt | 1 +
+ qt4/demos/Makefile.am | 1 +
+ qt4/demos/toc.cpp | 90
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/toc.h | 43 ++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 7 ++++
+ 5 files changed, 142 insertions(+), 0 deletions(-)
+
+commit 80925f06d125ebfc9909e36bdbe5d37fd0e48bdc
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 21:51:10 2008 +0100
+
+ Adapt the Fonts and Info docks to the new abstract info dock.
+
+ qt4/demos/fonts.cpp | 10 +++-------
+ qt4/demos/fonts.h | 11 +++++------
+ qt4/demos/info.cpp | 10 +++-------
+ qt4/demos/info.h | 11 +++++------
+ 4 files changed, 16 insertions(+), 26 deletions(-)
+
+commit c03531d691e56aba2b4c6538cf9e2463e1e0aa29
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 21:43:19 2008 +0100
+
+ Introduce a base info dock for handling the "dirty" work.
+
+ qt4/demos/CMakeLists.txt | 1 +
+ qt4/demos/Makefile.am | 1 +
+ qt4/demos/abstractinfodock.cpp | 57
+ ++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/abstractinfodock.h | 48 +++++++++++++++++++++++++++++++++
+ 4 files changed, 107 insertions(+), 0 deletions(-)
+
+commit 0f7d51c7fc2439ee9392c166576c341238f00f36
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 18:49:52 2008 +0100
+
+ Delete the poppler page after usage.
+
+ qt4/demos/pageview.cpp | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit b41d069cdd1435ddb14b3de2986875069523c814
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 18:48:57 2008 +0100
+
+ Initialize the current page number correctly.
+
+ qt4/demos/viewer.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 75e516af0e72a2e3041660300e522ad00869372b
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 18:43:56 2008 +0100
+
+ Add a side dock for showing the fonts of the document.
+
+ qt4/demos/CMakeLists.txt | 1 +
+ qt4/demos/Makefile.am | 1 +
+ qt4/demos/fonts.cpp | 78
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/fonts.h | 44 ++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 7 ++++
+ 5 files changed, 131 insertions(+), 0 deletions(-)
+
+commit 8e642d1cbd48d4790a6769287cbfd90c3bc9fc34
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 17:21:30 2008 +0100
+
+ Add a View menu where the dock widget toogle actions will be.
+
+ As start, put the Info dock there.
+
+ qt4/demos/viewer.cpp | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit c1feb7c2b5008cc04edb3c028f888072920ce4dc
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 17:14:00 2008 +0100
+
+ Add a side dock for showing the info keys.
+
+ qt4/demos/CMakeLists.txt | 1 +
+ qt4/demos/Makefile.am | 1 +
+ qt4/demos/info.cpp | 78
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/info.h | 44 ++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 5 +++
+ 5 files changed, 129 insertions(+), 0 deletions(-)
+
+commit abc9b00c6470f9f6b66c280455f544ad0ee3aa8c
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 16:09:52 2008 +0100
+
+ Basic work in the demo PDF viewer, open documents and navigate into
+ the pages.
+
+ An observer structure was introduced, so extra components can be
+ easily added and made aware of the document/page changes.
+ Both the navigation toolbar and the page view are implemented as
+ observers.
+
+ qt4/demos/CMakeLists.txt | 3 +
+ qt4/demos/Makefile.am | 3 +
+ qt4/demos/documentobserver.cpp | 45 ++++++++++++++++++
+ qt4/demos/documentobserver.h | 49 +++++++++++++++++++
+ qt4/demos/navigationtoolbar.cpp | 98
+ +++++++++++++++++++++++++++++++++++++++
+ qt4/demos/navigationtoolbar.h | 56 ++++++++++++++++++++++
+ qt4/demos/pageview.cpp | 60 ++++++++++++++++++++++++
+ qt4/demos/pageview.h | 44 +++++++++++++++++
+ qt4/demos/viewer.cpp | 98
+ +++++++++++++++++++++++++++++++++++++-
+ qt4/demos/viewer.h | 17 +++++++
+ 10 files changed, 470 insertions(+), 3 deletions(-)
+
+commit 14c88853a5675f40efb72f3ef01f49eb06ab846c
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 00:32:30 2008 +0100
+
+ Compile the poppler_qt4viewer.
+
+ qt4/demos/CMakeLists.txt | 7 +++++++
+ qt4/demos/Makefile.am | 12 ++++++++++--
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+commit aeb591f015d5e7a2643ed75d872358d2b1256b99
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 16 00:31:46 2008 +0100
+
+ Add a very minimal base PDF viewer.
+
+ So minimal that it does nothing at the moment...
+
+ qt4/demos/main_viewer.cpp | 29 ++++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp | 46
+ +++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/viewer.h | 45
+ ++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 120 insertions(+), 0 deletions(-)
+
+commit 8da490b090487c4c37290b63bdc9abcfaf6d6940
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 15 23:59:39 2008 +0100
+
+ Add a skeleton of directory where PopplerQt4 demos will be.
+
+ configure.ac | 1 +
+ qt4/CMakeLists.txt | 1 +
+ qt4/Makefile.am | 2 +-
+ qt4/demos/CMakeLists.txt | 10 ++++++++++
+ qt4/demos/Makefile.am | 20 ++++++++++++++++++++
+ 5 files changed, 33 insertions(+), 1 deletions(-)
+
+commit e24b49d52a5c1716641695ee731dd49848a114d9
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 14 22:21:54 2008 +0100
+
+ do not print it as string
+
+ qt4/src/poppler-private.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2316455864e9c900c08d051c59b9508eddcb7c34
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 14 21:02:20 2008 +0100
+
+ Pipe the poppler error messages through the Qt debug system.
+
+ qt4/src/poppler-private.cc | 21 +++++++++++++++++++++
+ qt4/src/poppler-private.h | 8 +++++++-
+ 2 files changed, 28 insertions(+), 1 deletions(-)
+
+commit d985d3b0cdc57370137865add2a5f3a7802109c7
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 14 14:56:18 2008 +0100
+
+ Use what FormWidgetText give us.
+
+ qt4/src/poppler-form.cc | 13 +++----------
+ 1 files changed, 3 insertions(+), 10 deletions(-)
+
+commit a69bd442e52f4495f8d6bfd3bb58b3ebd1be1a63
+Author: Michael Vrable <mvrable@cs.ucsd.edu>
+Date: Thu Feb 14 12:52:22 2008 +0100
+
+ Provide Unicode mappings for some control characters in
+ PDFDocEncoding.
+
+ Though they do not represent glyphs, values such as carriage return
+ can be
+ found in text strings in PDFDocEncoding. Provide mappings for
+ these bytes
+ to Unicode.
+
+ Additionally, map unknown characters to U+FFFD instead of U+0000,
+ so that
+ unknown characters do not result in nulls (which can truncate strings
+ early, particularly if the string is later re-encoded into
+ null-terminated
+ UTF-8).
+
+ poppler/PDFDocEncoding.cc | 23 +++++++++++++++++------
+ 1 files changed, 17 insertions(+), 6 deletions(-)
+
+commit ce17383e0ed21770b471e88f25046a64a23e7e45
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Feb 13 20:56:39 2008 +0100
+
+ Yet another fix for buggy documents, do not use the cache if the
+ cache could not be created because it ought to be too big
+
+ Fixes http://bugs.kde.org/show_bug.cgi?id=157777
+
+ splash/SplashFont.cc | 48
+ ++++++++++++++++++++++++++++--------------------
+ 1 files changed, 28 insertions(+), 20 deletions(-)
+
+commit 15a61cac718ae8cbf83911e299b4cfdd24cdf178
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 13 20:55:18 2008 +0100
+
+ add images.c
+
+ glib/demo/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 9cfe10ab7f51d329647e102e446baaef043d8cc6
+Merge: e918729 7d65b4d
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 13 20:53:43 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 7d65b4da1bc060aeb94d67c2ff26912cef48c030
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Feb 13 20:32:43 2008 +0100
+
+ Add images demo
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/images.c | 338
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/images.h | 31 +++++
+ glib/demo/main.c | 4 +-
+ 4 files changed, 374 insertions(+), 1 deletions(-)
+
+commit e9187292701e72db1020f7701d0725d83eee4b00
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 13 19:41:57 2008 +0100
+
+ Do the one-time initialisation in initTestCase().
+
+ qt4/tests/check_dateConversion.cpp | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit fb996c46e3c6b56a2c67819620000bcd804aacd6
+Author: Michael Vrable <mvrable@cs.ucsd.edu>
+Date: Wed Feb 13 18:44:41 2008 +0100
+
+ Major rework of text display in form fields code.
+
+ This adds support for UTF-16 strings as input, and will recode them
+ to the
+ appropriate character set for the font.
+
+ The method Annot::layoutText packs a lot of functionality together,
+ but I
+ couldn't see a good way to split it apart. It will convert an
+ input text
+ string from PDFDocEncoding or UTF-16 (encoding is autodetected) to the
+ appropriate encoding for the font which will be used to display
+ the form
+ field. At the same time, it can compute the width of the resulting
+ string,
+ and optionally break the string at a specified width to aid in
+ wrapping
+ multi-line text. Text wrapping is integrated with encoding conversion
+ since wrapping is easiest with the original text (where spaces
+ and newlines
+ are easily identified), but text widths can only be computed after
+ re-encoding.
+
+ Support for composite fonts is included, so long as those fonts use an
+ identity CMap, but this is still untested. Support for more
+ complex CMaps
+ is missing.
+
+ The rewrite also includes a minor improvement to the formatting
+ of comb
+ fields; characters are now centered in the comb cells.
+
+ poppler/Annot.cc | 507
+ ++++++++++++++++++++++++++++++++++--------------------
+ poppler/Annot.h | 9 +-
+ 2 files changed, 327 insertions(+), 189 deletions(-)
+
+commit 88c780aed4c9855f879e3c7a9f82500a859635a2
+Author: Michael Vrable <mvrable@cs.ucsd.edu>
+Date: Wed Feb 13 18:42:49 2008 +0100
+
+ Fix what look to be a few bugs in functions for mapping to/from
+ Unicode.
+
+ - Endianness fix in pdfDocEncodingToUTF16 (previously looked to
+ assume a
+ little-endian processor)
+ - Add support for CharCodeToUnicode::mapToCharCode for Unicode
+ codepoints
+ above 255.
+
+ poppler/CharCodeToUnicode.cc | 4 ++--
+ poppler/Form.cc | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 7574cb71f24ce5b32427f243c39b6029fb58ec81
+Merge: e798802 4e45e5c
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Feb 13 01:07:31 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 4e45e5ca4ab0ba2a6586505d80ed81f4b3426752
+Author: Patrick Spendrin <ps_ml@gmx.de>
+Date: Tue Feb 12 21:41:26 2008 +0100
+
+ Do the right thing with CDECL, that is, undefine it if it is defined
+ so we can redefine it later
+
+ poppler-config.h.cmake | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e798802f00bff0a24ee6d1312d6c62624395865a
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 12 20:57:56 2008 +0100
+
+ Apidox fix: state which checksum is returned (if available).
+
+ qt4/src/poppler-qt4.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4e2ba70a88c40fef6775053b1cc5fa30e622cea7
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 12 11:25:34 2008 +0100
+
+ Free the Object after you use it.
+
+ poppler/Annot.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 039545fcd2c12631c7b8aea89c35f36cb387a17a
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 12 11:13:27 2008 +0100
+
+ Return the siblings even for checkboxes.
+
+ qt4/src/poppler-form.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit fe5ee75cdf3e11e314318af12edf9d5bc8986250
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 12 11:12:01 2008 +0100
+
+ Initialize correctly; free your memory.
+
+ poppler/Form.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit e0eff92c7067d43faa8e93baed1f061863111251
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Feb 11 20:32:41 2008 +0100
+
+ Update the field dict instead of the annot dict for non composed dicts
+
+ We were always updating the annot dictionary, adding or updating
+ the V field. While this is correct for composed dicts (annot + field)
+ it isn't for non composed ones since the annot dictionary doesn't
+ contain any V field because it's a field of the form field dictionary.
+ In these cases the form field is not correctly updated and if the
+ document is saved it will be wrong.
+
+ poppler/Form.cc | 44 +++++++++++++++++++++++++++++++-------------
+ poppler/Form.h | 2 ++
+ 2 files changed, 33 insertions(+), 13 deletions(-)
+
+commit 905e6da9795fee94329022c0cafbc229055fd4f6
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 10 19:22:50 2008 +0100
+
+ Move forms specific draw methods from Annot to AnnotWidget class
+
+ poppler/Annot.cc | 3433
+ +++++++++++++++++++++++++++---------------------------
+ poppler/Annot.h | 87 +-
+ poppler/Form.cc | 39 +-
+ poppler/Form.h | 2 +
+ poppler/Page.cc | 9 +-
+ 5 files changed, 1765 insertions(+), 1805 deletions(-)
+
+commit 78afbc4d7819654e8742d4457c9847ad02b73bf1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Feb 10 17:12:59 2008 +0100
+
+ Some code refactoring and cleanup
+
+ - Unused 'field' attribute in FormWidget class is now used and
+ getField() method has been added
+ - Method isReadOnly() in FormWidget class is not virtual anymore
+ but implemented in the base class
+ - Unused attribute 'catalog' in Form class has been removed and
+ 'acroForm' has been added instead with a getObj() method to get it.
+ - createFieldFromDict() method is now static
+
+ poppler/Form.cc | 128
+ ++++++++++++++++++++++++++++---------------------------
+ poppler/Form.h | 41 ++++++++---------
+ 2 files changed, 84 insertions(+), 85 deletions(-)
+
+commit 5f8e2f9140ee2ede841700726b974768ec863672
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 11 20:16:44 2008 +0100
+
+ Use QVarLengthArray instead of relying on gcc-ism.
+
+ qt4/src/poppler-page.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 7499764d382366823519aa13a38e1e44781c78af
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 11 11:57:50 2008 +0100
+
+ Add FormFieldButton::siblings().
+
+ This is needed for grouping together the radio buttons.
+
+ qt4/src/poppler-form.cc | 14 ++++++++++++++
+ qt4/src/poppler-form.h | 8 ++++++++
+ 2 files changed, 22 insertions(+), 0 deletions(-)
+
+commit 85bfa4f499a90d45b13df4d0a8760a7da6fc1532
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 11 02:40:37 2008 +0100
+
+ Small apidox fix.
+
+ qt4/src/poppler-form.h | 11 ++---------
+ 1 files changed, 2 insertions(+), 9 deletions(-)
+
+commit ada05055c91e967dc3e2af32a2176dd12cb7fe70
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 11 02:27:19 2008 +0100
+
+ Preliminary support for "button" form fields (ie, push buttons,
+ check boxes, and radio buttons).
+
+ qt4/src/poppler-form.cc | 55
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-form.h | 54
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc | 6 +++++
+ 3 files changed, 115 insertions(+), 0 deletions(-)
+
+commit 278b33f25df418ef12798100002845a3e2ceebd3
+Merge: c730b33 fdb0a4a
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 11 00:57:24 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit fdb0a4a2f1d86aec7a3b0fcd4b4d48455791ecad
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Feb 10 18:47:40 2008 -0500
+
+ Avoid prescaling images when printing.
+
+ Adds a function for letting the CairoOutputDev know whether it is
+ targetting a
+ screen or not. It then uses this knowledge to avoid prescaling
+ images. This way
+ cairo gets the full resolution image for use in the printed output.
+
+ glib/poppler-page.cc | 1 +
+ poppler/CairoOutputDev.cc | 3 ++-
+ poppler/CairoOutputDev.h | 2 ++
+ 3 files changed, 5 insertions(+), 1 deletions(-)
+
+commit c730b33f1ec2032c4b8c2660738448d954eb0f7d
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 11 00:46:20 2008 +0100
+
+ Keep the EmbFile object, and use this for getting the data.
+
+ qt4/src/poppler-embeddedfile.cc | 33 +++++++++++----------------------
+ qt4/src/poppler-private.h | 1 -
+ 2 files changed, 11 insertions(+), 23 deletions(-)
+
+commit 5915e57e7785370ce305cbbb3c2fedf36886689f
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 10 03:19:18 2008 +0100
+
+ const & in foreach
+
+ qt4/tests/poppler-fonts.cpp | 2 +-
+ qt4/tests/stress-poppler-dir.cpp | 2 +-
+ qt4/tests/stress-poppler-qt4.cpp | 2 +-
+ qt4/tests/test-password-qt4.cpp | 2 +-
+ qt4/tests/test-poppler-qt4.cpp | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+commit d8374e0c2eb3ba05be101687e20c5fcbc42c1ad0
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 10 01:32:24 2008 +0100
+
+ Include only what needed; remove extra includes.
+
+ qt4/tests/poppler-attachments.cpp | 4 +++-
+ qt4/tests/poppler-fonts.cpp | 4 +++-
+ qt4/tests/stress-poppler-dir.cpp | 9 ++++++---
+ qt4/tests/stress-poppler-qt4.cpp | 9 ++++++---
+ qt4/tests/test-password-qt4.cpp | 10 ++++++----
+ qt4/tests/test-poppler-qt4.cpp | 12 ++++++++----
+ 6 files changed, 32 insertions(+), 16 deletions(-)
+
+commit fa01a1115c4554b18c3462b568d76860d2fbe17b
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 10 01:09:57 2008 +0100
+
+ Comment out unused vars.
+
+ utils/pdftoabw.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit d3275e4263372b534c276f81d0c997ecb6675487
+Merge: c2186c1 5347a97
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 9 23:57:03 2008 +0100
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit c2186c1829c695c4ddb6c471ef8ad4ffa23c1b70
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 9 23:56:32 2008 +0100
+
+ Only check if we are out of bounds if the object we are searching
+ for has a known id (0 also means not known)
+
+ Found by Michael Vrable
+
+ poppler/Lexer.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 5347a97e39388ae38cf2ab9c67f953b0f7a02a13
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 9 18:26:41 2008 +0100
+
+ Add the operators for the flags we have.
+
+ qt4/src/poppler-qt4.h | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 329ade4f936bf063539cdc887aaf9a1722a5b8e0
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 9 18:23:59 2008 +0100
+
+ Add options for the PDF export; add the WithChanges flag for saving
+ the changes to the document as well.
+
+ qt4/src/poppler-pdf-converter.cc | 25 +++++++++++++++++++++++--
+ qt4/src/poppler-qt4.h | 14 ++++++++++++++
+ 2 files changed, 37 insertions(+), 2 deletions(-)
+
+commit afb255366d56551bdc307766199bef9c5021d3ac
+Merge: 8c44b17 8cb0e75
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 9 17:58:49 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 8c44b175081983c492821858341109fee9e86b16
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 9 17:57:57 2008 +0100
+
+ Do not rely on GNU extensions, but at least use Qt.
+
+ qt4/src/poppler-qiodeviceoutstream.cc | 11 ++++-------
+ 1 files changed, 4 insertions(+), 7 deletions(-)
+
+commit 8cb0e75203daa01439413d1a775482b48e784baa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 9 17:56:13 2008 +0100
+
+ Domain order is x_min x_max y_min y_max and not x_min y_min x_max
+ y_max
+
+ poppler/GfxState.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c8f734ba4258059fa4521a4d364f62ca1632840b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 9 13:37:04 2008 +0100
+
+ PS cos and sin input values are degrees so convert to radians so we
+ can use the cos and sin cmath functions
+
+ poppler/Function.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 5fb0c9d31c1abf2e6ad306c112fbd2a7c33d8772
+Merge: 2655663 2255c85
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 9 13:15:15 2008 +0100
+
+ Merge branch 'master' of
+ ssh://carlosgc@git.freedesktop.org/git/poppler/poppler
+
+commit 26556636e71d5abcbfdd1373f5576d1233532cf8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Feb 9 13:14:41 2008 +0100
+
+ Add saveWithoutChangesAs method to be able to save the document
+ ignoring changes made in forms or annots
+
+ glib/poppler-document.cc | 41 ++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler-document.h | 3 +++
+ poppler/PDFDoc.cc | 38 ++++++++++++++++++++++++++++++++------
+ poppler/PDFDoc.h | 4 ++++
+ 4 files changed, 79 insertions(+), 7 deletions(-)
+
+commit 2255c85e4939a0752083dca21984ff4398baf8d2
+Merge: 5ba9287 56c9246
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 9 12:49:45 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 5ba928762471e1ea8b81acd4644dfd3f58d18f77
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 9 12:48:04 2008 +0100
+
+ Fix placeholders in printf-like functions.
+
+ glib/demo/page.c | 2 +-
+ glib/test-poppler-glib.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 56c924609223196c5c41b9e6d9102bc248bad947
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 9 12:26:06 2008 +0100
+
+ atan operator must yield a degrees result between 0 and 360
+
+ See testcase at http://bugs.kde.org/show_bug.cgi?id=157497
+
+ poppler/Function.cc | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 2a39932ae35a2716842bd2a1c3d4f9ce6b1e3dd8
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 9 01:31:20 2008 +0100
+
+ Few improvements to the password test.
+
+ - QString::fromUtf8() instead of QFile::encodeName() to correctly
+ pass the utf8 filenames
+ - QVERIFY(!foo) instead of QCOMPARE(foo, false)
+ - QVERIFY() also the return value of unlock()
+
+ qt4/tests/check_password.cpp | 31 ++++++++++++++++---------------
+ 1 files changed, 16 insertions(+), 15 deletions(-)
+
+commit cc9c124d4d859b845eebf4ca1e4397870a35fd4e
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Feb 9 01:09:02 2008 +0100
+
+ Add an unit test case for few invalid dates.
+
+ qt4/tests/check_dateConversion.cpp | 34
+ ++++++++++++++++++++++++++++++++++
+ 1 files changed, 34 insertions(+), 0 deletions(-)
+
+commit eca91761741de5b340f7a2160db5b33401feb935
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 18:42:14 2008 +0100
+
+ Remove unneeded headers.
+
+ qt4/src/poppler-page.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 899627505a4645fb1cc7d3599adbeec449c57041
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 18:41:13 2008 +0100
+
+ The return value is QString, so return QString's...
+
+ qt4/src/poppler-document.cc | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit a1606fa4ff438983e3a7f55dd2d10a66f72e6711
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 17:31:32 2008 +0100
+
+ Move checkDocument() inside the private class.
+
+ qt4/src/poppler-document.cc | 6 +++---
+ qt4/src/poppler-private.h | 2 ++
+ qt4/src/poppler-qt4.h | 2 +-
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+commit f1ec70a83f807493dab5118761df31c0f67decad
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 17:26:41 2008 +0100
+
+ Remove C-ism.
+
+ qt4/src/poppler-document.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3e994e8586fa1c87ef7e7f82af1cdacf2cd36310
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 12:21:56 2008 +0100
+
+ Add the missing font types.
+
+ qt4/src/poppler-fontinfo.cc | 11 +++++++++--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+commit ba07963f85d777a441349e23d4c2f510e45c73be
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 12:19:04 2008 +0100
+
+ Be safe against self-assignment.
+
+ qt4/src/poppler-fontinfo.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 834b86548e09f4b24cdb2f194299d053b9b55022
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 12:15:16 2008 +0100
+
+ Small apidox fix.
+
+ qt4/src/poppler-qt4.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 11a61eac5b8cde04bf762bbbe0deab5c0bd52951
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 02:21:32 2008 +0100
+
+ Pack few bools together.
+
+ qt4/src/poppler-annotation.cc | 8 ++++----
+ qt4/src/poppler-link.cc | 10 +++++-----
+ qt4/src/poppler-private.h | 4 ++--
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+commit 1aeba15b5eb9b30943259824678ebc9e4f56e870
+Merge: a489063 22d10c1
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 01:39:16 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit a4890637a2c2ab1623311d9a6920e82131c2597c
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 01:36:56 2008 +0100
+
+ Move QStringToUnicodeGooString() and QStringToGooString() to the
+ private module.
+
+ qt4/src/poppler-document.cc | 10 ----------
+ qt4/src/poppler-form.cc | 15 ---------------
+ qt4/src/poppler-private.cc | 25 +++++++++++++++++++++++++
+ qt4/src/poppler-private.h | 4 ++++
+ 4 files changed, 29 insertions(+), 25 deletions(-)
+
+commit 5e44241c4976b819f7be6badd2d183fbfb8ee6de
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 01:30:07 2008 +0100
+
+ Move the string functions implementation in a .cc file.
+
+ qt4/src/CMakeLists.txt | 1 +
+ qt4/src/Makefile.am | 1 +
+ qt4/src/poppler-private.cc | 70
+ ++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-private.h | 46 ++--------------------------
+ 4 files changed, 76 insertions(+), 42 deletions(-)
+
+commit 124d92139241ad95da559d22af48254b45ac4a2e
+Author: Pino Toscano <pino@kde.org>
+Date: Fri Feb 8 01:07:43 2008 +0100
+
+ Include own header first, remove extra includes.
+
+ qt4/src/poppler-document.cc | 1 -
+ qt4/src/poppler-embeddedfile.cc | 3 ++-
+ qt4/src/poppler-form.cc | 4 +++-
+ qt4/src/poppler-link-extractor-private.h | 2 ++
+ qt4/src/poppler-link-extractor.cc | 7 +++++--
+ qt4/src/poppler-page-private.h | 6 +++++-
+ qt4/src/poppler-private.h | 4 +++-
+ qt4/src/poppler-qt4.h | 2 --
+ qt4/src/poppler-sound.cc | 4 ++--
+ 9 files changed, 22 insertions(+), 11 deletions(-)
+
+commit 22d10c19e232dea143bda372c92aa12b999e4921
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 7 23:38:50 2008 +0100
+
+ PDF spec says name tokens have a maximum length of 127, but there are
+ some docs in the wild with more than that and they work on acroread
+ so increase the allowed length to 128+127
+
+ poppler/Lexer.cc | 25 +++++++++++++++++++++----
+ 1 files changed, 21 insertions(+), 4 deletions(-)
+
+commit ee9f85915feb86b54ace1a403baa13bbdd7c3966
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 7 18:07:53 2008 +0100
+
+ Having a PageData is mandatory.
+
+ Just assert when constructing instead of checking for it in each
+ link iteration.
+
+ qt4/src/poppler-link-extractor.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit ad4b1361f6c25359e6ddb38599bfc1e4e3e80408
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 7 18:03:30 2008 +0100
+
+ Precalc stuff we don't need to recalc in each link iteration.
+
+ qt4/src/poppler-link-extractor-private.h | 3 ++-
+ qt4/src/poppler-link-extractor.cc | 14 ++++++++------
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+commit 82432dbc62a0879f4513640c2e0f594fda9347ad
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 7 17:51:50 2008 +0100
+
+ Store the ::Page internally, so we don't need to get it again
+ everytime.
+
+ qt4/src/poppler-page-private.h | 3 +++
+ qt4/src/poppler-page.cc | 37
+ ++++++++++++++-----------------------
+ 2 files changed, 17 insertions(+), 23 deletions(-)
+
+commit 8ec51f7ca518aa6a4a69f30d373722d05f50cf07
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 7 16:48:16 2008 +0100
+
+ Compile the stress-poppler-dir test as well.
+
+ qt4/tests/CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 8a946b76ae2e7c2c5238b4e580c1c226eb457dc9
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Feb 7 01:07:28 2008 +0100
+
+ Micro-touches to the debug messages.
+
+ qt4/src/poppler-page.cc | 26 +++++++++++++-------------
+ 1 files changed, 13 insertions(+), 13 deletions(-)
+
+commit c31990dfe50c7a0e3999e6d967699fce5ccb3339
+Merge: 7701e2a 6d58cda
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 5 00:38:00 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 7701e2a5c7d18fdaa0fa40c190e6ee0524746046
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Feb 5 00:37:01 2008 +0100
+
+ Add a AnnotColor -> QColor conversion method.
+
+ qt4/src/poppler-annotation-helper.h | 6 ++++++
+ qt4/src/poppler-annotation.cc | 31
+ +++++++++++++++++++++++++++++++
+ 2 files changed, 37 insertions(+), 0 deletions(-)
+
+commit 6d58cda82b0181f2cca6e9d95b15877793be0812
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 4 23:33:51 2008 +0100
+
+ Protect us against weird dateString values
+
+ qt4/src/poppler-document.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit aa0435f1544fe1adcf10173e34eaeaf2a7a703c7
+Merge: b43f4e9 37600b5
+Author: Pino Toscano <pino@kde.org>
+Date: Mon Feb 4 20:56:53 2008 +0100
+
+ Merge branch 'master' of
+ ssh://pino@git.freedesktop.org/git/poppler/poppler
+
+commit 37600b5e848386d2c92c3dff8219c9dda16b0dca
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sun Feb 3 22:42:51 2008 +0100
+
+ Minor changes to Annot related stuff.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 15 ++++-----------
+ poppler/Annot.h | 12 ++++++++++--
+ poppler/Gfx.cc | 7 ++++---
+ poppler/Page.cc | 9 +++++++++
+ poppler/Page.h | 3 +++
+ 5 files changed, 30 insertions(+), 16 deletions(-)
+
+commit b43f4e9a161a1fd7b827244dc21b1bd2a6df7054
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Feb 3 20:32:15 2008 +0100
+
+ Pass the DocumentData to the Page (simplify a bit some code).
+
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-link-extractor-private.h | 4 +-
+ qt4/src/poppler-link-extractor.cc | 8 ++--
+ qt4/src/poppler-page-private.h | 4 +-
+ qt4/src/poppler-page.cc | 64
+ +++++++++++++++---------------
+ qt4/src/poppler-qt4.h | 5 +-
+ 6 files changed, 42 insertions(+), 45 deletions(-)
+
+commit 4e0bb0307fccefc21f74a4c5a3a0d7e8e687b550
+Author: Pino Toscano <pino@draco.(none)>
+Date: Sat Feb 2 12:57:25 2008 +0100
+
+ Fix include guard.
+
+ poppler/ArthurOutputDev.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 6f11ef660540fd13aad1350385beb90758ca86af
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Feb 1 23:55:37 2008 +0100
+
+ Fix for end condition, init ucode to 0
+
+ poppler/GfxFont.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1da2091807ae7f7d4d3f446953c41b4c440d4b1b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 31 23:52:20 2008 +0100
+
+ Ensure we don't draw outside the main bitmap on
+ SplashOutputDev::setSoftMask
+
+ Fixes crash on http://bugs.kde.org/show_bug.cgi?id=157000
+
+ poppler/SplashOutputDev.cc | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+commit ecabc9469b137e8251344e5502de1cbf875223b9
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jan 31 00:20:55 2008 +0100
+
+ Set RelWithDebInfo as default build type, if not specified.
+
+ cmake/modules/PopplerMacros.cmake | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 19da87a20b3906523a330e3c956903a58a3ede7f
+Author: Pino Toscano <pino@kde.org>
+Date: Thu Jan 31 00:11:58 2008 +0100
+
+ Support the different CMake build modes.
+
+ Now you can specify (using -DCMAKE_BUILD_TYPE=type) a CMake build
+ type to have GCC or ICC w/ tuned C(XX)FLAGS.
+ The supported build types are: None (as in no type is specified on
+ command line), RelWithDebInfo, Release, Debug, DebugFull, Profile.
+
+ CMakeLists.txt | 7 -------
+ cmake/modules/PopplerMacros.cmake | 29 +++++++++++++++++++++++++++++
+ 2 files changed, 29 insertions(+), 7 deletions(-)
+
+commit 37d2055137c310ceb217164a76814b188be3b1b2
+Author: Pino Toscano <pino@draco.(none)>
+Date: Wed Jan 30 23:12:03 2008 +0100
+
+ Introduce the CMake-based build system.
+
+ Mostly works nicely as the autotools, and it mimics (almost) all
+ the autotools behaviours.
+ Copied some scripts from the KDE cmake scripts (BSD-licensed).
+ TODO: gtk-doc.
+
+ CMakeLists.txt | 390 +++++++
+ ConfigureChecks.cmake | 47 +
+ cmake/modules/COPYING-CMAKE-SCRIPTS | 22 +
+ cmake/modules/FindCairo.cmake | 44 +
+ cmake/modules/FindFontconfig.cmake | 47 +
+ cmake/modules/FindFreetype.cmake | 74 ++
+ cmake/modules/FindGTK.cmake | 70 ++
+ cmake/modules/FindPackageHandleStandardArgs.cmake | 58 +
+ cmake/modules/FindQt3.cmake | 319 +++++
+ cmake/modules/FindQt4.cmake | 1295
+ +++++++++++++++++++++
+ cmake/modules/MacroBoolTo01.cmake | 20 +
+ cmake/modules/MacroEnsureVersion.cmake | 117 ++
+ cmake/modules/MacroOptionalFindPackage.cmake | 28 +
+ cmake/modules/MacroPushRequiredVars.cmake | 47 +
+ cmake/modules/PopplerDefaults.cmake | 10 +
+ cmake/modules/PopplerMacros.cmake | 83 ++
+ config.h.cmake | 149 +++
+ glib/CMakeLists.txt | 107 ++
+ glib/demo/CMakeLists.txt | 17 +
+ glib/poppler-features.h.cmake | 24 +
+ poppler-cairo.pc.cmake | 9 +
+ poppler-config.h.cmake | 160 +++
+ poppler-glib.pc.cmake | 13 +
+ poppler-qt.pc.cmake | 12 +
+ poppler-qt4.pc.cmake | 12 +
+ poppler-splash.pc.cmake | 9 +
+ poppler.pc.cmake | 11 +
+ qt/CMakeLists.txt | 33 +
+ qt4/CMakeLists.txt | 2 +
+ qt4/src/CMakeLists.txt | 43 +
+ qt4/tests/CMakeLists.txt | 47 +
+ test/CMakeLists.txt | 52 +
+ utils/CMakeLists.txt | 84 ++
+ 33 files changed, 3455 insertions(+), 0 deletions(-)
+
+commit 1ea831d3eee6eda35fadfb3c75962a0c708e6c7b
+Author: Pino Toscano <pino@kde.org>
+Date: Wed Jan 30 22:17:38 2008 +0100
+
+ Preprocessor #warning is GCC-specific.
+
+ poppler/ArthurOutputDev.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 4c738cc6bd51f9d9e23ba83949c490c5c8691345
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 29 23:45:52 2008 +0100
+
+ Scale text to match 'm' size
+
+ Fixes bug 12304
+
+ poppler/SplashOutputDev.cc | 37 +++++++++++++++++++++++++++++
+ splash/SplashFTFont.cc | 55
+ +++++++++++++++++++++++++++++++++++++++++++-
+ splash/SplashFTFont.h | 4 +++
+ splash/SplashFont.h | 4 +++
+ splash/SplashFontFile.cc | 1 +
+ splash/SplashFontFile.h | 2 +
+ 6 files changed, 102 insertions(+), 1 deletions(-)
+
+commit 64f16cf6ebf2870852fe8d937b25be58869ad40a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 29 23:41:15 2008 +0100
+
+ Enable antialias by default on the test tool
+
+ qt4/tests/test-poppler-qt4.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 90f0e6bc1e96d9f1666cb8476a92e127f5b927d4
+Author: Jonathan Kew <jonathan_kew@sil.org>
+Date: Tue Jan 29 20:23:08 2008 +0100
+
+ Provide gstrndup as a portable substitue of strndup
+
+ configure.ac | 1 -
+ goo/gmem.cc | 7 +++++++
+ goo/gmem.h | 5 +++++
+ poppler/GfxFont.cc | 8 +-------
+ 4 files changed, 13 insertions(+), 8 deletions(-)
+
+commit 77b91c852ad3d5554afc03aee92a1d928f233401
+Merge: 0babb0e 0533696
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jan 28 20:44:34 2008 +0100
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit 0babb0eb1afa343fb12a3fd037b98d2d1c794a1c
+Author: Jonathan Kew <jonathan_kew@sil.org>
+Date: Mon Jan 28 20:42:44 2008 +0100
+
+ Introduce a check for strndup and alternative for systems without it
+
+ configure.ac | 1 +
+ poppler/GfxFont.cc | 6 ++++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 053369678963206a4afa88a614de1994872c7c5a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jan 27 19:36:28 2008 +0100
+
+ Add ok_to_fill_form permission flag
+
+ glib/poppler-document.cc | 2 ++
+ glib/poppler-document.h | 3 ++-
+ glib/test-poppler-glib.cc | 21 +++++++++++++++++++--
+ 3 files changed, 23 insertions(+), 3 deletions(-)
+
+commit 3085a9495ad87a54758da0024372610fdaf88d57
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Jan 27 19:15:34 2008 +0100
+
+ Fix slice rendering in poppler glib demo
+
+ glib/demo/render.c | 41 ++++++++++++++++++++++++-----------------
+ 1 files changed, 24 insertions(+), 17 deletions(-)
+
+commit 7ad6c4ba110b970516d5380444a03ae217496ddf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 24 21:14:44 2008 +0100
+
+ Incrementing the iterator would be a good idea
+
+ qt4/src/poppler-annotation.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 7c99ec4635a4971321bbead7d1bc723da59b755e
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Thu Jan 24 19:18:15 2008 +0100
+
+ Revert unwanted change on Dict, fix leak on writeTrailer
+
+ poppler/Dict.cc | 2 +-
+ poppler/PDFDoc.cc | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 2335fb6034d2e9ec304abba400119b88302b3160
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 23 23:26:20 2008 +0100
+
+ Draw underlined Links correctly
+
+ See http://bugs.kde.org/show_bug.cgi?id=151359 for an example
+
+ poppler/Gfx.cc | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 96c532ea4b56a147de1deb965126e31f87df588b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jan 23 13:30:12 2008 +0100
+
+ Fix memory leak
+
+ poppler/Form.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 6bca64407c675ca837f83a12c0f655f975f14407
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jan 23 13:27:45 2008 +0100
+
+ Make sure default values are not loaded more than once for the
+ same widget.
+
+ poppler/Form.cc | 18 +++++++++++++++++-
+ poppler/Form.h | 1 +
+ 2 files changed, 18 insertions(+), 1 deletions(-)
+
+commit eccf84b51a1cf5d478c0ec84be3fc9be8e458f4f
+Author: Pino Toscano <pino@kde.org>
+Date: Tue Jan 22 23:28:16 2008 +0100
+
+ Refactor the PSConverter and add a PDFConverter (for PDF export/save).
+
+ Add an OutStream subclass to redirect the output to a QIODevice.
+ Split the PSConverter in a base class (BaseConverter) w/ d_ptr
+ structure.
+ Add a new PDFConverter that inherit BaseConverter, and do the
+ actual export
+ making use of the new QIODeviceOutStream.
+ The BaseConverter now handles automatically file or QIODevice output.
+
+ qt4/src/Makefile.am | 5 +
+ qt4/src/poppler-base-converter.cc | 99 ++++++++++++++++
+ qt4/src/poppler-converter-private.h | 48 ++++++++
+ qt4/src/poppler-document.cc | 5 +
+ qt4/src/poppler-pdf-converter.cc | 68 +++++++++++
+ qt4/src/poppler-ps-converter.cc | 162
+ +++++++++++---------------
+ qt4/src/poppler-qiodeviceoutstream-private.h | 47 ++++++++
+ qt4/src/poppler-qiodeviceoutstream.cc | 71 +++++++++++
+ qt4/src/poppler-qt4.h | 85 +++++++++++---
+ 9 files changed, 483 insertions(+), 107 deletions(-)
+
+commit 547db8be1ab0b2987f0f06d8529eaaed2414028c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jan 22 13:22:20 2008 +0100
+
+ Fix a crash when createAnnot returns NULL due to invalid annot dict.
+
+ poppler/Annot.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 0d558841142587d66bd3b2025e5a9ca39f7a6159
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jan 21 21:43:39 2008 +0100
+
+ Fix another reversed comparison due to cmp
+
+ poppler/Annot.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit cb6a87e39336e2e3893f3e5f577e4d176d237a9f
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Mon Jan 21 10:07:35 2008 +0100
+
+ Fixed a few compare issues with Annots.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 24 ++++++++++++------------
+ 1 files changed, 12 insertions(+), 12 deletions(-)
+
+commit 7cf85dc8d7c895a211684c7d36757063ed4f469b
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Mon Jan 21 21:27:49 2008 +0100
+
+ The glade file needs to be distributed
+
+ test/Makefile.am | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 46e93d31dd9b5909ecd8f7a8f8de23329444a7bc
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Sun Jan 20 19:56:51 2008 +0100
+
+ we need time.h if we use time()
+
+ poppler/PDFDoc.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit a0adb006c38ea07f010a01d9c0bb07ca0f48939d
+Author: Pino Toscano <pino@kde.org>
+Date: Sun Jan 20 19:55:55 2008 +0100
+
+ Added a saveAs() overload which takes a plain OutStream
+
+ poppler/PDFDoc.cc | 9 +++++++--
+ poppler/PDFDoc.h | 2 ++
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+commit fcdd5c51f370d040ae57aa64801c9bd4dbe88752
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jan 19 18:00:10 2008 +0100
+
+ Do not render images when getting the image mapping, it can be done
+ later on demand.
+
+ glib/poppler-page.cc | 81 +++++++++++++++------------
+ glib/poppler-page.h | 6 ++-
+ poppler/CairoOutputDev.cc | 131
+ ++++++++++++++++++++++++++-------------------
+ poppler/CairoOutputDev.h | 12 ++++-
+ 4 files changed, 135 insertions(+), 95 deletions(-)
+
+commit 37ae465775d9a53e7c06cf51aa215439214fd79c
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Sat Jan 19 14:00:31 2008 +0100
+
+ ignore pdf-fullrewrite binary
+
+ test/.gitignore | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 1d160935ea4c1116b745c584ed7f1fd03fbbfb46
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sat Jan 19 13:59:46 2008 +0100
+
+ AnnotWidget support and few fixes
+
+ poppler/Annot.cc | 243
+ +++++++++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/Annot.h | 142 +++++++++++++++++++++++++++++--
+ 2 files changed, 365 insertions(+), 20 deletions(-)
+
+commit 0e91a3973e525d65236d15930a8ea0e5bbb6a6cc
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sat Jan 19 13:59:25 2008 +0100
+
+ AnnotTextMarkup support and improved AnnotQuadrilaterals
+
+ poppler/Annot.cc | 356
+ +++++++++++++++++++++++++++++++++++++++++++-----------
+ poppler/Annot.h | 130 +++++++++++++++++---
+ 2 files changed, 400 insertions(+), 86 deletions(-)
+
+commit c13952cd56a40bad14a1bf28699b137f65162f10
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sat Jan 19 13:59:02 2008 +0100
+
+ Changed AnnotQuadrilateral parsing inside AnnotLink
+
+ poppler/Annot.cc | 246
+ +++++++++++++++++++++++++++++-------------------------
+ poppler/Annot.h | 19 ++--
+ 2 files changed, 144 insertions(+), 121 deletions(-)
+
+commit 2f821f10fbbba9363405201c86494cd861cec2b2
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sat Jan 19 13:49:43 2008 +0100
+
+ Add AnnotQuadPoints class
+
+ poppler/Annot.cc | 16 ++++++++++++++++
+ poppler/Annot.h | 23 +++++++++++++++++++++++
+ 2 files changed, 39 insertions(+), 0 deletions(-)
+
+commit de4c8fa6607e55c199bede1dc731227692ef4f53
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sun Dec 30 21:21:56 2007 +0100
+
+ AnnotFreeText support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 232
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h | 127 +++++++++++++++++++++++++++++
+ 2 files changed, 358 insertions(+), 1 deletions(-)
+
+commit c3504a87933ae1516b1ef05e527fd1c039091235
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Sun Dec 30 19:37:18 2007 +0100
+
+ Improved AnnotLink support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 116
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 51 ++++++++++++++++++++++++
+ 2 files changed, 167 insertions(+), 0 deletions(-)
+
+commit a20468cc38bb590124b2b028a08f364f90f2487f
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 13:02:17 2008 +0100
+
+ Adds a test application to test full rewrite functionnality.
+
+ test/Makefile.am | 11 ++++++++++-
+ test/pdf-fullrewrite.cc | 44
+ ++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 54 insertions(+), 1 deletions(-)
+
+commit 246294714c6011651fd0e5b3649bd65919058c72
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 12:59:03 2008 +0100
+
+ FormWidget's 'modified' member variable is now updated correctly
+ each time an update is done.
+
+ Before, only text FormWidget had their 'modified' field set to 'true'
+ if they had been updated.
+ It is now the case for the other type of FormWidgets.
+
+ poppler/Form.cc | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 6e0f297b8b17afb95779724b8618ca39016e664a
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 12:54:09 2008 +0100
+
+ Annot will save their generated appearance in their AP dict.
+
+ poppler/Annot.cc | 42 ++++++++++++++++++++++++++++++++++++++----
+ poppler/Annot.h | 1 +
+ 2 files changed, 39 insertions(+), 4 deletions(-)
+
+commit e20f6a8e9ac3936b4bc03710a71fe390dfc4c094
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 12:52:02 2008 +0100
+
+ Add deep copy constructor to Dict.
+
+ poppler/Dict.cc | 14 +++++++++++++-
+ poppler/Dict.h | 1 +
+ 2 files changed, 14 insertions(+), 1 deletions(-)
+
+commit e8d46cab77c7167edb0896296118daafc0f13b6d
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 12:51:44 2008 +0100
+
+ Adds the ability to save PDF using either incremental update or by
+ rewriting completly the PDF.
+
+ poppler/PDFDoc.cc | 379
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/PDFDoc.h | 18 +++-
+ poppler/XRef.cc | 12 ++-
+ poppler/XRef.h | 3 +-
+ 4 files changed, 402 insertions(+), 10 deletions(-)
+
+commit 742b0c3dec01d8672b84f56d5bb0e2890b178594
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 12:51:27 2008 +0100
+
+ Make the md5 method of Decrypt public so it can be used by other
+ files.
+
+ poppler/Decrypt.cc | 5 ++---
+ poppler/Decrypt.h | 1 +
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit bb7867976740dea259d4110c072552fc5953910f
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 12:51:07 2008 +0100
+
+ Modify the writeToFile method of XRef so it uses OutStream instead
+ of a C file descriptor.
+
+ poppler/XRef.cc | 10 +++++-----
+ poppler/XRef.h | 2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+commit d80736587fdbc0e163077f27bfd21c5e3a7fa4c7
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 12:50:49 2008 +0100
+
+ Adds addIndirectObject method to XRef. This method allow the creation
+ of new indirect objects.
+
+ poppler/XRef.cc | 39 +++++++++++++++++++++++++++++++++++++++
+ poppler/XRef.h | 1 +
+ 2 files changed, 40 insertions(+), 0 deletions(-)
+
+commit 8bd00dd0872191b8806e9411d9a1adc441f08a47
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 12:50:16 2008 +0100
+
+ Add some unfiltered methods to input stream.
+
+ With these methods, it is possible to read the raw content from the
+ stream, without any filtering (even not the headers).
+
+ poppler/Stream.cc | 41 ++++++++++++++++++++++++++++-------------
+ poppler/Stream.h | 26 ++++++++++++++++++++++++++
+ 2 files changed, 54 insertions(+), 13 deletions(-)
+
+commit 8bcda287ddd316f90b3e47a3a307fbe63a5c21f7
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 12:46:53 2008 +0100
+
+ Add setNeedFree method to MemStream so it is possible to choose if
+ the stream should take care of deleting the buffer.
+
+ poppler/Stream.h | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 4fbd143de7e3a8ab386dd14b057e62b3b9fe04e4
+Author: Julien Rebetez <julien@fhtagn.net>
+Date: Sat Jan 19 12:45:54 2008 +0100
+
+ Add Outstream, a base class for output streams and FileOutStream,
+ which implements OutStream for output to a file.
+
+ poppler/Stream.cc | 55 +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Stream.h | 64
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 119 insertions(+), 0 deletions(-)
+
+commit 696eaa47169fb063b7e6998c876926c578b6fbfa
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jan 17 15:56:59 2008 +0100
+
+ Fix a crash when editing text form fields
+
+ poppler/Annot.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 9ec1b28dcdade12498b94b650c26483581294ee6
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jan 17 14:54:34 2008 +0100
+
+ Fix a crash when a form field contains reference to non existant
+ children
+
+ poppler/Form.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit f7ed40c465033bad26dfda008c5984954baa0607
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jan 16 21:01:50 2008 +0100
+
+ Add a cast to fix build
+
+ glib/demo/info.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 1c0aa21e598b879ec49d96700e6438ccb8ac2283
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Fri Jan 11 20:28:49 2008 +0100
+
+ rename info.c to info.cc to fix bug 14024
+
+ glib/demo/Makefile.am | 2 +-
+ glib/demo/info.c | 243
+ -------------------------------------------------
+ glib/demo/info.cc | 243
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 244 insertions(+), 244 deletions(-)
+
+commit 88f8bf850b6c41d25b9576597b5fc5bd75a122f4
+Author: Kjartan Maraas <kmaraas@gnome.org>
+Date: Thu Jan 10 23:51:54 2008 +0100
+
+ Fix two use after free bugs in HtmlOutputDev.cc
+
+ utils/HtmlOutputDev.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 348f4f9d9d5b0f91da6f46e0fcefec80255d4179
+Merge: 8a8a4f0 4eca2e0
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Sat Jan 5 23:03:06 2008 +0100
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit 8a8a4f01272fb86898fafbda07129c0cbc03d527
+Author: Pino Toscano <pino@kde.org>
+Date: Sat Jan 5 23:02:22 2008 +0100
+
+ Make Document::renderHints return the correct render hints
+
+ qt4/src/poppler-document.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4eca2e041c93349e0c4666e83ad1ca3caff91dee
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jan 1 14:34:00 2008 +0100
+
+ Add page transitions demo
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/main.c | 16 ++-
+ glib/demo/transitions.c | 321
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/transitions.h | 31 +++++
+ 4 files changed, 363 insertions(+), 7 deletions(-)
+
+commit e92b50bbd3dfc8657b611e3c33129d7c5bae2319
+Author: Koji Otani <sho@bbr.jp>
+Date: Wed Dec 26 18:56:01 2007 +0100
+
+ Use getEmbeddedFontID instead of getEmbeddedFontName to check if a
+ font is embedded or not
+
+ poppler/GfxFont.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 30e9bae97e3742913015f7ea46636b2b80937612
+Author: Ed Catmur <ed@catmur.co.uk>
+Date: Sat Dec 22 22:54:51 2007 +0100
+
+ Fixlets for Adobe Glyph Naming convention implementation
+
+ poppler/GfxFont.cc | 94
+ ++++++++++++++++++++++++++-------------------------
+ 1 files changed, 48 insertions(+), 46 deletions(-)
+
+commit 40551e616b007ceb15c9d6e3d77c24538ffec924
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Sat Dec 22 14:31:50 2007 +0100
+
+ Check the destination page of the link does exist
+
+ qt4/src/poppler-link.cc | 20 ++++++++++++--------
+ 1 files changed, 12 insertions(+), 8 deletions(-)
+
+commit c06d6f2236d854f05e7621be280109ff27dc73b9
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Thu Dec 20 20:13:08 2007 +0100
+
+ Use UnicodeParsedString that does exactly what this code does
+
+ qt4/src/poppler-document.cc | 28 +---------------------------
+ 1 files changed, 1 insertions(+), 27 deletions(-)
+
+commit 5f9f06a10fdb72a9d809ee1f779e1a8f549840e7
+Author: Koji Otani <sho@bbr.jp>
+Date: Thu Dec 20 19:59:26 2007 +0100
+
+ Fix for latest CJK code
+
+ See
+ http://lists.freedesktop.org/archives/poppler/2007-December/003244.html
+ for more information
+
+ poppler/GfxFont.cc | 14 ++++++++++----
+ 1 files changed, 10 insertions(+), 4 deletions(-)
+
+commit bb49e1e3909fc7392c197dc67d9b7f5312fd0dad
+Author: Ed Catmur <ed@catmur.co.uk>
+Date: Tue Dec 18 20:20:11 2007 +0100
+
+ Implement Adobe Glyph Naming convention
+
+ poppler/GfxFont.cc | 183
+ +++++++++++++++++++++++++++++++++++++++++++--------
+ 1 files changed, 154 insertions(+), 29 deletions(-)
+
+commit 5634d63abdd64d371f2e8687a1c172f55b052008
+Author: Koji Otani <sho@bbr.jp>
+Date: Mon Dec 17 20:43:41 2007 +0100
+
+ Allow seting some more Graphics States (Font, LW, LC, LJ, ML, D,
+ RI, FL) by operator 'gs'
+
+ poppler/Gfx.cc | 67
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 67 insertions(+), 0 deletions(-)
+
+commit 7a9e7fc96b47b9d833300233ac38bbd60097f425
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Dec 16 21:21:08 2007 +0100
+
+ Add AnnotLink class so that link annots are properly recognized
+
+ Right now, all of the annots except Text, are created using the
+ base class Annot which sets the type to unknown. For link annots this
+ causes the border never be drawn, since we are checking first
+ whether the
+ annot is a Link and it's always false.
+
+ poppler/Annot.cc | 12 +++++++++++-
+ poppler/Annot.h | 10 ++++++++++
+ 2 files changed, 21 insertions(+), 1 deletions(-)
+
+commit 796d9cb9b188a8af69d7fbf9bccbb408cbf6a71a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Dec 15 15:21:49 2007 +0100
+
+ Fix a crash when trying to create a temp annot with catalog = NULL
+
+ poppler/Annot.cc | 7 +++++++
+ poppler/Annot.h | 1 +
+ poppler/Form.cc | 6 ++----
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+commit 99f049f0dfbfd9c22bea56ae96253837ae421e23
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Dec 14 15:26:24 2007 +0100
+
+ Use the default dash array when it's not correct in AnnotBorderBS
+
+ poppler/Annot.cc | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+commit cb2a997aa6f9dd5508ca8b04e63815da893497ef
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Dec 14 14:12:14 2007 +0100
+
+ Fix another crash due to uninitialized variables
+
+ poppler/Annot.cc | 18 ++++++++----------
+ poppler/Annot.h | 1 +
+ 2 files changed, 9 insertions(+), 10 deletions(-)
+
+commit f704e86d8c72bacbd9443c4d828cd284d3a11753
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Dec 14 12:58:12 2007 +0100
+
+ Fix several crashes due to uninitialized variables in Annots.
+
+ poppler/Annot.cc | 11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 0820a93ba1c0e893681024feb9f9bd120a9eeb4d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Dec 14 12:38:58 2007 +0100
+
+ Check whether top and left should be changed in FitH, FitV, FitBH
+ and FitBV destinations
+
+ According to the spec, if a null value is specified for top or left
+ parameter in such
+ destinations, the parameter should be retained unchanged.
+
+ poppler/Link.cc | 36 ++++++++++++++++++++++++++++--------
+ 1 files changed, 28 insertions(+), 8 deletions(-)
+
+commit 0fb42a2f557d5ec83b42326eb6b0be41622ca328
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Wed Dec 12 01:02:31 2007 +0100
+
+ Changed getters to const
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 28 ++++++++++----------
+ poppler/Annot.h | 72
+ +++++++++++++++++++++++++++---------------------------
+ 2 files changed, 50 insertions(+), 50 deletions(-)
+
+commit 29d39a8ae120e6045a16a7aa0944c36560b42508
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Mon Dec 10 17:56:44 2007 +0100
+
+ AnnotText support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 123
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h | 65 ++++++++++++++++++++++++----
+ 2 files changed, 177 insertions(+), 11 deletions(-)
+
+commit 2acecde458122bd67487cc302478befa78bf6fbe
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Mon Dec 10 16:45:46 2007 +0100
+
+ AnnotMarkup support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 115
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 51 ++++++++++++++++++++++++
+ 2 files changed, 166 insertions(+), 0 deletions(-)
+
+commit 1f8c1fe34e04688d2ba200f1166cfdd1ffe563f0
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Mon Dec 10 16:34:01 2007 +0100
+
+ AnnotPopup support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 34 ++++++++++++++++++++++++++++++++++
+ poppler/Annot.h | 21 +++++++++++++++++++++
+ 2 files changed, 55 insertions(+), 0 deletions(-)
+
+commit 6c83e06fb2eb77d0dbefd1ebfbcac3e5f0cbb622
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Mon Dec 10 16:24:38 2007 +0100
+
+ Prepare code to Annotation Subtype support.
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ glib/poppler-page.cc | 11 +---
+ poppler/Annot.cc | 160
+ ++++++++++++++++++++++++++++++++++++--------------
+ poppler/Annot.h | 54 ++++++++++++++---
+ poppler/Form.cc | 6 ++-
+ 4 files changed, 167 insertions(+), 64 deletions(-)
+
+commit fa0bb5bbea5bf2769c8b3084f78770b7781002eb
+Author: Iñigo Martínez <inigomartinez@gmail.com>
+Date: Mon Dec 10 15:41:38 2007 +0100
+
+ Various Annot improvements
+
+ Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
+
+ poppler/Annot.cc | 613
+ +++++++++++++++++++++++++++++++++++-------------------
+ poppler/Annot.h | 140 +++++++++++-
+ poppler/Gfx.cc | 21 ++-
+ poppler/Gfx.h | 5 +-
+ 4 files changed, 543 insertions(+), 236 deletions(-)
+
+commit e0f49fd5aef3c798798ad7e7dba55857bde1b4c0
+Author: Koji Otani <sho@bbr.jp>
+Date: Thu Dec 13 23:40:46 2007 +0100
+
+ Some CJK charecters are displayed vertical glyphs incorrectly when
+ horizontal mode
+
+ poppler/GfxFont.cc | 46 +++++++++++++++++++++++++---------------------
+ 1 files changed, 25 insertions(+), 21 deletions(-)
+
+commit 85901922bf354a1268037d0b6ec5cbf14da979a1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 13 23:30:59 2007 +0100
+
+ Yet another gmallocn to gmallocn_checkoverflow
+
+ Fixes http://bugs.kde.org/show_bug.cgi?id=153949
+
+ poppler/SplashOutputDev.cc | 23 ++++++++++++++++-------
+ 1 files changed, 16 insertions(+), 7 deletions(-)
+
+commit f24259cddb9c5e02cf9d2071bfa0106f3e88bd59
+Author: Koji Otani <sho@bbr.jp>
+Date: Mon Dec 10 23:24:14 2007 +0100
+
+ Display characters outside of unicode BMP with TT font
+
+ fofi/FoFiTrueType.cc | 33 +++++++++++++++++++--
+ fofi/FoFiTrueType.h | 2 +-
+ poppler/CMap.cc | 34 ++++++++++++++++++++++
+ poppler/CMap.h | 4 ++
+ poppler/GfxFont.cc | 75
+ +++++++++++++++++++++++++++++++------------------
+ 5 files changed, 115 insertions(+), 33 deletions(-)
+
+commit 7cbabbf378cf5a9c0411558ff02b44dec2040ea1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Dec 10 22:00:30 2007 +0100
+
+ Fix a crash when marked content properties operator is not a dict.
+
+ poppler/Gfx.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e807f9c72c7f0c5cc0655918f676f4af54739442
+Merge: bf57117 e2ea743
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 9 18:07:30 2007 +0100
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit bf57117df8786778faf31e5d843533004f867ff3
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Dec 9 18:07:00 2007 +0100
+
+ Add support for ActualText entries
+
+ Patch by Adrian Johnson with two minor changes by me (one fordward
+ declaration and a leak fix)
+
+ poppler/Form.cc | 2 +-
+ poppler/Gfx.cc | 2 +-
+ poppler/OutputDev.cc | 2 +-
+ poppler/OutputDev.h | 2 +-
+ poppler/PDFDocEncoding.h | 4 ++
+ poppler/TextOutputDev.cc | 98
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/TextOutputDev.h | 11 +++++
+ 7 files changed, 116 insertions(+), 5 deletions(-)
+
+commit e2ea7430e7d6db50cbfdac34713915e5b0942a89
+Author: Albert Astals Cid <tsdgeos@localhost.(none)>
+Date: Sat Dec 8 23:21:34 2007 +0100
+
+ disable warnings about assigning const char * to char *
+
+ We have them all over the place and we are not going to fix it as
+ that'll be too much overhead when re-merging xpdf changes
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit acf70c666d4f534cd97de64d4378bf6399e31fd4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 6 23:58:26 2007 +0100
+
+ Disable gtk tests if the user disabled glib frontend
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit bb0ec68f21d355081ff75aad641bc3809141e398
+Merge: 5a34cdd b925ea2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 6 18:38:54 2007 +0100
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit b925ea232b6ed5028712600f9aebe453f3b2ba06
+Author: Brad Hards <bradh@kde.org>
+Date: Tue Dec 4 19:11:13 2007 +1100
+
+ Remove redundant check.
+
+ poppler/PSOutputDev.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 275afca4ef24020273df652ccfdf76c6994e9294
+Author: Brad Hards <bradh@kde.org>
+Date: Sun Dec 2 19:45:16 2007 +1100
+
+ Preserve PDF page labels when we output as postscript.
+
+ Resolves bug 13338.
+
+ poppler/PSOutputDev.cc | 81
+ +++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/PSOutputDev.h | 2 +
+ 2 files changed, 82 insertions(+), 1 deletions(-)
+
+commit 641edb83a457083c13f3e374f6ac6c570dd54d7f
+Author: Brad Hards <bradh@kde.org>
+Date: Wed Nov 28 19:42:53 2007 +1100
+
+ Minor API documentation update
+
+ qt4/src/poppler-annotation.h | 81
+ ++++++++++++++++++++++++++++++++++++++++-
+ 1 files changed, 79 insertions(+), 2 deletions(-)
+
+commit 3635ec6fcbc89daf633c03efb644df9031b80f59
+Author: Brad Hards <bradh@kde.org>
+Date: Wed Nov 28 19:42:22 2007 +1100
+
+ Update doxygen configuration file to version 1.5.3
+
+ qt4/src/Doxyfile | 185
+ +++++++++++++++++++++++++++++++++++++++++-------------
+ 1 files changed, 141 insertions(+), 44 deletions(-)
+
+commit 02c7ea6e1fd3e225de1eda231813f4db0ffb9fdb
+Author: Brad Hards <bradh@kde.org>
+Date: Wed Nov 28 19:41:54 2007 +1100
+
+ Fix off-by-one in printCommands path.
+
+ poppler/Gfx.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 74af7c1209f47ed39addf7fde3ea106a7c77a408
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Nov 24 18:12:00 2007 +0100
+
+ Convert passwords from utf-8 to latin-1 when needed. Fixes bug #4557
+
+ glib/poppler-document.cc | 16 ++++++++++++++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+
+commit 5a34cddf043cb484549cb411e034786a7d8688a3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Nov 23 23:13:57 2007 +0100
+
+ add a ignore
+
+ glib/demo/.gitignore | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 21a58562cc1e575ec3d81b6e34bfcb21306eb67f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Nov 23 23:12:06 2007 +0100
+
+ sscanf does not like null strings, so don't call it on empty qstrings
+
+ qt/poppler-document.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6f8451cf9d19f57f658d1568643ecb0f953e1075
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Nov 11 21:29:40 2007 -0500
+
+ Add support for knockout groups to the cairo backend
+
+ This is sort of hacky because we need to keep track of shape and
+ opacity
+ seperately. It is also probably not entirely correct. However,
+ it should be
+ closer than previously.
+
+ poppler/CairoOutputDev.cc | 309
+ +++++++++++++++++++++++++++++++++++++++++++--
+ poppler/CairoOutputDev.h | 8 +-
+ 2 files changed, 303 insertions(+), 14 deletions(-)
+
+commit b0fbfb0ac366434d7e4c0350a9be83ddda7b03cf
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Nov 11 16:06:16 2007 -0500
+
+ Track the AlphaIsShape and TextKnockout state
+
+ Parse, store and notify the OutputDevices about these entries.
+
+ poppler/Gfx.cc | 14 ++++++++++++++
+ poppler/GfxState.h | 6 ++++++
+ poppler/OutputDev.h | 2 ++
+ 3 files changed, 22 insertions(+), 0 deletions(-)
+
+commit f6429b13a972f2deb25b3d3a9948dca024a54841
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Nov 10 14:08:09 2007 -0500
+
+ Fix accidental mode change.
+
+ 0 files changed, 0 insertions(+), 0 deletions(-)
+
+commit 5797f50a99d1494767edc5928f9c3e9d927b946d
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Nov 10 01:52:00 2007 -0500
+
+ Scale text to match 'm' size
+
+ This adds back the hack that was removed when fontconfig support
+ was added long
+ ago. It's not a great solution but lets us be at least as good as
+ xpdf. Fixes
+ #12304 with the cairo backend. The problem persists with the splash
+ backend.
+
+ poppler/CairoFontEngine.cc | 56
+ +++++++++++++++++++++++++++++++++++++++++--
+ poppler/CairoFontEngine.h | 7 ++++-
+ poppler/CairoOutputDev.cc | 8 ++++-
+ 3 files changed, 65 insertions(+), 6 deletions(-)
+
+commit 551212e55127c7e46d9aff3318015fd9b5385687
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sat Nov 10 11:56:15 2007 +0100
+
+ Fix uninitialized variable access
+
+ Supported by Derek B. Noonburg
+
+ poppler/GfxState.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 934a5ae45eb17bd0e2010be89f55510e8a69816b
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Nov 3 13:08:51 2007 -0400
+
+ Avoiding using floating point when converting to luminance.
+
+ The code now also does proper rounding instead of just truncating.
+
+ poppler/CairoOutputDev.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 1b3f045a25e5d172357bc87c15ba591c8e1511a7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Nov 8 23:34:07 2007 +0100
+
+ Move another gmallocn to gmallocn_checkoverflow. Fixes crashes on
+ incorrect pdf sent by Red Hat
+
+ poppler/Stream.cc | 21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
+
+commit 944d327fd7036332a33b4ad6476ceca7a650ef6e
+Merge: fb1d1f4 c340255
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 7 23:52:47 2007 +0100
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit fb1d1f459784a6c19034212a617268f7f5a90e9c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 7 23:51:58 2007 +0100
+
+ merge ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
+
+ poppler/Stream.cc | 417
+ ++++++++++++++++++++++++++++++-----------------------
+ poppler/Stream.h | 10 +-
+ 2 files changed, 245 insertions(+), 182 deletions(-)
+
+commit c340255f46bc95b5f850abcd3d9bcdc8594199bb
+Author: Brad Hards <bradh@kde.org>
+Date: Mon Nov 5 20:36:23 2007 +1100
+
+ Update .gitignore
+
+ Suppress the noise a bit.
+
+ qt4/.gitignore | 1 +
+ qt4/tests/.gitignore | 3 +++
+ test/.gitignore | 2 ++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+commit cebf770379e7d71166e729aebf771a4ca291d48b
+Author: Brad Hards <bradh@kde.org>
+Date: Mon Nov 5 20:31:18 2007 +1100
+
+ Add a new unit test, for non-ASCII searching.
+
+ There is a bug report (bug:7063) about not being able
+ to find text that isn't ASCII. I think that the problem isn't
+ in poppler core code - this unit test shows we can find
+ characters as long as they are properly encoded (which the
+ Qt4 front end does).
+
+ qt4/tests/Makefile.am | 7 ++++++-
+ qt4/tests/check_search.cpp | 40
+ ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 46 insertions(+), 1 deletions(-)
+
+commit 570fe464a2aae4f22d0b47cce73b8bc36b116e9f
+Merge: 1c7b7a0 7875067
+Author: Brad Hards <bradh@kde.org>
+Date: Mon Nov 5 15:55:39 2007 +1100
+
+ Merge branch 'minor-fixes'
+
+commit 78750679e213d7307cce38166b6af32562e871b8
+Author: Brad Hards <bradh@kde.org>
+Date: Mon Nov 5 15:54:36 2007 +1100
+
+ Additional check for password protected documents
+
+ We need to bail out on locked documents. In the future,
+ we could probably go interactive, and ask the user for
+ a password.
+
+ qt4/tests/test-poppler-qt4.cpp | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 1c7b7a0c581b542945cac257202bbb819d33694c
+Author: Brad Hards <bradh@kde.org>
+Date: Mon Nov 5 15:49:45 2007 +1100
+
+ Minor Qt4 API documentation fix
+
+ Also, this is a test of my git newbie-ness.
+
+ qt4/src/poppler-form.h | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit b86fc565d175835cf27e9c8632da47a5e0b50237
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 5 00:14:55 2007 +0100
+
+ Fix FSF address
+
+ glib/demo/fonts.c | 2 +-
+ glib/demo/fonts.h | 2 +-
+ glib/demo/forms.c | 2 +-
+ glib/demo/forms.h | 2 +-
+ glib/demo/info.c | 2 +-
+ glib/demo/info.h | 2 +-
+ glib/demo/links.c | 2 +-
+ glib/demo/links.h | 2 +-
+ glib/demo/main.c | 2 +-
+ glib/demo/outline.c | 2 +-
+ glib/demo/outline.h | 2 +-
+ glib/demo/page.c | 2 +-
+ glib/demo/page.h | 2 +-
+ glib/demo/render.c | 2 +-
+ glib/demo/render.h | 2 +-
+ glib/demo/utils.c | 2 +-
+ glib/demo/utils.h | 2 +-
+ glib/poppler-action.cc | 2 +-
+ glib/poppler-action.h | 2 +-
+ glib/poppler-attachment.cc | 2 +-
+ glib/poppler-attachment.h | 2 +-
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-document.h | 2 +-
+ glib/poppler-features.h.in | 2 +-
+ glib/poppler-form-field.cc | 2 +-
+ glib/poppler-form-field.h | 2 +-
+ glib/poppler-page.cc | 2 +-
+ glib/poppler-page.h | 2 +-
+ glib/poppler.cc | 2 +-
+ glib/poppler.h | 2 +-
+ poppler/PageTransition.cc | 2 +-
+ poppler/Sound.cc | 2 +-
+ poppler/Sound.h | 2 +-
+ qt/poppler-document.cc | 2 +-
+ qt/poppler-fontinfo.cc | 2 +-
+ qt/poppler-link-qt3.h | 2 +-
+ qt/poppler-link.cc | 2 +-
+ qt/poppler-page-transition-private.h | 2 +-
+ qt/poppler-page-transition.cc | 2 +-
+ qt/poppler-page-transition.h | 2 +-
+ qt/poppler-page.cc | 2 +-
+ qt/poppler-private.h | 2 +-
+ qt/poppler-qt.h | 2 +-
+ qt4/src/poppler-annotation-helper.h | 2 +-
+ qt4/src/poppler-annotation-private.h | 2 +-
+ qt4/src/poppler-annotation.cc | 2 +-
+ qt4/src/poppler-annotation.h | 2 +-
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-embeddedfile.cc | 2 +-
+ qt4/src/poppler-fontinfo.cc | 2 +-
+ qt4/src/poppler-form.cc | 2 +-
+ qt4/src/poppler-form.h | 2 +-
+ qt4/src/poppler-link-extractor-private.h | 2 +-
+ qt4/src/poppler-link-extractor.cc | 2 +-
+ qt4/src/poppler-link.cc | 2 +-
+ qt4/src/poppler-link.h | 2 +-
+ qt4/src/poppler-page-private.h | 2 +-
+ qt4/src/poppler-page.cc | 2 +-
+ qt4/src/poppler-private.h | 2 +-
+ qt4/src/poppler-ps-converter.cc | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
+ qt4/src/poppler-sound.cc | 2 +-
+ qt4/src/poppler-textbox.cc | 2 +-
+ 63 files changed, 63 insertions(+), 63 deletions(-)
+
+commit 37776afc6f8a5733b41da6fb0f45e7ace4edf737
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 5 00:03:55 2007 +0100
+
+ Update from http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+ COPYING | 27 +++++++++++++--------------
+ 1 files changed, 13 insertions(+), 14 deletions(-)
+
+commit 34a90b35998b65539cf1e8f09194d45db71064a1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 4 14:03:35 2007 +0100
+
+ Remove duplicate checking
+
+ poppler/JBIG2Stream.cc | 8 --------
+ 1 files changed, 0 insertions(+), 8 deletions(-)
+
+commit d694e1dd042fb97fbc62046b69cafe30d6f9ea58
+Merge: ba5b31c 432e657
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 4 13:26:47 2007 +0100
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit ba5b31c6a8b2317332bfa148f6d80f66891fb9ce
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sun Nov 4 13:25:12 2007 +0100
+
+ Require fontconfig >= 2.0 Fixes bug 9020
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 432e657a49cb097638a79e38c141088039572816
+Author: Jeff Muizelaar <jeff@freiheit.infidigm.net>
+Date: Mon Sep 17 19:15:21 2007 -0400
+
+ Use realloc/free instead of new/delete when resizing GooStrings
+
+ This allows for a large performance improvement when appending a
+ large number
+ of characters to a GooString. This is especially helpful for
+ TextOutputDev on
+ large PDFs. For example, the following code has the potential to be
+ O(n) instead of
+ O(n²) with a good implementation of realloc.
+
+ while (n) {
+ string.append(character);
+ n--;
+ }
+
+ goo/GooString.cc | 30 +++++++++++++++++-------------
+ 1 files changed, 17 insertions(+), 13 deletions(-)
+
+commit cb80112afed2c5b9642c3c43f1cc001ed88d08cb
+Author: Jonathan Kew <jonathan_kew@sil.org>
+Date: Thu Nov 1 20:53:05 2007 +0100
+
+ Do not try to parse directories when processing nameToUnicode
+ dir. Fixes ugly warnings on mingw32
+
+ poppler/GlobalParams.cc | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ad6b888edff7b30be72df948c4052b9934a37705
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Thu Nov 1 20:48:21 2007 +0100
+
+ Add some castings to make it compile
+
+ glib/test-poppler-glib.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit a968dcc759379f48265c91bea63ca4cf987d94a9
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Wed Oct 31 23:53:39 2007 +0100
+
+ Tests for passwords
+
+ qt4/tests/Makefile.am | 13 +++++-
+ qt4/tests/check_password.cpp | 87
+ ++++++++++++++++++++++++++++++++++++++
+ qt4/tests/stress-poppler-dir.cpp | 63 +++++++++++++++++++++++++++
+ qt4/tests/test-poppler-qt4.cpp | 15 ++++++-
+ 4 files changed, 175 insertions(+), 3 deletions(-)
+
+commit 7b7a08863a8278dee7aa1fe7789cf72223c26b35
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Wed Oct 31 23:53:27 2007 +0100
+
+ Improve documentation
+
+ qt4/src/poppler-qt4.h | 64
+ ++++++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 56 insertions(+), 8 deletions(-)
+
+commit 96493c9409186a7e964e894c7f730962b6995fd7
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Wed Oct 31 23:51:25 2007 +0100
+
+ remove old file
+
+ glib/test-poppler-glib.c | 514
+ ----------------------------------------------
+ 1 files changed, 0 insertions(+), 514 deletions(-)
+
+commit 951a05f7a11af4a44e4cb85a015939d6a3e513f5
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Sat Oct 27 12:33:22 2007 +0200
+
+ Remove fordward declaration of a non-existant class
+
+ poppler/Form.h | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 289679405ab143bc2106cf269227c514a1602e56
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Oct 25 22:16:10 2007 -0400
+
+ Avoid drawing borders unless /W and /S are specified in /BS
+
+ Acroread doesn't sometimes doesn't draw borders when you'd
+ expect it to. Special case that behaviour so that we do the
+ same thing.
+
+ poppler/Annot.cc | 15 ++++++++++++---
+ 1 files changed, 12 insertions(+), 3 deletions(-)
+
+commit ab0a6c37faf9916edcd70e128d9f2654eb795ace
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Thu Oct 25 20:56:58 2007 +0200
+
+ Fix compilation on mingw. Bug 12493
+
+ Added a check for localtime_r in configure.ac
+ Moved test-poppler-glib.c to test-poppler-glib.cc to get the correct
+ compiler
+
+ configure.ac | 1 +
+ glib/Makefile.am | 2 +-
+ glib/test-poppler-glib.cc | 520
+ +++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 522 insertions(+), 1 deletions(-)
+
+commit 6bd637dc135045b20abf024d394538d7a3160795
+Merge: c01ab71 25b273d
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Tue Oct 23 23:27:01 2007 +0200
+
+ Merge branch 'master' of
+ ssh://aacid@git.freedesktop.org/git/poppler/poppler
+
+commit c01ab714ecd42e39ecb0be1c0c2504635251ac01
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Tue Oct 23 23:26:21 2007 +0200
+
+ Provide setters for some methods that only had getters. Fixes
+ bug 12894
+
+ poppler/GlobalParams.cc | 49
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/GlobalParams.h | 7 ++++++
+ 2 files changed, 56 insertions(+), 0 deletions(-)
+
+commit 25b273db677815c8df11e52fe9df29fe857a8a88
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon Oct 22 23:01:37 2007 -0400
+
+ Unset the font if it doesn't exist or we can not load it properly
+
+ Previously, the previous font stayed current and glyphs would be
+ drawn using
+ it. This resulted in random glyphs being chosen unless the encodings
+ happened
+ to match. Now, instead, we draw nothing which matches the behaviour of
+ acroread.
+
+ poppler/Gfx.cc | 4 ++++
+ poppler/GfxFont.cc | 4 ++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 57331767ed5306eba1f9bf60e48fc88debdc2198
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Mon Oct 22 23:33:59 2007 +0200
+
+ builddir != srcdir fixes by Christian Persch <chpe gnome org>
+
+ autogen.sh | 7 ++++---
+ glib/demo/Makefile.am | 1 +
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 2a333e5a618b5c92f3c703816b950321f25d3aab
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Mon Oct 22 22:14:43 2007 +0200
+
+ Splash rework, check if font is inside clip area before rendering
+ it to a temporary bitmap. Fixes KDE bug 150693
+
+ This change is not trivial. What i did is:
+ It is getGlyph the one that does the intersection between clip area
+ and rendering area of the font instead fillGlyph2
+ That means some clipRes = state->clip->testRect but we win more
+ robustness against broken pdf that specify HUGE fonts
+
+ splash/Splash.cc | 207
+ ++++++++++++++++++++++++------------------------
+ splash/Splash.h | 4 +-
+ splash/SplashFTFont.cc | 23 +++++-
+ splash/SplashFTFont.h | 4 +-
+ splash/SplashFont.cc | 29 ++++++--
+ splash/SplashFont.h | 5 +-
+ splash/SplashT1Font.cc | 11 ++-
+ splash/SplashT1Font.h | 4 +-
+ 8 files changed, 162 insertions(+), 125 deletions(-)
+
+commit cf785cd12ae77e8dd778ed043584f8f26efe675f
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Mon Oct 22 21:59:35 2007 +0200
+
+ Add gmallocn_checkoverflow, it's the same as gmallocn but returns
+ NULL on overflow instead of doing exit()
+
+ goo/gmem.cc | 18 ++++++++++++++++++
+ goo/gmem.h | 3 +++
+ 2 files changed, 21 insertions(+), 0 deletions(-)
+
+commit 37e16ac301a35ceca2e3535f8c6100d4cf723c82
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Mon Oct 22 21:54:02 2007 +0200
+
+ exit(1) is bad in library code, use the src.abort method to describe
+ failure
+
+ poppler/DCTStream.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit dbe975c129999a3efceb1c86518fa6fda74f685c
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Oct 22 11:25:37 2007 +0200
+
+ Fix a crash with invalid TrueType fonts
+
+ fofi/FoFiTrueType.cc | 10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 8bfe30a48fd7021591ab307bd51f86c06ff202b9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Oct 19 15:46:50 2007 +0200
+
+ Do not generate appearance stream for radio button that are not active
+
+ poppler/Annot.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 1a531dcfee1c6fc79a414c38cbe7327fbf9a59d8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Oct 19 13:12:24 2007 +0200
+
+ Fix a crash with invalid embedded fonts
+
+ poppler/CairoFontEngine.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit e1740278457e512676b623bcdf9968193f0a8d7b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Oct 19 12:21:54 2007 +0200
+
+ Do not draw annotations when rendering for printing
+
+ glib/poppler-page.cc | 25 ++++++++++++++++++++++---
+ poppler/Annot.h | 2 ++
+ 2 files changed, 24 insertions(+), 3 deletions(-)
+
+commit a4d25f79dfc1a7e4998e2e113ef92312bd4af553
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Oct 16 15:24:08 2007 +0200
+
+ Detect form fields at any depth level
+
+ We were ignoring non root form fields that contain only a kids
+ dictionary.
+ See evince bug: http://bugzilla.gnome.org/show_bug.cgi?id=486957
+
+ poppler/Form.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 03e1da99f7393fb1103643311b0b5af7b875e09c
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Oct 13 19:38:15 2007 -0400
+
+ Add an implementation of CairoOutputDev::startPage()
+
+ The implementation initializes fill_pattern and stroke_pattern
+ to black matching SplashOutputDev. This fixes #12504.
+
+ poppler/CairoOutputDev.cc | 9 +++++++++
+ poppler/CairoOutputDev.h | 2 +-
+ 2 files changed, 10 insertions(+), 1 deletions(-)
+
+commit 825c942d46e0c3e254028441015c5dd8440cc734
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Fri Oct 12 13:47:09 2007 +0200
+
+ Copy the embeddef file description string correctly
+
+ poppler/Catalog.cc | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 5e60da78695eff44cc10dbce46ef170727f682b1
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Fri Oct 12 13:46:52 2007 +0200
+
+ Correctly delete the embedded file stream
+
+ qt4/src/poppler-embeddedfile.cc | 1 +
+ qt4/src/poppler-private.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 1627fbbde8be01af3bdd2583f3439897a37d5215
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Oct 6 23:27:40 2007 -0400
+
+ Use maskWidth and maskHeight for reading from the mask image in
+ CairoOutputDev::drawMaskedImage()
+
+ Previously, drawMaskedImage() was incorrectly using the image width
+ and height which is
+ wrong when width != maskWidth or heigh != maskHeight. Fixes #12668.
+
+ poppler/CairoOutputDev.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 3156d560c5eaf6970da422d0b09fd2e95bfe6d1d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Oct 5 11:34:01 2007 +0200
+
+ Fix a crash when Form Fields array contains references
+ to non existent objects. Fixes bug #11865
+
+ poppler/Form.cc | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit f0b5e6286e94c6153c8247b5fae63a18622c48d3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Oct 4 15:22:01 2007 +0200
+
+ Do not return unknown field type for signature form fields
+
+ glib/poppler-form-field.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 498fd7fb99b01a879d07e2ad12c0b9462a8fc438
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Oct 4 12:36:39 2007 +0200
+
+ Add poppler_page_render_for_printing() and
+ poppler_page_render_to_pixbuf_for_printing()
+
+ We were unconditionally passing printing=gFalse to displaySlice. With
+ these new
+ functions we can render to a pixbuf or cairo surface passing
+ printing=gTrue to
+ displaySlice.
+
+ glib/poppler-page.cc | 135
+ ++++++++++++++++++++++++++++++++++++++++----------
+ glib/poppler-page.h | 10 ++++
+ 2 files changed, 119 insertions(+), 26 deletions(-)
+
+commit 56af69787c78c2edbb69266e86a5a5b639ca6d3e
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Oct 3 23:02:25 2007 -0400
+
+ Error out if we can't find a .cidToUnicode for a known character
+ collection
+
+ This situation was caused by the fixes for bug #11413. I'm not sure
+ it's the best thing to do, but it seems better.
+
+ poppler/GfxFont.cc | 19 +++++++++++++++++++
+ 1 files changed, 19 insertions(+), 0 deletions(-)
+
+commit 3d0df46908379bce1d196b9dc41153b1adb5f725
+Author: Michael Wolf <maw@ximian.com>
+Date: Wed Oct 3 19:43:55 2007 +0200
+
+ Fix compile warning
+
+ glib/test-poppler-glib.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit aba29e12528025c2cc71bf46e02e76ac4db2b193
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Sep 28 21:01:50 2007 +0200
+
+ Add forms demo to glib poppler demo
+
+ glib/demo/Makefile.am | 2 +
+ glib/demo/forms.c | 489
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/forms.h | 31 +++
+ glib/demo/main.c | 8 +-
+ glib/demo/utils.c | 1 -
+ 5 files changed, 527 insertions(+), 4 deletions(-)
+
+commit d0c0f26d2c95232c216e3daa15e98a3aff14ac27
+Merge: 59d55f7 38d5bb1
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Tue Sep 25 03:33:52 2007 -0700
+
+ Merge branch 'master' of
+ ssh://kjk@git.freedesktop.org/git/poppler/poppler
+
+commit 38d5bb150a5fe883da1d4256463d1f796d201283
+Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)>
+Date: Tue Sep 25 16:13:51 2007 -0700
+
+ Silence deprecation warnings - annoying with msvc 2005.
+
+ makefile.vc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 59d55f7371bee81c9392fa2d4174ceffaacde471
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Tue Sep 25 01:21:19 2007 -0700
+
+ Fix misleading comment.
+
+ goo/GooTimer.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c36d8afc984795aca0a12a94ec7668092067db82
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Tue Sep 25 00:32:29 2007 -0700
+
+ Revert "replace extremely confusing 'a*(int)sizeof(foo)/sizeof(foo)
+ != a' which, due to type promotions, if a is int, is equivalent to
+ a < 0; fix problems revealed by the change"
+
+ This reverts commit 08bf7c1151d594d4c7d253a2c89f4f3a088ad8ec.
+
+ poppler/XRef.cc | 25 +++++++++++++++++++++----
+ 1 files changed, 21 insertions(+), 4 deletions(-)
+
+commit ff25e83abae1ca17e2e7dd6f20946026fca69fff
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Mon Sep 24 23:57:25 2007 -0700
+
+ Make perf-test compile on unix as well.
+
+ test/Makefile.am | 16 ++++++-
+ test/perf-test-preview-dummy.cc | 1 +
+ test/perf-test.cc | 104
+ ++++++++++++++++-----------------------
+ 3 files changed, 59 insertions(+), 62 deletions(-)
+
+commit 70f3bf42b3028d9a2e4aefdc2e1a458b3c77b0e7
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Mon Sep 24 21:26:54 2007 -0700
+
+ Let perf-test.cc manage lifetime of rendered bitmap.
+
+ test/perf-test-preview-win.cc | 7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+commit b622b252cba068a15eae77df5deb261dd98affaf
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Mon Sep 24 21:20:12 2007 -0700
+
+ Disable my_error for now - seems to corrupt memory.
+
+ test/perf-test.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit bde8c9669ca6b43cb6a664bd14df164a718041ea
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Mon Sep 24 21:08:58 2007 -0700
+
+ Con't copy the file unless COPY_FILE is defined.
+
+ test/perf-test.cc | 11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+commit bf9b46b012c64624818a2110af7c4b7e3b419728
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Mon Sep 24 20:13:54 2007 -0700
+
+ Respect -loadonly cmd-line arg.
+
+ test/perf-test.cc | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 2f664b654ca19135f0f8a0fe89872b9e0d526fa2
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Mon Sep 24 19:41:45 2007 -0700
+
+ Fix msvc debug build. Fix bitmap leak in perf-test.
+
+ makefile.vc | 6 ++++--
+ test/perf-test.cc | 1 +
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 05d41cd5aec39b4e3c8949445a9986e5ca8b50dd
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Mon Sep 24 08:10:37 2007 -0700
+
+ Use GooTimer instead of my own timer.
+
+ test/perf-test.cc | 98
+ ++++------------------------------------------------
+ 1 files changed, 8 insertions(+), 90 deletions(-)
+
+commit 05fbce5b6657e883ece9054c79576b25271a05a4
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Mon Sep 24 08:01:11 2007 -0700
+
+ Make GooTimer work for Windows/msvc build.
+
+ goo/GooTimer.cc | 69
+ +++++++++++++++++++++++++++++++++++++-----------------
+ goo/GooTimer.h | 28 +++++++++++++--------
+ poppler/Gfx.cc | 11 +-------
+ 3 files changed, 66 insertions(+), 42 deletions(-)
+
+commit 6347915085a487da08d39a859f4261fa812dab09
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Mon Sep 24 01:08:17 2007 -0700
+
+ Add Error.cc in msvc build and use setErrorFunction in perf-test.
+
+ makefile.vc | 3 +--
+ test/perf-test.cc | 10 +++++-----
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+commit ed01b3965c57ce2a4eabf9c46b5319ea627d3324
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Mon Sep 24 01:03:09 2007 -0700
+
+ Match declaration of setErrorFunction with its definition.
+
+ Also enable this code for Windows, since CDECL was what
+ was throwing msvc off.
+
+ poppler/Error.cc | 12 +++---------
+ 1 files changed, 3 insertions(+), 9 deletions(-)
+
+commit 71fb15f8bd131a13d8cf0f394fe601cfbb6e1772
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Mon Sep 24 00:38:29 2007 -0700
+
+ Even less compiler warnings.
+
+ poppler/CairoOutputDev.cc | 6 +++---
+ qt/poppler-page.cc | 3 +++
+ utils/HtmlOutputDev.cc | 10 ++++++----
+ 3 files changed, 12 insertions(+), 7 deletions(-)
+
+commit 7ba3f198a0651d2a7c91b7d9e10a5173dc3de0a3
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Mon Sep 24 00:32:37 2007 -0700
+
+ Even less compiler warnings.
+
+ qt/poppler-document.cc | 8 ++++++++
+ qt/poppler-private.h | 8 --------
+ qt4/src/poppler-document.cc | 10 ++++++++++
+ qt4/src/poppler-form.cc | 15 +++++++++++++++
+ qt4/src/poppler-private.h | 25 -------------------------
+ 5 files changed, 33 insertions(+), 33 deletions(-)
+
+commit ab1059f594cb9fccd8568ca2a535a363c7521daa
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Mon Sep 24 00:14:01 2007 -0700
+
+ Don't break aliasing.
+
+ poppler/GlobalParams.cc | 40 ++++++++++++++++++----------------------
+ 1 files changed, 18 insertions(+), 22 deletions(-)
+
+commit 71c47b30adf687a0bcece22834933267053360de
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Sun Sep 23 23:49:31 2007 -0700
+
+ Reduce compiler warnings.
+
+ poppler/JBIG2Stream.cc | 16 ++++++++++++----
+ 1 files changed, 12 insertions(+), 4 deletions(-)
+
+commit 8466d94929844c976bbad8bb7d1ea7f7f77cc196
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Sun Sep 23 23:34:52 2007 -0700
+
+ Reduce compiler warnings. Tabs to spaces.
+
+ fofi/FoFiType1C.cc | 30 +++++++++++++++---------------
+ 1 files changed, 15 insertions(+), 15 deletions(-)
+
+commit c53b8ccfba6fa4345086493f9e44212721c11d0a
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Sun Sep 23 23:23:34 2007 -0700
+
+ Reduce number of compiler warnings.
+
+ poppler/CharCodeToUnicode.cc | 2 +-
+ poppler/Gfx.cc | 6 ++----
+ poppler/PageLabelInfo.cc | 2 ++
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit abede2a06c5c9dc97b40479deda49621458f1171
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Sun Sep 23 23:03:36 2007 -0700
+
+ Reduce number of compiler warnings.
+
+ glib/poppler-action.cc | 1 -
+ glib/poppler-document.cc | 9 ++-------
+ glib/poppler-page.cc | 3 +--
+ qt/poppler-document.cc | 1 -
+ qt4/src/poppler-annotation.cc | 16 +++++++++++++---
+ 5 files changed, 16 insertions(+), 14 deletions(-)
+
+commit 60f5bcea4a920441e25ae11d677636242aabb2db
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Sun Sep 23 22:48:06 2007 -0700
+
+ Remove unused variables.
+
+ utils/pdftoppm.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3179eee44eb0afbc642675268b9a4abb16ccdde3
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Sun Sep 23 22:47:21 2007 -0700
+
+ Remove unused variables.
+
+ utils/HtmlOutputDev.cc | 23 -----------------------
+ 1 files changed, 0 insertions(+), 23 deletions(-)
+
+commit e9dc379190aa3166870d0b11a05ccc4e9dad2706
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Sun Sep 23 22:41:59 2007 -0700
+
+ Remove unused variables.
+
+ poppler/ArthurOutputDev.cc | 16 +++++-----------
+ 1 files changed, 5 insertions(+), 11 deletions(-)
+
+commit 08bf7c1151d594d4c7d253a2c89f4f3a088ad8ec
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Sun Sep 23 22:28:16 2007 -0700
+
+ replace extremely confusing 'a*(int)sizeof(foo)/sizeof(foo) != a'
+ which, due to type promotions, if a is int, is equivalent to a < 0;
+ fix problems revealed by the change
+
+ poppler/XRef.cc | 25 ++++---------------------
+ 1 files changed, 4 insertions(+), 21 deletions(-)
+
+commit 5a1f670a4d16affeed86cdf643ab22f481caa3a5
+Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)>
+Date: Sun Sep 23 20:42:59 2007 -0700
+
+ ignore *.o files
+
+ .gitignore | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit c156aed7234f82dea4cb384c1b8a7acdd34545be
+Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)>
+Date: Sun Sep 23 20:41:19 2007 -0700
+
+ remove unused variables
+
+ poppler/ABWOutputDev.cc | 10 ++--------
+ 1 files changed, 2 insertions(+), 8 deletions(-)
+
+commit d0bdef4752be5fa609a0766ee87aa54d51611d9a
+Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)>
+Date: Sat Sep 22 13:38:03 2007 -0700
+
+ undo accidental changes to file permissions
+
+ 0 files changed, 0 insertions(+), 0 deletions(-)
+
+commit 6c69473f2f4a49757614ddd249e65bb7a13c63c1
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Fri Sep 21 08:09:53 2007 -0700
+
+ undo accidental mode change
+
+ 0 files changed, 0 insertions(+), 0 deletions(-)
+
+commit e7e386e7ce8cb8eb8a7037ebdaa601524d332ae7
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Fri Sep 21 08:08:53 2007 -0700
+
+ more simplification by removing unneded code
+
+ makefile.vc | 2 +-
+ test/perf-test.cc | 60
+ ++++++++---------------------------------------------
+ 2 files changed, 10 insertions(+), 52 deletions(-)
+
+commit 3e10604637ec193269a3155985476d3b83dc7d62
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Fri Sep 21 07:48:38 2007 -0700
+
+ for portability use bool/true/false instead of BOOL/TRUE/FALSE
+
+ test/perf-test.cc | 176
+ ++++++++++++++++++++++++++---------------------------
+ 1 files changed, 86 insertions(+), 90 deletions(-)
+
+commit 634718936f2a95fac2a9d12fcea483b3d0ca8fa6
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Fri Sep 21 07:41:14 2007 -0700
+
+ simplify perf-test
+
+ test/perf-test-pdf-engine.h | 78
+ -----------------------------------------
+ test/perf-test-preview-win.cc | 5 +--
+ test/perf-test.cc | 75
+ ++++++++++++++++++++++++++++++++++++++-
+ 3 files changed, 75 insertions(+), 83 deletions(-)
+
+commit 617550199762fab42ca2e202e641e047b3efbac0
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Fri Sep 21 05:20:16 2007 -0700
+
+ simplify perf-test code
+
+ test/perf-test-pdf-engine.h | 67 +++--------------------
+ test/perf-test-preview-dummy.cc | 3 +-
+ test/perf-test-preview-win.cc | 80 +++++++++++++++++++++++----
+ test/perf-test.cc | 114
+ +++-----------------------------------
+ 4 files changed, 86 insertions(+), 178 deletions(-)
+
+commit fb5bf808b88992c1772a10e4ed9fe788fb618417
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Fri Sep 21 03:03:26 2007 -0700
+
+ more msvc build fixes
+
+ makefile.vc | 2 +-
+ test/perf-test.cc | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 60829b08a7440f36014f68ec54bee7a742412738
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Fri Sep 21 03:02:34 2007 -0700
+
+ msvc build fixes
+
+ msvc/poppler/poppler-config.h | 143
+ +++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 143 insertions(+), 0 deletions(-)
+
+commit 853c22a174bae81139edc9aeded7f26ae2655cef
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Thu Sep 20 23:21:35 2007 -0700
+
+ add pre-made config.h for msvc build
+
+ msvc/config.h | 62
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 62 insertions(+), 0 deletions(-)
+
+commit 31c43b118bd4372134018be6f6693f77d1f6a39b
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Thu Sep 20 22:10:09 2007 -0700
+
+ remove unused variables
+
+ poppler/CairoFontEngine.cc | 6 ++----
+ poppler/CairoOutputDev.cc | 14 ++------------
+ splash/SplashFTFontEngine.cc | 2 ++
+ 3 files changed, 6 insertions(+), 16 deletions(-)
+
+commit 01b99f60e36dd955817f23911ef38947360f61f7
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Thu Sep 20 21:14:17 2007 -0700
+
+ remove unused variables
+
+ poppler/GfxState.cc | 11 ++---------
+ poppler/SplashOutputDev.cc | 9 +++------
+ poppler/TextOutputDev.cc | 3 ---
+ 3 files changed, 5 insertions(+), 18 deletions(-)
+
+commit 7c406400532d68524a43cf963d894d3c4b269400
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Thu Sep 20 20:57:44 2007 -0700
+
+ remove unused variables
+
+ poppler/Catalog.cc | 1 -
+ poppler/Form.cc | 5 -----
+ poppler/GfxFont.cc | 6 ++----
+ poppler/Page.cc | 2 +-
+ splash/Splash.cc | 5 ++++-
+ 5 files changed, 7 insertions(+), 12 deletions(-)
+
+commit 70f23389c97b1870b7311d97322cdd16b580a79d
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Thu Sep 20 20:23:59 2007 -0700
+
+ don't silence warnings about unused variables/functions to keep
+ programmers honest
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit cdb6fcf98137473efd993e1374a6f010e9db67db
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Thu Sep 20 20:00:56 2007 -0700
+
+ Remove unused variables
+
+ poppler/Annot.cc | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+commit 0e76b49ac852a5a7ebae4c1f67b153e0b7c9f905
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Tue Sep 18 01:04:50 2007 -0700
+
+ Explain how to compile on Windows using msvc makefile.
+
+ README.windows | 63
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 63 insertions(+), 0 deletions(-)
+
+commit c002b4dc75b2688ffe8a734cf3e15f5891797842
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Tue Sep 18 00:04:47 2007 -0700
+
+ Add Windows/msvc makefile.
+
+ Add native msvc windows makefile and pre-made
+ config.h for windows in msvc directory.
+
+ makefile.vc | 149
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 149 insertions(+), 0 deletions(-)
+
+commit 1f33fc58201c92120c587189d2e0e819f83167da
+Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
+Date: Mon Sep 17 23:53:02 2007 -0700
+
+ Start on a test program.
+
+ Test program can be used for regression testing and
+ performance testing. It renders a page (or pages)
+ in a given PDF (or PDFs) and records rendering times.
+ For historical reasons the code is ugly and probably
+ only compiles on windows, but it'll get better.
+
+ test/perf-test-pdf-engine.h | 131 ++++
+ test/perf-test-preview-dummy.cc | 22 +
+ test/perf-test-preview-win.cc | 222 ++++++
+ test/perf-test.cc | 1428
+ +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 1803 insertions(+), 0 deletions(-)
+
+commit b96db4ad27535c2666fccdfe0a3c04cc7c37792d
+Author: Jeff Muizelaar <jeff@freiheit.infidigm.net>
+Date: Mon Sep 17 20:28:38 2007 -0400
+
+ Avoid double free caused by 302 merge
+
+ The ownership of the the string returned by getKey() changed with
+ the 302 merge
+ but this code was not updated. Found by Matthew Woehlke.
+
+ qt4/src/poppler-document.cc | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+commit 2a495f19d4465e15fd2fa96656d904315c79a443
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Sep 17 16:52:45 2007 -0400
+
+ Simplify ChangeLog rule a bit.
+
+ ChangeLog.mk | 81
+ ----------------------------------------------------------
+ Makefile.am | 7 +++--
+ 2 files changed, 4 insertions(+), 84 deletions(-)
+
+commit 7d5abbeec55e4b90b139671d96cfdf58bdab70b8
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Sep 17 15:45:26 2007 -0400
+
+ Add dist hook to generate ChangeLog.
+
+ Taken from cairo. It still need some tweaking.
+
+ ChangeLog.mk | 81
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ Makefile.am | 4 +++
+ configure.ac | 2 +-
+ 3 files changed, 86 insertions(+), 1 deletions(-)
+
+commit 15ad81c64cd8b1cb438d41be402daa19a239db3d
+Author: Albert Astals Cid <tsdgeos@bluebox.localdomain>
+Date: Mon Sep 17 19:39:29 2007 +0200
+
+ Use = instead of == in qt.m4
+
+ m4/qt.m4 | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 70fabcb96e207b9b889bb32c0cf5ea3fc0aa08f8
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun Sep 16 20:40:53 2007 -0400
+
+ Rename .cvsignore files to .gitignore and drop ChangeLog file.
+
+ .cvsignore | 25 -
+ .gitignore | 25 +
+ ChangeLog | 4586
+ ---------------------------------------------
+ fofi/.cvsignore | 8 -
+ fofi/.gitignore | 8 +
+ glib/.cvsignore | 11 -
+ glib/.gitignore | 11 +
+ glib/reference/.cvsignore | 18 -
+ glib/reference/.gitignore | 18 +
+ goo/.cvsignore | 8 -
+ goo/.gitignore | 8 +
+ poppler/.cvsignore | 10 -
+ poppler/.gitignore | 10 +
+ qt/.cvsignore | 7 -
+ qt/.gitignore | 7 +
+ qt4/.cvsignore | 3 -
+ qt4/.gitignore | 3 +
+ qt4/src/.cvsignore | 8 -
+ qt4/src/.gitignore | 8 +
+ qt4/tests/.cvsignore | 20 -
+ qt4/tests/.gitignore | 20 +
+ splash/.cvsignore | 8 -
+ splash/.gitignore | 8 +
+ test/.cvsignore | 11 -
+ test/.gitignore | 11 +
+ utils/.cvsignore | 12 -
+ utils/.gitignore | 12 +
+ 27 files changed, 149 insertions(+), 4735 deletions(-)
+
+commit c9f9403ffc5b95ae790c3c81284c7786afe33f4d
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Fri Sep 14 20:50:07 2007 +0000
+
+ Windows implementation for matching fonts that doesn't use fontconfig
+
+ ChangeLog | 6 +
+ poppler/GlobalParamsWin.cc | 285
+ ++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 291 insertions(+), 0 deletions(-)
+
+commit d18b5361a0504458da805ed6be037c9d648f9372
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Fri Sep 14 20:47:11 2007 +0000
+
+ Update ChangeLog for previous checkin
+
+ ChangeLog | 15 +++++++++++++++
+ 1 files changed, 15 insertions(+), 0 deletions(-)
+
+commit 3330763ddca66b30d5ee60aab94d6fe0bbae9c8f
+Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+Date: Fri Sep 14 06:17:35 2007 +0000
+
+ windows/msvc compilation fixes
+
+ poppler/DCTStream.h | 2 +-
+ poppler/Error.cc | 6 ++++++
+ poppler/FlateStream.h | 2 +-
+ poppler/GlobalParams.cc | 12 ++++++++++--
+ poppler/GlobalParams.h | 17 +++++++++++++++++
+ poppler/Stream.cc | 2 +-
+ splash/SplashFTFontEngine.cc | 2 ++
+ splash/SplashFontEngine.cc | 2 +-
+ splash/SplashFontFile.cc | 2 ++
+ splash/SplashFontFile.h | 3 ++-
+ splash/SplashT1FontEngine.cc | 2 +-
+ 11 files changed, 44 insertions(+), 8 deletions(-)
+
+commit 6eb159ef34eb7e2fb8adcfc48afd84d5f50efbbd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 10 17:38:05 2007 +0000
+
+ * autogen.sh: Support automake-1.10.
+ Patch by Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+
+ ChangeLog | 5 +++++
+ autogen.sh | 11 ++++++-----
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+commit 31bbc8c727cfecc79bd8da962ad8d99a0d1d3d33
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 8 10:40:17 2007 +0000
+
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-ps-converter.cc:
+ Add PSConverter::setOutputDevice() to set a QIODevice where
+ writing the resulting PS.
+
+ ChangeLog | 7 +++++
+ qt4/src/poppler-ps-converter.cc | 51
+ +++++++++++++++++++++++++++++++++++---
+ qt4/src/poppler-qt4.h | 5 +++-
+ 3 files changed, 58 insertions(+), 5 deletions(-)
+
+commit b3d63d03c310f01cc5b23d00ffd2103c6891fef2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 5 20:22:32 2007 +0000
+
+ * qt4/src/poppler-ps-converter.cc: Fix Right<->Left
+ interchange
+
+ ChangeLog | 1 +
+ qt4/src/poppler-ps-converter.cc | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 64368582d5ca4e28c236f440482c96f1dd3a8897
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 5 18:22:52 2007 +0000
+
+ * poppler/PSOutputDev.cc: Fix printing of second parameter
+
+ ChangeLog | 4 ++++
+ poppler/PSOutputDev.cc | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit eaf9d06cf0d08ccdc183759e0331dc2439a6f10f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Sep 5 10:57:09 2007 +0000
+
+ 2007-09-05 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-page.cc:
+ * glib/demo/render.c: Fix build with --disable-cairo-output.
+
+ ChangeLog | 5 +++++
+ glib/demo/render.c | 31 +++++++++++++++++++++++++++----
+ glib/poppler-page.cc | 22 ++++++++++++----------
+ 3 files changed, 44 insertions(+), 14 deletions(-)
+
+commit c0f488c2b0e115be3e1b7e4dc7baa38db5837498
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 4 22:04:52 2007 +0000
+
+ did not want to commit this
+
+ gtk-doc.make | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3462851b4ea342651095f1803cd488bc3b3f5749
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 4 22:02:06 2007 +0000
+
+ * utils/pdftoppm.cc: Fix build on Sun Studio compiler.
+ Patch by Brian Cameron <brian.cameron@sun.com>
+
+ ChangeLog | 5 +++++
+ gtk-doc.make | 2 +-
+ utils/pdftoppm.cc | 2 +-
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+commit cdf3b9062cc54d558b8dbeefb3211a920ff2cb94
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 3 19:23:11 2007 +0000
+
+ write news
+ fix qt4 build
+
+ NEWS | 13 +++++++++++++
+ qt4/src/Makefile.am | 3 ++-
+ 2 files changed, 15 insertions(+), 1 deletions(-)
+
+commit c82208a44f3b09c27bc33831641e4f746dd4361f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 3 18:28:44 2007 +0000
+
+ * configure.ac: Bump version to 0.6
+ * glib/Makefile.am
+ * poppler/Makefile.am
+ * qt/Makefile.am
+ * qt4/src/Makefile.am: Bump sonames
+
+ ChangeLog | 8 ++++++++
+ configure.ac | 2 +-
+ glib/Makefile.am | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt/Makefile.am | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ 6 files changed, 13 insertions(+), 5 deletions(-)
+
+commit 2a12409ebbf96ea3ca4556b71231a45ae37cb052
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 3 17:09:01 2007 +0000
+
+ * poppler/JBIG2Stream.cc:
+ * poppler/Stream.cc: Patch by Derek B. Noonburg
+ <derekn@foolabs.com>
+ to fix some errors in CCITTFaxStream and JBIG2Stream.cc
+
+ ChangeLog | 6 ++++++
+ poppler/JBIG2Stream.cc | 7 ++++---
+ poppler/Stream.cc | 2 +-
+ 3 files changed, 11 insertions(+), 4 deletions(-)
+
+commit 0b483e71ef02b4040b665935c1018c8b30b9c1ca
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Sep 3 08:54:01 2007 +0000
+
+ 2007-09-03 Carlos Garcia Campos <carlosgc@gnome.org>
+ * gtk-doc.make:
+ * glib/poppler-document.cc:
+ * glib/poppler-form-field.cc:
+ * glib/poppler-page.cc:
+ * glib/reference/poppler-docs.sgml:
+ * glib/reference/poppler-sections.txt:
+ * glib/reference/poppler.types:
+ * glib/reference/tmpl/poppler-action.sgml:
+ * glib/reference/tmpl/poppler-attachment.sgml:
+ * glib/reference/tmpl/poppler-document.sgml:
+ * glib/reference/tmpl/poppler-enums.sgml:
+ * glib/reference/tmpl/poppler-form-field.sgml:
+ * glib/reference/tmpl/poppler-page.sgml:
+ * glib/reference/tmpl/poppler-private.sgml:
+ * glib/reference/tmpl/poppler.sgml: Update glib bindings API
+ documentation.
+
+ ChangeLog | 19 ++
+ glib/poppler-document.cc | 10 +
+ glib/poppler-form-field.cc | 205 +++++++++++++++++
+ glib/poppler-page.cc | 12 +-
+ glib/reference/poppler-docs.sgml | 2 +
+ glib/reference/poppler-sections.txt | 108 +++++++++-
+ glib/reference/poppler.types | 2 +
+ glib/reference/tmpl/poppler-action.sgml | 36 +++-
+ glib/reference/tmpl/poppler-attachment.sgml | 65 ++++++
+ glib/reference/tmpl/poppler-document.sgml | 50 +++++
+ glib/reference/tmpl/poppler-enums.sgml | 60 +++++
+ glib/reference/tmpl/poppler-form-field.sgml | 315
+ +++++++++++++++++++++++++++
+ glib/reference/tmpl/poppler-page.sgml | 236 ++++++++++++++++++++-
+ glib/reference/tmpl/poppler-private.sgml | 6 +
+ glib/reference/tmpl/poppler.sgml | 49 ++++
+ gtk-doc.make | 34 ++--
+ 16 files changed, 1181 insertions(+), 28 deletions(-)
+
+commit 289e3893cda45055951bb8d3b82a45644bc0b6c6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 2 17:02:55 2007 +0000
+
+ * poppler/GfxState.cc: Pad zeroes instead of aborting when
+ rendering
+ 1-bit images and the stream is "too short" to mimic
+ Acroread and
+ ghostscript behaviour. Patch by <darren.kenny@sun.com>. Fixes
+ #12208
+
+ ChangeLog | 3 +++
+ poppler/GfxState.cc | 4 ++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 6f6c2180aca2e26ea0e3c2f21f11bc8f457c19c0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 2 16:31:19 2007 +0000
+
+ * glib/demo/Makefile.am: Add
+ $(top_builddir)/poppler/libpoppler.la
+ * poppler/TextOutputDev.cc: Patch from Ed Catmur
+ <ed@catmur.co.uk> to
+ improve matching of half strings of decomposed
+ characters/ligatures.
+
+ ChangeLog | 3 +++
+ glib/demo/Makefile.am | 1 +
+ poppler/TextOutputDev.cc | 21 +++++++++++++--------
+ 3 files changed, 17 insertions(+), 8 deletions(-)
+
+commit be1b5a0196cdfc78f74e08a023b477cac16eb0f3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 2 16:06:03 2007 +0000
+
+ poppler/PDFDoc.cc: Don't enforce %%EOF at the end of file
+
+ ChangeLog | 4 ++++
+ poppler/PDFDoc.cc | 3 ++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 500a87af9240344806c18ebbd05a89f4f4c69955
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Sep 2 00:53:42 2007 +0000
+
+ 2007-09-01 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/Error.cc:
+ * poppler/Error.h: Report any cairo errors when destroying
+ the cairo
+ context.
+
+ ChangeLog | 7 +++++++
+ poppler/CairoOutputDev.cc | 7 ++++++-
+ poppler/Error.cc | 7 +++++++
+ poppler/Error.h | 1 +
+ 4 files changed, 21 insertions(+), 1 deletions(-)
+
+commit 0c22556bf70ff67eb388cdcd9784603030397785
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Sep 1 23:38:04 2007 +0000
+
+ 2007-09-01 Jeff Muizelaar <jeff@infidigm.net>
+
+ * glib/demo/Makefile.am: Only build the demo app if the cflags
+ will be
+ appropriately set.
+
+ ChangeLog | 5 +++++
+ glib/demo/Makefile.am | 2 ++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit a23d45dd6cd8a2ac4181170a9ee924fe49a9781b
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Sep 1 23:00:59 2007 +0000
+
+ 2007-09-01 Jeff Muizelaar <jeff@infidigm.net>
+
+ * glib/poppler-page.cc: Add note about clipping
+
+ ChangeLog | 4 ++++
+ glib/poppler-page.cc | 2 ++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit bf489d5cebc467807f2b38f74f6a6e34a503a9ca
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Aug 30 18:39:51 2007 +0000
+
+ * poppler/Form.h: Remove unused methods. Fixes 12013
+
+ ChangeLog | 4 ++++
+ poppler/Form.h | 3 ---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+commit a81cc06c855385911dffa826b9e1407d6097e8c8
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Aug 30 18:15:34 2007 +0000
+
+ 2007-08-30 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/TextOutputDev.cc:
+ * poppler/TextOutputDev.h:
+ * glib/poppler.h:
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/test-poppler-glib.c: Add support for word and line
+ selections. Based on patch by Kristian Høgsberg.
+
+ ChangeLog | 10 ++++++
+ glib/poppler-page.cc | 81
+ ++++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-page.h | 2 +
+ glib/poppler.h | 4 +-
+ glib/test-poppler-glib.c | 2 +-
+ poppler/TextOutputDev.cc | 74
+ +++++++++++++++++++++++++++++-------------
+ poppler/TextOutputDev.h | 34 +++++++++++++++----
+ 7 files changed, 163 insertions(+), 44 deletions(-)
+
+commit 59ddb5cc8bec54305b6d256ad9975e95ecdcb935
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 27 18:37:55 2007 +0000
+
+ * poppler/UnicodeTypeTable.cc: Fix error on the NFKC text
+ matching
+ routine. Fixes bug #11775. Patch by Ed Catmur
+ <ed@catmur.co.uk>
+
+ ChangeLog | 5 +++++
+ poppler/UnicodeTypeTable.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit a6e46ce61670679f368e66c1a98a7d5d1c960c5b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 27 17:56:29 2007 +0000
+
+ * qt4/src/Doxyfile:
+ * qt4/src/Mainpage.dox:
+ * qt4/src/poppler-annotation.h:
+ * qt4/src/poppler-form.h:
+ * qt4/src/poppler-link.h:
+ * qt4/src/poppler-qt4.h:
+ A few API documentation fixes and improvements.
+
+ ChangeLog | 10 ++++++
+ qt4/src/Doxyfile | 26 +++++------------
+ qt4/src/Mainpage.dox | 26 ++++++++++------
+ qt4/src/poppler-annotation.h | 34 ++++++++++++++++++++++
+ qt4/src/poppler-form.h | 18 ++++++------
+ qt4/src/poppler-link.h | 63
+ +++++++++++++++++++++++++++++++++++++++--
+ qt4/src/poppler-qt4.h | 44 ++++++++++++++++++++---------
+ 7 files changed, 166 insertions(+), 55 deletions(-)
+
+commit a7f8d92fba8c45d6ca83568c045d5e324158ee6b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 27 17:17:14 2007 +0000
+
+ * qt4/src/poppler-link.cc:
+ * qt4/src/poppler-link.h:
+ Initialise correctly, and missing empty destructor.
+ * qt4/src/poppler-annotation.cc:
+ Don't leak the private class.
+
+ ChangeLog | 9 +++++++++
+ qt4/src/poppler-annotation.cc | 4 ++--
+ qt4/src/poppler-link.cc | 8 ++++++--
+ qt4/src/poppler-link.h | 1 +
+ 4 files changed, 18 insertions(+), 4 deletions(-)
+
+commit 2b1ef8f06879eb0b79288d57540c238ea833db24
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 26 21:39:22 2007 +0000
+
+ Fix bug 12121
+
+ ChangeLog | 4 ++++
+ utils/ImageOutputDev.cc | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 20bcac5ee1988befb9c590a0d16cb615f0c49901
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 26 21:28:34 2007 +0000
+
+ forgot to cvs add
+
+ qt4/src/poppler-annotation-private.h | 49
+ ++++++++++++++++++++++++++++++++++
+ 1 files changed, 49 insertions(+), 0 deletions(-)
+
+commit e48de657db0ef439457b4b5ca39b937da25d531e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 26 18:11:01 2007 +0000
+
+ * qt4/src/poppler-annotation.cc:
+ * qt4/src/poppler-annotation.h:
+ Move all the private members of the *Annotation classes into
+ a common
+ shared private.
+
+ ChangeLog | 4 +
+ qt4/src/poppler-annotation.cc | 969
+ ++++++++++++++++++++++++++++++++++-------
+ qt4/src/poppler-annotation.h | 277 ++++++++----
+ qt4/src/poppler-page.cc | 249 +++++++----
+ 4 files changed, 1155 insertions(+), 344 deletions(-)
+
+commit 392f050f909b6a1250acf1971446a1849534482c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 26 16:42:46 2007 +0000
+
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-embeddedfile.cc:
+ * qt4/src/poppler-fontinfo.cc:
+ * qt4/src/poppler-form.cc:
+ * qt4/src/poppler-form.h:
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-sound.cc:
+ * qt4/src/poppler-textbox.cc:
+ API work: remove 'const' and 'const&' from return values
+ with Qt
+ classes; make the non-copiable classes really non-copiable;
+ uninline a Document::page() method; other related small
+ changes.
+ * qt4/src/poppler-link.cc:
+ * qt4/src/poppler-link.h:
+ Make LinkDestination an implicitely shared class, with all
+ the private
+ members into the private class; move all the private members
+ of the
+ Link* classes into a common shared private.
+
+ ChangeLog | 23 +++-
+ qt4/src/poppler-document.cc | 7 +-
+ qt4/src/poppler-embeddedfile.cc | 12 --
+ qt4/src/poppler-fontinfo.cc | 12 +-
+ qt4/src/poppler-form.cc | 16 +-
+ qt4/src/poppler-form.h | 14 +-
+ qt4/src/poppler-link.cc | 373
+ ++++++++++++++++++++++++++++++---------
+ qt4/src/poppler-link.h | 67 +++++---
+ qt4/src/poppler-qt4.h | 32 +++--
+ qt4/src/poppler-sound.cc | 7 -
+ qt4/src/poppler-textbox.cc | 4 +-
+ 11 files changed, 404 insertions(+), 163 deletions(-)
+
+commit f215aca25fdd8fe287b717dde53f0be273d995e4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun Aug 26 10:52:19 2007 +0000
+
+ 2007-08-26 Carlos Garcia Campos <carlosgc@gnome.org>
+ * configure.ac:
+ * glib/Makefile.am:
+ * glib/demo/Makefile.am:
+ * glib/demo/fonts.[ch]:
+ * glib/demo/info.[ch]:
+ * glib/demo/links.[ch]:
+ * glib/demo/main.c:
+ * glib/demo/outline.[ch]:
+ * glib/demo/page.[ch]:
+ * glib/demo/render.[ch]:
+ * glib/demo/utils.[ch]: Add poppler glib demo tool.
+
+ ChangeLog | 14 ++
+ configure.ac | 1 +
+ glib/Makefile.am | 2 +-
+ glib/demo/Makefile.am | 26 +++
+ glib/demo/fonts.c | 276 +++++++++++++++++++++++++++
+ glib/demo/fonts.h | 31 +++
+ glib/demo/info.c | 243 ++++++++++++++++++++++++
+ glib/demo/info.h | 31 +++
+ glib/demo/links.c | 289 ++++++++++++++++++++++++++++
+ glib/demo/links.h | 31 +++
+ glib/demo/main.c | 205 ++++++++++++++++++++
+ glib/demo/outline.c | 218 +++++++++++++++++++++
+ glib/demo/outline.h | 31 +++
+ glib/demo/page.c | 249 ++++++++++++++++++++++++
+ glib/demo/page.h | 31 +++
+ glib/demo/render.c | 498
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/render.h | 31 +++
+ glib/demo/utils.c | 234 +++++++++++++++++++++++
+ glib/demo/utils.h | 42 ++++
+ 19 files changed, 2482 insertions(+), 1 deletions(-)
+
+commit 7c9529b70dc44bb001d21a3b47fc65916813dec1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Aug 23 20:39:31 2007 +0000
+
+ 2007-08-23 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-page.cc: Add missing comma.
+
+ ChangeLog | 4 ++++
+ glib/poppler-page.cc | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 3c4a85503261ee81a829a1683f1f5fa85d41f8ee
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Aug 23 20:15:46 2007 +0000
+
+ 2007-08-23 Jeff Muizelaar <jeff@infidigm.net>
+
+ * glib/poppler-page.cc: pass in -1 to displaySlice so that it
+ sets up
+ the slice size for us. This fixes the case of the wrong values
+ being
+ used when the pdf was rotated on its side.
+ Fixes #11913.
+
+ ChangeLog | 7 +++++++
+ glib/poppler-page.cc | 5 ++---
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 3ba088d8caee3c40c2aba0cd85adcf9195ae88a3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Aug 22 21:29:32 2007 +0000
+
+ * splash/SplashBitmap.cc:
+ * splash/SplashBitmap.h:
+ * utils/pdftoppm.cc: Add the following features to pdftoppm
+ - if omitting input filename or using - for input filename
+ reads pdf from stdin
+ - if omitting output filename, prints output to stdout
+ - create image of a cropped rectangle of the pdf
+ - scale pdf to fit in a square of wanted size
+ Patch by Ilmari Heikkinen <ilmari.heikkinen@gmail.com>
+
+ ChangeLog | 12 +++++
+ splash/SplashBitmap.cc | 18 ++++++--
+ splash/SplashBitmap.h | 2 +
+ utils/pdftoppm.cc | 107
+ ++++++++++++++++++++++++++++++++++++++++-------
+ 4 files changed, 119 insertions(+), 20 deletions(-)
+
+commit 567e82c13aace4f40c7a555a62a3a4d223a46d92
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Aug 22 19:34:02 2007 +0000
+
+ 2007-08-22 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/GlobalParams.cc: Fix debug spew. Patch from Matthias
+ Clasen.
+
+ ChangeLog | 4 ++++
+ poppler/GlobalParams.cc | 1 -
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit bc499987074d046baf29deafe4a29d57039c0c5e
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Aug 22 19:28:24 2007 +0000
+
+ 2007-08-22 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Fix the computation of the padding
+ in the
+ image scaling code.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+commit d9719233447cb4f85f2bf9d9ec6ef089caa21140
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Aug 19 16:20:21 2007 +0000
+
+ 2007-08-19 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Avoid allocating the glyph array if
+ currentFont is not set in beginString. This closes a possible
+ memory leak.
+
+ ChangeLog | 6 ++++++
+ poppler/CairoOutputDev.cc | 3 +++
+ 2 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 099eb56896046e020f4ef0365e1ee382f85ec1ab
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Aug 15 18:52:20 2007 +0000
+
+ * poppler/JBIG2Stream.cc: Quick fix for bug #12014
+
+ ChangeLog | 4 ++++
+ poppler/JBIG2Stream.cc | 16 +++++++++++-----
+ 2 files changed, 15 insertions(+), 5 deletions(-)
+
+commit 3b7e3645c85c7a3d341457f105835b58c935bd67
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Aug 15 00:04:48 2007 +0000
+
+ RC2 is out! (0.5.91)
+
+ ChangeLog | 1 +
+ NEWS | 18 ++++++++++++++++++
+ configure.ac | 2 +-
+ 3 files changed, 20 insertions(+), 1 deletions(-)
+
+commit c240daefe660ac3456dc0c5f5dc82aa53ebc3313
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 14 23:10:37 2007 +0000
+
+ * poppler/Stream.cc: Fix CVE-2007-3387 by merging xpdf-3.02pl1.patch
+
+ ChangeLog | 1 +
+ poppler/Stream.cc | 12 +++++-------
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+commit 1ba884b6b98ac8d755c9adc9f23a7a68d8b17b54
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 14 22:47:30 2007 +0000
+
+ * configure.ac:
+ * pòppler/Makefile.am: Patch by Vincent Torri
+ <vtorri@univ-evry.fr> to
+ fix linking under MinGW
+
+ ChangeLog | 6 ++++++
+ configure.ac | 13 +++++++++++++
+ poppler/Makefile.am | 5 +++--
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+commit 3c31f923fcf1aeb361910eb1e9445cc28aa5b3ca
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Aug 7 16:22:12 2007 +0000
+
+ 2007-08-07 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Don't use the prescaleMethod
+ when we have a rotation as that case has not been tested.
+ Also make sure that scaledHeight is at least 1.
+
+ ChangeLog | 6 ++++++
+ poppler/CairoOutputDev.cc | 7 ++++++-
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+commit af97e5f8e0f3beeb43acde92a0788c02d9718adf
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Aug 6 17:41:17 2007 +0000
+
+ 2007-08-06 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/Annot.cc:
+ * poppler/Annot.h:
+ * poppler/Form.cc:
+ * poppler/Form.h:
+ * poppler/Page.cc: Do not always regenerate appearance stream for
+ every form widget, but only when it's actually needed.
+
+ ChangeLog | 9 +++++
+ poppler/Annot.cc | 86
+ ++++++++++++++++++++++++++++++++---------------------
+ poppler/Annot.h | 8 ++--
+ poppler/Form.cc | 25 ++-------------
+ poppler/Form.h | 4 ++-
+ poppler/Page.cc | 8 +----
+ 6 files changed, 74 insertions(+), 66 deletions(-)
+
+commit 74627e71388ca0a4c0938a472c291ef87186f370
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Jul 31 21:40:19 2007 +0000
+
+ 2007-07-31 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/GlobalParams.cc: s/GList/GooList/ some Windows code.
+
+ ChangeLog | 4 ++++
+ poppler/GlobalParams.cc | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+commit f421e2151345ac855b75e819e19343a90789b3bf
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Jul 31 16:50:06 2007 +0000
+
+ 2007-07-31 Jeff Muizelaar <jeff@infidigm.net>
+
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h: Add poppler_fonts_iter_get_file_name.
+
+ ChangeLog | 5 +++++
+ glib/poppler-document.cc | 16 ++++++++++++++++
+ glib/poppler-document.h | 1 +
+ 3 files changed, 22 insertions(+), 0 deletions(-)
+
+commit 4d57b8a12b845d5d5ac321d7a4bca980d60d429f
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Jul 31 16:48:35 2007 +0000
+
+ 2007-07-31 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.h: Add comment about
+ CairoImageOutputDevice's
+ implementation.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.h | 1 +
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit f04a67006abdb5843ab481aa1e25b51abd1b1b64
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 31 11:41:53 2007 +0000
+
+ 2007-07-31 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/Form.cc:
+ * poppler/Form.h: Fix memory leak.
+
+ ChangeLog | 5 +++++
+ poppler/Form.cc | 9 +++++----
+ poppler/Form.h | 4 ++--
+ 3 files changed, 12 insertions(+), 6 deletions(-)
+
+commit ee9d556a8b413160911a535a0e9089b919ca29f5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 31 11:40:22 2007 +0000
+
+ 2007-07-31 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/CairoOutputDev.h: Empty implementation of transparency
+ groups and soft masks in CairoImageOutputDev. Fixes a crash in
+ poppler_page_get_image_mapping.
+
+ ChangeLog | 6 ++++++
+ poppler/CairoOutputDev.h | 11 +++++++++++
+ 2 files changed, 17 insertions(+), 0 deletions(-)
+
+commit e08779856c801b9968dc2d47e28e86abc1ec7110
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Jul 31 05:29:57 2007 +0000
+
+ 2007-07-31 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/GfxFont.cc: Fix the case where the Encoding is
+ "Identity"
+ and ToUnicode exists. GfxCIDFont::getCodeToGIDMap makes
+ CIDTOGID map
+ from ToUnicde map, but when encoding is Identity, it should
+ not use
+ ToUnicode map to get GID. If encoding is Identity, No CIDTOGID
+ map is
+ needed.
+ Patch by Koji Otani.
+ Fixes #11413.
+
+ ChangeLog | 10 ++++++++++
+ poppler/GfxFont.cc | 1 +
+ 2 files changed, 11 insertions(+), 0 deletions(-)
+
+commit 86fc9a6f343be920f5159e745947401227e41a37
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon Jul 30 19:28:17 2007 +0000
+
+ 2007-07-30 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: Prescale image masks before giving
+ them
+ to cairo to improve the quality of the scaled image. Improves
+ #5589.
+
+ ChangeLog | 6 +
+ poppler/CairoOutputDev.cc | 300
+ +++++++++++++++++++++++++++++++++++++++++++--
+ poppler/CairoOutputDev.h | 10 ++-
+ 3 files changed, 303 insertions(+), 13 deletions(-)
+
+commit f754246e47161e9bf99887201e283c1419ade4f1
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon Jul 30 19:07:45 2007 +0000
+
+ 2007-07-30 Jeff Muizelaar <jeff@infidigm.net>
+
+ * configure.ac: Update require cairo version to 1.4
+
+ ChangeLog | 4 ++++
+ configure.ac | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit bb20249ac676995725b617ef442f5feb01f78205
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon Jul 30 18:44:41 2007 +0000
+
+ 2007-07-30 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: Add transparency group support.
+ Fixes #7856.
+
+ ChangeLog | 6 ++
+ poppler/CairoOutputDev.cc | 133
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 21 +++++++-
+ 3 files changed, 159 insertions(+), 1 deletions(-)
+
+commit a85acecaeb0d122becbc52a385d918561e995eca
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon Jul 30 00:22:35 2007 +0000
+
+ 2007-07-29 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: transform the original matrix for
+ type3 fonts
+ instead of using set_matrix()
+
+ ChangeLog | 6 ++++++
+ poppler/CairoOutputDev.cc | 20 +++++++++++++++++---
+ poppler/CairoOutputDev.h | 1 +
+ 3 files changed, 24 insertions(+), 3 deletions(-)
+
+commit a81a082169de32d01c36c969616a5c2279f1bac7
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon Jul 30 00:18:59 2007 +0000
+
+ 2007-07-29 Jeff Muizelaar <jeff@infidigm.net>
+
+ * glib/test-poppler-glib.c: include <time.h> to fix compilation.
+
+ ChangeLog | 4 ++++
+ glib/test-poppler-glib.c | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 81393cb30f6287caf5195265cdc039555f2767d3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jul 28 08:22:40 2007 +0000
+
+ 2007-07-28 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/Annot.cc:
+ * poppler/Annot.h:
+ * poppler/Form.cc:
+ * poppler/Form.h: Make fieldLookup static in Form and use it from
+ both Form and Annot.
+
+ ChangeLog | 8 ++++++
+ poppler/Annot.cc | 43 +++++++++-------------------------
+ poppler/Annot.h | 1 -
+ poppler/Form.cc | 66
+ ++++++++++++++++++++++++++---------------------------
+ poppler/Form.h | 2 +
+ 5 files changed, 54 insertions(+), 66 deletions(-)
+
+commit 81b669dcb14bf821a49c9879f8d4129075647f5f
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jul 28 08:05:11 2007 +0000
+
+ 2007-07-28 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-page.h: Remove unneeded declarations. Fixes bug
+ #11744. Patch by Kouhei Sutou <kou@cozmixng.org>.
+
+ ChangeLog | 5 +++++
+ glib/poppler-page.h | 2 --
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit f2c4e5305009f1da770c99d3e2e3371ff37c75f3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri Jul 27 09:17:40 2007 +0000
+
+ 2007-07-27 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ * glib/poppler-private.h:
+ * glib/test-poppler-glib.c: Make PopplerFontInfo GObject. Patch by
+ Kouhei Sutou <kou@cozmixng.org>.
+
+ ChangeLog | 8 ++++++++
+ glib/poppler-document.cc | 44
+ ++++++++++++++++++++++++++++++++++++++++----
+ glib/poppler-document.h | 6 +++++-
+ glib/poppler-private.h | 1 +
+ glib/test-poppler-glib.c | 2 +-
+ 5 files changed, 55 insertions(+), 6 deletions(-)
+
+commit 975c7cff10d9b00359e147329ae2c7a93f8a3833
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 25 17:20:06 2007 +0000
+
+ micro optimization
+
+ qt4/src/poppler-page.cc | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 525a7f49dd95f2644870a1c59ca15124e30026b4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 24 16:45:25 2007 +0000
+
+ 2007-07-24 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/Annot.cc:
+ * poppler/Form.cc: Several fixes in forms. Generate appearance for
+ field buttons that don't have an AP dict. Do not remove the first
+ character of the second and following lines in multiline text
+ fields. Fix a crash with pdf documents created by ooo which have
+ radio buttons. Look for some inheritable attributes in the
+ parent when needed.
+
+ ChangeLog | 10 +++++++
+ poppler/Annot.cc | 27 ++++++++++---------
+ poppler/Form.cc | 77
+ +++++++++++++++++++++++++++++++++++++----------------
+ 3 files changed, 78 insertions(+), 36 deletions(-)
+
+commit 633a1cde65f86ee6577a68f4f8d36de43d14c714
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 15 21:03:50 2007 +0000
+
+ * utils/HtmlOutputDev.cc:
+ * utils/HtmlOutputDev.h: Create the html files in the
+ correct place,
+ not in the invocation dir. Fixes bug #11610
+
+ ChangeLog | 6 ++++++
+ utils/HtmlOutputDev.cc | 37 ++++++++++---------------------------
+ utils/HtmlOutputDev.h | 4 ----
+ 3 files changed, 16 insertions(+), 31 deletions(-)
+
+commit ccb2d420ca8d818aa9ba1d64f08f5e94ab313a72
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 15 17:09:29 2007 +0000
+
+ * poppler/DCTStream.cc
+ * poppler/DCTStream.h: Implement less evil error handling. On
+ a
+ error_exit level error we don't want to actually exit the
+ program. See
+ http://bugs.kde.org/show_bug.cgi?id=147878 for a pdf with this
+ problem. libjpeg was printing "Bogus Huffman table definition"
+ and
+ exiting the program.
+ * poppler/Stream.cc: Remove bogus #warning
+
+ ChangeLog | 10 ++++++++++
+ poppler/DCTStream.cc | 17 ++++++++++++++++-
+ poppler/DCTStream.h | 1 +
+ poppler/Stream.cc | 1 -
+ 4 files changed, 27 insertions(+), 2 deletions(-)
+
+commit f9d82dfd299ae23a1baf3e35e2c3cd351129c525
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jul 14 18:23:42 2007 +0000
+
+ * utils/pdftops.cc: init width/height to -1 so it is
+ calculated if not
+ specified
+
+ ChangeLog | 5 +++++
+ utils/pdftops.cc | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 1c04136e9538ccfaa2d6b968861682ca3b69ffb3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jul 14 15:23:31 2007 +0000
+
+ 2007-07-14 Pino Toscano <pino@kde.org>
+ * glib/poppler-action.h:
+ * glib/poppler-document.h: Remove trailing comma from the last
+ item of enums.
+
+ ChangeLog | 6 ++++++
+ glib/poppler-action.h | 2 +-
+ glib/poppler-document.h | 8 ++++----
+ 3 files changed, 11 insertions(+), 5 deletions(-)
+
+commit b9b68cabce19a5e23911e5432ace8c13bd237391
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jul 14 15:15:57 2007 +0000
+
+ 2007-07-14 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-form-field.cc:
+ * glib/poppler-form-field.h:
+ * glib/test-poppler-glib.c: Make is_password a property instead of
+ a text form field type, since a text field could be multiline and
+ password at the same time.
+
+ ChangeLog | 8 ++++++++
+ glib/poppler-form-field.cc | 10 ++++++++--
+ glib/poppler-form-field.h | 2 +-
+ glib/test-poppler-glib.c | 4 ++--
+ 4 files changed, 19 insertions(+), 5 deletions(-)
+
+commit 14a8361039d708661b8699b2e7c4496135021a85
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 13 22:18:05 2007 +0000
+
+ * fofi/FoFiTrueType.cc
+ * fofi/FoFiTrueType.h
+ * poppler/CairoFontEngine.cc
+ * poppler/CharCodeToUnicode.cc
+ * poppler/CharCodeToUnicode.h
+ * poppler/GfxFont.cc
+ * poppler/GfxFont.h
+ * poppler/SplashOutputDev.cc: Patch by
+ Koji Otani <sho@bbr.jp> to fix several problems with
+ Japanese fonts.
+ Fixes bug 11413
+
+ ChangeLog | 13 ++
+ fofi/FoFiTrueType.cc | 305
+ ++++++++++++++++++++++++++++++++++++++++++
+ fofi/FoFiTrueType.h | 12 ++
+ poppler/CairoFontEngine.cc | 47 ++-----
+ poppler/CharCodeToUnicode.cc | 16 +++
+ poppler/CharCodeToUnicode.h | 1 +
+ poppler/GfxFont.cc | 232 ++++++++++++++++++++++++++++----
+ poppler/GfxFont.h | 2 +
+ poppler/SplashOutputDev.cc | 53 ++------
+ 9 files changed, 578 insertions(+), 103 deletions(-)
+
+commit 8389099d8e8940e3f8920b14a83075d69bcd8e6c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 13 18:21:02 2007 +0000
+
+ * poppler/FontInfo.cc: Fix the FontInfoScanner::scan method to
+ actually scan the number of requested pages
+
+ ChangeLog | 6 ++++++
+ poppler/FontInfo.cc | 12 ++++++------
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+commit 9ced4442372d08375e0ded62f79052d8a3ec9cd6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 13 18:08:44 2007 +0000
+
+ * poppler/GlobalParams.cc: Remove dead unused code from
+ Win32 ifdef
+
+ ChangeLog | 4 ++++
+ poppler/GlobalParams.cc | 6 ------
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+commit fb89fdb8de608ff94082e16819f042cddabf2bcc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 11 18:52:12 2007 +0000
+
+ * poppler/PSOutputDev.cc
+ * poppler/PSOutputDev.h
+ * utils/pdftohtml.cc: Fix bug 9746. pdftohtml complex mode
+ had text
+ twice
+
+ ChangeLog | 7 +++++++
+ poppler/PSOutputDev.cc | 5 +++++
+ poppler/PSOutputDev.h | 2 ++
+ utils/pdftohtml.cc | 3 +--
+ 4 files changed, 15 insertions(+), 2 deletions(-)
+
+commit 0c9fa59bf5edf3cfcca1792da51b904a7c7f7615
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 11 18:30:19 2007 +0000
+
+ 2007-07-11 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/Form.cc:
+ * poppler/XRef.cc:
+ * poppler/XRef.h: Fix memory leak.
+
+ ChangeLog | 6 ++++++
+ poppler/Form.cc | 49 ++++++++++++++++++++++++-------------------------
+ poppler/XRef.cc | 22 ++++++++++------------
+ poppler/XRef.h | 2 +-
+ 4 files changed, 41 insertions(+), 38 deletions(-)
+
+commit 4ae7d43bd54c5b3e2f08c48441f741d3099e228f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 11 18:12:26 2007 +0000
+
+ * goo/GooVector.h: Rename guard from _VECTOR_H to GOO_VECTOR_H
+ * goo/gfile.cc: GString -> GooString in Windows code
+ * poppler/GlobalParams.cc: GString -> GooString in Windows
+ code
+ * splash/SplashT1FontEngine.cc
+ * splash/SplashT1FontEngine.h
+ * splash/SplashT1FontFile.cc
+ * splash/SplashT1FontFile.h: T1 code is not supported,
+ but at least
+ make it compile :-D
+
+ ChangeLog | 11 +++++++++++
+ goo/GooVector.h | 4 ++--
+ goo/gfile.cc | 6 +++---
+ poppler/GlobalParams.cc | 26 +++++++++++++-------------
+ splash/SplashFontEngine.cc | 2 +-
+ splash/SplashT1FontEngine.cc | 8 ++++----
+ splash/SplashT1FontEngine.h | 7 +++----
+ splash/SplashT1FontFile.cc | 8 +++++---
+ splash/SplashT1FontFile.h | 4 ++--
+ 9 files changed, 44 insertions(+), 32 deletions(-)
+
+commit 7bd125ce96c603fd5cf42d7c6a29b542e82dd4ec
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 11 18:08:07 2007 +0000
+
+ 2007-07-11 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/Form.cc:
+ * poppler/Form.h:
+ * glib/poppler-form-field.cc:
+ * glib/poppler-form-field.h:
+ * glib/test-poppler-glib.c: Add a method to get the max length
+ allowed in text form fields.
+
+ ChangeLog | 9 +++++++++
+ glib/poppler-form-field.cc | 8 ++++++++
+ glib/poppler-form-field.h | 1 +
+ glib/test-poppler-glib.c | 1 +
+ poppler/Form.cc | 11 +++++++++++
+ poppler/Form.h | 4 ++++
+ 6 files changed, 34 insertions(+), 0 deletions(-)
+
+commit 8a68855735e9d295d71685e82de39204d639ea7a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jul 9 08:52:58 2007 +0000
+
+ 2007-07-09 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/Annot.cc:
+ * poppler/Annot.h: Render '*' instead of the actual content in
+ password form fields. Patch by Julien Rebetez <julien@fhtagn.net>
+
+ ChangeLog | 6 ++++++
+ poppler/Annot.cc | 52
+ +++++++++++++++++++++++++++++-----------------------
+ poppler/Annot.h | 5 +++--
+ 3 files changed, 38 insertions(+), 25 deletions(-)
+
+commit 53cf7d7084dc03a28239f11c94f2095bb02d6108
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jul 7 16:23:56 2007 +0000
+
+ 2007-07-07 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/Form.cc:
+ * poppler/Form.h:
+ * glib/poppler-form-field.cc:
+ * glib/poppler-form-field.h:
+ * glib/test-poppler-glib.c: Add a method to get the type of a Form
+ Field Button.
+
+ ChangeLog | 9 +++++++++
+ glib/poppler-form-field.cc | 18 ++++++++++++++++++
+ glib/poppler-form-field.h | 8 ++++++++
+ glib/test-poppler-glib.c | 26 +++++++++++++++++++++++---
+ poppler/Form.cc | 5 +++++
+ poppler/Form.h | 2 ++
+ 6 files changed, 65 insertions(+), 3 deletions(-)
+
+commit de0a40181e5832a0dc263d40ed0a269867764623
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jul 7 15:28:29 2007 +0000
+
+ 2007-07-07 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/Form.cc: Fix a crash when setting state on buttons that
+ don't have state.
+
+ ChangeLog | 5 +++++
+ poppler/Form.cc | 3 +++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit a33518a3283ff25aa5517bc535ddb61383b1cfdc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 6 09:08:44 2007 +0000
+
+ * poppler/Form.cc: Fix a bug with FormField's destructor
+ which was not
+ checking if the FormField is terminal to determine wether
+ it needs to
+ delete children or widgets. Patch by
+ Julien Rebetez <julien@fhtagn.net>
+
+ ChangeLog | 4 ++++
+ poppler/Form.cc | 17 +++++++++++------
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+commit 43f0d5b9bb198cdcbc2f7111f294c6f947105314
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 6 08:47:11 2007 +0000
+
+ * goo/GooString.cc:
+ * poppler/ABWOutputDev.cc: Build on Sun Force compiler,
+ patch by
+ Darren Kenny <darren.kenny@sun.com>
+
+ ChangeLog | 6 ++++++
+ goo/GooString.cc | 2 +-
+ poppler/ABWOutputDev.cc | 4 +++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+commit 4e7405071b69889362e4d49de3f881f0e3e261e3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 5 13:04:01 2007 +0000
+
+ 2007-07-05 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-form-field.cc: Allow to set NULL in form fields
+ that can contain text.
+
+ ChangeLog | 5 +++++
+ glib/poppler-form-field.cc | 30 ++++++++++++------------------
+ 2 files changed, 17 insertions(+), 18 deletions(-)
+
+commit 625510797c528257527003477fe28adbacfe80e7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Thu Jul 5 08:13:51 2007 +0000
+
+ 2007-07-05 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-attachment.cc:
+ * glib/poppler-attachment.h:
+ * glib/test-poppler-glib.c: Rename cdate and mdate again to ctime
+ and mtime, since they are public attributes and we don't want to
+ break the API.
+
+ ChangeLog | 8 ++++++++
+ glib/poppler-attachment.cc | 4 ++--
+ glib/poppler-attachment.h | 4 ++--
+ glib/test-poppler-glib.c | 4 ++--
+ 4 files changed, 14 insertions(+), 6 deletions(-)
+
+commit 9b2640f156f24b07c797d9461f84e64d550efa1a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 4 13:57:31 2007 +0000
+
+ * qt4/src/poppler-form.cc: QStringToGooString ->
+ QStringToUnicodeGooString has FormWidgetText::setContent
+ wants to have
+ the unicode formated string
+ * qt4/src/poppler-private.h: create QStringToUnicodeGooString
+
+ ChangeLog | 7 +++++++
+ qt4/src/poppler-form.cc | 2 +-
+ qt4/src/poppler-private.h | 15 +++++++++++++++
+ 3 files changed, 23 insertions(+), 1 deletions(-)
+
+commit b70115cf979b29f75c644518ae0e9c0dd9892ebf
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 4 13:06:38 2007 +0000
+
+ 2007-07-04 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-form-field.cc: Convert strings from UTF8 to UTF16BE
+ before setting them.
+
+ ChangeLog | 5 +++++
+ glib/poppler-form-field.cc | 34 ++++++++++++++++++++++++----------
+ 2 files changed, 29 insertions(+), 10 deletions(-)
+
+commit d37843877a6f93a9f27502d07ad82cba79e9aa73
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Wed Jul 4 08:26:52 2007 +0000
+
+ 2007-07-04 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-attachment.cc:
+ * glib/poppler-attachment.h: Add size, creation and modification
+ date and checksum properties to attachments. Fix memory leaks.
+ * glib/test-poppler-glib.c:
+ * glib/poppler.h:
+ * glib/poppler-private.h:
+ * glib/poppler-document.cc: Add a function to convert a pdf date
+ into a GTime that is used by attachments and document
+ properties. Fix memory leak in attachments.
+
+ ChangeLog | 12 ++++
+ glib/poppler-attachment.cc | 25 +++++++-
+ glib/poppler-attachment.h | 16 +++--
+ glib/poppler-document.cc | 142
+ +++++++++++++++++++++++---------------------
+ glib/poppler-private.h | 6 +-
+ glib/poppler.h | 1 +
+ glib/test-poppler-glib.c | 56 +++++++++++++++--
+ 7 files changed, 171 insertions(+), 87 deletions(-)
+
+commit d933f47d4af0992059148259a189373b42499bbe
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 3 20:31:20 2007 +0000
+
+ * qt4/tests/poppler-fonts.cpp: For the sake of completeness,
+ add all
+ the enums
+
+ ChangeLog | 2 ++
+ qt4/tests/poppler-fonts.cpp | 28 ++++++++++++++++++++--------
+ 2 files changed, 22 insertions(+), 8 deletions(-)
+
+commit d90b166cfbdc4857351baa627d158d5e0b6652b4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 3 16:46:51 2007 +0000
+
+ * poppler/Catalog.cc: Fix crash,
+ embeddedFileNameTree.getName(i)
+ returns a reference to its own data so does not have to
+ be deleted
+ * qt4/tests/poppler-attachments.cpp: Delete the doc, just
+ for sake of
+ correctness
+
+ ChangeLog | 7 +++++++
+ poppler/Catalog.cc | 1 -
+ qt4/tests/poppler-attachments.cpp | 1 +
+ 3 files changed, 8 insertions(+), 1 deletions(-)
+
+commit 7fa87eb2b093770271bc3a72de5b0b9dc228aa1b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 3 14:01:40 2007 +0000
+
+ 2007-07-03 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-form-field.cc:
+ * glib/poppler-form-field.h:
+ * glib/test-poppler-glib.c: Add choice_commit_on_change function
+ to glib bindings.
+
+ ChangeLog | 7 +++++++
+ glib/poppler-form-field.cc | 8 ++++++++
+ glib/poppler-form-field.h | 1 +
+ glib/test-poppler-glib.c | 2 ++
+ 4 files changed, 18 insertions(+), 0 deletions(-)
+
+commit 8b67e0403f6eaab6770cc0b7861074ae0b6d85bb
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Tue Jul 3 13:49:18 2007 +0000
+
+ 2007-07-03 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-form-field.cc:
+ * glib/poppler-form-field.h:
+ * glib/test-poppler-glib.c: Fix a typo.
+
+ ChangeLog | 6 ++++++
+ glib/poppler-form-field.cc | 2 +-
+ glib/poppler-form-field.h | 2 +-
+ glib/test-poppler-glib.c | 2 +-
+ 4 files changed, 9 insertions(+), 3 deletions(-)
+
+commit 33a5765eb404a4b321b09c26af74c1ed64a5d474
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 3 13:22:54 2007 +0000
+
+ * poppler/Catalog.cc:
+ * poppler/Catalog.h: Add size and checksum properties to
+ the embeded
+ files
+ * qt4/src/poppler-embeddedfile.cc:
+ * qt4/src/poppler-qt4.h: Add size and checksum properties
+ to the qt4
+ frontend
+
+ ChangeLog | 9 +++++++++
+ poppler/Catalog.cc | 19 ++++++++++++++++---
+ poppler/Catalog.h | 13 +++++++++++--
+ qt4/src/poppler-embeddedfile.cc | 16 ++++++++++++++++
+ qt4/src/poppler-qt4.h | 14 ++++++++++++++
+ 5 files changed, 66 insertions(+), 5 deletions(-)
+
+commit c7d21f9354bbe090cce6459124dcaadf1e46639e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jul 2 13:39:32 2007 +0000
+
+ 2007-07-02 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-form-field.cc:
+ * glib/poppler-form-field.h:
+ * glib/test-poppler-glib.c:
+ Use FILE_SELECT instead of FILESELECT and fix a typo. Patch by
+ Kouhei Sutou
+
+ ChangeLog | 9 +++++++++
+ glib/poppler-form-field.cc | 2 +-
+ glib/poppler-form-field.h | 2 +-
+ glib/test-poppler-glib.c | 2 +-
+ 4 files changed, 12 insertions(+), 3 deletions(-)
+
+commit 5e301064c62c6d58f488839d7bf804af912a3de1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Mon Jul 2 13:34:26 2007 +0000
+
+ 2007-07-02 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-form-field.cc:
+ * glib/poppler-form-field.h:
+ * glib/test-poppler-glib.c:
+ Add poppler_form_field_is_read_only to glib bindings. Patch by
+ Kouhei Sutou
+
+ ChangeLog | 9 +++++++++
+ glib/poppler-form-field.cc | 8 ++++++++
+ glib/poppler-form-field.h | 1 +
+ glib/test-poppler-glib.c | 6 +++++-
+ 4 files changed, 23 insertions(+), 1 deletions(-)
+
+commit 11875746ce28e8999bcad46167fcfea131cd267a
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jun 30 08:33:30 2007 +0000
+
+ 2007-06-30 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-page.cc: Use poppler_page_transition_get_type
+ instead of poppler_page_transition which doesn't exist. Patch by
+ Kouhei Sutou
+
+ ChangeLog | 6 ++++++
+ glib/poppler-page.cc | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 0a5acaae3b9bfcd731bc4e072f35f9433aa773da
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jun 30 08:25:15 2007 +0000
+
+ 2007-06-30 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/Makefile.am:
+ * glib/poppler-form-field.cc:
+ * glib/poppler-form-field.h:
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler-private.h:
+ * glib/poppler.h:
+ * glib/test-poppler-glib.c: Improve forms API in the glib bindings
+ in order to make it more consistent with the current API and
+ easier to use.
+
+ ChangeLog | 15 ++
+ glib/Makefile.am | 2 +
+ glib/poppler-document.cc | 197 ++-------------------------
+ glib/poppler-document.h | 55 +--------
+ glib/poppler-form-field.cc | 316
+ ++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-form-field.h | 96 +++++++++++++
+ glib/poppler-page.cc | 210 ++++++++++++-----------------
+ glib/poppler-page.h | 55 ++-------
+ glib/poppler-private.h | 11 +-
+ glib/poppler.h | 40 ++----
+ glib/test-poppler-glib.c | 119 ++++++++++++++---
+ 11 files changed, 662 insertions(+), 454 deletions(-)
+
+commit 2212874e57a6eb9db733b2e9a98f0cfcb88a8fc1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 26 21:31:07 2007 +0000
+
+ * poppler/Form.cc: Don't crash on documents with AcroForm
+ but no
+ AcroForm->Fields (it's mandatory but...)
+
+ ChangeLog | 5 +++++
+ poppler/Form.cc | 54
+ +++++++++++++++++++++++++++++-------------------------
+ 2 files changed, 34 insertions(+), 25 deletions(-)
+
+commit e48ee9c4af6bf98b6988c51dcab9ee9ef6e3cafe
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sat Jun 23 18:06:07 2007 +0000
+
+ 2007-06-23 Carlos Garcia Campos <carlosgc@gnome.org>
+ * poppler/Annot.cc:
+ * poppler/Form.cc: Fix memory leaks.
+
+ ChangeLog | 5 +++++
+ poppler/Annot.cc | 2 +-
+ poppler/Form.cc | 13 +++++++++----
+ 3 files changed, 15 insertions(+), 5 deletions(-)
+
+commit d874a2753e3ac51b6f539dfdf980435c8c381b4f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 20 20:07:15 2007 +0000
+
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-document.cc: Allow access to a document's
+ metadata contents
+ from the qt4 binding. Based on patch by Jason Kivlighn
+ * qt4/tests/test-poppler-qt4.cpp: Print metadata if it exists
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-document.cc | 13 +++++++++++++
+ qt4/src/poppler-qt4.h | 5 +++++
+ qt4/tests/test-poppler-qt4.cpp | 1 +
+ 4 files changed, 24 insertions(+), 0 deletions(-)
+
+commit 08d4c437e735ac50a340c4ae17ee0eeccd00dc20
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 20 18:40:03 2007 +0000
+
+ * glib/poppler-document.cc: Allow access to a document's
+ metadata stream
+ through the glib binding. Patch by Jason Kivlighn
+ <jkivlighn@gmail.com> Approved by Carlos
+
+ ChangeLog | 6 ++++++
+ glib/poppler-document.cc | 21 +++++++++++++++++++++
+ 2 files changed, 27 insertions(+), 0 deletions(-)
+
+commit cdd2a49dc99aa16ded674c58dbb50298f06cf18a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 15 18:15:53 2007 +0000
+
+ * poppler/ABWOutputDev.cc: Replaces the getBiggestSeperator
+ function
+ at the ABWoutputdev with one that is easier to read/debug
+ and less likely to contain bugs. Some cosmetic fixes at the
+ functions recursiveXYC and splitnodes. Patch by
+ Jauco Noordzij <jauco.noordzij@gmail.com>. More info at
+ bug #11273
+
+ ChangeLog | 8 +
+ poppler/ABWOutputDev.cc | 384
+ ++++++++++++-----------------------------------
+ 2 files changed, 106 insertions(+), 286 deletions(-)
+
+commit 7f23383197b0e2fa24be7b4925ea6f39eb95bbc1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 13 20:39:21 2007 +0000
+
+ * poppler/ABWOutputDev.cc
+ * poppler/ABWOutputDev.h: Remove dependency on debugxml. Patch
+ by
+ Jauco Noordzij <jauco.noordzij@gmail.com>. Fixes bug #11187
+
+ ChangeLog | 6 +++
+ poppler/ABWOutputDev.cc | 80
+ ++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/ABWOutputDev.h | 1 +
+ 3 files changed, 86 insertions(+), 1 deletions(-)
+
+commit 948520cd529ce47d1970aae6a0b8058128e37c30
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 13 18:50:40 2007 +0000
+
+ * goo/FixedPoint.h
+ * goo/gmem.h
+ * poppler/SecurityHandler.h
+ * poppler/poppler-config.h.in
+ * utils/ImageOutputDev.h:
+ Patch by Axel Howind <Axel.Howind@htp-tel.de>
+ - include USE_EXCEPTIONS and USE_FIXEDPOINT in
+ poppler-config.h.in
+ - fix typo (MULTITHREADED/MULTITHREADING) in
+ poppler.config.h.in
+ - change installed headers to include poppler-config.h
+ instead of
+ config.h
+ - use <poppler/poppler-config.h> instead of <poppler-config.h>
+ so that
+ installed headers can be used without including
+ .../include/poppler
+ in the include path
+
+ ChangeLog | 16 ++++++++++++++++
+ goo/FixedPoint.h | 2 +-
+ goo/gmem.h | 2 +-
+ poppler/SecurityHandler.h | 2 +-
+ poppler/poppler-config.h.in | 12 +++++++++++-
+ utils/ImageOutputDev.h | 2 +-
+ 6 files changed, 31 insertions(+), 5 deletions(-)
+
+commit 825461e47b05595805e87a0d2960b07197c8da8b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 13 18:24:56 2007 +0000
+
+ configure.ac: Fix detection of glib
+
+ ChangeLog | 4 ++++
+ configure.ac | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit a67a93fc6b4812a4f892b311c5b299e59283cd47
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jun 11 21:14:22 2007 +0000
+
+ * poppler/CMap.h:
+ * poppler/CharCodeToUnicode.h:
+ * poppler/GlobalParams.h:
+ * poppler/PageLabelInfo.h:
+ * poppler/UnicodeMap.h: Further include cleanup. Patch by
+ Axel Howind
+ on bug #11228
+
+ ChangeLog | 9 +++++++++
+ poppler/CMap.h | 2 +-
+ poppler/CharCodeToUnicode.h | 2 +-
+ poppler/GlobalParams.h | 2 +-
+ poppler/PageLabelInfo.h | 6 +++---
+ poppler/UnicodeMap.h | 2 +-
+ 6 files changed, 16 insertions(+), 7 deletions(-)
+
+commit 051b31af053cac4727718169b79b25451a4bdd95
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jun 11 21:11:05 2007 +0000
+
+ * qt/poppler-qt.h
+ * qt4/src/poppler-qt4.h: Headers cleanup
+
+ ChangeLog | 5 +++++
+ qt/poppler-qt.h | 6 +++---
+ qt4/src/poppler-qt4.h | 8 ++++----
+ 3 files changed, 12 insertions(+), 7 deletions(-)
+
+commit 3e1597b80fc6750f1ec3269f9819aa8225879524
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 8 22:39:23 2007 +0000
+
+ poppler/Annot.cc: Fix leak
+
+ ChangeLog | 4 ++++
+ poppler/Annot.cc | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 49535c20b4f71d1c1381134233e2e1449cf560c0
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Jun 7 21:23:03 2007 +0000
+
+ 2007-06-07 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/ABWOutputDev.cc: Change "and", "or", "not" to "&&",
+ "||",
+ "!" for consistency with the rest of the code. Patch by Jens
+ Granseuer
+
+ ChangeLog | 5 +++
+ poppler/ABWOutputDev.cc | 93
+ ++++++++++++++++++++++++-----------------------
+ 2 files changed, 52 insertions(+), 46 deletions(-)
+
+commit dd8fa975bf51dd18120369d0ef2d8f1781e04d93
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jun 2 09:18:11 2007 +0000
+
+ correct form of patch 11102
+
+ utils/HtmlFonts.cc | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+commit cdf70857ece0748f13b11c923ccf9626094555b4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jun 1 18:34:48 2007 +0000
+
+ * poppler/ArthurOutputDev.cc
+ * splash/SplashFTFont.cc
+ * splash/SplashMath.h: Make it compile with
+ --enable-fixedpoint. Fixes
+ bug 11110
+
+ ChangeLog | 7 +++++++
+ poppler/ArthurOutputDev.cc | 8 ++++----
+ splash/SplashFTFont.cc | 8 ++++----
+ splash/SplashMath.h | 2 +-
+ 4 files changed, 16 insertions(+), 9 deletions(-)
+
+commit 90b1a404629a884cc32737a3a729c9a75f7a59c1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 30 18:33:24 2007 +0000
+
+ * configure.ac: Fix to check for glib-2.0 not glib that is
+ 1.0. Patch
+ came though Pardus developers and they don't remember where
+ they got
+ it from.
+
+ ChangeLog | 6 ++++++
+ configure.ac | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 03d766ea1ddd4ce6d938f96b53906a7dc8bd179a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 30 18:29:57 2007 +0000
+
+ make dist needs this
+
+ qt4/src/Makefile.am | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit d540c04268047fdd125ad932ca05c7553a97c0fe
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 30 17:50:00 2007 +0000
+
+ * utils/HtmlFonts.cc: Make pdftohtml not pollute stdout. Patch
+ by
+ Nanning Buitenhuis <nanning@elvenkind.com>
+
+ And some changes in glib/reference/tmpl
+
+ ChangeLog | 5 +
+ glib/reference/tmpl/poppler-document.sgml | 4 +
+ glib/reference/tmpl/poppler-enums.sgml | 150
+ +++++++++++++++++++++++++++++
+ glib/reference/tmpl/poppler-page.sgml | 5 +-
+ glib/reference/tmpl/poppler-unused.sgml | 130
+ -------------------------
+ utils/HtmlFonts.cc | 2 +-
+ 6 files changed, 162 insertions(+), 134 deletions(-)
+
+commit ce414f2a36f4d97a3bddfd42baabdc1e34bf9321
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue May 29 22:01:58 2007 +0000
+
+ 2007-05-29 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/gen-unicode-tables.py: Add this script to fix distcheck.
+
+ ChangeLog | 4 ++++
+ poppler/gen-unicode-tables.py | 38
+ ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 42 insertions(+), 0 deletions(-)
+
+commit 97e602752b05f3690acb1821bdca31c5771361e1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun May 27 11:24:40 2007 +0000
+
+ 2007-05-27 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/test-poppler-glib.c: Add forms test
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ Fix indentation, some code cleanups and memory leaks.
+
+ ChangeLog | 7 ++
+ glib/poppler-page.cc | 198
+ +++++++++++++++++++++++++++------------------
+ glib/poppler-page.h | 6 +-
+ glib/test-poppler-glib.c | 39 +++++++++
+ 4 files changed, 168 insertions(+), 82 deletions(-)
+
+commit 3d31c2b1ea913fc80211f1c6fed9b3666f124049
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Sun May 27 10:12:56 2007 +0000
+
+ 2007-05-27 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ Add missing image mapping type definition.
+
+ ChangeLog | 6 ++++++
+ glib/poppler-page.cc | 48
+ +++++++++++++++++++++++++++++++++++++++++++++---
+ glib/poppler-page.h | 5 +++++
+ 3 files changed, 56 insertions(+), 3 deletions(-)
+
+commit 8284a769568322066a9d4626bd9b2cf3d18a6487
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 26 23:20:12 2007 +0000
+
+ * configure.ac:
+ * NEWS: Bump release to 0.5.9 (0.6 Release Candidate)
+
+ ChangeLog | 2 ++
+ NEWS | 15 +++++++++++++++
+ configure.ac | 2 +-
+ 3 files changed, 18 insertions(+), 1 deletions(-)
+
+commit e6ff9e0d95e058f6aff3c72d5f4d7d7ccf661999
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 26 22:33:21 2007 +0000
+
+ * poppler-qt.pc.in:
+ * poppler-qt4.pc.in:
+ * qt/Makefile.am:
+ * qt4/src/Makefile.am: Install qt3 and qt4 headers in
+ separate dirs.
+ That way be can reuse poppler-page-transition.h and distros
+ don't get
+ conflicts when making separate qt3 and qt4 packages
+
+ ChangeLog | 9 +++++++++
+ poppler-qt.pc.in | 2 +-
+ poppler-qt4.pc.in | 2 +-
+ qt/Makefile.am | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ 5 files changed, 13 insertions(+), 4 deletions(-)
+
+commit fefefe495a182c1745314186b99441b9e76ba5b4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri May 25 23:17:58 2007 +0000
+
+ * qt4/src/poppler-link-extractor-private.cc:
+ * qt4/src/poppler-link-extractor-private.h:
+ * qt4/src/poppler-link.cc:
+ * qt4/src/poppler-link.h: Return link coordinates in 0..1
+ range
+ instead of 0..size, much more easier to do user<->dev
+ transformations
+ * qt4/src/poppler-private.h: Fix indentation
+
+ ChangeLog | 6 ++++++
+ qt4/src/poppler-link-extractor-private.h | 1 +
+ qt4/src/poppler-link-extractor.cc | 12 ++++++------
+ qt4/src/poppler-link.cc | 25 +++++++++++++++----------
+ qt4/src/poppler-link.h | 7 ++++++-
+ qt4/src/poppler-private.h | 15 ++++++++-------
+ 6 files changed, 42 insertions(+), 24 deletions(-)
+
+commit ecaeaa9512d1dae4a036703ea8739102a8e463f0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri May 25 22:30:20 2007 +0000
+
+ * qt4/src/poppler-link-extractor.cc: Use correct page box
+ to extract
+ link clickable area
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-link-extractor.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 774a9456c668ef70b2e8f17d59f8f427aa97bad5
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Fri May 25 18:43:04 2007 +0000
+
+ 2007-05-25 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/GfxFont.cc:
+ * poppler/GfxFont.h:
+ * poppler/GlobalParams.cc:
+ Don't cache DisplayFontParams by font name, instead cache them
+ in GfxFont. Fixes #8140.
+
+ ChangeLog | 8 ++++++++
+ poppler/GfxFont.cc | 2 ++
+ poppler/GfxFont.h | 6 ++++++
+ poppler/GlobalParams.cc | 4 ++--
+ 4 files changed, 18 insertions(+), 2 deletions(-)
+
+commit a88fadf0bb9af55c83c9c4f7d08deb17d6aa9ae4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date: Fri May 25 17:33:37 2007 +0000
+
+ 2007-05-25 Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler.h:
+ Add selection style parameter to render_selection in order
+ to allow
+ requesting selections of words and paragraphs.
+
+ ChangeLog | 8 ++++++++
+ glib/poppler-page.cc | 30 ++++++++++++++++--------------
+ glib/poppler-page.h | 6 ++++--
+ glib/poppler.h | 7 +++++++
+ 4 files changed, 35 insertions(+), 16 deletions(-)
+
+commit bf195b489c22875695e202d6ca6659144ef57e61
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 23 21:20:58 2007 +0000
+
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-private.h:
+ Better handle the setting of the vector antialiasing for
+ Splash.
+ * qt4/src/Mainpage.dox:
+ * qt4/src/poppler-link.h:
+ * qt4/src/poppler-qt4.h:
+ A few of API documentation fixes and improvements.
+
+ ChangeLog | 10 +++++++
+ qt4/src/Mainpage.dox | 8 +----
+ qt4/src/poppler-document.cc | 5 ++-
+ qt4/src/poppler-link.h | 4 ++-
+ qt4/src/poppler-private.h | 1 +
+ qt4/src/poppler-qt4.h | 57
+ ++++++++++++++++++++++++++++--------------
+ 6 files changed, 57 insertions(+), 28 deletions(-)
+
+commit 36d1fe292778ba29990a389c50a0df0d51f11913
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 21 21:42:38 2007 +0000
+
+ Fix assert in bug 11023
+
+ ChangeLog | 4 ++++
+ glib/poppler-action.cc | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 5b411246a2cce6ed3bb2d8c9e9d856227b6aba7f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 21 21:39:08 2007 +0000
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ poppler_page_render_section() for cairo. Bug 7023
+
+ ChangeLog | 6 +++
+ glib/poppler-page.cc | 88
+ ++++++++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-page.h | 9 +++++
+ 3 files changed, 93 insertions(+), 10 deletions(-)
+
+commit 409f2a9cb31add29accb87011331c50dc08110cd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 21 21:35:10 2007 +0000
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler-private.h:
+ * glib/poppler.h:
+ * glib/test-poppler-glib.c:
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: Extend CairoOutputdev to do
+ image caching when rendering
+
+ ChangeLog | 11 +++
+ glib/poppler-page.cc | 161 ++++++++++++++++++++++++++++++++--
+ glib/poppler-page.h | 10 ++
+ glib/poppler-private.h | 3 +
+ glib/poppler.h | 9 +-
+ glib/test-poppler-glib.c | 27 ++++++-
+ poppler/CairoOutputDev.cc | 215
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 122 +++++++++++++++++++++++++
+ 8 files changed, 545 insertions(+), 13 deletions(-)
+
+commit afd11ec66430dae084b5a5560333e933460fc637
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 21 21:29:09 2007 +0000
+
+ * poppler/Annot.cc: avoid crashing if the font for the
+ drawing methods
+ can not be found
+ * poppler/Form.cc: fix memory leak
+ * qt4/src/poppler-private.h: fix the UnicodeParsedString
+ function to
+ really work and not crash
+ * splash/SplashTypes.h: RGB8X mode makes max number of
+ components in
+ any SplashColor always be 4
+
+ ChangeLog | 11 +++++++++++
+ poppler/Annot.cc | 6 ++++++
+ poppler/Form.cc | 1 +
+ qt4/src/poppler-private.h | 5 ++++-
+ splash/SplashTypes.h | 6 +-----
+ 5 files changed, 23 insertions(+), 6 deletions(-)
+
+commit f019c8a8efde004e1663ea88cb48c0e46318d936
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu May 17 21:32:57 2007 +0000
+
+ 2007-05-17 Pino Toscano <pino@kde.org>
+
+ * qt4/src/poppler-link.cc:
+ Give some default values to LinkDestination
+ * qt4/src/poppler-private.h:
+ Fix memory leak when converting QString -> GooString
+
+ ChangeLog | 7 +++++++
+ qt4/src/poppler-link.cc | 12 ++++++++++++
+ qt4/src/poppler-private.h | 4 +++-
+ 3 files changed, 22 insertions(+), 1 deletions(-)
+
+commit d68a4eb44b5390b3093774f39a6805ad2e95c146
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun May 13 00:53:43 2007 +0000
+
+ 2007-05-12 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/Annot.cc: Only do appearance generation for text,
+ choice or
+ other fields that contain text. Patch by Julien Rebetez.
+
+ ChangeLog | 5 +++++
+ poppler/Annot.cc | 52
+ ++++++++++++++++++++++++++++++++++++++++++++++------
+ 2 files changed, 51 insertions(+), 6 deletions(-)
+
+commit 96f8731e90af1abce67d00a3febc11880c69ce62
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 7 18:41:09 2007 +0000
+
+ * Catalog.cc: Fix leak
+ * Form.cc: Fix leak, provide empty
+ FormPageWidgets::~FormPageWidgets
+ implementation
+ * Page.cc: Fix leak
+
+ ChangeLog | 7 +++++++
+ poppler/Catalog.cc | 1 +
+ poppler/Form.cc | 5 +++++
+ poppler/Page.cc | 1 +
+ 4 files changed, 14 insertions(+), 0 deletions(-)
+
+commit d46553d696b2d7fe416ce8db40db54dd1d7c6733
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Apr 30 22:34:21 2007 +0000
+
+ * poppler/Makefile.am: Don't link cairo to all poppler,
+ just to
+ poppler_cairo so when compiling the qt frontend and the
+ glib frontend
+ the qt one does not end up depending on cairo
+
+ ChangeLog | 6 ++++++
+ poppler/Makefile.am | 1 -
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit d5c52409c532a126bcb8eb65f6f1390113a5f258
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Apr 29 17:37:38 2007 +0000
+
+ jeff committed this line by mistake
+
+ ChangeLog | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit 6ddc11ef4c534369ee104422bfb989603c466790
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Apr 29 17:33:58 2007 +0000
+
+ 2007-04-29 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/UnicodeTypeTable.cc: Make some of the unicode tables
+ const
+ which gets rid of about 20k of data.
+
+ text data bss dec hex filename
+ before: 1415838 128864 8 1544710 179206 libpoppler.so
+ after: 1404574 140128 8 1544710 179206 libpoppler.so
+
+ ChangeLog | 10 ++++++++++
+ poppler/UnicodeTypeTable.cc | 24 ++++++++++++------------
+ 2 files changed, 22 insertions(+), 12 deletions(-)
+
+commit c5613ab5ce65fc84eb3a5584cee1454171173fa7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 28 23:25:59 2007 +0000
+
+ * poppler/SplashOutputDev.cc:
+ * qt/poppler-private.h:
+ * qt4/src/poppler-private.h:
+ * splash/Splash.cc:
+ * splash/SplashBitmap.cc:
+ * splash/SplashTypes.h: Rename splashModeRGBX8 to
+ splashModeXBGR8 and
+ hopefully fix qt frontends image generation
+
+ ChangeLog | 10 ++++
+ poppler/SplashOutputDev.cc | 102
+ ++++++++++++++++++++++++++++++++------------
+ qt/poppler-private.h | 2 +-
+ qt4/src/poppler-private.h | 2 +-
+ splash/Splash.cc | 44 ++++++++++---------
+ splash/SplashBitmap.cc | 16 +++---
+ splash/SplashTypes.h | 4 +-
+ 7 files changed, 120 insertions(+), 60 deletions(-)
+
+commit 6479ce224f1393235ca9888dfe0710327fbfccd2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 28 22:12:22 2007 +0000
+
+ fix merging problems
+
+ splash/Splash.cc | 1 +
+ splash/SplashBitmap.cc | 1 -
+ 2 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e2ac4ada3e29139053871ff7f53772e1ccc7adc0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 28 15:39:36 2007 +0000
+
+ \n at the end of the printf
+ Although i'm not sure we want to printf this...
+
+ poppler/GlobalParams.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9b8133940638c95940edcb9b98126ca9a4f7b8d4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 28 12:00:38 2007 +0000
+
+ * qt4/src/Makefile.am:
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-ps-converter.cc:
+ * qt4/src/poppler-qt4.h: Replace Document::print function
+ with lots of
+ arguments with a helper class with lots of functions. Will
+ help
+ mantaining BC in case we decide to add more functionality
+ to the
+ printing process.
+
+ ChangeLog | 10 ++
+ qt4/src/Makefile.am | 1 +
+ qt4/src/poppler-document.cc | 39 +-------
+ qt4/src/poppler-ps-converter.cc | 190
+ +++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 119 +++++++++++++++++++++----
+ 5 files changed, 307 insertions(+), 52 deletions(-)
+
+commit 26d5fefcd4c858e2ebd689d963a65773957ac808
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 28 11:35:34 2007 +0000
+
+ * qt4/src/poppler-page.cc:
+ Hopefully fix the calculation of the image size when rendering
+ using
+ ArthurOutputDev.
+
+ ChangeLog | 6 ++++++
+ qt4/src/poppler-page.cc | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 218364bc4951682de8e63e1bd3f061636b08b615
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 28 11:34:14 2007 +0000
+
+ * glib/poppler-document.h:
+ * poppler/FontInfo.h:
+ * qt/poppler-qt.h:
+ * qt4/src/poppler-qt4.h: GfxFontType changed, adapt enums
+ of the
+ frontends and helper classes. Forgot to do it before merging.
+
+ ChangeLog | 8 ++++++++
+ glib/poppler-document.h | 6 +++++-
+ poppler/FontInfo.h | 6 +++++-
+ qt/poppler-qt.h | 6 +++++-
+ qt4/src/poppler-qt4.h | 20 ++++++++++++--------
+ 5 files changed, 35 insertions(+), 11 deletions(-)
+
+commit c1a40d3b4e9b27e34c94c9477a0313534563a394
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 28 11:20:58 2007 +0000
+
+ * qt4/src/poppler-annotation.h:
+ Make the header clean.
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-annotation.h | 3 +++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit 3f4bf880b95e28a1ae7a38b18b341e089860780c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 28 11:16:49 2007 +0000
+
+ * qt4/src/Makefile.am:
+ * qt4/src/poppler-link-extractor-private.h:
+ * qt4/src/poppler-link-extractor.cc:
+ * qt4/src/poppler-page-private.h:
+ * qt4/src/poppler-page.cc:
+ * qt4/src/poppler-private.h:
+ * qt4/src/poppler-qt4.h:
+ Getting the links of a page now is not more dependant on
+ the current
+ output device, and can be done anytime; thus, the doLinks
+ parameter
+ of the Page::render() can be dropped.
+
+ ChangeLog | 13 +++++
+ qt4/src/Makefile.am | 3 +-
+ qt4/src/poppler-link-extractor-private.h | 55 ++++++++++++++++++++++
+ qt4/src/poppler-link-extractor.cc | 74
+ ++++++++++++++++++++++++++++++
+ qt4/src/poppler-page-private.h | 38 +++++++++++++++
+ qt4/src/poppler-page.cc | 52 +++------------------
+ qt4/src/poppler-private.h | 5 ++-
+ qt4/src/poppler-qt4.h | 4 +-
+ 8 files changed, 195 insertions(+), 49 deletions(-)
+
+commit 7f9eec9ef4e7dc895d2a3e38014b6368cc7564b6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Apr 27 22:41:10 2007 +0000
+
+ 2007-04-28 Albert Astals Cid <aacid@kde.org>
+
+ * qt4/*: Stop requyring users to declare UNSTABLE_POPPLER_QT4
+
+ ChangeLog | 4 ++++
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Mainpage.dox | 3 +--
+ qt4/src/poppler-document.cc | 2 --
+ qt4/src/poppler-embeddedfile.cc | 2 --
+ qt4/src/poppler-fontinfo.cc | 2 --
+ qt4/src/poppler-form.cc | 1 -
+ qt4/src/poppler-link.cc | 2 --
+ qt4/src/poppler-page.cc | 1 -
+ qt4/src/poppler-qt4.h | 3 ---
+ qt4/src/poppler-sound.cc | 2 --
+ qt4/src/poppler-textbox.cc | 2 --
+ qt4/tests/check_attachments.cpp | 1 -
+ qt4/tests/check_dateConversion.cpp | 1 -
+ qt4/tests/check_fonts.cpp | 1 -
+ qt4/tests/check_metadata.cpp | 1 -
+ qt4/tests/check_pagelayout.cpp | 1 -
+ qt4/tests/check_pagemode.cpp | 1 -
+ qt4/tests/check_permissions.cpp | 1 -
+ qt4/tests/poppler-attachments.cpp | 1 -
+ qt4/tests/poppler-fonts.cpp | 1 -
+ qt4/tests/stress-poppler-qt4.cpp | 1 -
+ qt4/tests/test-password-qt4.cpp | 1 -
+ qt4/tests/test-poppler-qt4.cpp | 1 -
+ 24 files changed, 6 insertions(+), 32 deletions(-)
+
+commit 45993a6faafd7646075bc6630d5d2ad7a44f7e20
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Apr 27 22:26:09 2007 +0000
+
+ 2007-04-28 Carlos Garcia Campos <carlosgc@gnome.org>
+ reviewed and some code by: Albert Astals Cid <aacid@kde.org>
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler.h:
+ * glib/test-poppler-glib.c:
+ * poppler/Makefile.am:
+ * poppler/PageTransition.cc:
+ * poppler/PageTransition.h:
+ * qt/poppler-page-transition.cc:
+ * qt/poppler-page-transition.h: Move Page Transition parsing
+ from qt
+ frontends to poppler core. Expose Page transitions on the glib
+ frontend.
+
+ ChangeLog | 15 +++
+ glib/poppler-page.cc | 122 +++++++++++++++++++++++++
+ glib/poppler-page.h | 111 ++++++++++++++----------
+ glib/poppler.h | 58 +++++++++---
+ glib/test-poppler-glib.c | 60 +++++++++++++
+ poppler/Makefile.am | 2 +
+ poppler/PageTransition.cc | 197
+ +++++++++++++++--------------------------
+ poppler/PageTransition.h | 86 ++++++++++++++++++
+ qt/poppler-page-transition.cc | 145 ++++++-------------------------
+ qt/poppler-page-transition.h | 9 ++-
+ 10 files changed, 497 insertions(+), 308 deletions(-)
+
+commit 877d6b202a75eb12119b16e740f85cc8b477d589
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Apr 27 21:25:30 2007 +0000
+
+ * glib/poppler-page.cc:
+ * poppler/PSOutputDev.cc:
+ * poppler/PSOutputDev.h:
+ * qt/poppler-document.cc:
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-qt4.h:
+ * utils/pdftohtml.cc:
+ * utils/pdftops.cc:
+ Add option to force rasterizing the pages when printing them
+ Add functionality to output the title field on the PS file
+ Only Qt4 frontend exposes the functionality
+
+ Bringing this features from KPDF 3.5.7 to poppler
+ Testers welcome
+ Patches for other frontends more than welcome
+ Comments and suggestions even more than welcome :-)
+
+ ChangeLog | 14 ++++++++++++
+ glib/poppler-page.cc | 3 +-
+ poppler/PSOutputDev.cc | 48
+ +++++++++++++++++++++++++++++-------------
+ poppler/PSOutputDev.h | 17 +++++++++-----
+ qt/poppler-document.cc | 2 +-
+ qt4/src/poppler-document.cc | 9 ++++++-
+ qt4/src/poppler-qt4.h | 2 +-
+ utils/pdftohtml.cc | 2 +-
+ utils/pdftops.cc | 2 +-
+ 9 files changed, 71 insertions(+), 28 deletions(-)
+
+commit 99053be5357235c47a87775985646ef8d9880ed9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Apr 26 17:57:01 2007 +0000
+
+ * goo/Makefile.am: Remove duplicate gmem.h
+
+ ChangeLog | 4 ++++
+ goo/Makefile.am | 1 -
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit f6adb46cd88d23b34f1918d3be31c05b68b6a443
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 25 21:31:17 2007 +0000
+
+ ignore pdftoabw binary
+
+ utils/.cvsignore | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit e09f231ac6c03ac2c3606f1bf20ba1bde3d85abd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 25 21:25:06 2007 +0000
+
+ 2007-04-25 Albert Astals Cid <aacid@kde.org>
+
+ * qt4/src/poppler-document.cc: remove a delete[] no longer
+ needed
+ * qt4/src/poppler-private: initilize m_hints
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-document.cc | 1 -
+ qt4/src/poppler-private.h | 1 +
+ 3 files changed, 6 insertions(+), 1 deletions(-)
+
+commit bf7e0e980bf29994021cb1228f89f582adddf284
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 25 19:59:09 2007 +0000
+
+ Merge xpdf302branch in HEAD as noone vetoed it.
+ Testing more than welcome
+
+ ChangeLog | 140 +
+ configure.ac | 4 +
+ fofi/FoFiTrueType.cc | 458 +++-
+ fofi/FoFiTrueType.h | 42 +-
+ fofi/FoFiType1.cc | 65 +-
+ fofi/FoFiType1C.cc | 590 +++--
+ fofi/FoFiType1C.h | 7 +-
+ glib/poppler-action.cc | 12 +-
+ glib/poppler-document.cc | 5 +-
+ glib/poppler-page.cc | 8 +-
+ goo/FixedPoint.cc | 31 +-
+ goo/FixedPoint.h | 5 +
+ goo/GooString.cc | 444 +++-
+ goo/GooString.h | 41 +-
+ goo/Makefile.am | 2 +-
+ goo/gfile.cc | 54 +-
+ goo/gmem.c | 238 --
+ goo/gmem.cc | 264 ++
+ goo/gmem.h | 27 +-
+ poppler/ABWOutputDev.cc | 1 -
+ poppler/ABWOutputDev.h | 1 -
+ poppler/Annot.cc | 1685 ++++++++++---
+ poppler/Annot.h | 83 +-
+ poppler/ArthurOutputDev.cc | 13 +-
+ poppler/Catalog.cc | 79 +-
+ poppler/Catalog.h | 16 +-
+ poppler/CharCodeToUnicode.cc | 31 +-
+ poppler/DCTStream.cc | 2 +-
+ poppler/DCTStream.h | 4 +-
+ poppler/Decrypt.cc | 427 +++-
+ poppler/Decrypt.h | 54 +-
+ poppler/Dict.cc | 23 +-
+ poppler/Dict.h | 27 +-
+ poppler/FontInfo.cc | 1 -
+ poppler/Form.cc | 19 +-
+ poppler/Form.h | 2 +-
+ poppler/Function.cc | 65 +-
+ poppler/Function.h | 8 +-
+ poppler/Gfx.cc | 1247 +++++++---
+ poppler/Gfx.h | 39 +-
+ poppler/GfxFont.cc | 45 +-
+ poppler/GfxFont.h | 7 +-
+ poppler/GfxState.cc | 209 ++-
+ poppler/GfxState.h | 42 +-
+ poppler/GlobalParams.cc | 399 +++-
+ poppler/GlobalParams.h | 41 +-
+ poppler/JBIG2Stream.cc | 96 +-
+ poppler/JBIG2Stream.h | 4 +-
+ poppler/JPXStream.cc | 246 ++-
+ poppler/JPXStream.h | 8 +-
+ poppler/Lexer.cc | 18 +-
+ poppler/Link.cc | 150 +-
+ poppler/Link.h | 49 +-
+ poppler/Makefile.am | 4 +-
+ poppler/Object.cc | 5 +-
+ poppler/Object.h | 29 +-
+ poppler/Outline.cc | 1 -
+ poppler/OutputDev.cc | 2 +
+ poppler/OutputDev.h | 62 +-
+ poppler/PDFDoc.cc | 100 +-
+ poppler/PDFDoc.h | 21 +-
+ poppler/PSOutputDev.cc | 2715 ++++++++++++++-----
+ poppler/PSOutputDev.h | 58 +-
+ poppler/PSTokenizer.cc | 2 +-
+ poppler/Page.cc | 227 ++-
+ poppler/Page.h | 22 +-
+ poppler/PageLabelInfo.cc | 1 -
+ poppler/Parser.cc | 66 +-
+ poppler/Parser.h | 11 +-
+ poppler/PreScanOutputDev.cc | 255 ++
+ poppler/PreScanOutputDev.h | 128 +
+ poppler/SecurityHandler.cc | 17 +-
+ poppler/SecurityHandler.h | 5 +
+ poppler/SplashOutputDev.cc | 1480 ++++++-----
+ poppler/SplashOutputDev.h | 41 +-
+ poppler/Stream.cc | 338 ++--
+ poppler/Stream.h | 39 +-
+ poppler/TextOutputDev.cc | 537 ++++-
+ poppler/TextOutputDev.h | 77 +-
+ poppler/UGooString.cc | 182 --
+ poppler/UGooString.h | 79 -
+ poppler/XRef.cc | 29 +-
+ poppler/XRef.h | 6 +-
+ qt/poppler-document.cc | 15 +-
+ qt/poppler-page-transition.cc | 1 -
+ qt/poppler-page.cc | 4 +-
+ qt/poppler-private.h | 72 +-
+ qt4/src/poppler-annotation-helper.h | 38 +-
+ qt4/src/poppler-document.cc | 7 +-
+ qt4/src/poppler-embeddedfile.cc | 6 +-
+ qt4/src/poppler-form.cc | 12 +-
+ qt4/src/poppler-page.cc | 8 +-
+ qt4/src/poppler-private.h | 76 +-
+ splash/Splash.cc | 4994
+ ++++++++++++++++++-----------------
+ splash/Splash.h | 137 +-
+ splash/SplashBitmap.cc | 110 +-
+ splash/SplashBitmap.h | 10 +-
+ splash/SplashClip.cc | 276 ++-
+ splash/SplashClip.h | 28 +-
+ splash/SplashFTFont.cc | 104 +-
+ splash/SplashFTFont.h | 5 +-
+ splash/SplashFTFontEngine.cc | 54 +-
+ splash/SplashFTFontEngine.h | 9 +-
+ splash/SplashFTFontFile.cc | 19 +-
+ splash/SplashFTFontFile.h | 9 +-
+ splash/SplashFont.cc | 6 +-
+ splash/SplashFont.h | 13 +-
+ splash/SplashFontEngine.cc | 72 +-
+ splash/SplashFontEngine.h | 11 +-
+ splash/SplashFontFile.cc | 1 -
+ splash/SplashFontFile.h | 2 +-
+ splash/SplashMath.h | 15 +-
+ splash/SplashPath.cc | 42 +-
+ splash/SplashPath.h | 31 +-
+ splash/SplashPattern.cc | 28 -
+ splash/SplashPattern.h | 25 -
+ splash/SplashScreen.cc | 304 ++-
+ splash/SplashScreen.h | 18 +-
+ splash/SplashState.cc | 63 +-
+ splash/SplashState.h | 14 +-
+ splash/SplashT1Font.cc | 101 +-
+ splash/SplashT1Font.h | 6 +-
+ splash/SplashT1FontEngine.cc | 4 +-
+ splash/SplashT1FontFile.cc | 9 +-
+ splash/SplashT1FontFile.h | 7 +-
+ splash/SplashTypes.h | 72 +-
+ splash/SplashXPath.cc | 353 ++--
+ splash/SplashXPath.h | 26 +-
+ splash/SplashXPathScanner.cc | 143 +
+ splash/SplashXPathScanner.h | 13 +
+ utils/HtmlOutputDev.cc | 15 +-
+ utils/HtmlOutputDev.h | 15 +-
+ utils/pdffonts.cc | 15 +-
+ utils/pdfinfo.cc | 21 +-
+ utils/pdftoabw.cc | 1 -
+ utils/pdftohtml.cc | 3 +-
+ utils/pdftoppm.cc | 8 +
+ utils/pdftops.cc | 8 +-
+ utils/pdftotext.cc | 1 -
+ 139 files changed, 14538 insertions(+), 7039 deletions(-)
+
+commit ba74bb3b0632593d1937911d73709fc870480efd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Apr 16 21:25:46 2007 +0000
+
+ * qt4/src/poppler-private.h:
+ Add the information about the open/close item in the DOM tree
+ of the TOC.
+
+ ChangeLog | 7 +++++++
+ qt4/src/poppler-private.h | 5 ++++-
+ 2 files changed, 11 insertions(+), 1 deletions(-)
+
+commit 6c7969f37c85f326327aca98e0346f2ebc86ffda
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 14 23:19:46 2007 +0000
+
+ * utils/HtmlFonts.cc: Fix rendering of text colors on
+ complex mode.
+ * utils/pdftohtml.cc: Fix rendering of links.
+
+ ChangeLog | 5 +++++
+ utils/HtmlFonts.cc | 8 ++++----
+ utils/pdftohtml.cc | 2 +-
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+commit add8515d7b3fba59c20ed1bbb058cea9e138c1a8
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sat Apr 14 07:29:04 2007 +0000
+
+ Not sure what this was intended to do, but it triggers a lot of
+ problems with the unit tests (essentially, duplicate delete's).
+
+ CCMAIL: aacid@kde.org
+
+ qt4/src/poppler-embeddedfile.cc | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+commit f3ded10305f6ac682640c37c21f569db0f830756
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Apr 7 21:12:35 2007 +0000
+
+ 2007-04-07 Jeff Muizelaar <jeff@infidigm.net>
+
+ * utils/pdftoabw.cc: Fixing passing the wrong type
+ to fprintf. Patch by Kouhei Sutou. Fixes #10554.
+
+ ChangeLog | 5 +++++
+ utils/pdftoabw.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 2fcb76df955c143153fe4b273d0388fcb7f67d8a
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Fri Apr 6 15:27:52 2007 +0000
+
+ 2007-04-06 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/ABWOutputDev.cc:
+ * utils/pdftoabw.cc: Fix a number of issues with the new
+ AbiWord code:
+ *) Allows you to save to a file other than stdout
+ *) Checks for error conditions when reading the PDF
+ doc and
+ writing the ABW doc
+ *) Removes dead code in pdftoabw.cc
+ *) Fixes a SEGV I encountered when converting my new
+ home's floor plan
+ *) Returns proper error conditions should the conversion
+ fail for any reason
+ Patch by Dominic Lachowicz
+
+ ChangeLog | 12 ++++++
+ poppler/ABWOutputDev.cc | 3 +
+ utils/pdftoabw.cc | 101
+ +++++++++++++++++++++++++++-------------------
+ 3 files changed, 74 insertions(+), 42 deletions(-)
+
+commit 29da65ec48b5ba91139084e197ce457d3cff3732
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Apr 5 12:13:51 2007 +0000
+
+ * poppler/PSOutputDev.cc: Readd code wrongly removed when doing the
+ GlobalParams cleaning
+
+ ChangeLog | 5 +++++
+ poppler/PSOutputDev.cc | 5 +++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 722b2bd86f58f2d7a914571cccfa195485a70c47
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Apr 4 02:42:29 2007 +0000
+
+ 2007-04-03 Jeff Muizelaar <jeff@infidigm.net>
+
+ * configure.ac:
+ * poppler/ABWOutputDev.cc:
+ * poppler/ABWOutputDev.h:
+ * poppler/Makefile.am:
+ * utils/Makefile.am:
+ * utils/pdftoabw.cc: Add AbiWord output device and pdftoabw
+ program.
+ Patch by Jauco Noordzij. Autotools stuff by Dominic Lachowicz.
+
+ ChangeLog | 10 +
+ configure.ac | 15 +
+ poppler/ABWOutputDev.cc | 1286
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/ABWOutputDev.h | 140 +++++
+ poppler/Makefile.am | 17 +
+ utils/Makefile.am | 16 +-
+ utils/pdftoabw.cc | 138 +++++
+ 7 files changed, 1620 insertions(+), 2 deletions(-)
+
+commit c9b467da290476da5ebbe8dc25699cd25e589b57
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 22 20:56:24 2007 +0000
+
+ * poppler/Gfx.cc: Accept reals for width and height of
+ images. Fixes
+ KDE bug 143322
+
+ ChangeLog | 5 +++++
+ poppler/Gfx.cc | 14 ++++++++++----
+ 2 files changed, 15 insertions(+), 4 deletions(-)
+
+commit ff8f8d44ef47a98f7dbdfaa4d27a720b1f37015f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 15 20:16:13 2007 +0000
+
+ * glib/Makefile.am: Make it build with BSD/Make. Patch by
+ Henry Precheur <henry@precheur.org>
+
+ ChangeLog | 5 +++++
+ glib/Makefile.am | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit bbf7e78b6b2509ecdc476d7f55151ef327470d9d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Mar 7 19:15:32 2007 +0000
+
+ 2007-03-07 Carlos Garcia Campos <carlosgc@gnome.org>
+ reviewed by: Albert Astals Cid <aacid@kde.org>
+
+ * poppler/Page.cc: Consider 0x0 boxes as invalid. Fixes
+ http://bugzilla.gnome.org/show_bug.cgi?id=408682
+
+ 2007-03-06 Pino Toscano <pino@kde.org>
+ reviewed by: Albert Astals Cid <aacid@kde.org>
+
+ * configure.ac:
+ * qt/Makefile.am:
+ * qt/poppler-link.cc:
+ * qt/poppler-page.cc:
+ * qt/poppler-private.h:
+ * qt4/poppler-link.cc:
+ Make the Qt4 frontend compilable again with no Splash.
+ Make the Qt3 frontend compilable with no Splash.
+
+ ChangeLog | 18 ++++++++++++++++++
+ configure.ac | 12 +-----------
+ poppler/Page.cc | 7 ++++++-
+ qt/Makefile.am | 1 -
+ qt/poppler-link.cc | 4 +++-
+ qt/poppler-page.cc | 16 +++++++++++++++-
+ qt/poppler-private.h | 11 ++++++++++-
+ qt4/src/poppler-link.cc | 10 ++++++----
+ 8 files changed, 59 insertions(+), 20 deletions(-)
+
+commit 08dcc7121450cbfa163254001e73bb6a2670e055
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 6 22:27:18 2007 +0000
+
+ * poppler/Annot.cc:
+ * poppler/Form.cc:
+ Fix uninitialized variables.
+ Properly escape parenthesis and slash in text field
+
+ ChangeLog | 9 ++++++++-
+ poppler/Annot.cc | 3 +++
+ poppler/Form.cc | 1 +
+ 3 files changed, 12 insertions(+), 1 deletions(-)
+
+commit e8d3b21d08a59ec8b62503b48504fe046d746bfa
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sun Mar 4 07:30:31 2007 +0000
+
+ Switch to using pkg-config to find Qt4.
+
+ ChangeLog | 9 +++
+ configure.ac | 36 +++++------
+ m4/qt.m4 | 165
+ -------------------------------------------------
+ poppler/Makefile.am | 2 +-
+ qt4/src/Makefile.am | 3 +-
+ qt4/tests/Makefile.am | 21 +++----
+ 6 files changed, 36 insertions(+), 200 deletions(-)
+
+commit bd99616b9c06f96beadb68e015d2904b7fe2df1d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 25 00:34:21 2007 +0000
+
+ 007-02-25 Julien Rebetez <julienr@svn.gnome.org>
+
+ reviewed by: Albert Astals Cid <aacid@kde.org>
+
+ * poppler/Annot.cc:
+ * poppler/Annot.h:
+ * poppler/Form.cc:
+ * poppler/Form.h:
+ Fix compilation warnings.
+
+ ChangeLog | 10 ++++++++++
+ poppler/Annot.cc | 30 +++++++++++++++++-------------
+ poppler/Annot.h | 5 ++++-
+ poppler/Form.cc | 37 ++++++++++++++-----------------------
+ poppler/Form.h | 13 ++++++-------
+ 5 files changed, 51 insertions(+), 44 deletions(-)
+
+commit d8d23b56332618d8c7d8198f55ec6efafd24187e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 25 00:00:20 2007 +0000
+
+ forgot to commit these
+
+ qt4/src/poppler-form.cc | 284
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-form.h | 247 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 531 insertions(+), 0 deletions(-)
+
+commit 984ce7f919aec27d5f4225376550cd6b58d4ae52
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 24 23:58:31 2007 +0000
+
+ 2007-02-25 Pino Toscano <pino@kde.org>
+ reviewed by: Albert Astals Cid <aacid@kde.org>
+
+ * qt4/src/Doxyfile:
+ * qt4/src/Makefile.am:
+ * qt4/src/poppler-annotation-helper.h:
+ * qt4/src/poppler-form.cc:
+ * qt4/src/poppler-form.h:
+ * qt4/src/poppler-page.cc:
+ * qt4/src/poppler-private.h:
+ * qt4/src/poppler-qt4.h:
+ Beginning of interactive forms support, first
+ implementation in the
+ Qt4 frontend. It supports text and choice fields in
+ a basic way.
+
+ ChangeLog | 14 +++++++++
+ qt4/src/Doxyfile | 1 +
+ qt4/src/Makefile.am | 2 +
+ qt4/src/poppler-annotation-helper.h | 18 ++++++------
+ qt4/src/poppler-page.cc | 36 ++++++++++++++++++++++++
+ qt4/src/poppler-private.h | 52
+ ++++++++++++++++++++++++++++++++++-
+ qt4/src/poppler-qt4.h | 7 +++++
+ 7 files changed, 120 insertions(+), 10 deletions(-)
+
+commit de7a90fc724de14151ec994d18f860ada3be2ac8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 24 23:43:34 2007 +0000
+
+ 2007-02-25 Albert Astals Cid <aacid@kde.org>
+
+ * configure.ac:
+ * glib/poppler-document.cc:
+ * poppler/GlobalParams.cc:
+ * poppler/GlobalParams.h:
+ * poppler/PSOutputDev.cc:
+ * qt/poppler-document.cc:
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-private.h:
+ * qt4/src/poppler-qt4.h:
+ * test/gtk-splash-test.cc:
+ * test/pdf-inspector.cc:
+ * utils/pdffonts.cc:
+ * utils/pdfimages.cc:
+ * utils/pdfinfo.cc:
+ * utils/pdftohtml.cc:
+ * utils/pdftoppm.cc:
+ * utils/pdftops.cc:
+ * utils/pdftotext.cc: Remove dependency on xpdfrc file
+ and cleanup
+ GlobalParams accordingly
+
+ ChangeLog | 22 ++
+ configure.ac | 1 -
+ glib/poppler-document.cc | 4 +-
+ poppler/GlobalParams.cc | 666
+ +------------------------------------------
+ poppler/GlobalParams.h | 59 +----
+ poppler/PSOutputDev.cc | 8 -
+ qt/poppler-document.cc | 4 +-
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-private.h | 2 +-
+ qt4/src/poppler-qt4.h | 6 +-
+ test/gtk-splash-test.cc | 2 +-
+ test/pdf-inspector.cc | 2 +-
+ utils/pdffonts.cc | 5 +-
+ utils/pdfimages.cc | 5 +-
+ utils/pdfinfo.cc | 5 +-
+ utils/pdftohtml.cc | 2 +-
+ utils/pdftoppm.cc | 15 +-
+ utils/pdftops.cc | 50 ++--
+ utils/pdftotext.cc | 5 +-
+ 19 files changed, 72 insertions(+), 793 deletions(-)
+
+commit 74e70386b759a3cd9864d11eb4ca210010136aa5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 24 23:32:22 2007 +0000
+
+ 2007-02-25 Julien Rebetez <julienr@svn.gnome.org>
+ reviewed by: <aacid@kde.org>
+
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler-private.h:
+ * glib/poppler.h:
+ * poppler/Annot.cc:
+ * poppler/Annot.h:
+ * poppler/Catalog.cc:
+ * poppler/Catalog.h:
+ * poppler/CharCodeToUnicode.cc:
+ * poppler/CharCodeToUnicode.h:
+ * poppler/Dict.cc:
+ * poppler/Dict.h:
+ * poppler/Form.cc:
+ * poppler/Form.h:
+ * poppler/GfxFont.cc:
+ * poppler/GfxFont.h:
+ * poppler/Makefile.am:
+ * poppler/Object.h:
+ * poppler/Page.cc:
+ * poppler/Page.h:
+ * poppler/XRef.cc:
+ * poppler/XRef.h:
+ Beginning of Interactive Form support:
+ Add a bunch of new classes (FormWidget / FormField)
+ to deal with form
+ fields.
+ Add support for object modification through
+ XRef::setModifiedObject, as
+ well as a function to write the Xref to a file,
+ which will be used
+ to implement PDF writing.
+ Add some functions to glib wrapper to expose the
+ new form features.
+
+ ChangeLog | 35 ++
+ glib/poppler-document.cc | 192 +++++++
+ glib/poppler-document.h | 55 ++
+ glib/poppler-page.cc | 120 +++++
+ glib/poppler-page.h | 55 ++
+ glib/poppler-private.h | 4 +
+ glib/poppler.h | 15 +-
+ poppler/Annot.cc | 344 ++++++++++---
+ poppler/Annot.h | 21 +-
+ poppler/Catalog.cc | 17 +-
+ poppler/Catalog.h | 4 +
+ poppler/CharCodeToUnicode.cc | 34 ++
+ poppler/CharCodeToUnicode.h | 3 +
+ poppler/Dict.cc | 32 ++
+ poppler/Dict.h | 4 +
+ poppler/Form.cc | 1187
+ ++++++++++++++++++++++++++++++++++++++++++
+ poppler/Form.h | 470 +++++++++++++++++
+ poppler/GfxFont.cc | 27 +
+ poppler/GfxFont.h | 5 +
+ poppler/Makefile.am | 2 +
+ poppler/Object.h | 4 +
+ poppler/Page.cc | 11 +-
+ poppler/Page.h | 8 +-
+ poppler/XRef.cc | 87 +++
+ poppler/XRef.h | 9 +
+ 25 files changed, 2666 insertions(+), 79 deletions(-)
+
+commit 5c4ea446f33248964431e79b14592b30362634fe
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 18 21:44:24 2007 +0000
+
+ * configure.ac: Change {datadir}/poppler to {datarootdir}/poppler so
+ that i get /usr/local/share/poppler in config.h
+ instead of
+ ${prefix}/poppler Better fixes are welcome.
+
+ ChangeLog | 6 ++++++
+ configure.ac | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit dd140dd63de661303b578863af4d515d82117cca
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 4 00:19:25 2007 +0000
+
+ fix date
+
+ ChangeLog | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 3c1ed68bf4ee49b27275f7f65d49f42933b1cfa0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 4 00:16:43 2007 +0000
+
+ * poppler/Lexer.cc:
+ * poppler/Lexer.h: Patch to fix regression introduced by
+ optimizations
+ in bugzilla issue 7808
+
+ ChangeLog | 6 ++++++
+ poppler/Lexer.cc | 30 ++++++++++++++++++++----------
+ poppler/Lexer.h | 2 +-
+ 3 files changed, 27 insertions(+), 11 deletions(-)
+
+commit 672408839de0deac4c6006b54df723336ee4be2d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 31 22:05:09 2007 +0000
+
+ * qt4/src/poppler-page.cc:
+ Patch by Pino Toscano <pino@kde.org> to remove a nonsense done
+ by him.
+
+ * qt4/tests/test-poppler-qt4.cpp:
+ Simply a bit. Patch by Pino Toscano <pino@kde.org>.
+
+ ChangeLog | 8 ++++++++
+ qt4/src/poppler-page.cc | 2 --
+ qt4/tests/test-poppler-qt4.cpp | 24 ++++++++++++------------
+ 3 files changed, 20 insertions(+), 14 deletions(-)
+
+commit 9c64b8c754e09ff2858af56ce38ef013002bf8e4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 31 18:48:16 2007 +0000
+
+ * m4/qt.m4: Fix Qt4 detection on Mac. Patch by Benjamin Reed
+ <ranger@befunk.com>
+
+ ChangeLog | 5 +++++
+ m4/qt.m4 | 26 +++++++++++++++++++++++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+commit 1b81192ff2bb9fae4a7bbc685fafe1718f303a7b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 28 15:55:11 2007 +0000
+
+ * glib/poppler-page.cc: Make link mapping coordinates
+ follow page
+ rotation. Patch by Carlos Garcia Campos <carlosgc@gnome.org>
+ * glib/poppler-action.cc: Fix link destination
+ coordinates. Patch by
+ Carlos Garcia Campos <carlosgc@gnome.org>
+
+ ChangeLog | 4 ++
+ glib/poppler-action.cc | 15 +++++-
+ glib/poppler-page.cc | 124
+ ++++++++++++++++++++++++++++++-----------------
+ 3 files changed, 97 insertions(+), 46 deletions(-)
+
+commit 75dcf94f53c2d7241111f0d527ee4d3a2ef0b0cf
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 28 15:36:08 2007 +0000
+
+ * glib/poppler-document.cc: Plug memory leak in
+ poppler-document. Patch by Carlos Garcia Campos <carlosgc@gnome.org>
+
+ ChangeLog | 5 +++++
+ glib/poppler-document.cc | 30 ++++++++++++++----------------
+ 2 files changed, 19 insertions(+), 16 deletions(-)
+
+commit 682a15fc38a2c569d9b1f9871e3e949b62b33cf8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 21 22:35:23 2007 +0000
+
+ * poppler-document.cc:
+ * poppler-page.cc:
+ * poppler-private.h:
+ * poppler-qt4.h:
+ No need to destroy the Splash output device to change its
+ paper color.
+ Add the possibility to set flags that affect the rendering
+ (some
+ backends supports only some of them, though).
+ Add a Page::label to get the label associated with a page.
+ Patches by Pino Toscano <pino@kde.org>.
+
+ ChangeLog | 12 ++++++++++++
+ qt4/src/poppler-document.cc | 20 ++++++++++++++++++++
+ qt4/src/poppler-page.cc | 14 +++++++++++++-
+ qt4/src/poppler-private.h | 29 ++++++++++++++++++++++++-----
+ qt4/src/poppler-qt4.h | 25 +++++++++++++++++++++++++
+ 5 files changed, 94 insertions(+), 6 deletions(-)
+
+commit 7331bc46c1cb323316501f05ae1740bea5655596
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 17 20:06:29 2007 +0000
+
+ * poppler/Sound.h:
+ * poppler/Sound.cc:
+ * qt4/src/poppler-sound.cc: Move most of the sound reading
+ code
+ into the Sound class, so frontends can use it easily.
+ Patch by Pino Toscano <pino@kde.org>.
+
+ ChangeLog | 10 +++-
+ poppler/Sound.cc | 80 ++++++++++++++++++++++++-
+ poppler/Sound.h | 32 ++++++++++-
+ qt4/src/poppler-sound.cc | 144
+ ++++++++++++++++-----------------------------
+ 4 files changed, 167 insertions(+), 99 deletions(-)
+
+commit 841bee94da7b6376d2e1fb3daaf8b727b90e42d8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jan 13 23:19:21 2007 +0000
+
+ * poppler/Stream.h:
+ * poppler/Stream.cc: Remove MemStream::setNeedFree method
+ i really did
+ not need it
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-link.cc:
+ * qt4/src/poppler-page.cc:
+ * qt4/src/poppler-private.h: Make Document::loadFromData
+ work on
+ documents with a password and don't need to do a malloc and
+ a memcpy.
+
+ ChangeLog | 11 ++++++
+ poppler/Stream.cc | 5 ---
+ poppler/Stream.h | 1 -
+ qt4/src/poppler-document.cc | 74
+ ++++++++++++++++++++++--------------------
+ qt4/src/poppler-link.cc | 4 +-
+ qt4/src/poppler-page.cc | 34 ++++++++++----------
+ qt4/src/poppler-private.h | 24 +++++++++-----
+ 7 files changed, 84 insertions(+), 69 deletions(-)
+
+commit e1432fd7c4a6a2386789f450d39c6d954fd4e656
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jan 13 18:29:39 2007 +0000
+
+ * configure.ac
+ * poppler/Makefile.am
+ * qt4/src/Makefile.am
+ * qt4/src/poppler-document.cc
+ * qt4/src/poppler-link.cc
+ * qt4/src/poppler-page.cc
+ * qt4/src/poppler-private.h
+ * qt4/src/poppler-qt4.h: Make the Qt4 backend compilable
+ even with
+ no Splash backend. Patch by Pino Toscano <pino@kde.org>.
+
+ ChangeLog | 12 ++++++++++++
+ configure.ac | 5 -----
+ poppler/Makefile.am | 5 +++--
+ qt4/src/Makefile.am | 6 +++++-
+ qt4/src/poppler-document.cc | 16 ++++++++++++++--
+ qt4/src/poppler-link.cc | 1 +
+ qt4/src/poppler-page.cc | 15 ++++++++++++---
+ qt4/src/poppler-private.h | 8 +++++++-
+ qt4/src/poppler-qt4.h | 6 ++++++
+ 9 files changed, 60 insertions(+), 14 deletions(-)
+
+commit 457038e97325720615c4390ffa075dd8283966ee
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jan 13 17:56:07 2007 +0000
+
+ * poppler/Stream.h:
+ * poppler/Stream.cc: Add MemStream::setNeedFree method
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-private.h:
+ * qt4/src/poppler-qt4.h: Add Document::loadFromData method
+
+ ChangeLog | 8 ++++++++
+ poppler/Stream.cc | 5 +++++
+ poppler/Stream.h | 1 +
+ qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++
+ qt4/src/poppler-private.h | 17 +++++++++++++++--
+ qt4/src/poppler-qt4.h | 16 ++++++++++++++++
+ 6 files changed, 67 insertions(+), 2 deletions(-)
+
+commit 4e2a9c49ecab00b1f5d175570165cd490afdd31e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 11 22:28:03 2007 +0000
+
+ goo/gmem.c: Merge change from xpdf-3.01pl2
+
+ ChangeLog | 4 ++++
+ goo/gmem.c | 13 +++++++++++--
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+commit bce14b274fd788d728116950d6464a85e33a9966
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 11 22:12:11 2007 +0000
+
+ * poppler/Catalog.h:
+ * poppler/Catalog.cc: Limit max depth of recursive calls on
+ readPageTree to fix MOAB-06-01-2007
+
+ ChangeLog | 6 ++++++
+ poppler/Catalog.cc | 20 +++++++++++++++-----
+ poppler/Catalog.h | 2 +-
+ 3 files changed, 22 insertions(+), 6 deletions(-)
+
+commit 3f0679a336ffaf2aff149f8526fa11f8f8cbda59
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jan 6 21:53:08 2007 +0000
+
+ Patch by Pino Toscano <pino@kde.org> to fix some memory leaks when
+ dealing with sounds.
+
+ ChangeLog | 9 +++++++++
+ poppler/Sound.cc | 1 +
+ qt4/src/poppler-link.cc | 5 +++++
+ qt4/src/poppler-link.h | 1 +
+ qt4/src/poppler-page.cc | 4 ++++
+ qt4/src/poppler-sound.cc | 7 ++++++-
+ 6 files changed, 26 insertions(+), 1 deletions(-)
+
+commit d41cd2f567a955031cb7498d9089e70e14df4a42
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 4 19:10:16 2007 +0000
+
+ qt4/src/poppler-private.h: gmallocn -> new[]
+
+ ChangeLog | 4 ++++
+ qt4/src/poppler-private.h | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit f8edfb6832144cbbd1b234f6b35e33325269255c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 4 18:56:13 2007 +0000
+
+ qt/poppler-page-transition.cc: Fix memory leak. Patch by Tobias
+ Koenig <tokoe@kde.org>
+
+ ChangeLog | 5 +++++
+ qt/poppler-page-transition.cc | 1 +
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 250a9f4b429344e0968c7bd0c0cebe7af373ae0a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Dec 30 14:50:25 2006 +0000
+
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-document.cc: Add const & to some parameters. Patch
+ by Pino Toscano <pino@kde.org>
+
+ ChangeLog | 6 ++++++
+ qt4/src/poppler-document.cc | 4 ++--
+ qt4/src/poppler-qt4.h | 4 ++--
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+commit 250c1f94cc9a53f980fd08364d6cce29db9fd067
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 29 14:08:35 2006 +0000
+
+ * poppler/UGooString.cc: Patch by Pino Toscano <pino@kde.org> so
+ that QStringToUGooString does not crash.
+
+ ChangeLog | 5 +++++
+ poppler/UGooString.cc | 1 +
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 42770e5f07407b03dce31c73fd6956f9c8fc9a06
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Fri Dec 29 04:12:40 2006 +0000
+
+ 2006-12-28 Brad Taylor <brad@getcoded.net>
+
+ * poppler/glib/poppler-document.h:
+ * poppler/glib/poppler-document.cc: Add
+ poppler_document_new_from_data
+ to allow loading PDFs out of memory.
+
+ ChangeLog | 6 +++
+ glib/poppler-document.cc | 113
+ +++++++++++++++++++++++++++++++++------------
+ glib/poppler-document.h | 4 ++
+ 3 files changed, 93 insertions(+), 30 deletions(-)
+
+commit 6fedd991b584e300b5710630fa7942d357fe7aaa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 28 17:22:36 2006 +0000
+
+ * qt4/src/poppler-embeddedfile.cc:
+ * qt4/src/poppler-document.cc:
+ * qt/poppler-document.cc: Fix memory leaks
+
+ ChangeLog | 6 ++++++
+ qt/poppler-document.cc | 4 ++++
+ qt4/src/poppler-document.cc | 4 +++-
+ qt4/src/poppler-embeddedfile.cc | 4 +++-
+ 4 files changed, 16 insertions(+), 2 deletions(-)
+
+commit 7da5885e45c33382060276c95d9a3bd117ae55c7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 28 15:51:44 2006 +0000
+
+ * goo/GooString.cc
+ * goo/GooString.h
+ * goo/gmem.c
+ * goo/gmem.h
+ * poppler/Lexer.cc
+ * poppler/Lexer.h
+ * poppler/PageLabelInfo.cc
+ * poppler/Parser.cc
+ * poppler/UGooString.cc
+ * poppler/UGooString.h: Patch by Krzysztof Kowalczyk
+ <kkowalczyk@gmail.com> to improve performance. See bug 7808 for
+ details.
+
+ ChangeLog | 15 ++++
+ goo/GooString.cc | 186
+ +++++++++++++++++++++++-----------------------
+ goo/GooString.h | 28 ++++++--
+ goo/gmem.c | 3 +-
+ goo/gmem.h | 2 +-
+ poppler/Lexer.cc | 19 ++++-
+ poppler/Lexer.h | 10 +++
+ poppler/PageLabelInfo.cc | 1 +
+ poppler/Parser.cc | 17 +++--
+ poppler/UGooString.cc | 137 ++++++++++++++++++++++++++++------
+ poppler/UGooString.h | 40 ++++++++--
+ 11 files changed, 313 insertions(+), 145 deletions(-)
+
+commit fbc05a6791fc28ee26a9d9188722ea3453c65ddc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Dec 27 23:15:06 2006 +0000
+
+ * poppler/Annot.cc:
+ * poppler/Annot.h: Add type checking to processing of "Rect". Patch
+ by Scott Turner <scotty1024@mac.com>
+
+ ChangeLog | 6 ++++++
+ poppler/Annot.cc | 48 +++++++++++++++++++++++++++++-------------------
+ poppler/Annot.h | 1 +
+ 3 files changed, 36 insertions(+), 19 deletions(-)
+
+commit dc6b372358ac629c43aa2faabd644942cb0ed98b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Dec 27 15:23:04 2006 +0000
+
+ Remove , after last value of enum. Thanks to André Wöbbeking
+
+ ChangeLog | 1 +
+ poppler/Catalog.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+commit c7d19539a95927eb277966a521f13393c9e116bb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Dec 27 12:38:58 2006 +0000
+
+ qt4/src/poppler-qt4.h: Remove , after last value of enum. Thanks to
+ André Wöbbeking
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-qt4.h | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit b29429c702e6540b9f35689b0a164f30e747d5d9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Dec 26 20:07:03 2006 +0000
+
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-page.cc: Add Page::duration() function to the
+ qt4 frontend.
+
+ ChangeLog | 6 ++++++
+ qt4/src/poppler-page.cc | 8 ++++++++
+ qt4/src/poppler-qt4.h | 9 ++++++++-
+ 3 files changed, 22 insertions(+), 1 deletions(-)
+
+commit 62dfc58903b496c4cc720c8b2c759c6fb82fb443
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Dec 26 19:56:28 2006 +0000
+
+ * glib/test-poppler-glib.c:
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * poppler/Page.cc:
+ * poppler/Page.h: Implement /Dur entry in page object. Patch
+ by Carlos
+ Garcia Campos <carlosgc@gnome.org>
+
+ ChangeLog | 9 +++++++++
+ glib/poppler-page.cc | 16 ++++++++++++++++
+ glib/poppler-page.h | 1 +
+ glib/test-poppler-glib.c | 7 +++++++
+ poppler/Page.cc | 13 +++++++++++++
+ poppler/Page.h | 6 ++++++
+ 6 files changed, 52 insertions(+), 0 deletions(-)
+
+commit 34e5aa62f4d3ba7a2d94a68a91c11a48277a4119
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Dec 23 13:12:13 2006 +0000
+
+ * poppler/PSTokenizer.cc: Enhance PSTokenizer::getToken
+ performance.
+ Patch by Scott Turner <scotty1024@mac.com>. In a random pdf
+ i tested
+ the patchs improves PSTokenizer::getToken performance by 15%
+
+ ChangeLog | 6 ++++++
+ poppler/PSTokenizer.cc | 33 +++++++++++++++++++++------------
+ poppler/PSTokenizer.h | 1 +
+ 3 files changed, 28 insertions(+), 12 deletions(-)
+
+commit 1a5fa1d2ced62e7d027e085663e987cff625ce0b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 22 23:39:41 2006 +0000
+
+ poppler/Page.cc: Fix memory leak when reading a wrong color map in
+ a thumbnail. Patch by Scott Turner <scotty1024@mac.com>
+
+ ChangeLog | 3 +++
+ poppler/Page.cc | 1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit dd1c134dcf085338a85188c7f205fc300396dc86
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 22 23:27:53 2006 +0000
+
+ qt/poppler-page.cc: Fix memory leak in Page::textList. Patch by
+ Jerry Epplin <jepplin@globalvelocity.com>
+
+ ChangeLog | 5 +++++
+ qt/poppler-page.cc | 4 +++-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+commit 87e474a018c4808d6251fd79f9e9640e0f733551
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Dec 21 01:01:30 2006 +0000
+
+ 2006-12-20 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Fix scaling of maskedImage
+ masks. They
+ should be scaled to the size of the image not the size of
+ the mask.
+ Fixes #9403.
+
+ ChangeLog | 6 ++++++
+ poppler/CairoOutputDev.cc | 8 ++------
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+commit 769a89623c680f51690db1751522b016b02b83a8
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Dec 20 19:55:55 2006 +0000
+
+ 2006-12-20 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/GlobalParams.cc: Try to make zero-width lines as
+ close to
+ one pixel wide as we can. Fixes #9393.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 10 ++++++++--
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+commit 5c4bca18373528f293bd5e080efca572977fc1ff
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Dec 19 20:27:55 2006 +0000
+
+ poppler/SplashOutputDev.cc: Fix gray calculation. Patch by Scott
+ Turner <scotty1024@mac.com>
+
+ ChangeLog | 5 +++++
+ poppler/SplashOutputDev.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit fba99578f6001ae0c0df0442bb73040b55109b1d
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Dec 12 05:23:59 2006 +0000
+
+ 2006-12-12 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Change a cairo_set_matrix to
+ cairo_transform so that we don't blindly clobber the existing
+ matrix.
+ Patch by Daniel Colascione.
+ Fixes #9190.
+
+ ChangeLog | 7 +++++++
+ poppler/CairoOutputDev.cc | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+commit 9a6ffa1c6e009f8606a055f873efdcd5829fcfa2
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Dec 10 05:24:56 2006 +0000
+
+ 2006-12-09 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/Function.cc: Initialize PostScriptFunction::codeString
+ to
+ NULL so that it can safely deleted if initialization fails.
+ Fixes #9263.
+
+ ChangeLog | 6 ++++++
+ poppler/Function.cc | 1 +
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit e92d63a179ae022270156da4e396c15ff9236d89
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Nov 23 19:01:44 2006 +0000
+
+ * m4/libjpeg.m4: Make JPEG library header search work under
+ MSYS. Patch by Alexis Wilke
+
+ ChangeLog | 5 +++++
+ m4/libjpeg.m4 | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 3913110f698fd006b394a395b5b0adfde30af31b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 22 21:55:27 2006 +0000
+
+ there should not be any whitespace after the \
+
+ qt4/src/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit c3ab7addec5a7990872949b813c2b727b1614d64
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 19 18:51:23 2006 +0000
+
+ Another leak fix on qt4/src/poppler-page.cc the previous changelog
+ is enough for this one ;-)
+
+ qt4/src/poppler-page.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 9e9b82da91abacb916b05302d40bf822af6ac7f1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Nov 19 12:59:48 2006 +0000
+
+ * qt4/src/poppler-link.cc:
+ * qt4/src/poppler-page.cc:
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-textbox.cc: Fix memory leaks
+ * splash/Splash.cc: Initialize the values of nClipRes
+
+ ChangeLog | 8 ++++++++
+ qt4/src/poppler-link.cc | 6 ++++++
+ qt4/src/poppler-page.cc | 4 +++-
+ qt4/src/poppler-qt4.h | 1 +
+ qt4/src/poppler-textbox.cc | 5 +++++
+ splash/Splash.cc | 2 +-
+ 6 files changed, 24 insertions(+), 2 deletions(-)
+
+commit b9faacc62182efcbc84df2471e4c5dcf2b03bda8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 18 17:08:04 2006 +0000
+
+ * qt4/src/poppler-document.cc
+ * qt4/src/poppler-qt4.h: Add int marginRight, int
+ marginBottom, int
+ marginLeft, int marginTop, bool strictMargins to
+ Document::print()
+
+ ChangeLog | 6 ++++++
+ qt4/src/poppler-document.cc | 11 +++++++++--
+ qt4/src/poppler-qt4.h | 6 +++++-
+ 3 files changed, 20 insertions(+), 3 deletions(-)
+
+commit da8e6d4c3e0afdaa031413649ae20545c8a1f845
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Nov 16 21:03:27 2006 +0000
+
+ really commit pino's patch :-S
+
+ qt4/src/Doxyfile | 11 +++-
+ qt4/src/Mainpage.dox | 26 ++++-----
+ qt4/src/poppler-annotation.h | 33 +++++++-----
+ qt4/src/poppler-link.h | 68 +++++++++++++++++++++----
+ qt4/src/poppler-qt4.h | 115
+ ++++++++++++++++++++++++++---------------
+ 5 files changed, 171 insertions(+), 82 deletions(-)
+
+commit 4f26e65096e3133a39fc0c9e82084c90cf77dda9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Nov 16 21:00:10 2006 +0000
+
+ * qt4/src/Mainpage.dox:
+ * qt4/src/Doxyfile:
+ * qt4/src/poppler-annotation.h:
+ * qt4/src/poppler-link.h:
+ * qt4/src/poppler-qt4.h: Improve API documentation. Patch by
+ Pino Toscano.
+
+ Generated docu at http://people.freedesktop.org/~aacid/docs/qt4/
+
+ ChangeLog | 9 +++++++++
+ qt4/src/Mainpage.dox | 2 +-
+ 2 files changed, 10 insertions(+), 1 deletions(-)
+
+commit e68b6f3f8fea1e4f036eba0f19bb7e0c423d408c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Nov 15 21:07:50 2006 +0000
+
+ 2006-11-15 Albert Astals Cid <aacid@kde.org>
+
+ * qt4/src/poppler-link.cc:
+ * qt4/src/poppler-page.cc:
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-private.h: Generalize the way we render
+ the pages:
+ merge all the Page::renderTo* functions in only one that
+ renders on
+ a QImage, taking into account the currently chosen backend.
+ It is possible to switch rendering backend using the Document.
+ Patch by Pino Toscano.
+
+ * qt4/tests/stress-poppler-qt4.cpp:
+ * qt4/tests/test-password-qt4.cpp:
+ * qt4/tests/test-poppler-qt4.cpp: Adapt the tests to the
+ changes in
+ the rendering API of Page. Patch by Pino Toscano.
+
+ ChangeLog | 17 +++++
+ qt4/src/poppler-document.cc | 14 ++++
+ qt4/src/poppler-link.cc | 2 +-
+ qt4/src/poppler-page.cc | 125
+ ++++++++++++++++++++------------------
+ qt4/src/poppler-private.h | 32 +++++++---
+ qt4/src/poppler-qt4.h | 75 ++++++-----------------
+ qt4/tests/stress-poppler-qt4.cpp | 3 +-
+ qt4/tests/test-password-qt4.cpp | 12 ++--
+ qt4/tests/test-poppler-qt4.cpp | 17 ++---
+ 9 files changed, 153 insertions(+), 144 deletions(-)
+
+commit 37088dd3335be6e7641c47bea9b1ddd689b07372
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 13 19:16:44 2006 +0000
+
+ * poppler/ArthurOutputDev.cc: Small fix to get colors right
+
+ ChangeLog | 4 ++++
+ poppler/ArthurOutputDev.cc | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+commit 302e2cab9fd626222c69ad40f7e40be2e65d34a9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Nov 11 15:41:27 2006 +0000
+
+ Fix typo when outputing PS scale
+
+ ChangeLog | 4 ++++
+ poppler/PSOutputDev.cc | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit e3550fb286dae98992b30edbf4a9300fa58d2e77
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Nov 7 23:53:31 2006 +0000
+
+ 2006-11-07 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: take horizontal scaling into account
+ when updating the font. Also, cleanup some unused code. Fixes
+ #8924.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 9 ++-------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+commit f020b64a72ad5c82c3e7bdcf15039bb0037b1f22
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Oct 18 18:43:59 2006 +0000
+
+ 2006-10-18 Albert Astals Cid <aacid@kde.org>
+
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-private.h: Do not crash when opening a
+ encrypted document. Do not crash when unlocking a locked
+ document.
+
+ ChangeLog | 7 +++++++
+ qt4/src/poppler-document.cc | 41
+ ++++++++++++++++-------------------------
+ qt4/src/poppler-private.h | 14 ++++++++++++++
+ 3 files changed, 37 insertions(+), 25 deletions(-)
+
+commit 577330ee1d4d1021174cf1bd59557a83a017e06f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Oct 11 23:09:24 2006 +0000
+
+ * splash/Splash.cc:
+ * splash/SplashErrorCodes.h: Do not crash on documents that
+ report a
+ 0x0 mask for an image, like
+ http://bugs.kde.org/attachment.cgi?id=18083&action=view
+
+ ChangeLog | 7 +++++++
+ splash/Splash.cc | 2 ++
+ splash/SplashErrorCodes.h | 2 ++
+ 3 files changed, 11 insertions(+), 0 deletions(-)
+
+commit 42c016c6d3c6de65fd92b51b9d6cc96d52404689
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 8 20:38:47 2006 +0000
+
+ * poppler/Link.cc:
+ * poppler/Link.h:
+ * poppler/Makefile.am:
+ * poppler/Page.cc:
+ * poppler/Page.h:
+ * poppler/Sound.cc:
+ * poppler/Sound.h: Make poppler able to read Sound objects,
+ Sound
+ actions and Opening/Closing page actions. Patch by Pino
+ Toscano.
+
+ * qt4/src/Makefile.am:
+ * qt4/src/poppler-link.cc:
+ * qt4/src/poppler-link.h:
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-page.cc:
+ * qt4/src/poppler-sound.cc: Support for sounds, sound links
+ and page
+ actions in the Qt4 backend. Patch by Pino Toscano.
+
+ ChangeLog | 19 +++++
+ poppler/Link.cc | 53 ++++++++++++++
+ poppler/Link.h | 32 ++++++++
+ poppler/Makefile.am | 2 +
+ poppler/Page.cc | 8 ++
+ poppler/Page.h | 4 +
+ poppler/Sound.cc | 65 +++++++++++++++++
+ poppler/Sound.h | 46 ++++++++++++
+ qt4/src/Makefile.am | 1 +
+ qt4/src/poppler-link.cc | 35 +++++++++
+ qt4/src/poppler-link.h | 26 +++++++-
+ qt4/src/poppler-page.cc | 32 ++++++++
+ qt4/src/poppler-qt4.h | 87 ++++++++++++++++++++++
+ qt4/src/poppler-sound.cc | 177
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ 14 files changed, 586 insertions(+), 1 deletions(-)
+
+commit 1da064d7e7403ec7111eecb2b9613e27a2c4bb5d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Sep 30 16:28:35 2006 +0000
+
+ * qt4/src/poppler-page.cc: PA is optional, H is a name not a string
+
+ ChangeLog | 4 ++++
+ qt4/src/poppler-page.cc | 15 +++++++++------
+ 2 files changed, 13 insertions(+), 6 deletions(-)
+
+commit 29366d8e470ab2207cdfdab115c2fa9618c4c74e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 25 20:43:18 2006 +0000
+
+ * glib/Makefile.am
+ * qt/Makefile.am
+ * qt4/src/Makefile.am
+ * qt4/tests/Makefile.am
+ * test/Makefile.am
+ * utils/Makefile.am: Add FONTCONFIG_CFLAGS FONTCONFIG_LIBS
+ for people
+ that need them. Patch by morfoh@opensde.org. Fixes bug #8415
+
+ ChangeLog | 10 ++++++++++
+ glib/Makefile.am | 2 ++
+ qt/Makefile.am | 6 ++++--
+ qt4/src/Makefile.am | 2 ++
+ qt4/tests/Makefile.am | 2 ++
+ test/Makefile.am | 6 ++++--
+ utils/Makefile.am | 6 ++++--
+ 7 files changed, 28 insertions(+), 6 deletions(-)
+
+commit 957c1e59df213a01ca87f03d067a8dab5dc09fb6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 25 20:05:28 2006 +0000
+
+ ignore poppler-features.h
+
+ glib/.cvsignore | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 3158b54375bdfdc82779362cc9442aade87f84f6
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Sep 22 00:55:54 2006 +0000
+
+ 2006-09-21 Kristian Høgsberg <krh@redhat.com>
+
+ * NEWS: Update list of bugs fixes, release 0.5.4.
+
+ ChangeLog | 2 ++
+ NEWS | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletions(-)
+
+commit 17dd1f60f9328ae68fbe262ae0745be976ff9f95
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Sep 21 23:28:14 2006 +0000
+
+ 2006-09-21 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Check for gtk+ 2.8 for the gtk+ test case, invert
+ help text for zlib option (#7788, #7661).
+
+ ChangeLog | 3 +++
+ configure.ac | 12 +++++-------
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+commit ddbbd697424b9122ce1f0541ddada3fe8bb38fb1
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Sep 21 22:58:31 2006 +0000
+
+ 2006-09-21 Kristian Høgsberg <krh@redhat.com>
+
+ * utils/pdftops.cc: Get duplex setting from GlobalParams.
+
+ ChangeLog | 2 ++
+ utils/pdftops.cc | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 0d25592a1a5811ee8fffbd70307c7bcaaaacadf3
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Sep 21 22:40:52 2006 +0000
+
+ 2006-09-21 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (_poppler_page_new): Make PopplerPage
+ reference its document throughout the lifetime of the page
+ (#7005).
+
+ ChangeLog | 3 +++
+ glib/poppler-page.cc | 5 ++++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit b834755c7ae45eb4020e9cdbc3852eac0151fcdc
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Sep 21 22:37:00 2006 +0000
+
+ 2006-09-21 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/Gfx.cc: Remove the right out->updateAll() call.
+
+ ChangeLog | 4 ++++
+ poppler/Gfx.cc | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 181e2af1edf2cbc3c8edadad0dce215a64a990dd
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Sep 21 01:05:23 2006 +0000
+
+ 2006-09-20 Kristian Høgsberg <krh@redhat.com>
+
+ * NEWS: Sum up changes.
+
+ * configure.ac: Bump release to 0.5.4.
+
+ ChangeLog | 4 ++++
+ NEWS | 10 ++++++++++
+ configure.ac | 2 +-
+ 3 files changed, 15 insertions(+), 1 deletions(-)
+
+commit cc9c17a6730422be99ebcd69991fcf5d7b569640
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Sep 21 00:56:33 2006 +0000
+
+ 2006-09-20 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/Gfx.cc: Remove last remnant of erroneous type3 commit a
+ while back, fixing #8182.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 1 -
+ poppler/Gfx.cc | 1 -
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 83be722b56d9266b89946fe994023351e47eb4fd
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Sep 20 20:22:19 2006 +0000
+
+ 2006-09-20 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/TextOutputDev.cc: TextFontInfo stores a copy of
+ a pointer
+ to a GfxFont but does not increment the reference count. Fix the
+ problem by calling incRefCnt and decRefCnt appropriately. Fixes
+ #4649
+
+ ChangeLog | 6 ++++++
+ poppler/TextOutputDev.cc | 4 ++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 1cf60015d7d78668c83737be6015dc880fd04ebf
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Sep 19 04:39:07 2006 +0000
+
+ 2006-09-19 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/GlobalParams.cc: Add scanEncodingDirs() to automatically
+ scan in any encodings found under ${datadir}/poppler.
+
+ * m4/define-dir.m4: New file, adds AC_DEFINE_DIR macro.
+
+ ChangeLog | 7 +++
+ configure.ac | 16 +------
+ goo/gfile.cc | 16 +++----
+ goo/gfile.h | 2 +
+ m4/define-dir.m4 | 34 ++++++++++++++
+ poppler/GlobalParams.cc | 116
+ +++++++++++++++++++++++++++++++---------------
+ poppler/GlobalParams.h | 7 +++-
+ 7 files changed, 136 insertions(+), 62 deletions(-)
+
+commit 821c883f9df9cc0e5b81aa2e070727996cf3bc4e
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Sep 18 15:40:50 2006 +0000
+
+ 2006-09-13 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/Makefile.am (libpoppler_la_LIBADD): Add cairo libs to
+ link if configured.
+
+ ChangeLog | 3 +++
+ poppler/Makefile.am | 4 ++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit d8ab8ebc94c32d32ad17ed54cede453de25d7dd5
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Sep 13 20:25:03 2006 +0000
+
+ 2006-09-13 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Tighten glib check (#7906), add check for C++
+ compiler (#8048).
+
+ ChangeLog | 5 +++++
+ configure.ac | 3 ++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 7c748075e18cfe95be6a56adf09ce7f2f032b86f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 12 19:48:47 2006 +0000
+
+ sorry Jeff
+
+ ChangeLog | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 6cdcfae0e1c6fbec07ee5273e6ad97ef04110868
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Sep 11 21:20:56 2006 +0000
+
+ 2006-09-11 Albert Astals Cid <aacid@kde.org>
+
+ * qt4/src/poppler-annotation.cc:
+ * qt4/src/poppler-annotation.h:
+ * qt4/src/poppler-page.cc: Add support for
+ LinkAnnotation. Patch by
+ Pino Toscano
+
+ ChangeLog | 10 +-
+ qt4/src/poppler-annotation.cc | 230
+ ++++++++++++++++++++++++++++++++++++++-
+ qt4/src/poppler-annotation.h | 22 ++++-
+ qt4/src/poppler-page.cc | 237
+ +++++++++++++++++++++++++----------------
+ 4 files changed, 392 insertions(+), 107 deletions(-)
+
+commit 8335c7eea2aa62a580170f47323d8674bd89e412
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Fri Sep 8 23:28:22 2006 +0000
+
+ 2006-09-08 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: The work-around for 1x1 imagemasks
+ was not
+ calling cairo_set_source causing the rectangles to be drawn
+ the wrong
+ colour occasionally. Fix by moving the existing call to
+ cairo_set_source above the work-around. Fixes #7113.
+
+ ChangeLog | 7 +++++++
+ poppler/CairoOutputDev.cc | 8 ++++----
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+commit 02d505aa0176b6e5a54ee82426d8333a9ef8f000
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Sep 7 04:01:39 2006 +0000
+
+ 2006-09-06 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Avoid crashing in CairoOutputDev if
+ endString is called without a corresponding beginString. Fixes
+ #4515.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 8 +++++++-
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+commit 3ea0aada0434c9f815814253dd9d1374ae6643cc
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Sep 6 23:54:30 2006 +0000
+
+ 2006-09-06 Jeff Muizelaar <jeff@infidigm.net>
+
+ * configure.ac:
+ * poppler/FlateStream.cc:
+ * poppler/FlateStream.h: Fix FlateStream to not read more than it
+ needs. This has a performance impact because our input buffer
+ is now
+ only 1 byte large, however correctness is better than performance.
+ This should fix #3948.
+
+ ChangeLog | 9 +++++++++
+ configure.ac | 2 +-
+ poppler/FlateStream.cc | 35 +++++++++++++++++++++++++----------
+ poppler/FlateStream.h | 3 ++-
+ 4 files changed, 37 insertions(+), 12 deletions(-)
+
+commit 1d2e6aedca0b8fcce6ac84ae2576ab067912886b
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Sep 5 01:21:50 2006 +0000
+
+ 2006-09-04 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Initialize currentFont to NULL before
+ use. Found by Pascal Terjan. Fixes #7924.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 1 +
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 7905adaa21f2347346927fa567c64be60e2bc69c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Sep 3 09:27:21 2006 +0000
+
+ * poppler/Dict.cc:
+ * poppler/Dict.h:
+ * poppler/Object.h:
+ * poppler/Parser.cc: Patch by Krzysztof Kowalczyk to increase
+ speed by
+ means of doing less copies between objects. See bug 8112
+ for more
+ information.
+
+ ChangeLog | 9 +++++++++
+ poppler/Dict.cc | 4 ++--
+ poppler/Dict.h | 11 +++++++++--
+ poppler/Object.h | 12 ++++++++++++
+ poppler/Parser.cc | 15 +++++++++------
+ 5 files changed, 41 insertions(+), 10 deletions(-)
+
+commit 4da7c90a619002e54f436c4efee723b5bc42a112
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Aug 24 22:32:31 2006 +0000
+
+ * qt4/src/poppler-private.h: Init m_fontInfoScanner to
+ NULL. Discovered by
+ Rafael Rodríguez <rafael.rodriguez.tf@gmail.com>
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-private.h | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 469202e117910beb4e0ad906d5c154a3bae5c98b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Aug 16 14:35:14 2006 +0000
+
+ * qt/poppler-page.cc: Report correct page size. Backport from Qt4
+ frontend. Patch by Wilfried Huss
+
+ ChangeLog | 5 +++++
+ qt/poppler-page.cc | 10 ++++++++--
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+commit b881844e4d31009c5d54c9321a6daaf0f354cf6b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Aug 16 09:18:04 2006 +0000
+
+ did not want to commit that, thanks Brad for noticing!
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit f52380e6d569280839d7c37362bd7cc59f2573c3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Aug 15 22:27:31 2006 +0000
+
+ add a warning how nasty zlib can be, it can come and it your pdfs
+ and make your readers crash when you are not looking at it, so be
+ aware that if you enable it you are on your own ;-)
+
+ ChangeLog | 4 ++++
+ configure.ac | 4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 1caba84b1024f1fa7865deebbf70379855ce078d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 11 13:12:11 2006 +0000
+
+ 2006-08-11 Albert Astals Cid <aacid@kde.org>
+
+ * poppler/Catalog.cc: Fix leak
+
+ ChangeLog | 4 ++++
+ poppler/Catalog.cc | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 9b6455f6530e273afaa5f948b67ceeec8a06f976
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Aug 10 16:08:51 2006 +0000
+
+ 2006-08-10 Albert Astals Cid <aacid@kde.org>
+
+ * poppler/SplashOutputDev.cc: Try to fix refs to fonts
+ yet again
+
+ ChangeLog | 4 ++++
+ poppler/SplashOutputDev.cc | 4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 305f60e0437dcfc5babd449123a1fe4cd062a219
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 5 17:10:07 2006 +0000
+
+ 2006-08-05 Albert Astals Cid <aacid@kde.org>
+
+ * poppler/Catalog.cc: The name array can contain references
+ to strings
+ instead of stings themselves, or at least PDF of
+ https://bugs.freedesktop.org/show_bug.cgi?id=7780 does. This
+ makes it
+ work with that file
+ * qt4/src/poppler-embeddedfile.cc: Use UGooString for
+ description
+
+ ChangeLog | 8 ++++++++
+ poppler/Catalog.cc | 12 ++++++++++--
+ qt4/src/poppler-embeddedfile.cc | 3 ++-
+ 3 files changed, 20 insertions(+), 3 deletions(-)
+
+commit dd8758ea3f0f44e9f8362343f15b2064f428ad64
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Aug 4 22:48:09 2006 +0000
+
+ 2006-08-05 Albert Astals Cid <aacid@kde.org>
+
+ * utils/pdftotext.cc:
+ * utils/pdfinfo.cc:
+ * utils/pdffonts.cc: Add the posibility of reading a file
+ from stdin.
+ Patch by Dom Lachowicz
+
+ ChangeLog | 7 +++++++
+ utils/pdffonts.cc | 11 ++++++++++-
+ utils/pdfinfo.cc | 11 ++++++++++-
+ utils/pdftotext.cc | 11 ++++++++++-
+ 4 files changed, 37 insertions(+), 3 deletions(-)
+
+commit a418d844cf6baa797919796ceadaf21ef9b2e5b9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Aug 3 10:34:52 2006 +0000
+
+ * configure.ac: Use the correct variable to output the
+ utils status.
+ Patch by Dom Lachowic
+
+ ChangeLog | 5 +++++
+ configure.ac | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 1673b895656143a8a1f1a45e07f777f39995940d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 30 20:31:31 2006 +0000
+
+ * poppler/GfxState.cc: make nGfxBlendModeNames define
+ return the
+ correct size of the gfxBlendModeNames array so it does
+ not access
+ invalid memory areas when the blend mode is not
+ found. Discovered by
+ Krzysztof Kowalczyk
+
+ ChangeLog | 7 +++++++
+ poppler/GfxState.cc | 12 +++++++-----
+ 2 files changed, 14 insertions(+), 5 deletions(-)
+
+commit e4561568d14e7b3b2aec6ecaf3cc09078bdf7a46
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 30 09:38:28 2006 +0000
+
+ * splash/SplashFontEngine.cc:
+ * poppler/SplashOutputDev.cc: Fix memory leak when using
+ embedded
+ fonts in the pdf file. Patch by Krzysztof Kowalczyk
+
+ ChangeLog | 6 ++++++
+ poppler/SplashOutputDev.cc | 8 ++++++--
+ splash/SplashFontEngine.cc | 12 ++++++++----
+ 3 files changed, 20 insertions(+), 6 deletions(-)
+
+commit 4a27502159a89992f54be2673b44bf7a8392b60d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jul 29 16:24:53 2006 +0000
+
+ push back thing i did not want to commit, sorry
+
+ configure.ac | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit ba448afc0e97a9e779409ff228adcd4f627971f5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jul 29 16:22:52 2006 +0000
+
+ * configure.ac: Disable qt and qt4 frontends if splash
+ backend is
+ disabled
+
+ ChangeLog | 5 +++++
+ configure.ac | 18 ++++++++++++++----
+ 2 files changed, 19 insertions(+), 4 deletions(-)
+
+commit 1e32d3baa5e8296caf55bd5853216a96618c74ac
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Jul 28 18:17:45 2006 +0000
+
+ 2006-07-28 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDev.cc: Don't set font matrix translation
+ (fix from Behdad Esfahbod).
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 0bc1b0f35c28cb80dd27d24110367348e52c143b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jul 27 18:21:28 2006 +0000
+
+ fix date, i don't live in the past
+
+ ChangeLog | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2f27c3a0218608568f6cd1c718ef51b9879023a3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jul 27 18:17:50 2006 +0000
+
+ * poppler/Stream.cc: If you are going to test a variable,
+ better
+ initialize it first ;-) Fixes bug 7646
+
+ ChangeLog | 5 +++++
+ poppler/Stream.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit f39ab43ca824cb7e5db73137c4545b3e85134425
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 26 18:16:01 2006 +0000
+
+ 2006-07-26 Albert Astals Cid <aacid@kde.org>
+
+ * qt/poppler-document.cc:
+ * qt/poppler-private.h:
+ * qt/poppler-qt.h: Port the QDomDocument *Document::toc()
+ const method
+ from the qt4 frontend to the qt frontend. Patch by Wilfried
+ Huss
+
+ ChangeLog | 7 +++++
+ qt/poppler-document.cc | 18 +++++++++++++++
+ qt/poppler-private.h | 58
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt/poppler-qt.h | 16 +++++++++++++
+ 4 files changed, 99 insertions(+), 0 deletions(-)
+
+commit c3a9fd546b853c85b6be5fc8f4e5a78d8a7e7437
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 25 18:39:57 2006 +0000
+
+ * qt4/src/poppler-document.cc: Obey kdeprint masters in that
+ a library
+ should output as much device independent PS as posible,
+ so disabling
+ duplex printing for default is a good idea.
+
+ ChangeLog | 6 ++++++
+ qt4/src/poppler-document.cc | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit edc0499644b8083600ced9a5087ec0b0189e615b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jul 24 19:49:51 2006 +0000
+
+ 2006-07-24 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac:
+ * poppler/Makefile.am: Move fontconfig dependency to libpoppler.
+
+ ChangeLog | 5 +++++
+ configure.ac | 18 +++++++-----------
+ poppler/Makefile.am | 6 ++++--
+ 3 files changed, 16 insertions(+), 13 deletions(-)
+
+commit 24b5a68a3f4cdba63fbcd01dc178a330b5f604a7
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Jul 18 21:32:11 2006 +0000
+
+ 2006-07-18 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/Gfx.cc: fix opCloseStroke to match the behaviour of
+ a separate opClose and opStroke. Previously, opCloseStroke only
+ closes if there is a path however opClose closes unconditionally.
+
+ ChangeLog | 6 ++++++
+ poppler/Gfx.cc | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit c57ebd40fcf85432b2e5045086d158a63af12525
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Jul 18 21:26:57 2006 +0000
+
+ 2006-07-18 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/TextOutputDev.cc: call setDefaultCTM() after start page
+ like in Gfx.cc. This fixes a regression caused by the fix
+ to #6948.
+
+ ChangeLog | 5 +++++
+ poppler/TextOutputDev.cc | 1 +
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 640d5d5a9d9e53f3f677eb05f3d18e6bfc74e95a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jul 16 18:22:23 2006 +0000
+
+ 2006-07-16 Albert Astals Cid <aacid@kde.org>
+
+ * poppler/GfxState.cc: Do not crash when we can not
+ parse a GfxImageColorMap
+ Fixes crash on pdf that can be found at
+
+ ChangeLog | 7 +++++++
+ poppler/GfxState.cc | 4 ++++
+ qt4/src/Doxyfile | 4 ++--
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+commit c6926d1d8ab04468f56f4687cdd3f06af206226b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jun 28 19:23:52 2006 +0000
+
+ * poppler/DCTStream.cc:
+ * poppler/DCTStream.h: Reset jpeg structures on reset.
+ Fixes crash while printing pdf at
+ http://bugs.kde.org/attachment.cgi?id=16818&action=view
+
+ ChangeLog | 7 +++++++
+ poppler/DCTStream.cc | 25 ++++++++++++++++++-------
+ poppler/DCTStream.h | 2 ++
+ 3 files changed, 27 insertions(+), 7 deletions(-)
+
+commit 96ac8dec591a0325a822c1f7b7bc7e78b867e3a0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 25 16:59:31 2006 +0000
+
+ Ask for paper size width and height to pass it to PSOutputDev in
+ both qt frontends (qt got abi mantained, qt4 changed as you still
+ have to define UNSTABLE_POPPLER_QT4 to be able of using it, one day
+ we'll have to think of removing it)
+
+ ChangeLog | 8 ++++++++
+ qt/poppler-document.cc | 9 +++++++--
+ qt/poppler-qt.h | 9 +++++++++
+ qt4/src/poppler-document.cc | 4 ++--
+ qt4/src/poppler-qt4.h | 10 +++++++++-
+ 5 files changed, 35 insertions(+), 5 deletions(-)
+
+commit 965011f2001fb1ea36857995d5555266f82b8d96
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 25 16:20:50 2006 +0000
+
+ put back a change that was not meant to be commited
+
+ qt/poppler-qt.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 4995d09c91173d34a435112828aff21a63b147e9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 25 16:19:32 2006 +0000
+
+ rename poppler-link.h to poppler-link-qt3.h to not get conflicts
+ on install
+
+ qt/Makefile.am | 2 +-
+ qt/poppler-link-qt3.h | 188 +++++++++++++++++++++++++++++++++++
+ qt/poppler-link.cc | 258
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ qt/poppler-qt.h | 4 +-
+ 4 files changed, 449 insertions(+), 3 deletions(-)
+
+commit 087921b134c2646e6d41960f471a1819c7c8790a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 25 10:29:22 2006 +0000
+
+ add link support to qt3 frontend.
+ Patch by Wilfried Huss based on Qt4 code
+
+ ChangeLog | 11 ++++
+ qt/Makefile.am | 4 +-
+ qt/poppler-document.cc | 19 +++----
+ qt/poppler-page.cc | 136
+ +++++++++++++++++++++++++++++++++++++++++++++--
+ qt/poppler-private.h | 33 +++++++++++-
+ qt/poppler-qt.h | 14 ++++-
+ 6 files changed, 196 insertions(+), 21 deletions(-)
+
+commit 831bd8942ef3224354b128d5e14e68fdfc57168b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 11 16:14:32 2006 +0000
+
+ optimization by Mario Teijeiro Otero
+
+ poppler/UGooString.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1223fd4b200f6c13996f8299f3563c818af0c21d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Jun 10 22:23:19 2006 +0000
+
+ * poppler/UGooString.cc: When any of the chars that we
+ are passing to the UGooString is not pdfencodable, do not
+ encode the string, because we loose information if we do,
+ this fixes rendering of
+ http://publikationen.ub.uni-frankfurt.de/volltexte/2005/890/pdf/TR_abs_g.pdf
+ and other docs with type3 fonts and ligatures
+
+ ChangeLog | 9 +++++++++
+ poppler/UGooString.cc | 8 ++++++++
+ 2 files changed, 17 insertions(+), 0 deletions(-)
+
+commit b85a39ddfc7de8c0621e995c114885ecd08fcdc2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jun 1 21:03:38 2006 +0000
+
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-page.cc: Add Rotation parameter that
+ is passed
+ to the respective output devs
+
+ ChangeLog | 6 ++++++
+ qt4/src/poppler-page.cc | 22 ++++++++++++++--------
+ qt4/src/poppler-qt4.h | 14 +++++++++-----
+ 3 files changed, 29 insertions(+), 13 deletions(-)
+
+commit 2b5d3277f36864ff1ef44f1942f22de247d67ab6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jun 1 17:23:45 2006 +0000
+
+ * qt/poppler-document.cc:
+ * qt/poppler-qt.h: Add printing support, patch by
+ Stefan Kebekus <stefan.kebekus@math.uni-koeln.de>
+
+ ChangeLog | 6 ++++++
+ qt/poppler-document.cc | 18 ++++++++++++++++++
+ qt/poppler-qt.h | 2 ++
+ 3 files changed, 26 insertions(+), 0 deletions(-)
+
+commit 5380d005b7b54cc6587ce6e8c3bbb358da5cd9a5
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Jun 1 06:42:25 2006 +0000
+
+ 2006-06-01 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/PSOutputDev.cc:
+ * poppler/PSOutputDev.h: Change filename parameter to PSOutputDev
+ constructor from char * to const char *.
+
+ ChangeLog | 6 ++++++
+ poppler/PSOutputDev.cc | 2 +-
+ poppler/PSOutputDev.h | 2 +-
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+commit c2a81ea8b01f3943a2eb737cf957acc0d05f7eed
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed May 31 20:14:04 2006 +0000
+
+ * poppler/SplashOutputDev.cc:
+ * splash/Splash.cc: Fix no splashModeRGB8Qt mode, that is,
+ make it
+ show images
+
+ I'm sorry, really, i'll try to do better
+
+ ChangeLog | 6 ++++++
+ poppler/SplashOutputDev.cc | 10 ++++++++++
+ splash/Splash.cc | 3 +++
+ 3 files changed, 19 insertions(+), 0 deletions(-)
+
+commit 643b310cf51474b6dfc077fe086ea121e807f6e1
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed May 31 19:18:28 2006 +0000
+
+ 2006-05-31 Jeff Muizelaar <jeff@infidigm.net>
+
+ * TODO: Remove items's from my list that are done.
+
+ ChangeLog | 4 ++++
+ TODO | 3 ---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 96e582721dcb15ea258b989c7c500084bff9f56d
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed May 31 17:31:49 2006 +0000
+
+ 2006-05-31 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: Change the cairo backend to use the
+ transformation in cairo instead of doing all of the
+ transformations in
+ the OutputDevice. Fixes #6948.
+
+ ChangeLog | 7 ++
+ poppler/CairoOutputDev.cc | 200
+ ++++++++++++++++++++-------------------------
+ poppler/CairoOutputDev.h | 1 +
+ 3 files changed, 96 insertions(+), 112 deletions(-)
+
+commit 00ffb9bf50b6b3b2e8eaa8af593aaa01d4a62a34
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 31 04:53:27 2006 +0000
+
+ 2006-05-31 Kristian Høgsberg <krh@redhat.com>
+
+ * NEWS: Sum up changes.
+
+ * configure.ac: Bump release to 0.5.3.
+
+ ChangeLog | 6 ++++++
+ NEWS | 8 ++++++++
+ configure.ac | 2 +-
+ 3 files changed, 15 insertions(+), 1 deletions(-)
+
+commit 223a4bf3a679f666b6c963a8787cf5b5ac75c4b6
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 31 02:02:54 2006 +0000
+
+ 2006-05-30 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler-glib.pc.in:
+ * configure.ac: Add poppler as a private requires if pkg-config
+ supports it.
+
+ ChangeLog | 6 ++++++
+ configure.ac | 11 +++++++++++
+ poppler-glib.pc.in | 3 ++-
+ 3 files changed, 19 insertions(+), 1 deletions(-)
+
+commit 7aaa4d3fbdb8ea2534d3cb80e68b2759b2e8fd2f
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue May 30 21:46:06 2006 +0000
+
+ 2006-05-30 Kristian Høgsberg <krh@redhat.com>
+
+ * test/gtk-cairo-test.cc: Add --page option to gtk-cairo-test.
+
+ ChangeLog | 4 ++++
+ test/gtk-cairo-test.cc | 21 ++++++++++++++++++---
+ 2 files changed, 22 insertions(+), 3 deletions(-)
+
+commit f7c1d519b9695ad8adfdcf3af696de746cdcf375
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon May 29 18:44:17 2006 +0000
+
+ 2006-05-29 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoFontEngine.cc:
+ * poppler/CairoFontEngine.h:
+ * poppler/CairoOutputDev.cc: Allow CairoFont creation to fail more
+ gracefully. Fixes #4030.
+
+ ChangeLog | 7 +++++++
+ poppler/CairoFontEngine.cc | 27 +++++++++++++++++++++------
+ poppler/CairoFontEngine.h | 4 +++-
+ poppler/CairoOutputDev.cc | 5 +++++
+ 4 files changed, 36 insertions(+), 7 deletions(-)
+
+commit 84861800dad3649d4757d5c5539b9e86e2b2c644
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat May 27 17:27:37 2006 +0000
+
+ 2006-05-27 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: Back out the rest of krh's type3
+ font work. This fixes type3 fonts in CairoOutputDevice.
+
+ ChangeLog | 6 ++++++
+ poppler/CairoOutputDev.cc | 3 +++
+ poppler/CairoOutputDev.h | 2 +-
+ 3 files changed, 10 insertions(+), 1 deletions(-)
+
+commit 6f5a89a0a2cf17d45d1c31ce105829be8c7ac456
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue May 23 20:49:16 2006 +0000
+
+ * poppler/SplashOutputDev.cc:
+ * qt4/src/poppler-private.h:
+ * splash/Splash.cc:
+ * splash/SplashBitmap.cc:
+ * splash/SplashTypes.h: bring splashModeRGB8 back to the
+ old code
+ (before Frank's patch), create splashModeRGB8Qt that has
+ Frank's
+ codepath and is used by Qt frontends. Fixes corruption on
+ other programs expecting the old behaviour.
+
+ Remember dude we are now a lib! you can not change behaviour from
+ one day to another!
+
+ /me hits himself
+
+ ChangeLog | 11 +++
+ poppler/SplashOutputDev.cc | 8 ++
+ qt/poppler-private.h | 2 +-
+ qt4/src/poppler-private.h | 2 +-
+ splash/Splash.cc | 169
+ ++++++++++++++++++++++++++++++++++++++++++++
+ splash/SplashBitmap.cc | 26 ++++++-
+ splash/SplashTypes.h | 2 +
+ 7 files changed, 216 insertions(+), 4 deletions(-)
+
+commit 495d592c3ba7fe81e03774f5b2ed677e5aa560c7
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue May 23 19:16:37 2006 +0000
+
+ 2006-05-23 Kristian Høgsberg <krh@redhat.com>
+
+ * qt4/src/Makefile.am (libpoppler_qt4_la_SOURCES): Add missing
+
+ ChangeLog | 5 +++++
+ qt4/src/Makefile.am | 1 +
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit eecd06c86585bca05c99cd2e9a1b1ff3bbae3c72
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon May 22 20:19:35 2006 +0000
+
+ 2006-05-22 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Bump release.
+ * NEWS: Sum up changes.
+
+ ChangeLog | 5 +++++
+ NEWS | 11 ++++++++++-
+ configure.ac | 2 +-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+commit 680f20dfd1cf0342d49516b3848a2aef5d2a3883
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon May 22 19:58:41 2006 +0000
+
+ 2006-05-22 Kristian Høgsberg <krh@redhat.com>
+
+ Patch from Rainer Keller to fix the ImageOutputDev (#6984).
+
+ * utils/ImageOutputDev.cc (drawImage): Upate to work with new
+ 16-bit color representation.
+
+ * utils/ImageOutputDev.h: Return gTrue for needNonText().
+
+ ChangeLog | 9 +++++++++
+ NEWS | 4 ++++
+ utils/ImageOutputDev.cc | 6 +++---
+ utils/ImageOutputDev.h | 2 +-
+ 4 files changed, 17 insertions(+), 4 deletions(-)
+
+commit e43a06bf6e953fa9af18476e2c9f27106398c09c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun May 21 23:26:45 2006 +0000
+
+ 2006-05-21 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoFontEngine.cc:
+ * poppler/CairoFontEngine.h: Back out type3 font work committed by
+ accident.
+
+ ChangeLog | 6 +
+ poppler/CairoFontEngine.cc | 347
+ +++++---------------------------------------
+ poppler/CairoFontEngine.h | 17 +--
+ 3 files changed, 47 insertions(+), 323 deletions(-)
+
+commit 7d4bb0533f88f06449ebd64c1220d0b75001937d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun May 21 18:14:15 2006 +0000
+
+ fix all is blue issue on ppc machines
+
+ ChangeLog | 7 +++++++
+ qt/poppler-page.cc | 17 +++++++++++++++++
+ qt4/src/poppler-page.cc | 17 +++++++++++++++++
+ 3 files changed, 41 insertions(+), 0 deletions(-)
+
+commit 655af1e0126ca96d75c9c718d7d8f928c898b1f6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun May 21 17:19:53 2006 +0000
+
+ hope to fix really Kouhei's name now
+
+ ChangeLog | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit cc783a1ebe868ff75db5472775dabe0020ae501f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun May 21 11:54:30 2006 +0000
+
+ Fix Kouhei name
+
+ ChangeLog | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e4b6ad3bb873a6f334934921e6d56e9d26e06a9a
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 22:55:49 2006 +0000
+
+ Add bug number to ChangeLog entry.
+
+ ChangeLog | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 46f5f070cceb2c0f3b53537c8e33340b9f1bba38
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 22:26:03 2006 +0000
+
+ 2006-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-action.h:
+ * glib/poppler-action.cc: Add poppler_dest_get_type(), patch from
+ Kouhei Souto (#6907).
+
+ ChangeLog | 4 ++++
+ glib/poppler-action.cc | 13 +++++++++++++
+ glib/poppler-action.h | 4 ++++
+ 3 files changed, 21 insertions(+), 0 deletions(-)
+
+commit 875dc5b112dfe2d4a48a7567b1ff79257447cc0d
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 22:21:35 2006 +0000
+
+ 2006-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler-glib.pc.in (Requires): Add gdk-2.0 dependency, from
+ Kouhei Souto (#6896).
+
+ ChangeLog | 3 +++
+ poppler-glib.pc.in | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit b66dda2640c088bbe205f698a0c4028144027922
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 22:19:21 2006 +0000
+
+ 2006-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.h (POPPLER_TYPE_INDEX_ITER)
+ (POPPLER_TYPE_FONTS_ITER): Add these macros, patch from Kouhei
+ Souto (#6897).
+
+ ChangeLog | 4 ++++
+ glib/poppler-document.h | 2 ++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 095730456c0d8312067af10dd55a3b9165a83736
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 22:16:25 2006 +0000
+
+ 2006-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/Makefile.am (INCLUDES): Add define for G_LOG_DOMAIN, from
+ Kouhei Souto (#6899).
+
+ ChangeLog | 3 +++
+ glib/Makefile.am | 1 +
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+commit b8d77633899c1dec5f3b9c9a0f075f39afa98965
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 22:12:38 2006 +0000
+
+ 2006-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc (poppler_document_save): Memleak patch
+ from Paolo Borelli (#6908).
+
+ ChangeLog | 5 +++++
+ glib/poppler-document.cc | 2 ++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 488f77298fee9eebbca5983c1c9fb186b3b67aa3
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 22:04:17 2006 +0000
+
+ 2006-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ * TextOutputDev.h:
+ * TextOutputDev.cc:
+ * UnicodeTypeTable.h:
+ * UnicodeTypeTable.cc:
+ * UnicodeCClassTables.h:
+ * UnicodeCompTables.h:
+ * UnicodeDecompTables.h:
+ * gen-unicode-tables.py: Patch from Ed Catmur (#2929) to convert
+ search string and document text to unicode NFKC (compatibility
+ composition) before matching so ligatures match correctly.
+
+ ChangeLog | 13 +
+ poppler/Makefile.am | 5 +
+ poppler/TextOutputDev.cc | 41 +-
+ poppler/TextOutputDev.h | 3 +
+ poppler/UnicodeCClassTables.h | 1827 +++++++++
+ poppler/UnicodeCompTables.h | 665 ++++
+ poppler/UnicodeDecompTables.h | 8526
+ +++++++++++++++++++++++++++++++++++++++++
+ poppler/UnicodeTypeTable.cc | 235 ++
+ poppler/UnicodeTypeTable.h | 3 +
+ 9 files changed, 11303 insertions(+), 15 deletions(-)
+
+commit ecb942e54a1ab0f7eded91b7d1278f0ac62e2071
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 21:42:54 2006 +0000
+
+ 2006-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_prepare_output_dev): Fix the
+ rotation bug for real.
+
+ ChangeLog | 5 +++++
+ glib/poppler-page.cc | 16 +++++++++-------
+ 2 files changed, 14 insertions(+), 7 deletions(-)
+
+commit 28ae789afe0625a641525e4a0768d51fa8bd667c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 20:54:13 2006 +0000
+
+ 2006-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ Patch from Kouhei Sutou (#6905).
+
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ * glib/poppler-private.h:
+ * glib/reference/tmpl/poppler-private.sgml:
+ * glib/reference/tmpl/poppler.sgml: Make PopplerPSOutput a proper
+ glib object.
+
+ ChangeLog | 11 ++++++
+ glib/poppler-document.cc | 51
+ ++++++++++++++++++++++++-----
+ glib/poppler-document.h | 4 ++
+ glib/poppler-private.h | 2 +
+ glib/reference/tmpl/poppler-private.sgml | 1 +
+ glib/reference/tmpl/poppler.sgml | 1 +
+ 6 files changed, 61 insertions(+), 9 deletions(-)
+
+commit 02cf7fd7df0b2d8c2b1c6f108e581bc1c7a973b1
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 20:35:43 2006 +0000
+
+ 2006-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_prepare_output_dev): Fix
+ rotation bug (#6913, #6926).
+
+ ChangeLog | 3 +++
+ glib/poppler-page.cc | 12 +++++++++++-
+ 2 files changed, 14 insertions(+), 1 deletions(-)
+
+commit 78ae3efd9541d7b63ff5a2c4de3fde300806688f
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 19 19:21:59 2006 +0000
+
+ 2006-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ Memory leak patch from Carlos Garcia Campos (#6947).
+
+ * glib/poppler-action.cc:
+ * glib/poppler-document.cc:
+ * glib/poppler-page.cc:
+ * poppler/CairoFontEngine.cc:
+ * poppler/CairoFontEngine.h:
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h:
+ * poppler/Gfx.cc:
+ * poppler/TextOutputDev.cc: Fix various memory leaks.
+
+ ChangeLog | 14 ++
+ glib/poppler-action.cc | 9 +-
+ glib/poppler-document.cc | 31 +++-
+ glib/poppler-page.cc | 2 +
+ poppler/CairoFontEngine.cc | 347
+ +++++++++++++++++++++++++++++++++++++++-----
+ poppler/CairoFontEngine.h | 17 ++-
+ poppler/CairoOutputDev.cc | 5 +-
+ poppler/CairoOutputDev.h | 2 +-
+ poppler/Gfx.cc | 1 +
+ poppler/TextOutputDev.cc | 9 +
+ 10 files changed, 381 insertions(+), 56 deletions(-)
+
+commit 354c1926b7181fd668f221e1d672974e04fda747
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri May 19 17:24:19 2006 +0000
+
+ * qt4/src/poppler-link.cc: Patch by Pino Toscano, ensure the
+ splashoutput is created when parsing the TOC.
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-link.cc | 5 +++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 3c9a5f37704781c9a51e72edd18451870452b9a7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun May 14 16:11:54 2006 +0000
+
+ * poppler/FontInfo.cc: Fix possible crash, half patch
+ by Kouhei Sutou <kou@cozmixng.org>
+
+ ChangeLog | 5 +++++
+ poppler/FontInfo.cc | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 436f578fe762e8ceccce95a0f2003406527dde64
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 13 16:01:57 2006 +0000
+
+ * poppler/GfxState.cc:
+ * poppler/GfxState.h: Fix memleak, patch by
+ Carlos Garcia Campos <carlosgc@gnome.org>
+
+ ChangeLog | 6 ++++++
+ poppler/GfxState.cc | 8 ++++++++
+ poppler/GfxState.h | 3 +--
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+commit 906515769097f2e38f6b2c2aff598919b9d1ee0d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 13 15:58:37 2006 +0000
+
+ * qt4/src/poppler-document.cc: leak--
+ * qt4/src/poppler-private.h: Refcount globalparams
+ * qt4/tests/test-poppler-qt4.cpp: Some leaks less
+
+ ChangeLog | 6 ++++++
+ qt4/src/poppler-document.cc | 10 +++++-----
+ qt4/src/poppler-private.h | 8 ++++++++
+ qt4/tests/test-poppler-qt4.cpp | 6 ++++--
+ 4 files changed, 23 insertions(+), 7 deletions(-)
+
+commit 46fd63c44369c882d8dac473d4156001d9d4ed18
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 13 11:14:24 2006 +0000
+
+ numbers for easier casting
+
+ qt4/src/poppler-link.h | 14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+commit 35500375e3f790c444ab7e7d0a687d270c5a66b1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri May 12 21:02:01 2006 +0000
+
+ fixing compile problems for some people
+
+ qt4/src/poppler-page.cc | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 181f09829cf4831965059e3064114d83348c51b5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri May 12 20:40:05 2006 +0000
+
+ * qt4/src/Makefile.am
+ * qt4/src/poppler-annotation-helper.h
+ * qt4/src/poppler-annotation.cc
+ * qt4/src/poppler-annotation.h
+ * qt4/src/poppler-link.cc
+ * qt4/src/poppler-link.h
+ * qt4/src/poppler-page.cc
+ * qt4/src/poppler-qt4.h: Code for annotations stripped
+ from oKular,
+ it's all based on Enrico's work, so ask him for details,
+ the problem
+ is that he left KDE development a while ago.
+
+ ChangeLog | 14 +
+ qt4/src/Makefile.am | 2 +
+ qt4/src/poppler-annotation-helper.h | 213 ++++++++++
+ qt4/src/poppler-annotation.cc | 792
+ +++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.h | 257 ++++++++++++
+ qt4/src/poppler-link.cc | 4 +-
+ qt4/src/poppler-link.h | 2 +-
+ qt4/src/poppler-page.cc | 691 ++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 8 +-
+ 9 files changed, 1980 insertions(+), 3 deletions(-)
+
+commit 3a48e89dfbe54af73a68ed8e917938f14ad17f01
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue May 9 20:07:06 2006 +0000
+
+ * qt4/src/Makefile.am:
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-link.cc:
+ * qt4/src/poppler-page.cc:
+ * qt4/src/poppler-private.h:
+ * qt4/src/poppler-qt4.h: Adding links extraction code,
+ should work as
+ it is basically stripped out from kpdf, but comments are
+ obviously welcome as always
+
+ ChangeLog | 10 +++
+ qt4/src/Makefile.am | 1 +
+ qt4/src/poppler-document.cc | 13 +--
+ qt4/src/poppler-link.cc | 129 ++++++++++++++++++++++++++++++-
+ qt4/src/poppler-link.h | 178
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc | 139 ++++++++++++++++++++++++++++++----
+ qt4/src/poppler-private.h | 9 +-
+ qt4/src/poppler-qt4.h | 56 +++-----------
+ 8 files changed, 456 insertions(+), 79 deletions(-)
+
+commit f628e1506e576a8553a9699c1d7f05ef55c24fa2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 8 19:03:51 2006 +0000
+
+ memleak-- by carlos
+
+ ChangeLog | 5 +++++
+ poppler/Catalog.cc | 5 ++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 1fce6266564583d356817a21f43c6b1ad8ce3716
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat May 6 10:57:07 2006 +0000
+
+ fix code, i suck
+
+ qt4/src/poppler-page.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit be913b90d59da35a347498b86fdd3edb065aef23
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri May 5 20:51:01 2006 +0000
+
+ * poppler/Function.cc: quick fix for KDE bug #126760
+
+ Better solutions are of course accepted
+
+ ChangeLog | 4 ++++
+ poppler/Function.cc | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit 2b085293bd73b4e77da848b3fe63a7e82e9ba5e5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu May 4 19:10:55 2006 +0000
+
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-page.cc: Implement search functionality
+
+ more code to make oKular qt4popplered possible, probably not most
+ quickest code around, feel free to comment/optimize
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-page.cc | 43
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 16 ++++++++++++++++
+ 3 files changed, 64 insertions(+), 0 deletions(-)
+
+commit a9b0c7977aba7bc85a8673c7f95187ff17ee4173
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue May 2 04:38:39 2006 +0000
+
+ 2006-05-02 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc:
+ * poppler/Gfx.cc:
+ * poppler/GfxFont.cc:
+ * poppler/GfxFont.h:
+ * poppler/GfxState.cc:
+ * poppler/TextOutputDev.cc: Patch from Gary Coady to add reference
+ counting to GfxFont so we don't crash on text selection.
+
+ ChangeLog | 10 ++++++++++
+ glib/poppler-page.cc | 2 +-
+ poppler/Gfx.cc | 2 ++
+ poppler/GfxFont.cc | 14 +++++++++++++-
+ poppler/GfxFont.h | 4 ++++
+ poppler/GfxState.cc | 7 +++++++
+ poppler/TextOutputDev.cc | 1 +
+ 7 files changed, 38 insertions(+), 2 deletions(-)
+
+commit 57af0207334ff1a407899370281ebb90fe953a32
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 1 18:33:47 2006 +0000
+
+ * qt4/src/poppler-page.cc:
+ * qt4/src/poppler-private.h:
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-textbox.cc: Add nextWord(), hasSpaceAfter()
+ and
+ edge() to TextBox
+
+ More things to make poppler-qt4Okular nearer
+
+ ChangeLog | 8 ++++++++
+ qt4/src/poppler-page.cc | 14 ++++++++++++++
+ qt4/src/poppler-private.h | 11 +++++++++++
+ qt4/src/poppler-qt4.h | 8 ++++++++
+ qt4/src/poppler-textbox.cc | 23 ++++++++++++++++-------
+ 5 files changed, 57 insertions(+), 7 deletions(-)
+
+commit 61b126390f764fd38c79b6a64160a7dc7870bd4a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 1 13:41:14 2006 +0000
+
+ revert thing that should not have gone in
+
+ poppler/PageLabelInfo.cc | 43
+ +++++++++++++++++++++++++++++++++++++++++++
+ poppler/PageLabelInfo.h | 44
+ --------------------------------------------
+ 2 files changed, 43 insertions(+), 44 deletions(-)
+
+commit f2424ef63e86d82b2be277e2b268b48aae29601e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon May 1 13:32:31 2006 +0000
+
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-private.h:
+ * qt4/src/poppler-qt4.h: Add the possibility of setting
+ the paper
+ color
+
+ One step more to make oKular fully use the qt4 bindings
+
+ ChangeLog | 7 ++++++
+ poppler/PageLabelInfo.cc | 43
+ ------------------------------------------
+ poppler/PageLabelInfo.h | 44
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-document.cc | 10 +++++++++
+ qt4/src/poppler-private.h | 22 ++++++++++++++++----
+ qt4/src/poppler-qt4.h | 6 +++++
+ 6 files changed, 84 insertions(+), 48 deletions(-)
+
+commit 4147400e2b692df7f70c3772e8a4b576d4d85294
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 29 15:23:41 2006 +0000
+
+ Fix memory leak. Bug 6765
+
+ ChangeLog | 5 +++++
+ poppler/JBIG2Stream.cc | 1 +
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 960d60467d62d28f20b127d07e8de1af42eec568
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Apr 27 17:26:36 2006 +0000
+
+ 2006-04-27 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: delete imgStr if some of the cairo
+ functions fail. Fixes coverty reports #2106, #2107, #2077 and
+ bug #6764. Patch by Kjartan Maraas.
+
+ ChangeLog | 6 ++++++
+ poppler/CairoOutputDev.cc | 34 +++++++++++++++++++++++++---------
+ 2 files changed, 31 insertions(+), 9 deletions(-)
+
+commit 155112131c6e25bfde752cf5daa80a6c9712cfed
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Apr 23 15:50:52 2006 +0000
+
+ qt4/src/poppler-private.h: Protect us against a link not having
+ a destination or a namedDestination
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-private.h | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit c902a3a22bcceedc8ee8ca377064efcc8a9178ca
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Fri Apr 21 12:02:19 2006 +0000
+
+ Add another path to search for Qt4 libs and includes.
+
+ CCMAIL: montel@kde.org
+
+ m4/qt.m4 | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 18f8e1f1d213dbcda27cd0ec429273801f65e208
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 18 19:11:56 2006 +0000
+
+ * goo/GooVector.h: Fix typo that was preventing build with MSVC8
+ Discovered by Reece Dunn <msclrhd@hotmail.com>
+
+ ChangeLog | 5 +++++
+ goo/GooVector.h | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit cbbb28a5959343d20dffe945ea83272c0b2e287b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun Apr 16 22:59:44 2006 +0000
+
+ 2006-04-16 Carlos Garcia Campos <carlosgc@gnome.org>
+
+ * glib/poppler-action.cc:
+ * glib/poppler-action.h:
+ * glib/poppler-private.h:
+ * glib/poppler.h:
+ Add support for named destinations and named actions.
+
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ Allow to find named destinations in document.
+
+ ChangeLog | 12 +++
+ glib/poppler-action.cc | 152
+ ++++++++++++++++++++++++-----
+ glib/poppler-action.h | 7 +-
+ glib/poppler-document.cc | 37 +++++++
+ glib/poppler-document.h | 4 +-
+ glib/poppler-private.h | 2 +
+ glib/poppler.h | 1 +
+ glib/reference/tmpl/poppler-action.sgml | 2 +
+ glib/reference/tmpl/poppler-document.sgml | 4 -
+ 9 files changed, 189 insertions(+), 32 deletions(-)
+
+commit 85687a1e0e4c6be2dbfb23ba00018b9c7c7454f5
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Apr 12 06:52:07 2006 +0000
+
+ 2006-04-12 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: Add support for masked images to
+ the cairo
+ backend. CairoOutputDevice really should have been refactored
+ before
+ committing this, but the results were so pretty I couldn't resist.
+ Fixes #6174.
+
+ ChangeLog | 8 +++
+ poppler/CairoOutputDev.cc | 118
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 8 +++
+ 3 files changed, 134 insertions(+), 0 deletions(-)
+
+commit 6039d4fc65cb25bef20efa29bc29d42086fc0854
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Apr 12 05:46:44 2006 +0000
+
+ 2006-04-12 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Fix breakage by krh by only calling
+ cairo_destroy on non-null.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 4 +++-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+commit d839a0bd78361930e5e2fe889df12e1e853ffed3
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Apr 12 02:07:07 2006 +0000
+
+ 2006-04-11 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac:
+ * poppler-glib.pc.in:
+ * glib/Makefile.am:
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler.h:
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h:
+ * glib/poppler-features.h.in:
+ Make the CairoOutputDev render to a cairo_t instead of a
+ cairo_surface_t and expose that functionality in the glib wrapper
+ (poppler_page_render).
+
+ * test/Makefile.am:
+ * test/gtk-cairo-test.cc:
+ Update gtk-cairo-test to use this new interface and add a spin
+ button for changing page (#5951).
+
+ * utils/Makefile.am (EXTRA_DIST): Fix warning where this was
+ assigned twice.
+
+ ChangeLog | 23 ++++
+ configure.ac | 8 ++
+ glib/Makefile.am | 10 +-
+ glib/poppler-features.h.in | 24 ++++
+ glib/poppler-page.cc | 63 +++++++---
+ glib/poppler-page.h | 10 ++
+ glib/poppler.h | 1 +
+ poppler-glib.pc.in | 2 +-
+ poppler/CairoOutputDev.cc | 23 ++--
+ poppler/CairoOutputDev.h | 6 +-
+ test/Makefile.am | 4 +-
+ test/gtk-cairo-test.cc | 286
+ +++++++++++++-------------------------------
+ utils/Makefile.am | 6 +-
+ 13 files changed, 221 insertions(+), 245 deletions(-)
+
+commit b198c9801c668014c0979c57033a0637e7e046e2
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon Apr 10 18:12:44 2006 +0000
+
+ 2006-04-10 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: take originX and originY into
+ account in
+ drawChar() to draw vertical text properly. Fixes #6551.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit fd251f52efc7748fda91cc77fb9d3966e0f02ac8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Apr 9 11:05:51 2006 +0000
+
+ m4/qt.m4: Improve for systems that need -pthread to be linked when
+ linking Qt. Patch by Diego Pettenò
+
+ ChangeLog | 5 +++++
+ m4/qt.m4 | 28 +++++++++++++++++++++++++++-
+ 2 files changed, 32 insertions(+), 1 deletions(-)
+
+commit 36de9747153a2ea9b3cf86c41e75a521441a2e06
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 8 10:44:43 2006 +0000
+
+ * poppler/Makefile.am:
+ * qt4/src/Makefile.am: Don't link Qt4 in libpoppler when using
+ Qt4 frontend
+ Patch by Stefan Schweizer
+
+ ChangeLog | 6 ++++++
+ poppler/Makefile.am | 11 +++++------
+ qt4/src/Makefile.am | 1 +
+ 3 files changed, 12 insertions(+), 6 deletions(-)
+
+commit bf7afe161d76c50fd1c480eb236607145782e59d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Apr 5 18:20:56 2006 +0000
+
+ poppler/JBIG2Stream.cc: Fix for some buggy JBIG2 documents, patch
+ by Raj Kumar and Paul Walmsley. Fixes bug 6500
+
+ ChangeLog | 5 +++++
+ poppler/JBIG2Stream.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 48 insertions(+), 0 deletions(-)
+
+commit 315f8e488d3db848f88a06c7568b6583bbf0e432
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Apr 5 17:20:56 2006 +0000
+
+ 2006-04-05 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: use a separate matrix for the
+ softmask.
+ fixes #6492.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 11 ++++++++++-
+ 2 files changed, 15 insertions(+), 1 deletions(-)
+
+commit 0d311518f678a479c1efeaec15011e0a34de80fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 4 21:01:01 2006 +0000
+
+ * splash/Splash.cc:
+ * splash/SplashBitmap.cc: Make Splashbitmap RGB8 use 32bits
+ internally
+ * qt/poppler-page.cc:
+ * qt4/src/poppler-page.cc: Adapt to splashbitmap change so
+ copying to
+ QImage is faster.
+ Patch by Frank Meerkötter slightly modified by Albert
+ Astals Cid
+
+ I'll leave adapting the glib frontend for you guys, i tried to adapt
+ it but i got lost at gdk_pixbuf_get_n_channels (pixbuf);
+
+ ChangeLog | 9 +++++
+ qt/poppler-page.cc | 18 +++-------
+ qt4/src/poppler-page.cc | 15 +++-----
+ splash/Splash.cc | 81
+ ++++++++++++++++++++++++-----------------------
+ splash/SplashBitmap.cc | 10 +++---
+ 5 files changed, 67 insertions(+), 66 deletions(-)
+
+commit 888bd41b42507f0a1af55c55495d31d802ce7706
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Apr 4 20:42:08 2006 +0000
+
+ Fix crash when using fixedpoint math. Patch by Frank Meerkoetter
+
+ ChangeLog | 5 +++++
+ splash/SplashFTFont.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 56c98450160b639790931226a045ce4712e7d45e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Apr 2 18:07:59 2006 +0000
+
+ Improvements to the Qt4 frontend, comments welcome
+
+ ChangeLog | 7 ++
+ m4/qt.m4 | 4 +-
+ qt4/src/Makefile.am | 1 +
+ qt4/src/poppler-document.cc | 85 +++++++++++++++++++++------
+ qt4/src/poppler-link.cc | 138
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc | 9 +++-
+ qt4/src/poppler-private.h | 95 +++++++++++++++++++++++++++++-
+ qt4/src/poppler-qt4.h | 86 ++++++++++++++++++++++++---
+ 8 files changed, 395 insertions(+), 30 deletions(-)
+
+commit c80ebf237e9c6232a1d0567a2688a294acfd481b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Apr 1 11:25:57 2006 +0000
+
+ Fix bug 6454
+
+ ChangeLog | 5 +++++
+ poppler/XRef.cc | 22 +++++++++++++---------
+ 2 files changed, 18 insertions(+), 9 deletions(-)
+
+commit fe8142fbc12127682b8024673fe1af57b47bb5c9
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Mar 21 04:25:53 2006 +0000
+
+ 2006-03-20 Jeff Muizelaar <jeff@infidigm.net>
+
+ * glib/poppler-page.cc: Avoid strdup in poppler_page_get_property
+ and
+ make code cleaner. Combined with the memleak fix closes #6187.
+ Patch by chpe.
+
+ ChangeLog | 6 ++++++
+ glib/poppler-page.cc | 5 +----
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 4f961df2e6e91a0dc0a024ae5acdefa394179a05
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Mar 21 04:19:18 2006 +0000
+
+ 2006-03-20 Jeff Muizelaar <jeff@infidigm.net>
+
+ * glib/poppler-page.cc: Fix memory leak in poppler_page_get_text
+ Patch by chpe.
+
+ ChangeLog | 5 +++++
+ glib/poppler-page.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit ff4febab0a519732972c21bf76d7693c98265e0f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Mar 20 20:07:36 2006 +0000
+
+ Use UGooString for dates, fixes KDE bug 123938
+
+ ChangeLog | 6 ++++++
+ qt/poppler-document.cc | 2 +-
+ qt4/src/poppler-document.cc | 2 +-
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+commit 75ac6de8cd651b1cbe2d6a7ffa4574097088041f
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon Mar 20 19:12:29 2006 +0000
+
+ 2006-03-20 Carlos Garcia Campos <calosgc@gnome.org>
+
+ reviewed by: Jeff Muizelaar <jeff@infidigm.net>
+
+ * glib/poppler-document.cc: Fix memory leak in
+ poppler_font_info_free
+
+ ChangeLog | 6 ++++++
+ glib/poppler-document.cc | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 784f6d9a0888dab34c586ffe14db8e55b8a11f51
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon Mar 20 19:02:10 2006 +0000
+
+ 2006-03-20 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoFontEngine.h: remove unused variables
+
+ ChangeLog | 4 ++++
+ poppler/CairoFontEngine.h | 1 -
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit 847436779d7c82b428acfd6339130228bfadca24
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 19 19:19:42 2006 +0000
+
+ fix date
+
+ ChangeLog | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 401bae69cc7ade676cacd89b483f0a93a653c7a1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Mar 19 17:01:05 2006 +0000
+
+ fix htmloutputdev
+
+ ChangeLog | 4 ++++
+ utils/HtmlOutputDev.cc | 2 +-
+ utils/HtmlOutputDev.h | 2 +-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+commit d56330e688c0a40b4e206ed3bbddd06d7f3ee66c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 16 22:04:56 2006 +0000
+
+ * poppler/Page.cc: Remove a #ifdef that was never defined
+ (nice to
+ have so sucky W args), probably came from gpdf (it's not
+ on xpdf
+ sources) and was causing bugs 6079 and 6167
+
+ Might be worth backporting to the stable branch
+
+ ChangeLog | 8 +++++++-
+ poppler/Page.cc | 2 --
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 7ed6737b00ece7ca00cee1d148752b11700370e6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 16 19:21:11 2006 +0000
+
+ poppler/FontInfo.cc: Embedded fonts don't have a font file
+
+ ChangeLog | 4 ++++
+ poppler/FontInfo.cc | 20 ++++++++++++--------
+ 2 files changed, 16 insertions(+), 8 deletions(-)
+
+commit a34688ee29e1cdfcbaca232cf005af55af87f796
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Mar 14 19:34:10 2006 +0000
+
+ * qt4/src/poppler-qt4.h: Fix compilation with gcc4.1, patch by
+ Michael Olbrich
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-qt4.h | 10 +++++-----
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+commit 1a90b3aaf6be4ca3ebb47e904842b1e14a0e8dfc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Mar 11 15:19:02 2006 +0000
+
+ * poppler/FontInfo.cc:
+ * poppler/FontInfo.h: Add getFile() function that returns
+ the path of the font that is beign used in the system to
+ represent that font
+ * qt4/src/poppler-document.cc:
+ * qt4/src/poppler-fontinfo.cc:
+ * qt4/src/poppler-private.h:
+ * qt4/src/poppler-qt4.h: Add the file() function
+ * qt4/tests/poppler-fonts.cpp: Show the path of the font
+ used to represent each font
+
+ May be interesting to have in the other frontends
+
+ ChangeLog | 13 +++++++++++++
+ poppler/FontInfo.cc | 10 ++++++++++
+ poppler/FontInfo.h | 2 ++
+ qt4/src/poppler-document.cc | 14 +-------------
+ qt4/src/poppler-fontinfo.cc | 29 +++++++++--------------------
+ qt4/src/poppler-private.h | 29 +++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 8 ++++++--
+ qt4/tests/poppler-fonts.cpp | 5 +++--
+ 8 files changed, 73 insertions(+), 37 deletions(-)
+
+commit 22b1618185ec70895ec644d9e590c266ff98c9db
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Mar 9 21:56:07 2006 +0000
+
+ Build with cairo disabled, patch by Eduardo de Barros Lima
+
+ ChangeLog | 5 +++++
+ glib/Makefile.am | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 50ecfadab36a9769b09e4c2c1670d86448a0e1ee
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Feb 28 23:24:59 2006 +0000
+
+ 2006-02-28 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Bump release to 0.5.1.
+
+ * NEWS: Sum up 0.5.1 changes so far.
+
+ * TextOutputDev.h: add getters for a couple of attributes.
+
+ * glib/Makefile.am:
+ * poppler/Makefile.am: Move cairo link dependency to glib
+ bindings.
+
+ ChangeLog | 11 +++++++++++
+ NEWS | 10 ++++++++++
+ configure.ac | 2 +-
+ glib/Makefile.am | 11 ++++++-----
+ poppler/Makefile.am | 19 ++++++++-----------
+ poppler/TextOutputDev.h | 7 +++++--
+ qt/Makefile.am | 1 +
+ test/Makefile.am | 16 +++++++++-------
+ utils/Makefile.am | 29 +++++++++++++++++------------
+ 9 files changed, 68 insertions(+), 38 deletions(-)
+
+commit b9e951ac68b9977ab7217ad0346bcf46a3fa3dfe
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Feb 28 19:59:58 2006 +0000
+
+ 2006-02-28 Kristian Høgsberg <krh@redhat.com>
+
+ * goo/gmem.c: (gmalloc), (grealloc):
+ * poppler/JBIG2Stream.cc:
+ * poppler/Stream.cc:
+ * poppler/Stream.h:
+ * splash/SplashXPathScanner.cc:
+
+ More integer overflow fixes from Derek Noonburg (#5922).
+
+ ChangeLog | 10 ++++++++++
+ goo/gmem.c | 9 +++++----
+ poppler/JBIG2Stream.cc | 12 ++++++++++--
+ poppler/Stream.cc | 7 +++++++
+ poppler/Stream.h | 2 +-
+ 5 files changed, 33 insertions(+), 7 deletions(-)
+
+commit 46db73a142d65a0c944910388d5971debc06ecbf
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Feb 28 18:31:59 2006 +0000
+
+ 2006-02-28 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/PSOutputDev.cc: Make PSOutputDev constructor respect
+ passed in paper size (#5946, #5749).
+
+ ChangeLog | 5 +++++
+ poppler/PSOutputDev.cc | 14 ++++++++------
+ 2 files changed, 13 insertions(+), 6 deletions(-)
+
+commit 0f7f2182b2abe965b382937f5569b65a8828fc93
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Feb 28 18:25:00 2006 +0000
+
+ 2006-02-28 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc (info_dict_get_string): Refactor
+ _popper_goo_string_to_utf8() out into it's own function.
+
+ * glib/poppler-page.cc (poppler_page_get_property): Use
+ _popper_goo_string_to_utf8() here to convert ucs2 page labels.
+
+ * glib/poppler-page.cc (poppler_page_get_selection_region):
+ Add
+ braces to fix warning.
+
+ * poppler/PageLabelInfo.cc: If the label prefix string has
+ a ucs2
+ marker, append the number part of the label as ucs2 (#5952).
+
+ ChangeLog | 14 +++
+ glib/poppler-document.cc | 52 ++++++-----
+ glib/poppler-page.cc | 23 +++--
+ glib/poppler-private.h | 3 +
+ glib/reference/tmpl/poppler-enums.sgml | 150
+ -------------------------------
+ glib/reference/tmpl/poppler-unused.sgml | 130 ++++++++++++++++++++++++++
+ glib/test-poppler-glib.c | 2 +-
+ goo/GooString.cc | 5 +
+ goo/GooString.h | 4 +
+ poppler/PageLabelInfo.cc | 39 ++++++---
+ poppler/PageLabelInfo.h | 2 +-
+ 11 files changed, 228 insertions(+), 196 deletions(-)
+
+commit 1bf83cdc8b75e1c76956ae643ee273e0b558fd08
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 25 12:30:30 2006 +0000
+
+ fix warning
+
+ ChangeLog | 4 ++++
+ poppler/Object.cc | 3 ++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit eb5642f396c8772c83b2cf27da437413b692c952
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 23 22:26:05 2006 +0000
+
+ Don't build pdftoppm when splashoutput is disabled as it does not link
+
+ ChangeLog | 5 +++++
+ utils/Makefile.am | 13 +++++++++++--
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+commit 7c5c1361045429a429a6f40d936f8c7c01fe0d07
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Feb 18 20:17:00 2006 +0000
+
+ 2006-02-18 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h:
+ * poppler/GfxState.cc:
+ * poppler/GfxState.h: Add support for drawSoftMaskedImage to
+ CairoOutputDev. Ugly but works.
+
+ ChangeLog | 8 ++++
+ poppler/CairoOutputDev.cc | 101
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h | 6 +++
+ poppler/GfxState.cc | 50 ++++++++++++++++++++++
+ poppler/GfxState.h | 2 +
+ 5 files changed, 167 insertions(+), 0 deletions(-)
+
+commit dcb748f68112bd5f99fea8a3da06666be6cff0c5
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Feb 16 19:41:17 2006 +0000
+
+ 2006-02-16 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Work around cairo bug when scaling
+ 1x1 bitmaps. Fixes #3387. Also gives a performance improvement.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 33 ++++++++++++++++++++++++---------
+ 2 files changed, 29 insertions(+), 9 deletions(-)
+
+commit ef1070f6ca2d1e74c5f94728f3aaae22f0990c17
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 16 19:28:54 2006 +0000
+
+ Update soname
+
+ ChangeLog | 8 ++++++++
+ glib/Makefile.am | 2 ++
+ poppler/Makefile.am | 2 ++
+ qt/Makefile.am | 2 ++
+ qt4/src/Makefile.am | 2 ++
+ 5 files changed, 16 insertions(+), 0 deletions(-)
+
+commit 24b9f5c33fb00ff80a79b34444282a57288f636c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 13 23:04:54 2006 +0000
+
+ * poppler/ArthurOutputDev.cc: Make it compile after changing code
+ so we did not pass files to freetype but buffers
+
+ ChangeLog | 5 ++++
+ poppler/ArthurOutputDev.cc | 53
+ +++++++++++++++----------------------------
+ 2 files changed, 24 insertions(+), 34 deletions(-)
+
+commit 0bda90310b267d3a4963096293eb2bd29b120768
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 13 22:38:44 2006 +0000
+
+ Probably the last of inner patches missing from kpdf
+ Everybody will we happy now, kpdf has been finally assimilated
+
+ ChangeLog | 5 ++
+ poppler/PSOutputDev.cc | 124
+ ++++++++++++++++++++++++++++++++++++++++++++----
+ poppler/PSOutputDev.h | 4 +-
+ 3 files changed, 123 insertions(+), 10 deletions(-)
+
+commit cf9867fbbee2468a955b5845016585eeedf2debe
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 6 20:49:21 2006 +0000
+
+ Various fixes from Frank Meerkötter to enable fixedpoint arithmetic
+
+ ChangeLog | 8 ++++++++
+ configure.ac | 2 +-
+ goo/FixedPoint.h | 2 +-
+ splash/Splash.cc | 4 ++--
+ splash/SplashTypes.h | 2 +-
+ 5 files changed, 13 insertions(+), 5 deletions(-)
+
+commit f04e2c4f20f821ff8cb9465a715ccbb22091d449
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Feb 6 18:50:10 2006 +0000
+
+ Jeff Muizelaar's improvements to my yesterday's small patches
+
+ ChangeLog | 6 ++++++
+ poppler/Annot.cc | 9 ++++-----
+ poppler/JBIG2Stream.cc | 2 +-
+ 3 files changed, 11 insertions(+), 6 deletions(-)
+
+commit 33e98f81cdfda0935ac7ea79a691976465ec790b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Feb 5 15:46:10 2006 +0000
+
+ Some small fixes from kpdf
+
+ ChangeLog | 8 ++++++++
+ poppler/Gfx.cc | 1 +
+ poppler/GfxFont.cc | 1 +
+ poppler/JBIG2Stream.cc | 2 +-
+ poppler/SplashOutputDev.cc | 1 -
+ 5 files changed, 11 insertions(+), 2 deletions(-)
+
+commit 6d9e6489d24b3105204ff4233f6493136e9b5715
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Feb 4 21:10:41 2006 +0000
+
+ 2006-02-04 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/Gfx.cc:
+ * poppler/OutputDev.cc:
+ * poppler/OutputDev.h: Let output devices know about pdf grouping
+ operators.
+ Patch by Thorkild Stray.
+
+ ChangeLog | 8 ++++++++
+ poppler/Gfx.cc | 14 ++++++++++++++
+ poppler/OutputDev.cc | 16 ++++++++++++++++
+ poppler/OutputDev.h | 10 ++++++++++
+ 4 files changed, 48 insertions(+), 0 deletions(-)
+
+commit b4e34d905cd0ca5815a450de35b4c2774f4887c9
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Feb 4 20:48:25 2006 +0000
+
+ 2006-02-04 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/GlobalParams.cc: Check all fonts returned by fontconfig.
+ Discard the ones that are not truetype or type1. Fixes #5758.
+ Patch by Ed Catmur.
+
+ ChangeLog | 6 +++++
+ poppler/GlobalParams.cc | 51
+ +++++++++++++++++++++++++---------------------
+ 2 files changed, 34 insertions(+), 23 deletions(-)
+
+commit fd85a0afdd7b4cafc68df400d4f94fccaea18c76
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 4 20:34:13 2006 +0000
+
+ Remove bug from "do not use an external file to pass fonts to
+ Freetype" patch, patch by Stefan Schweizer
+
+ ChangeLog | 3 +++
+ poppler/SplashOutputDev.cc | 14 ++++++++++----
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+
+commit 67ca9d01f8badcf542f60b23521c384c9840ca1b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 4 20:31:00 2006 +0000
+
+ Added a DTD of the xml pdftohtml creates patch by Stefan Schweizer
+
+ ChangeLog | 2 ++
+ utils/Makefile.am | 2 ++
+ utils/pdf2xml.dtd | 28 ++++++++++++++++++++++++++++
+ 3 files changed, 32 insertions(+), 0 deletions(-)
+
+commit f4df23ca7f396883a906f16dfc8db1ebd528e04a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 4 20:24:03 2006 +0000
+
+ ignore++
+
+ utils/.cvsignore | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 93ad488679f594e45547a67e2a7397f4c8bd2820
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Feb 4 20:07:07 2006 +0000
+
+ Actually create pdftoppm patch by Stefan Schweizer
+
+ ChangeLog | 44 +++++++++++++++++++++++++-------------------
+ utils/Makefile.am | 10 ++++++++--
+ utils/pdftoppm.cc | 9 +++++----
+ 3 files changed, 38 insertions(+), 25 deletions(-)
+
+commit 7d2be955e6345a052590b06b29a6d2fb2111e2e6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 2 23:06:20 2006 +0000
+
+ CVE-2006-0301 fix by Derek though KDE security team
+
+ ChangeLog | 5 +++++
+ splash/SplashXPathScanner.cc | 32 ++++++++++++++++++++------------
+ 2 files changed, 25 insertions(+), 12 deletions(-)
+
+commit c191e7d0f13ea429017e4d4f79ce803e84c72e40
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 2 22:54:27 2006 +0000
+
+ i should learn on which day i live
+
+ ChangeLog | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 1ddeed60d07c3a7e011f3f594fa9299379d0b000
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Feb 2 22:50:01 2006 +0000
+
+ don't use files to pass fonts to freetype
+
+ ChangeLog | 26 ++++++++++++
+ fofi/FoFiTrueType.cc | 43 ++++++++++++++++---
+ fofi/FoFiTrueType.h | 7 ++-
+ fofi/FoFiType1C.h | 2 +-
+ goo/gfile.cc | 8 ++++
+ poppler/GfxFont.cc | 49 +++++++++++++++++++++-
+ poppler/GfxFont.h | 2 +
+ poppler/GlobalParams.cc | 1 +
+ poppler/GlobalParams.h | 1 +
+ poppler/SplashOutputDev.cc | 94
+ +++++++++++++++++++++---------------------
+ splash/SplashFTFontEngine.cc | 44 ++++++++++++-------
+ splash/SplashFTFontEngine.h | 16 +++----
+ splash/SplashFTFontFile.cc | 47 +++++++++++++--------
+ splash/SplashFTFontFile.h | 18 ++++----
+ splash/SplashFontEngine.cc | 46 ++++++++------------
+ splash/SplashFontEngine.h | 16 +++----
+ splash/SplashFontFile.cc | 70 +++++++++++++++++++++++++++----
+ splash/SplashFontFile.h | 25 +++++++++--
+ splash/SplashT1FontEngine.cc | 29 ++++++-------
+ splash/SplashT1FontFile.cc | 30 +++++++++++--
+ splash/SplashT1FontFile.h | 4 +-
+ 21 files changed, 396 insertions(+), 182 deletions(-)
+
+commit 34df4cfa5cd8788ccf2ea698cbedd05b209041f5
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Feb 1 03:52:12 2006 +0000
+
+ 2006-01-31 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/GlobalParams.cc (GlobalParams::getDisplayFont):
+ Allow ttc fonts to be used.
+
+ ChangeLog | 5 +++++
+ poppler/GlobalParams.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 0184e7c928ec60c0aa3f8634d96ae0cf0ad6d157
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Jan 29 05:16:31 2006 +0000
+
+ 2006-01-28 Jeff Muizelaar <jeff@infidigm.net>
+
+ * glib/poppler-attachment.h: fix compile by adding <time.h>
+ include.
+ Acked-by: Jonathan Blanford <jrb@redhat.com>
+
+ ChangeLog | 5 +++++
+ glib/poppler-attachment.h | 1 +
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit c805e25f2f074640e4345f8b71eef8d7de677109
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Jan 26 19:25:07 2006 +0000
+
+ 2006-01-26 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDev.cc: Patch from Christian Krause;
+ handle
+ 0-width lines (#5545).
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDev.cc | 6 +++++-
+ 2 files changed, 10 insertions(+), 1 deletions(-)
+
+commit 4f48abcd4c21460d4c5b718a7ba18cdceb30c2d1
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Tue Jan 24 06:21:39 2006 +0000
+
+ Tue Jan 24 01:19:40 2006 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/Makefile.am:
+ * glib/poppler-attachment.cc:
+ * glib/poppler-attachment.h:
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ * glib/poppler-page.cc:
+ * glib/poppler-private.h:
+ * glib/poppler.h:
+ * glib/test-poppler-glib.c:
+ * glib/reference/tmpl/poppler-enums.sgml:
+ * glib/reference/tmpl/poppler-unused.sgml: glib bindings
+ for the
+ embedded file support. It doesn't support mtime and
+ ctime yet,
+ but the rest works.
+
+ ChangeLog | 16 +++
+ glib/Makefile.am | 2 +
+ glib/poppler-attachment.cc | 223
+ +++++++++++++++++++++++++++++++
+ glib/poppler-attachment.h | 67 +++++++++
+ glib/poppler-document.cc | 63 +++++++++
+ glib/poppler-document.h | 6 +
+ glib/poppler-page.cc | 2 +-
+ glib/poppler-private.h | 6 +-
+ glib/poppler.h | 1 +
+ glib/reference/tmpl/poppler-enums.sgml | 150 +++++++++++++++++++++
+ glib/reference/tmpl/poppler-unused.sgml | 130 ------------------
+ glib/test-poppler-glib.c | 26 ++++-
+ 12 files changed, 559 insertions(+), 133 deletions(-)
+
+commit 052bf4b80c8a0dc45f6222617bfd8ae1b9c40410
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jan 23 18:52:48 2006 +0000
+
+ 2006-01-23 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac:
+ * poppler/GlobalParams.cc:
+ * poppler/poppler-config.h.in:
+ * utils/pdftohtml.cc:
+ * utils/pdftops.cc: Respect command line paper size settings
+ (#5641).
+ Drop the built-in paper sizes.
+
+ ChangeLog | 9 +++++++++
+ configure.ac | 1 -
+ poppler/GlobalParams.cc | 23 ++---------------------
+ poppler/poppler-config.h.in | 5 -----
+ utils/pdftohtml.cc | 4 +---
+ utils/pdftops.cc | 4 +++-
+ 6 files changed, 15 insertions(+), 31 deletions(-)
+
+commit fb2054a5031d60aac3ccc9a36b3ed88a32188e33
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jan 23 15:40:54 2006 +0000
+
+ 2006-01-23 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/test-poppler-glib.c (print_document_info, print_index):
+ Move variable declarations to top (#5692).
+
+ * utils/*.cc: Move config.h #include to top of #include's
+ (#5693).
+
+ ChangeLog | 5 +++++
+ glib/test-poppler-glib.c | 5 +++--
+ poppler/FontInfo.cc | 2 +-
+ utils/HtmlOutputDev.cc | 2 +-
+ utils/ImageOutputDev.cc | 2 +-
+ utils/pdffonts.cc | 2 +-
+ utils/pdfimages.cc | 2 +-
+ utils/pdfinfo.cc | 2 +-
+ utils/pdftohtml.cc | 4 ++--
+ utils/pdftoppm.cc | 2 +-
+ utils/pdftops.cc | 2 +-
+ utils/pdftotext.cc | 2 +-
+ 12 files changed, 19 insertions(+), 13 deletions(-)
+
+commit 836af3529e827e25f20cb4710cbbf9ed0371a42c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jan 23 14:45:30 2006 +0000
+
+ 2006-01-23 Kristian Høgsberg <krh@redhat.com>
+
+ * splash/SplashFTFont.cc: Don't use deprecated freetype
+ include
+ files.
+
+ ChangeLog | 5 +++++
+ splash/SplashFTFont.cc | 3 ++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 60e13bf84e4f020a264811e4a5bf85d67e15d6df
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Jan 21 21:56:40 2006 +0000
+
+ 2006-01-21 Jeff Muizelaar <jeff@infidigm.net>
+
+ * TODO: Add my todo list.
+
+ ChangeLog | 4 ++++
+ TODO | 10 ++++++++++
+ 2 files changed, 14 insertions(+), 0 deletions(-)
+
+commit cebba06563d1b691a8bbb83828e47c9cc91e231a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 18 22:40:26 2006 +0000
+
+ ok, ok, lasts files, i promise :-/
+
+ qt4/tests/check_attachments.cpp | 151
+ +++++++++++++++++++++++++++++++++++++
+ qt4/tests/poppler-attachments.cpp | 37 +++++++++
+ 2 files changed, 188 insertions(+), 0 deletions(-)
+
+commit 0b12e7cce6c6633b1d07e2902a9fa13ff52079e7
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 18 22:38:59 2006 +0000
+
+ YAMF = Yet Another Missing File
+
+ qt4/src/poppler-embeddedfile.cc | 106
+ +++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 106 insertions(+), 0 deletions(-)
+
+commit 38c8f3a53b3eb2be1fbfa360f77285037d89b719
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 18 22:36:01 2006 +0000
+
+ as usual i foget some files
+
+ poppler/UGooString.cc | 86
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/UGooString.h | 55 +++++++++++++++++++++++++++++++
+ 2 files changed, 141 insertions(+), 0 deletions(-)
+
+commit ad6e7d862c8fa6e10a7dbbb3391cbb0b6c922375
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 18 22:32:13 2006 +0000
+
+ Brad patch for embedded document extraction, only has Qt4 bindings
+ for now, needs Qt3 and glib work
+
+ ChangeLog | 42 +++++++++++++
+ glib/poppler-action.cc | 2 +-
+ glib/poppler-document.cc | 1 +
+ poppler/Annot.cc | 1 +
+ poppler/Catalog.cc | 133
+ ++++++++++++++++++++++++++++++++++++++---
+ poppler/Catalog.h | 60 +++++++++++++++++--
+ poppler/Dict.cc | 17 +++---
+ poppler/Dict.h | 15 +++--
+ poppler/FontInfo.cc | 1 +
+ poppler/Function.cc | 1 +
+ poppler/Gfx.cc | 1 +
+ poppler/GfxFont.cc | 5 +-
+ poppler/GfxState.cc | 1 +
+ poppler/Link.cc | 9 ++-
+ poppler/Link.h | 9 ++-
+ poppler/Makefile.am | 2 +
+ poppler/Object.h | 17 +++---
+ poppler/Outline.cc | 1 +
+ poppler/PDFDoc.cc | 1 +
+ poppler/PDFDoc.h | 2 +-
+ poppler/PSOutputDev.cc | 5 +-
+ poppler/Page.cc | 1 +
+ poppler/PageLabelInfo.cc | 1 +
+ poppler/Parser.cc | 2 +
+ poppler/SecurityHandler.cc | 1 +
+ poppler/Stream.cc | 1 +
+ poppler/XRef.cc | 1 +
+ qt/poppler-document.cc | 1 +
+ qt/poppler-page-transition.cc | 1 +
+ qt4/src/Makefile.am | 1 +
+ qt4/src/poppler-document.cc | 26 +++++++-
+ qt4/src/poppler-private.h | 2 +
+ qt4/src/poppler-qt4.h | 68 +++++++++++++++++++++
+ qt4/tests/.cvsignore | 2 +
+ qt4/tests/Makefile.am | 16 ++++-
+ utils/HtmlOutputDev.cc | 1 +
+ utils/pdffonts.cc | 1 +
+ utils/pdfinfo.cc | 1 +
+ utils/pdftohtml.cc | 1 +
+ utils/pdftotext.cc | 1 +
+ 40 files changed, 401 insertions(+), 54 deletions(-)
+
+commit 550fb0b617ece7951ec39aec5fa5504cc90022fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 18 21:22:12 2006 +0000
+
+ Add some more documentation to PageTransition, patch by Stefan Kebekus
+
+ ChangeLog | 6 ++++++
+ qt/poppler-page-transition.h | 40
+ +++++++++++++++++++++++++++++++++-------
+ qt4/src/Doxyfile | 2 +-
+ 3 files changed, 40 insertions(+), 8 deletions(-)
+
+commit d66f3647ff1c38318d4cd056cb4d4c7a32eb6603
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jan 18 18:54:12 2006 +0000
+
+ poppler/CharCodeToUnicode.cc: Fix check for length that was not
+ having into account that there could be \n or \r in tokens
+ an that
+ those do not have to be took into account. Fixes
+ http://bugs.kde.org/show_bug.cgi?id=120310
+
+ ChangeLog | 9 ++++++++-
+ poppler/CharCodeToUnicode.cc | 31 +++++++++++++++++++++++++++----
+ 2 files changed, 35 insertions(+), 5 deletions(-)
+
+commit d78b670339c8f92a32ab5f0a574d0e21690806f8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 17 21:35:31 2006 +0000
+
+ When doing the parsing check with XREF we did not grow too much. Fixes
+ serialata10a.pdf
+
+ ChangeLog | 10 ++++++++++
+ poppler/Lexer.cc | 22 +++++++++++++++++++---
+ poppler/Lexer.h | 8 +++++---
+ poppler/Parser.cc | 6 +++---
+ poppler/Parser.h | 2 +-
+ poppler/XRef.cc | 17 +++++++++++++++++
+ poppler/XRef.h | 3 +++
+ 7 files changed, 58 insertions(+), 10 deletions(-)
+
+commit f5db636af0cd6e05cd7ede37a8585001d51192a1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 17 20:33:08 2006 +0000
+
+ i suck
+ i suck
+ i suck
+ i suck
+ i suck
+ A file i forgot to add to make it compile :-/
+
+ qt/poppler-page-transition-private.h | 28 ++++++++++++++++++++++++++++
+ 1 files changed, 28 insertions(+), 0 deletions(-)
+
+commit 9cc97908ea67ab431e58129f589e00f41f40a143
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Jan 12 23:54:08 2006 +0000
+
+ 2006-01-12 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/GlobalParams.cc: Make buildFcPattern() static.
+
+ ChangeLog | 4 ++++
+ poppler/GlobalParams.cc | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit c7ce134fb1dadb46e2b3773d0976ea31da0a046f
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Jan 11 16:52:58 2006 +0000
+
+ 2006-01-11 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/JBIG2Stream.cc:
+ * poppler/Stream.cc: Merge patch to fix CVE-2005-3624,
+ CVE-2005-3625 and CVE-2005-3627 issues.
+
+ ChangeLog | 6 ++++++
+ poppler/JBIG2Stream.cc | 32 +++++++++++++++++++++++++++++++-
+ poppler/Stream.cc | 8 +++++---
+ 3 files changed, 42 insertions(+), 4 deletions(-)
+
+commit ec7fb41725c19bc7f2aad1073fe6397ea0a8da0d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jan 10 21:57:28 2006 +0000
+
+ * configure.ac:
+ * m4/qt.m4: Fix bugs created when splitting the code from
+ configure.ac, take QTDIR into account when looking for
+ QtTestLib and
+ do not die if it is not found as it is not mandatory
+ * qt/poppler-page-transition.cc:
+ * qt/poppler-page.cc:
+ * qt/poppler-private.h:
+ * qt4/tests/Makefile.am:
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-page.cc:
+ * qt4/src/Makefile.am: Fix mess created my the moving and
+ renaming of
+ PageTransition.cc
+
+ ChangeLog | 15 +++++++++++++++
+ configure.ac | 14 ++++----------
+ m4/qt.m4 | 5 +++++
+ qt/poppler-page-transition.cc | 2 +-
+ qt/poppler-page.cc | 1 +
+ qt/poppler-private.h | 5 -----
+ qt4/src/Makefile.am | 1 +
+ qt4/src/poppler-page.cc | 2 +-
+ qt4/src/poppler-qt4.h | 2 +-
+ qt4/tests/Makefile.am | 1 +
+ 10 files changed, 30 insertions(+), 18 deletions(-)
+
+commit d9bc53a741b3bbd2a202662c66fe70f49ac72a49
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Jan 10 17:59:51 2006 +0000
+
+ 2006-01-10 Kristian Høgsberg <krh@redhat.com>
+
+ * splash/Makefile.am: Only install splash headers if
+ --enable-xpdf-headers is given.
+
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Set this here.
+
+ ChangeLog | 7 +++++++
+ Makefile.am | 1 +
+ splash/Makefile.am | 4 ++++
+ 3 files changed, 12 insertions(+), 0 deletions(-)
+
+commit ea6d9b97cec6fabf8a5005c565bbdb378bed7f54
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Tue Jan 10 17:55:59 2006 +0000
+
+ 2006-01-10 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h:
+ Fix the following fixme in CairoOutputDevice.
+
+ // FIXME: This is quite right yet, we need to accumulate all
+ // glyphs within one text object before we clip. Right now this
+ // just add this one string.
+
+ The fix uses a strategy similar to the one the Splash backend.
+ textClipPath is used to store the appended path from each call to
+ endString(). The accumulated path is clipped in endTextObject.
+
+ ChangeLog | 14 ++++++++++++++
+ poppler/CairoOutputDev.cc | 27 +++++++++++++++++++++++----
+ poppler/CairoOutputDev.h | 1 +
+ 3 files changed, 38 insertions(+), 4 deletions(-)
+
+commit 9e8a655a2bd3ca8cff1a150dce0dd378aeca047b
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Jan 8 22:59:48 2006 +0000
+
+ 2006-01-08 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Don't try and load type3 fonts
+ (#4030).
+
+ ChangeLog | 6 +++++-
+ poppler/CairoOutputDev.cc | 5 ++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+commit 25fd8e1ea87c41855a4ee702fbe47f5661a54c22
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Jan 8 22:51:17 2006 +0000
+
+ 2006-01-08 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/Page.cc: use colToByte for reading thumbnails (#5420).
+
+ Patch by Nickolay V. Shmyrev.
+
+ ChangeLog | 6 ++++++
+ poppler/Page.cc | 6 +++---
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+commit df73ee2ec4b65ccf611f0fd76fb456cc797693d4
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Jan 7 06:10:15 2006 +0000
+
+ 2006-01-07 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/CairoOutputDev.cc: Initialize (fill|stroke)_opacity.
+
+ ChangeLog | 4 ++++
+ poppler/CairoOutputDev.cc | 2 ++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 18eb8de66749082e4aa65cc6d369a533826fab33
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Jan 6 10:05:58 2006 +0000
+
+ 2006-01-06 Kristian Høgsberg <krh@redhat.com>
+
+ * qt/poppler-page.cc:
+ * qt/poppler-private.h:
+ * qt/poppler-qt.h:
+ * qt4/src/Makefile.am:
+ * qt/Makefile.am:
+ * poppler/Makefile.am: Move PageTransition to qt bindings,
+ move
+ contents from Private.h to qt/poppler-private.h.
+
+ * poppler/TextOutputDev.cc (visitWord): Remove #warning.
+
+ * utils/Makefile.am (pdfimages_SOURCES): Add ImageOutputDev.h,
+ use
+ dist_man1_MANS so we actually dist the man pages.
+
+ * goo/Makefile.am (poppler_goo_include_HEADERS): Add
+ GooVector.h.
+
+ * glib/reference/Makefile.am: DOC_SOURCE_DIR must be
+ relative to
+ $(srcdir), fix this to make distchek run.
+
+ * m4/qt.m4:
+ * m4/libjpeg.m4:
+ * acinclude.m4:
+ * configure.ac: Split out Qt and libjpeg checks from
+ configure.ac
+ and acinclude.m4 to m4/qt.m4 and m4/libjpeg.m4.
+
+ ChangeLog | 26 ++++
+ acinclude.m4 | 112 ----------------
+ configure.ac | 223
+ +++----------------------------
+ glib/reference/Makefile.am | 2 +-
+ glib/reference/tmpl/poppler-enums.sgml | 150 ---------------------
+ glib/reference/tmpl/poppler-unused.sgml | 130 ++++++++++++++++++
+ goo/Makefile.am | 1 +
+ m4/libjpeg.m4 | 109 +++++++++++++++
+ m4/qt.m4 | 206
+ ++++++++++++++++++++++++++++
+ poppler/Makefile.am | 1 -
+ poppler/PageTransition.h | 118 ----------------
+ poppler/Private.h | 30 ----
+ poppler/TextOutputDev.cc | 2 -
+ qt/Makefile.am | 8 +-
+ qt/poppler-page-transition.cc | 187 ++++++++++++++++++++++++++
+ qt/poppler-page-transition.h | 117 ++++++++++++++++
+ qt/poppler-page.cc | 1 -
+ qt/poppler-private.h | 9 +-
+ qt/poppler-qt.h | 2 +-
+ qt4/src/Makefile.am | 8 +-
+ utils/Makefile.am | 54 ++++++--
+ 21 files changed, 857 insertions(+), 639 deletions(-)
+
+commit 93921e77115ebe4d527f98675e438de485e84507
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 5 23:53:33 2006 +0000
+
+ * poppler/DCTStream.cc: Fix handling of malformed jpeg streams like
+ the one at http://bugs.kde.org/show_bug.cgi?id=119569
+
+ Might be worth backporting to 0.4.x
+
+ ChangeLog | 5 +++++
+ poppler/DCTStream.cc | 26 ++++++++++++++++----------
+ 2 files changed, 21 insertions(+), 10 deletions(-)
+
+commit 0dc16af02071350a0dc11af4106799378c99cdad
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jan 5 13:53:58 2006 +0000
+
+ Introduce variants of renderTo that return a QImage and do not use
+ a QPixmap so threading is possible.
+
+ ChangeLog | 8 ++++++
+ qt/poppler-page.cc | 18 +++++++++----
+ qt/poppler-qt.h | 30 ++++++++++++++++++++----
+ qt4/src/poppler-page.cc | 9 ++++++-
+ qt4/src/poppler-qt4.h | 59
+ +++++++++++++++++++++++++---------------------
+ 5 files changed, 85 insertions(+), 39 deletions(-)
+
+commit 5c2cbf5d327c6cc75c073b56c3ab1748c0d24387
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jan 2 14:24:31 2006 +0000
+
+ Use error() instead std::cerr in PageTranstion.cc
+
+ ChangeLog | 4 ++++
+ poppler/PageTransition.cc | 5 +++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit da5a4233498b56df611e1c7bca0090306cb5dbe0
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Mon Jan 2 00:06:45 2006 +0000
+
+ Sun Jan 1 18:50:51 2006 Jonathan Blandford <jrb@redhat.com>
+
+ * Makefile.am:
+ * autogen.sh:
+ * configure.ac:
+ * gtk-doc.make:
+ * glib/Makefile.am: enable gtk-doc support.
+
+ ChangeLog | 8 +++
+ Makefile.am | 2 +
+ autogen.sh | 14 +++++
+ configure.ac | 4 ++
+ glib/Makefile.am | 1 +
+ gtk-doc.make | 153
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ m4/gtk-doc.m4 | 53 +++++++++++++++++++
+ 7 files changed, 235 insertions(+), 0 deletions(-)
+
+commit 372c34cc9728d7041bc4f6893c0bae50c9501c50
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 1 22:35:48 2006 +0000
+
+ * qt4/src/poppler-private.h:
+ * qt4/src/poppler-page.cc:
+ * qt4/src/poppler-document.cc: Don't create a SplashOutputDev
+ for
+ every splashRenderToPixmap
+
+ ChangeLog | 4 ++++
+ qt4/src/poppler-document.cc | 1 -
+ qt4/src/poppler-page.cc | 18 +++++-------------
+ qt4/src/poppler-private.h | 24 +++++++++++++++++++++++-
+ 4 files changed, 32 insertions(+), 15 deletions(-)
+
+commit 6ff83474ac594368015334db9c6b33d3a552079f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 1 22:18:47 2006 +0000
+
+ * qt/poppler-page.cc:
+ * qt/poppler-private.h: Don't create a SplashOutputDev for every
+ renderToPixmap.
+
+ ChangeLog | 6 ++++++
+ qt/poppler-page.cc | 8 +-------
+ qt/poppler-private.h | 24 +++++++++++++++++++++++-
+ 3 files changed, 30 insertions(+), 8 deletions(-)
+
+commit 6942646d4c82327a80b021838a38aa55c1026883
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Sun Jan 1 20:34:36 2006 +0000
+
+ Sun Jan 1 15:32:08 2006 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/reference/*: More gtk-doc work. Not enabled for
+ building
+ by default, but filled in.
+
+ .cvsignore | 1 +
+ ChangeLog | 5 +
+ glib/reference/.cvsignore | 18 ++
+ glib/reference/Makefile.am | 87 +++++++
+ glib/reference/poppler-docs.sgml | 17 ++
+ glib/reference/poppler-sections.txt | 151 +++++++++++
+ glib/reference/poppler.types | 4 +
+ glib/reference/tmpl/poppler-action.sgml | 172 +++++++++++++
+ glib/reference/tmpl/poppler-document.sgml | 354
+ ++++++++++++++++++++++++++
+ glib/reference/tmpl/poppler-enums.sgml | 169 ++++++++++++
+ glib/reference/tmpl/poppler-page.sgml | 243 ++++++++++++++++++
+ glib/reference/tmpl/poppler-private.sgml | 128 +++++++++
+ glib/reference/tmpl/poppler.sgml | 216 ++++++++++++++++
+ glib/reference/tmpl/stamp-poppler-enums.sgml | 19 ++
+ 14 files changed, 1584 insertions(+), 0 deletions(-)
+
+commit 0fab1b711f153859e113cb3b6d734ddcb58fb87a
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Sat Dec 31 02:10:33 2005 +0000
+
+ Fri Dec 30 21:08:33 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/*{cc,h}: Update inline doc comments. This is in
+ preparation for gtk-doc support.
+
+ ChangeLog | 5 ++
+ glib/poppler-action.cc | 14 ++++
+ glib/poppler-action.h | 2 -
+ glib/poppler-document.cc | 151
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler-document.h | 4 +-
+ glib/poppler-page.cc | 28 +++++++++
+ glib/poppler.cc | 16 +++++
+ glib/test-poppler-glib.c | 29 +++++++++
+ 8 files changed, 243 insertions(+), 6 deletions(-)
+
+commit 313530036b204eaa5ddfa150730302e855560d6a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 30 22:54:46 2005 +0000
+
+ A delete that slipped from the last patch-commit
+
+ qt4/src/poppler-page.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit cf6f8123af19aca4200b58a454652f68ce8132e2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 30 22:31:32 2005 +0000
+
+ Puting PageTransition implementation into poppler "core", both Qt
+ and Qt4 frontends use it.
+
+ poppler/Makefile.am | 1 +
+ poppler/PageTransition.cc | 188
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PageTransition.h | 118 ++++++++++++++++++++++++++++
+ poppler/Private.h | 30 +++++++
+ qt/Makefile.am | 2 +-
+ qt/poppler-page.cc | 111 +-------------------------
+ qt/poppler-qt.h | 72 +-----------------
+ qt4/src/Makefile.am | 2 +-
+ qt4/src/poppler-page.cc | 17 ++++-
+ qt4/src/poppler-qt4.h | 14 +++-
+ 10 files changed, 374 insertions(+), 181 deletions(-)
+
+commit 56035ab199ac6deb5c1e07e745d120d1121a5960
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Dec 30 21:59:58 2005 +0000
+
+ * utils/HtmlOutputDev.cc:
+ * utils/ImageOutputDev.cc: Fix build when using --disable-libjpeg
+
+ ChangeLog | 5 +++++
+ utils/HtmlOutputDev.cc | 2 ++
+ utils/ImageOutputDev.cc | 2 ++
+ 3 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 8b64dafc7f1d198fb0052c0d6f0da6de97bbb48d
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Wed Dec 28 09:23:43 2005 +0000
+
+ Plug a few memory leaks in the Qt4 bindings.
+
+ ChangeLog | 25 +++++++++++++++++++
+ qt4/src/poppler-document.cc | 3 ++
+ qt4/src/poppler-private.h | 7 ++++-
+ qt4/src/poppler-qt4.h | 3 ++
+ qt4/tests/check_fonts.cpp | 8 ++++++
+ qt4/tests/check_metadata.cpp | 50
+ +++++++++++++++++++++++++++++++++----
+ qt4/tests/check_pagelayout.cpp | 6 ++++
+ qt4/tests/check_pagemode.cpp | 10 +++++++
+ qt4/tests/check_permissions.cpp | 2 +
+ qt4/tests/check_version.cpp | 22 ----------------
+ qt4/tests/poppler-fonts.cpp | 1 +
+ qt4/tests/stress-poppler-qt4.cpp | 2 +
+ 12 files changed, 110 insertions(+), 29 deletions(-)
+
+commit 64c07a20a4ed844f3b3dd26e974f58d5877cf9fd
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Tue Dec 27 06:10:01 2005 +0000
+
+ qt4/src/poppler-qt4.h and qt4/src/poppler-document.cc: add
+ convertDate() function that
+ turns char* PDF date strings into QDateTime. This version handles
+ the timezone conversions. Refactored the existing date() method
+ to use it.
+
+ qt4/tests/check_dateConversion.cpp: unit tests for convertDate()
+ qt4/tests/check_metadata.cpp: update to reflect UTC.
+ qt4/tests/.cvsignore: suppress check_dateConversion
+
+ ChangeLog | 9 +++
+ qt4/src/poppler-document.cc | 89 ++++++++++++++++++++-----------
+ qt4/src/poppler-qt4.h | 5 ++
+ qt4/tests/.cvsignore | 1 +
+ qt4/tests/Makefile.am | 11 +++-
+ qt4/tests/check_dateConversion.cpp | 105
+ ++++++++++++++++++++++++++++++++++++
+ qt4/tests/check_metadata.cpp | 4 +-
+ 7 files changed, 188 insertions(+), 36 deletions(-)
+
+commit 4b2e3b5106b75f23c830837a886cd29beb1d1d1b
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Tue Dec 27 05:08:34 2005 +0000
+
+ * qt4/src/Doxyfile (JAVADOC_AUTOBRIEF): Turned on automatic
+ \brief mode.
+
+ * qt4/src/poppler-qt4.h: Update API documentation. Patch from
+ Stefan Kebekus, with some changes. Removed \brief entries.
+
+ ChangeLog | 8 +++++
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/poppler-qt4.h | 81
+ ++++++++++++++++++++++++++++++++++++++----------
+ 3 files changed, 73 insertions(+), 18 deletions(-)
+
+commit 8d9cf43aaa73d5012428a6a4c5d7e2cccbd3036e
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Dec 21 22:09:47 2005 +0000
+
+ 2005-12-21 Kristian Høgsberg <krh@redhat.com>
+
+ * NEWS: Sum up 0.5 changes so far.
+
+ * acinclude.m4: Split jpeg macros out into this file.
+
+ * poppler/Stream.cc: Apply latest CVE-2005-3191 updates.
+
+ ChangeLog | 8 ++++
+ NEWS | 8 ++++
+ acinclude.m4 | 112
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 114
+ --------------------------------------------------
+ poppler/JPXStream.cc | 1 +
+ poppler/Stream.cc | 11 ++++-
+ 6 files changed, 137 insertions(+), 117 deletions(-)
+
+commit 97243286560cb4f264b875185c8768a6af09d554
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Dec 21 17:30:33 2005 +0000
+
+ 2005-12-21 Kristian Høgsberg <krh@redhat.com>
+
+ * utils/Makefile.am: Add parseargs.h to sources and add
+ -I$(top_srcdir)/poppler to INCLUDES.
+
+ * poppler/CairoFontEngine.cc: Apply patch from Hiroyuki
+ Ikezoe to
+ man non-embedded CJK fonts work.
+
+ ChangeLog | 14 +++++++++--
+ configure.ac | 2 +-
+ poppler/CairoFontEngine.cc | 52
+ +++++++++++++++++++++++++++++++++++++++----
+ utils/Makefile.am | 15 +++++++-----
+ 4 files changed, 68 insertions(+), 15 deletions(-)
+
+commit cf887a9a9fae7272165d3aae05c85444ff5ca604
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 18 22:03:30 2005 +0000
+
+ * poppler/Page.cc: Only discard cropbox sizes one by one
+ and not
+ completely. Jeff and Martin were right
+
+ ChangeLog | 2 ++
+ poppler/Page.cc | 13 ++++++++++---
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+commit 495890b9cef9d5d61bb47e789add1cf2c3b8f83d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 18 21:56:15 2005 +0000
+
+ + .cvsignore
+
+ utils/.cvsignore | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 5dca860bba6918e06fab3aa56a2c75f0ac9ecdfb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 18 21:08:48 2005 +0000
+
+ Fix utils building on Slackware
+
+ ChangeLog | 3 +++
+ configure.ac | 3 +++
+ utils/Makefile.am | 3 ++-
+ 3 files changed, 8 insertions(+), 1 deletions(-)
+
+commit 03e3d9164ffd71f03136b57a9941ea14fadb21aa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 18 17:12:28 2005 +0000
+
+ 2005-12-18 Albert Astals Cid <aacid@kde.org>
+
+ * configure.ac: Better jpeg detection, refer to ml PCbsd
+ problem
+
+ ChangeLog | 4 ++
+ configure.ac | 131
+ ++++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 118 insertions(+), 17 deletions(-)
+
+commit 888d76a29c9c5ea6c90cc4299b230ca0c2c2944f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 12 20:21:08 2005 +0000
+
+ * poppler/Page.cc: Ignore cropBox if it seems incorrect
+
+ ChangeLog | 4 ++++
+ poppler/Page.cc | 7 +++++++
+ 2 files changed, 11 insertions(+), 0 deletions(-)
+
+commit bcc5e3afe27c8787ce7022a0701997c96eddb4fe
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Dec 12 20:15:11 2005 +0000
+
+ 2005-12-12 Kristian Høgsberg <krh@redhat.com>
+
+ * Makefile.am:
+ * configure.ac:
+ * goo/GooVector.h:
+ * utils/HtmlFonts.cc:
+ * utils/HtmlFonts.h:
+ * utils/HtmlLinks.cc:
+ * utils/HtmlLinks.h:
+ * utils/HtmlOutputDev.cc:
+ * utils/HtmlOutputDev.h:
+ * utils/ImageOutputDev.cc:
+ * utils/ImageOutputDev.h:
+ * utils/Makefile.am:
+ * utils/parseargs.c:
+ * utils/parseargs.h:
+ * utils/pdffonts.1:
+ * utils/pdffonts.cc:
+ * utils/pdfimages.1:
+ * utils/pdfimages.cc:
+ * utils/pdfinfo.1:
+ * utils/pdfinfo.cc:
+ * utils/pdftohtml.1:
+ * utils/pdftohtml.cc:
+ * utils/pdftoppm.1:
+ * utils/pdftoppm.cc:
+ * utils/pdftops.1:
+ * utils/pdftops.cc:
+ * utils/pdftotext.1:
+ * utils/pdftotext.cc: Add command line utilities from xpdf.
+
+ ChangeLog | 31 +
+ Makefile.am | 6 +-
+ configure.ac | 25 +-
+ goo/GooVector.h | 101 +++
+ utils/HtmlFonts.cc | 326 ++++++++++
+ utils/HtmlFonts.h | 85 +++
+ utils/HtmlLinks.cc | 101 +++
+ utils/HtmlLinks.h | 49 ++
+ utils/HtmlOutputDev.cc | 1569
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ utils/HtmlOutputDev.h | 302 +++++++++
+ utils/ImageOutputDev.cc | 195 ++++++
+ utils/ImageOutputDev.h | 76 +++
+ utils/Makefile.am | 18 +
+ utils/parseargs.c | 190 ++++++
+ utils/parseargs.h | 71 +++
+ utils/pdffonts.1 | 128 ++++
+ utils/pdffonts.cc | 294 +++++++++
+ utils/pdfimages.1 | 96 +++
+ utils/pdfimages.cc | 159 +++++
+ utils/pdfinfo.1 | 157 +++++
+ utils/pdfinfo.cc | 376 ++++++++++++
+ utils/pdftohtml.1 | 85 +++
+ utils/pdftohtml.cc | 429 +++++++++++++
+ utils/pdftoppm.1 | 113 ++++
+ utils/pdftoppm.cc | 189 ++++++
+ utils/pdftops.1 | 224 +++++++
+ utils/pdftops.cc | 336 ++++++++++
+ utils/pdftotext.1 | 135 ++++
+ utils/pdftotext.cc | 337 ++++++++++
+ 29 files changed, 6194 insertions(+), 9 deletions(-)
+
+commit 5fbded32741acb5fac411189f80cb57aa11df517
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Dec 10 10:52:15 2005 +0000
+
+ * qt4/src/poppler-page.cc:
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/tests/test-poppler-qt4.cpp: The parameters x,y,w,h to the
+ method splashRenderToPixmap are now used. Convenient
+ defaults are provided. The test has been changed accordingly. Some
+ added documentation. Patch by Stefan Kebekus
+
+ ChangeLog | 9 +++++++++
+ qt4/src/poppler-page.cc | 4 ++--
+ qt4/src/poppler-qt4.h | 31 +++++++++++++++++++++++--------
+ qt4/tests/test-poppler-qt4.cpp | 2 +-
+ 4 files changed, 35 insertions(+), 11 deletions(-)
+
+commit bc6df8c41081c0c0107655cbf70ddb8b0c493c34
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Dec 9 20:49:59 2005 +0000
+
+ 2005-12-09 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/GfxState.cc: Use colToByte() for converting
+ GxfColorComp
+ to bytes (really fix #5117).
+
+ * poppler/Stream.cc: Remove duplicated check (#5243).
+
+ ChangeLog | 5 +++++
+ poppler/GfxState.cc | 6 +++---
+ poppler/Stream.cc | 4 ----
+ 3 files changed, 8 insertions(+), 7 deletions(-)
+
+commit 8a2464122455311c6d16ae62bb9ac9a0ae365a28
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Dec 9 19:40:40 2005 +0000
+
+ 2005-12-09 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac:
+ * poppler/Makefile.am (poppler_includedir):
+ * goo/Makefile.am (poppler_goo_include_HEADERS): Make
+ installation
+ of xpdf header files optional.
+
+ ChangeLog | 10 +++++++++-
+ configure.ac | 8 ++++++++
+ goo/Makefile.am | 4 ++++
+ poppler/Makefile.am | 4 ++++
+ 4 files changed, 25 insertions(+), 1 deletions(-)
+
+commit 830b61bfd1c985fe14ec4d0f6724c8f70e924fc1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 8 18:17:42 2005 +0000
+
+ * configure.ac: Detect if gettimeofday is available, fixes
+ for correct
+ linking to Qt4 on windows
+ * goo/GooTimer.[cc|h]: Only build if gettimeofday is available
+ * poppler/Gfx.cc: Only use the timer for profiling if
+ gettimeofday is
+ available
+ * poppler/GlobalParams.cc: Remove extra unlockGlobalParams
+ that was
+ making windows hang
+ * splash/SplashFTFontEngine.cc: i need unistd.h on windows
+ also
+ * splash/SplashFontFile.cc: i need unistd.h on windows also
+
+ ChangeLog | 12 ++++++++++++
+ configure.ac | 14 +++++++++++++-
+ goo/GooTimer.cc | 3 +++
+ goo/GooTimer.h | 4 ++++
+ poppler/Gfx.cc | 6 ++++++
+ poppler/GlobalParams.cc | 1 -
+ splash/SplashFTFontEngine.cc | 4 +---
+ splash/SplashFontFile.cc | 4 +---
+ 8 files changed, 40 insertions(+), 8 deletions(-)
+
+commit 0a1c33ed17fd7053ed455da3444856a5dab3c9b4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 8 12:42:50 2005 +0000
+
+ Remove -DDATADIR we are not using if for anything and it shadows a
+ windows typedef
+
+ ChangeLog | 8 ++++++++
+ glib/Makefile.am | 3 +--
+ poppler/Makefile.am | 3 +--
+ qt/Makefile.am | 3 +--
+ test/Makefile.am | 3 +--
+ 5 files changed, 12 insertions(+), 8 deletions(-)
+
+commit adca042e666fd932f16213d0a4daba08b5021901
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Wed Dec 7 08:42:21 2005 +0000
+
+ Remove the version check. OK'd by krh.
+
+ ChangeLog | 2 ++
+ poppler/PDFDoc.cc | 6 +-----
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+commit bc57f8dd73eef9a74e4a6e248ed6985c360db838
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Wed Dec 7 08:31:09 2005 +0000
+
+ Add infoKeys() - allows you to get a list of all the string names
+ (keys)
+ for the metadata.
+
+ ChangeLog | 7 +++++++
+ qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 7 +++++++
+ qt4/tests/check_metadata.cpp | 18 ++++++++++++++++++
+ 4 files changed, 54 insertions(+), 0 deletions(-)
+
+commit 7ec41df91e6dbf792e11676d929acc2f634bd382
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Tue Dec 6 09:58:04 2005 +0000
+
+ Add more unit tests for better coverage.
+
+ ChangeLog | 6 ++++
+ qt4/tests/check_fonts.cpp | 24 +++++++++++++++
+ qt4/tests/check_metadata.cpp | 66
+ ++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 96 insertions(+), 0 deletions(-)
+
+commit a92b10016306ac46775c9b95b52d249b233ff950
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 5 20:46:22 2005 +0000
+
+ * poppler/CairoFontEngine.cc: Correct fix for #5149, i broke it when
+ merging xpdf 3.01 patches
+
+ ChangeLog | 5 +++++
+ poppler/CairoFontEngine.cc | 4 +---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+commit 66096477d1a86f13fcb07ae25caff1cc02b1e7cd
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sun Dec 4 19:48:25 2005 +0000
+
+ Add checking for Type3 fonts in the unit test.
+
+ ChangeLog | 5 +++++
+ qt4/tests/check_fonts.cpp | 24 ++++++++++++++++++++++++
+ 2 files changed, 29 insertions(+), 0 deletions(-)
+
+commit 62345b0affed8e2e37728fca7f2b750879192c43
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 4 18:53:40 2005 +0000
+
+ Fix error in merging CAN-2005-3193 fix. Thanks Daniel Gryniewicz
+ for notifying
+
+ ChangeLog | 5 +++++
+ poppler/JPXStream.cc | 2 --
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit ba4b3f88271892f197aa2ec076c80ff63a175887
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Dec 4 11:30:00 2005 +0000
+
+ * qt/poppler-qt.h:
+ * qt/poppler-fontinfo.h:
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-fontinfo.cc: Implement copy constructor of
+ FontInfo needed
+ as Q[Value]List<FontInfo> uses it when appending
+
+ ChangeLog | 8 ++++++++
+ qt/poppler-fontinfo.cc | 9 +++++++++
+ qt/poppler-qt.h | 2 ++
+ qt4/src/poppler-fontinfo.cc | 9 +++++++++
+ qt4/src/poppler-qt4.h | 2 ++
+ 5 files changed, 30 insertions(+), 0 deletions(-)
+
+commit e091231d98d12c19b0098ffbaec6ecda28097dff
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sun Dec 4 10:45:25 2005 +0000
+
+ Add new unit test to .cvsignore suppressions.
+
+ ChangeLog | 2 ++
+ qt4/tests/.cvsignore | 1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 6a7b1eaaedbfdd3a8e6b4d899477350f2b485641
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sun Dec 4 10:05:21 2005 +0000
+
+ * qt4/src/poppler-qt4.h:
+ qt4/src/fontinfo.cc: add implementation for FontInfo::typeName()
+
+ * qt4/tests/check_fonts.cpp:
+ * qt4/tests/Makefile.am: add unit test for fonts
+
+ * qt4/src/Mainpage.dox: Minor typo fixes.
+
+ ChangeLog | 11 +++++++++++
+ qt4/src/Mainpage.dox | 5 +++--
+ qt4/src/poppler-fontinfo.cc | 24 ++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 14 +++++++++++++-
+ qt4/tests/Makefile.am | 5 +++++
+ qt4/tests/check_fonts.cpp | 42
+ ++++++++++++++++++++++++++++++++++++++++++
+ 6 files changed, 98 insertions(+), 3 deletions(-)
+
+commit 31b28b4c59f7820901e9cf893197f381acbae8ce
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun Dec 4 02:24:25 2005 +0000
+
+ 2005-12-03 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_set_selection_alpha): Use
+ Nickolays original fix instead of trying to be clever with
+ gdk_pixbuf_fill().
+
+ * poppler/CairoFontEngine.cc: Fix text corruption bug (#5149),
+ a rerun of an old classic (#3340).
+
+ ChangeLog | 7 +++++++
+ glib/poppler-page.cc | 8 +++++++-
+ poppler/CairoFontEngine.cc | 2 ++
+ 3 files changed, 16 insertions(+), 1 deletions(-)
+
+commit 4d169c5c345cdac84a39026e759b928977643417
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun Dec 4 01:42:29 2005 +0000
+
+ 2005-12-03 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/GfxState.cc: Fixing another problem with new GfxRGB
+ representation causing images to show up as random pixels
+ (#5117).
+
+ ChangeLog | 5 +++++
+ poppler/GfxState.cc | 6 +++---
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+commit 58de0458e17b1639ce0bcae45a4b09b2c0a56618
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sat Dec 3 23:23:53 2005 +0000
+
+ 2005-12-03 Kristian Høgsberg <krh@redhat.com>
+
+ * qt/Makefile.am (noinst_PROGRAMS): Only build qt test
+ program if
+ splash is enabled.
+
+ * poppler/CairoOutputDev.cc: Remove unused grid snapping code,
+ sidestepping #4507.
+
+ * glib/poppler-document.h (PopplerPermissions): Breaking enum
+ definition over multiple lines confuses glib-mkenums (#4600).
+
+ * poppler/Makefile.am (libpoppler_la_LIBADD): Add
+ FREETYPE_LIBS
+ (#4515).
+
+ * poppler/TextOutputDev.cc:
+ * qt/poppler-qt.h: GCC-4.1 fixes (#5031).
+
+ ChangeLog | 17 +++++++++++++++++
+ glib/poppler-document.h | 5 +----
+ poppler/CairoOutputDev.cc | 35 +++++++++--------------------------
+ poppler/CairoOutputDev.h | 2 +-
+ poppler/Makefile.am | 3 ++-
+ poppler/TextOutputDev.cc | 2 +-
+ qt/Makefile.am | 4 ++++
+ qt/poppler-qt.h | 6 +++---
+ 8 files changed, 38 insertions(+), 36 deletions(-)
+
+commit df45483f1437d8a96519e1428d1f4b3ffc08c2cd
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Dec 3 22:39:06 2005 +0000
+
+ remove another chagne should not have gone in
+
+ test/pdf-inspector.cc | 9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+commit 7dfe02ee112dee51346525b62d877e6591135761
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Dec 3 22:28:46 2005 +0000
+
+ Add the font retrieveing on the qt3 backend also, based on a patch
+ by Wilfried Huss
+
+ ChangeLog | 3 ++
+ qt/poppler-fontinfo.cc | 75
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 78 insertions(+), 0 deletions(-)
+
+commit 655b9dd195ac9faf2f7ea0255880b8c83b249a06
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Dec 3 22:26:07 2005 +0000
+
+ this should have not went in
+
+ poppler/TextOutputDev.h | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+commit ab45eb562159d5b006e658ec66723a0a47908f65
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Dec 3 22:20:54 2005 +0000
+
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-fontinfo.cc:
+ * qt4/src/poppler-textbox.cc: Remove implementation of that classes
+ from the header, use pimpl
+
+ ChangeLog | 9 ++++-
+ poppler/TextOutputDev.h | 10 +++---
+ qt/Makefile.am | 1 +
+ qt/poppler-document.cc | 29 +++++++++++++++
+ qt/poppler-private.h | 2 +
+ qt/poppler-qt.h | 80
+ ++++++++++++++++++++++++++++++++++++++++++-
+ qt4/src/Makefile.am | 2 +
+ qt4/src/poppler-fontinfo.cc | 69 +++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 43 +++++++++--------------
+ qt4/src/poppler-textbox.cc | 49 ++++++++++++++++++++++++++
+ test/pdf-inspector.cc | 9 ++++-
+ 11 files changed, 268 insertions(+), 35 deletions(-)
+
+commit 64079ad81caf6d2cf66b1f3a3de9454146e15c6c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sat Dec 3 21:55:36 2005 +0000
+
+ 2005-12-03 Kristian Høgsberg <krh@redhat.com>
+
+ Fixes from Nickolay V. Shmyrev:
+
+ * poppler/TextOutputDev.cc (TextLine::visitSelection,
+ TextBlock::visitSelection): Fix selection crash with
+ zero-width
+ word boxes or zero-height line boxes (#4402).
+
+ * poppler/CairoOutputDev.h: Fix wrong cairo-ft.h include
+ (#4413).
+
+ * poppler/CairoOutputDev.cc (eoFill, fill):
+ * glib/poppler-page.cc (poppler_page_render_selection):
+ Update to
+ work with new GfxColor definition and use
+ cairo_pattern_create_rgba() to cache cairo_pattern_t's for the
+ fill and stroke colors.
+
+ * glib/poppler-page.cc (poppler_page_set_selection_alpha):
+ Zero
+ out pixbuf first.
+
+ ChangeLog | 21 ++++++++++++++++
+ glib/poppler-page.cc | 18 ++++++++-----
+ poppler/CairoOutputDev.cc | 59
+ ++++++++++++++++++++++++++++++++------------
+ poppler/CairoOutputDev.h | 6 ++--
+ poppler/TextOutputDev.cc | 8 +++---
+ 5 files changed, 82 insertions(+), 30 deletions(-)
+
+commit f3da21a3ecdd2694290e64af86c8e35fcb61371b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Dec 3 21:35:45 2005 +0000
+
+ More docs for the Qt4 frontend, patch by Stefan Kebekus
+
+ ChangeLog | 8 ++++
+ qt4/src/.cvsignore | 3 +-
+ qt4/src/Doxyfile | 4 +-
+ qt4/src/Mainpage.dox | 91
+ ++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc | 20 ++-------
+ qt4/src/poppler-qt4.h | 57 +++++++++++++++++-------
+ qt4/tests/test-poppler-qt4.cpp | 5 +-
+ 7 files changed, 151 insertions(+), 37 deletions(-)
+
+commit 7b2c6e92611db9350ca5dcaf3fd730fe5e69afea
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 1 22:45:10 2005 +0000
+
+ Fix CAN-2005-3193 related bugs
+ Thanks Leonard for reporting
+
+ ChangeLog | 6 ++++++
+ poppler/JPXStream.cc | 9 ++++++++-
+ poppler/Stream.cc | 33 ++++++++++++++++++++++++++++++++-
+ poppler/Stream.h | 3 +++
+ 4 files changed, 49 insertions(+), 2 deletions(-)
+
+commit a90f076af9ebb188895e7b223bcb7e5c3f4309c4
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 28 22:50:19 2005 +0000
+
+ Fix QPixmap contents generation messed when doing the xpdf 3.01
+ transition in qt4 frontend
+ Use Splash backend by default in the qt4 test, added -arthur option
+ to use the Arthur backend
+
+ ChangeLog | 12 +++++++-
+ qt4/src/poppler-page.cc | 45 ++++++++++++++++++++++++++-------
+ qt4/src/poppler-qt4.h | 17 +++++++++----
+ qt4/tests/test-poppler-qt4.cpp | 53
+ +++++++++++++++++++++++++---------------
+ 4 files changed, 90 insertions(+), 37 deletions(-)
+
+commit b7e4f0e7d175abde7fafb1fcc7ba129468bc8c1a
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sun Nov 27 01:33:51 2005 +0000
+
+ Convert Qt4 unit tests to use the new Qt4.1 QTestlib framework.
+ Add a little more API documentation
+
+ ChangeLog | 7 +++++
+ qt4/src/poppler-qt4.h | 11 +++++---
+ qt4/tests/Makefile.am | 12 +++++---
+ qt4/tests/check_metadata.cpp | 58
+ +++++++++++++++++++-------------------
+ qt4/tests/check_pagelayout.cpp | 14 +++++-----
+ qt4/tests/check_pagemode.cpp | 22 +++++++-------
+ qt4/tests/check_permissions.cpp | 18 ++++++------
+ 7 files changed, 78 insertions(+), 64 deletions(-)
+
+commit d036fa022dbb6f4421ccc8b12b8f9e4f0c8d7406
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Nov 25 22:52:56 2005 +0000
+
+ patch from kebekus to add to the qt4 binding the same functions we
+ added to the qt3 one
+
+ ChangeLog | 5 +++++
+ qt4/src/poppler-page.cc | 44
+ ++++++++++++++++++++++++++++++++++++++++++--
+ qt4/src/poppler-qt4.h | 22 ++++++++++++++++++++++
+ 3 files changed, 69 insertions(+), 2 deletions(-)
+
+commit 3c9f09d76dc70e4ba766930facee8b6f30bcd2da
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 22 21:50:44 2005 +0000
+
+ Fix page range in the inspector
+
+ ChangeLog | 4 ++++
+ test/pdf-inspector.cc | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit e64f63416dbce497cb2167272b95491664f213e8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 21 22:12:15 2005 +0000
+
+ PAtch to add some more functions to the qt binding by Stefan Kebekus
+
+ ChangeLog | 5 ++++
+ qt/poppler-page.cc | 69
+ +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ qt/poppler-qt.h | 41 +++++++++++++++++++++++++++++++
+ 3 files changed, 114 insertions(+), 1 deletions(-)
+
+commit 8bd8cb4160b73da69d058783750352fbface66dc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Nov 21 19:44:09 2005 +0000
+
+ Fix a possible build problem
+
+ ChangeLog | 4 ++++
+ qt/Makefile.am | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit fc59b79dc375544681032a1618e96c458515d724
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun Nov 20 23:17:32 2005 +0000
+
+ 2005-11-20 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/GfxState.cc: Fix the byte_lookup initialization
+ broken
+ by the merges (#4350). Modify GfxColorSpace::getRGBLine()
+ to work
+ with new GfXColor type.
+
+ ChangeLog | 13 ++++++++++-
+ poppler/GfxState.cc | 59
+ ++++++++++++++++++++++++++++++--------------------
+ 2 files changed, 47 insertions(+), 25 deletions(-)
+
+commit 6fe2cb0fcd53211143dcd0c47bf8c8c7a8c11a39
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Nov 17 21:37:34 2005 +0000
+
+ make it compile with freetype 2.2.0 preversions
+
+ ChangeLog | 4 ++++
+ splash/SplashFTFont.cc | 42 +++++++++++++++++++++++++++++++++++++-----
+ 2 files changed, 41 insertions(+), 5 deletions(-)
+
+commit 429d3521d788be702a3944bc290569f90ae04892
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Nov 4 19:03:55 2005 +0000
+
+ Make it compile using --disable-cairo-output
+
+ ChangeLog | 4 ++++
+ glib/poppler-document.cc | 6 ++++--
+ glib/poppler-page.cc | 27 +++++++++++++--------------
+ 3 files changed, 21 insertions(+), 16 deletions(-)
+
+commit b96c118eb08d478914c2981204d749a95957cbb3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 1 15:29:32 2005 +0000
+
+ Comment some unused parameters to calm down compiler warnings when
+ using these heders on external projects with higher warning verbosity
+
+ ChangeLog | 5 ++
+ poppler/OutputDev.h | 125
+ ++++++++++++++++++++++++++-------------------------
+ poppler/Stream.h | 24 +++++-----
+ 3 files changed, 80 insertions(+), 74 deletions(-)
+
+commit 51670972777510a3ec64a56649716b31167b9d0e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 30 20:29:05 2005 +0000
+
+ Last xpdf 3.01 merge (at least from my side)
+ It's very big, but noone has opposed in the 2 weeks time i gave on
+ the ml so either poppler is dead or people agree with the patch
+
+ ChangeLog | 39 +
+ glib/poppler-page.cc | 32 +-
+ poppler/ArthurOutputDev.cc | 2 +-
+ poppler/ArthurOutputDev.h | 2 +-
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h | 2 +-
+ poppler/Gfx.cc | 645 ++++++++++--
+ poppler/Gfx.h | 17 +-
+ poppler/GfxState.cc | 1410 +++++++++++++++++++++---
+ poppler/GfxState.h | 196 +++-
+ poppler/OutputDev.cc | 25 +
+ poppler/OutputDev.h | 46 +-
+ poppler/PDFDoc.cc | 98 ++-
+ poppler/PDFDoc.h | 24 +-
+ poppler/PSOutputDev.cc | 1461 +++++++++++++++++++++----
+ poppler/PSOutputDev.h | 48 +-
+ poppler/Page.cc | 115 ++-
+ poppler/Page.h | 23 +-
+ poppler/SplashOutputDev.cc | 1525 +++++++++++++++++++++++---
+ poppler/SplashOutputDev.h | 59 +-
+ poppler/TextOutputDev.cc | 230 +++--
+ poppler/TextOutputDev.h | 16 +-
+ qt/poppler-page.cc | 34 +-
+ qt4/src/poppler-page.cc | 31 +-
+ splash/Splash.cc | 2656
+ +++++++++++++++++++++++++++++++++-----------
+ splash/Splash.h | 75 +-
+ splash/SplashBitmap.cc | 216 +++--
+ splash/SplashBitmap.h | 13 +-
+ splash/SplashPattern.cc | 22 +-
+ splash/SplashPattern.h | 19 +-
+ splash/SplashState.cc | 11 +
+ splash/SplashState.h | 3 +
+ splash/SplashTypes.h | 145 ++-
+ test/gtk-cairo-test.cc | 2 +-
+ test/gtk-splash-test.cc | 23 +-
+ test/pdf-inspector.cc | 2 +-
+ 36 files changed, 7685 insertions(+), 1584 deletions(-)
+
+commit 10dfa2254dafb9de93692def2bfb3133d9a39989
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Oct 17 02:17:51 2005 +0000
+
+ 2005-10-05 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_render_to_ps):
+ Fix another
+ off-by-one page number error (#4555).
+
+ ChangeLog | 6 +++++-
+ poppler/poppler-config.h.in | 2 +-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 9830f0ea41f09fefada740e9429c491e067a5082
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 16 15:11:32 2005 +0000
+
+ GfxFont merges from xpdf 3.01
+
+ ChangeLog | 1 +
+ poppler/GfxFont.cc | 109
+ +++++++++++++++++++++++++++++++++++-----------------
+ 2 files changed, 75 insertions(+), 35 deletions(-)
+
+commit 62b5ba221aca8c320e964916b0c0329efc8da572
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 16 15:04:39 2005 +0000
+
+ Stream[cc|h] merges from xpdf 3.01
+
+ ChangeLog | 1 +
+ poppler/Stream.cc | 714
+ ++++++++++++++++++++++++++++++++++++++++++++++++-----
+ poppler/Stream.h | 19 +-
+ 3 files changed, 658 insertions(+), 76 deletions(-)
+
+commit b9fab51179f38e9798b10366be672f0432c874da
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 16 14:58:14 2005 +0000
+
+ Function.cc|h merges from xpdf 3.01
+
+ ChangeLog | 1 +
+ poppler/Function.cc | 76
+ +++++++++++++++++++++++++++++----------------------
+ poppler/Function.h | 42 ++++++++++++++++++++++++++++
+ 3 files changed, 86 insertions(+), 33 deletions(-)
+
+commit c6e0242200f818c67508041763ff317e79daadd6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 16 14:54:17 2005 +0000
+
+ Annot.[cc|h] and related merges from xpdf 3.01
+
+ ChangeLog | 7 ++-
+ poppler/Annot.cc | 234
+ ++++++++++++++++++++++++++++++++++++++++++------
+ poppler/Annot.h | 20 ++---
+ poppler/FontInfo.cc | 2 +-
+ poppler/PSOutputDev.cc | 2 +-
+ poppler/Page.cc | 2 +-
+ 6 files changed, 221 insertions(+), 46 deletions(-)
+
+commit 65d574fdc009e45ad66d1d402d5e805e4e94f427
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 16 14:30:16 2005 +0000
+
+ Merge SplashFTFont.cc with xpdf 3.01 changes
+
+ ChangeLog | 1 +
+ splash/SplashFTFont.cc | 64
+ +++++++++++++++++++++++++++++++++---------------
+ 2 files changed, 45 insertions(+), 20 deletions(-)
+
+commit f9d208e86433b213b21a75089f82fd00dcd746fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 16 14:25:32 2005 +0000
+
+ Merge SplashScreen.[cc|h] from xpdf 3.01
+
+ ChangeLog | 4 ++
+ splash/SplashScreen.cc | 110
+ +++++++++++++++++++++++++++++++----------------
+ splash/SplashScreen.h | 12 +++++-
+ 3 files changed, 87 insertions(+), 39 deletions(-)
+
+commit 7d46ac000316566503a27b5e5c68621be9c081d0
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Oct 16 14:19:47 2005 +0000
+
+ Merging SplashXPathScanner.cc changes from xpdf 3.01
+
+ splash/SplashXPathScanner.cc | 80
+ ++++++++++++++++++++++-------------------
+ 1 files changed, 43 insertions(+), 37 deletions(-)
+
+commit e34713a2187e05358f98e749ec2923210a40a862
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Oct 5 15:57:17 2005 +0000
+
+ 2005-10-05 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_render_to_ps):
+ Fix another
+ off-by-one page number error (#4555).
+
+ ChangeLog | 5 +++++
+ glib/poppler-page.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit fdd0934430ed251f9aeb45158b6ec95684b3e7b4
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Mon Sep 26 19:29:45 2005 +0000
+
+ 2005-09-26 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * glib/poppler-action.cc:
+
+ Initialize window title even if the action is unknown
+
+ ChangeLog | 6 ++++++
+ glib/poppler-action.cc | 5 +++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+commit e9753049ddfbdf28df7a222d35eccdbcbcbc848d
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Mon Sep 26 10:42:38 2005 +0000
+
+ 2005-09-26 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * glib/poppler-action.cc:
+ * glib/poppler-action.h:
+
+ Implement launch action
+
+ ChangeLog | 7 +++++++
+ glib/poppler-action.cc | 11 ++++++++---
+ glib/poppler-action.h | 1 +
+ 3 files changed, 16 insertions(+), 3 deletions(-)
+
+commit ab18b2cb6d1c62bb91173d105e8631fe4ef1bcfb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 20 15:27:31 2005 +0000
+
+ Parser.cc merges from xpdf 3.01
+
+ ChangeLog | 1 +
+ poppler/Parser.cc | 19 +++++++++++--------
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
+commit cf6723caaed24615c3b8965cee9c433007f80d77
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 20 15:08:52 2005 +0000
+
+ TextPage *TextOutpudDev::takeText() from xpdf 3.01
+
+ ChangeLog | 1 +
+ poppler/TextOutputDev.cc | 8 ++++++++
+ poppler/TextOutputDev.h | 4 ++++
+ 3 files changed, 13 insertions(+), 0 deletions(-)
+
+commit e0cbb0ca2c611ad5ac0267e46279c9d61450902a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 20 14:59:43 2005 +0000
+
+ more 3.00 -> 3.01 merging
+
+ ChangeLog | 1 +
+ poppler/XRef.cc | 1 -
+ 2 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 9c7adb318d395ff674c6febf6406a8d47e9e5bf6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 20 14:43:15 2005 +0000
+
+ * poppler/UnicodeMap.cc: More grealloc -> greallocn
+ * poppler/UnicodeTypeTable.cc: Merge from xpdf 3.01
+
+ ChangeLog | 2 ++
+ poppler/UnicodeMap.cc | 4 ++--
+ poppler/UnicodeTypeTable.cc | 4 ++--
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 2c4c9b855b0df1dc0836d4f44e9471215a419ea6
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 20 14:34:31 2005 +0000
+
+ Merge link.cc changes from xpdf 3.00 -> 3.01
+
+ ChangeLog | 1 +
+ poppler/Link.cc | 64
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 62 insertions(+), 3 deletions(-)
+
+commit 4e9490c0219dd9c99ba0e5533c96663b8570a87b
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Sep 20 14:00:43 2005 +0000
+
+ Merge GlobalParam.* changes, they are worthless for us as poppler
+ but this way we are nearer to have the 3.01 sources merged, then we
+ can remove them if we decide we don't need this options.
+ Remove a setEncryption from the Xref.h marco probably forgot to
+ remove when merging
+
+ ChangeLog | 3 +++
+ poppler/GlobalParams.cc | 41 +++++++++++++++++++++++++++++++++++++++++
+ poppler/GlobalParams.h | 22 ++++++++++++++++------
+ poppler/XRef.h | 4 ----
+ 4 files changed, 60 insertions(+), 10 deletions(-)
+
+commit 22da021bf69d83d641e3f30cc0e1bd62394e56a4
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Tue Sep 20 13:23:08 2005 +0000
+
+ 2005-09-20 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/XRef.cc:
+
+ Remove duplicated initialization
+
+ ChangeLog | 6 ++++++
+ poppler/XRef.cc | 4 ----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+commit 2a8778147938e3ed2af177226a9c35655f898c95
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Tue Sep 20 10:18:57 2005 +0000
+
+ 2005-09-20 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/GlobalParams.cc:
+
+ s/G/Goo in not yet compiled plugins code
+
+ ChangeLog | 6 ++++++
+ poppler/GlobalParams.cc | 8 ++++----
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+commit 16f720b87cfc491db585dbdc99236cf492ffe85b
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Tue Sep 20 09:57:41 2005 +0000
+
+ 2005-09-20 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/Makefile.am:
+
+ Add XPDFPlugin*. Thanks to TSDgeos that noticed this.
+
+ * poppler/XpdfPluginAPI.cc:
+
+ Fixup
+
+ ChangeLog | 10 ++++++++++
+ poppler/Makefile.am | 4 +++-
+ poppler/XpdfPluginAPI.cc | 2 +-
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+
+commit 5f30791c3d87315ad1f742de64d2c1351ca70cb7
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 19:33:28 2005 +0000
+
+ *** empty log message ***
+
+ ChangeLog | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit db62e07fcf57f45951b21f8aab44b0d943efe5d0
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 19:33:05 2005 +0000
+
+ 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/PDFDoc.cc:
+ * poppler/PDFDoc.h:
+ * poppler/XRef.cc:
+ * poppler/XRef.h:
+
+ Merge more from 3.01
+
+ poppler/PDFDoc.cc | 20 ++++++++++++++++----
+ poppler/PDFDoc.h | 19 +++++++++----------
+ poppler/XRef.cc | 13 +++++++++++--
+ poppler/XRef.h | 7 +++++--
+ 4 files changed, 41 insertions(+), 18 deletions(-)
+
+commit 3acc7be594712fd0ce7ac07b7188d5b38b382782
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 19:05:00 2005 +0000
+
+ 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/XRef.cc:
+
+ Merge some initialization that I lost before
+
+ ChangeLog | 6 ++++++
+ poppler/XRef.cc | 4 ++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+commit 3badd82b72b2768be27e309b048cd8dcb1c80038
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 18:46:37 2005 +0000
+
+ 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/XRef.cc:
+
+ Merge change from 3.01
+
+ ChangeLog | 6 ++++++
+ poppler/XRef.cc | 8 --------
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+commit 5474583e20ca773befa17242d4ad7b8f81d5bf99
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 18:38:58 2005 +0000
+
+ 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/CharCodeToUnicode.cc:
+ * poppler/CharCodeToUnicode.h:
+
+ Improvements from xpdf 3.01
+
+ ChangeLog | 7 +++++++
+ poppler/CharCodeToUnicode.cc | 31 +++++++++++++++++++------------
+ poppler/CharCodeToUnicode.h | 4 ++++
+ 3 files changed, 30 insertions(+), 12 deletions(-)
+
+commit b2a6eab113fecd3823885c64f3302bea4f372a9f
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 18:37:29 2005 +0000
+
+ 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/CMap.cc:
+
+ Improvements from xpdf 3.01
+
+ ChangeLog | 6 ++++++
+ poppler/CMap.cc | 30 +++++++++++++++++++++++++++---
+ 2 files changed, 33 insertions(+), 3 deletions(-)
+
+commit 3f69f2158453b9dab9efc280ed1578ac3d0cebe8
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 18:35:29 2005 +0000
+
+ 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/NameToUnicodeTable.h:
+ * poppler/UnicodeTypeTable.cc:
+ * poppler/UnicodeTypeTable.h:
+
+ Merge some unicode table changes from xpdf 3.01
+
+ ChangeLog | 8 +
+ poppler/NameToUnicodeTable.h | 168 +++++-----
+ poppler/UnicodeTypeTable.cc | 690
+ ++++++++++++++++++++++++++++++++++++++++--
+ poppler/UnicodeTypeTable.h | 2 +
+ 4 files changed, 764 insertions(+), 104 deletions(-)
+
+commit 6cbe76bc55d557fe5fca0f8f1b33bda95acdc0e9
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 18:32:29 2005 +0000
+
+ 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/SplashOutputDev.h:
+ * splash/Splash.cc:
+ * splash/Splash.h:
+
+ Modified region support from xpdf 3.01
+
+ ChangeLog | 8 ++++++++
+ poppler/SplashOutputDev.h | 5 +++++
+ splash/Splash.cc | 31 +++++++++++++++++++++++++++++++
+ splash/Splash.h | 11 +++++++++++
+ 4 files changed, 55 insertions(+), 0 deletions(-)
+
+commit a9df3f3203c14161e5d6bc6048ec7e123536e6d3
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 18:29:18 2005 +0000
+
+ 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * goo/Makefile.am:
+ * poppler/DCTStream.h:
+ * poppler/Decrypt.cc:
+ * poppler/Decrypt.h:
+ * poppler/FlateStream.h:
+ * poppler/GlobalParams.cc:
+ * poppler/GlobalParams.h:
+ * poppler/Makefile.am:
+ * poppler/PDFDoc.cc:
+ * poppler/PDFDoc.h:
+ * poppler/Parser.cc:
+ * poppler/Parser.h:
+ * poppler/Stream.cc:
+ * poppler/Stream.h:
+ * poppler/XRef.cc:
+ * poppler/XRef.h:
+ * poppler/poppler-config.h.in:
+
+ Merge security plugins support from xpdf 3.01
+
+ ChangeLog | 24 +++
+ goo/FixedPoint.cc | 95 +++++++++++
+ goo/FixedPoint.h | 150 +++++++++++++++++
+ goo/Makefile.am | 6 +-
+ poppler/DCTStream.h | 2 -
+ poppler/Decrypt.cc | 23 ++-
+ poppler/Decrypt.h | 6 +-
+ poppler/FlateStream.h | 2 -
+ poppler/GlobalParams.cc | 229 ++++++++++++++++++++++++++
+ poppler/GlobalParams.h | 16 ++
+ poppler/Makefile.am | 5 +-
+ poppler/PDFDoc.cc | 36 ++++
+ poppler/PDFDoc.h | 1 +
+ poppler/Parser.cc | 20 ---
+ poppler/Parser.h | 4 -
+ poppler/SecurityHandler.cc | 376
+ +++++++++++++++++++++++++++++++++++++++++++
+ poppler/SecurityHandler.h | 157 ++++++++++++++++++
+ poppler/Stream.cc | 18 --
+ poppler/Stream.h | 8 -
+ poppler/XRef.cc | 162 ++-----------------
+ poppler/XRef.h | 13 +-
+ poppler/XpdfPluginAPI.cc | 262 ++++++++++++++++++++++++++++++
+ poppler/XpdfPluginAPI.h | 341
+ +++++++++++++++++++++++++++++++++++++++
+ poppler/poppler-config.h.in | 2 -
+ 24 files changed, 1737 insertions(+), 221 deletions(-)
+
+commit a777e5c26483b90d0910e85c2be666640835d0bf
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 18:21:38 2005 +0000
+
+ 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * configure.ac:
+ * goo/Makefile.am:
+ * splash/Makefile.am:
+ * splash/SplashFTFont.cc:
+ * splash/SplashMath.h:
+ * splash/SplashTypes.h:
+
+ Merge support for fixed point
+
+ ChangeLog | 11 +++++++++++
+ configure.ac | 4 ++++
+ splash/Makefile.am | 1 +
+ splash/SplashFTFont.cc | 7 +++++++
+ splash/SplashMath.h | 34 +++++++++++++++++++++++++++++++++-
+ splash/SplashTypes.h | 5 +++++
+ 6 files changed, 61 insertions(+), 1 deletions(-)
+
+commit 00457c5f44a246c9f867a114a72be9f7b2dc1cf5
+Author: Marco Pesenti Gritti <mpg@redhat.com>
+Date: Fri Sep 16 18:11:14 2005 +0000
+
+ 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com>
+
+ * poppler/ArthurOutputDev.cc:
+ * poppler/CairoFontEngine.cc:
+ * poppler/TextOutputDev.cc:
+ * poppler/UnicodeMap.cc:
+
+ Use mallocn when possible
+
+ ChangeLog | 9 +++++++++
+ poppler/ArthurOutputDev.cc | 2 +-
+ poppler/CairoFontEngine.cc | 4 ++--
+ poppler/TextOutputDev.cc | 2 +-
+ poppler/UnicodeMap.cc | 2 +-
+ 5 files changed, 14 insertions(+), 5 deletions(-)
+
+commit 09c9ff67ceae5753811a2f625e3ad810628c782e
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 16 18:00:43 2005 +0000
+
+ SplashXPath.cc merges from xpdf 3.00 -> 3.01
+
+ ChangeLog | 3 ++
+ splash/SplashXPath.cc | 81
+ +++++++++++++++++++++++-------------------------
+ 2 files changed, 42 insertions(+), 42 deletions(-)
+
+commit 0555ba861d3b84d88c80da4fa247274338ff7817
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Sep 16 17:42:56 2005 +0000
+
+ SplashFontEngine.cc merge from xpdf 3.00 -> 3.01
+
+ splash/SplashFontEngine.cc | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+commit ddc72bd8354168d992631d1ef8cd0939b428966c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 15 22:24:55 2005 +0000
+
+ Merge xpdf 3.00 -> 3.01 changes in SplashT1Font.* files
+
+ splash/SplashT1Font.cc | 23 ++++++++++++++++++-----
+ splash/SplashT1Font.h | 2 ++
+ 2 files changed, 20 insertions(+), 5 deletions(-)
+
+commit ba409db3157105f326b4bbc342ca7af859a44ce9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 15 22:20:37 2005 +0000
+
+ Merge xpdf 3.00 -> 3.01 changes in SplashPath.* files
+
+ splash/SplashPath.cc | 3 ++-
+ splash/SplashPath.h | 5 +++++
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 3ea00e853049d8c26ee88aaef8ea6c47c8d46956
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 15 22:15:47 2005 +0000
+
+ Merge xpdf 3.00 -> 3.01 changes in SplashFont.* files
+
+ splash/SplashFont.cc | 6 ++++++
+ splash/SplashFont.h | 10 +++++++++-
+ 2 files changed, 15 insertions(+), 1 deletions(-)
+
+commit e571dcbfd0c77a28e41710577859f632cc989de5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 15 22:09:50 2005 +0000
+
+ Merge the xpdf 3.01 change that uses runtime detection of freetype
+ version
+
+ ChangeLog | 6 ++++++
+ configure.ac | 14 +++-----------
+ poppler/CairoFontEngine.cc | 21 ++++++++++++++-------
+ poppler/CairoFontEngine.h | 3 ++-
+ splash/SplashFTFontEngine.cc | 19 +++++++++++--------
+ splash/SplashFTFontEngine.h | 1 +
+ 6 files changed, 37 insertions(+), 27 deletions(-)
+
+commit 59fe2937db192dc7b59bf28c3f29909faf11aae3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 15 21:51:16 2005 +0000
+
+ Merge xpdf 3.00 -> 3.01 changes for that file
+
+ splash/SplashClip.h | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+commit b2f94635249f2c5f0c876a1005826fe4c6eb6025
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 15 12:52:36 2005 +0000
+
+ Merge xpdf 3.00 -> xpdf 3.01 changes for Catalog.[cc|h]
+
+ poppler/Catalog.cc | 5 ++++-
+ poppler/Catalog.h | 3 +++
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 0fc2e70576b1c48cf47a686e8aa7e202a802bc9d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 15 12:32:25 2005 +0000
+
+ Another small merge from xpdf 3.01
+
+ ChangeLog | 3 +++
+ poppler/Outline.cc | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+commit f8983ceb3c55df72c94870806d71db139c11bdeb
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 15 12:28:34 2005 +0000
+
+ Another small xpdf 3.00 -> xpdf 3.01 merge
+
+ poppler/Object.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 52efe9845cf3eb1dd836f90bfa203760baa2f87c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Sep 15 11:46:56 2005 +0000
+
+ bradh forgot to remove the two returns when merging xpdf 3.00 ->
+ xpdf 3.01 changes of this file
+
+ poppler/JPXStream.cc | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 4b4fc5c017bf147c9069bbce32fc14467bd2a81a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Sep 14 21:20:36 2005 +0000
+
+ Merge all the fofi/ changes from xpdf 3.01, there is only one api
+ change that affects PSOutputDev (also has been updated the part
+ that uses this api not the whole file). All our fixes in that dir
+ are included in the upgrade.
+
+ ChangeLog | 4 +
+ fofi/FoFiTrueType.cc | 406
+ ++++++++++++++++++++++++++++++++++++++++++------
+ fofi/FoFiTrueType.h | 15 ++-
+ fofi/FoFiType1.cc | 25 ++--
+ fofi/FoFiType1C.cc | 134 ++++++++++++++---
+ fofi/FoFiType1C.h | 6 +
+ poppler/PSOutputDev.cc | 7 +-
+ poppler/PSOutputDev.h | 3 +-
+ 8 files changed, 515 insertions(+), 85 deletions(-)
+
+commit a68e8e6330418b1f623867973b9c128a9a139c0c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Sep 7 03:00:36 2005 +0000
+
+ 2005-09-06 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Enable A4_PAPER and OPI_SUPPORT by default.
+ There
+ is no reason to not enable OPI and the paper size should be
+ controlled by the application.
+
+ * test/Makefile.am (EXTRA_DIST): Add pdf-operators.c
+
+ ChangeLog | 8 ++++++++
+ configure.ac | 17 ++---------------
+ test/Makefile.am | 3 +++
+ 3 files changed, 13 insertions(+), 15 deletions(-)
+
+commit b6490944c081ff53f623acea7ab7a600c3e54816
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sat Sep 3 11:53:44 2005 +0000
+
+ Switch the qt4/tests unittests to use QtTestLib.
+
+ ChangeLog | 6 ++
+ configure.ac | 66 ++++++++++++++++++++
+ qt4/tests/.cvsignore | 17 ++----
+ qt4/tests/Makefile.am | 71 +++++++---------------
+ qt4/tests/README.unittest | 23 +++++++
+ qt4/tests/check_author.cpp | 25 --------
+ qt4/tests/check_linearised.cpp | 23 -------
+ qt4/tests/check_metadata.cpp | 101
+ +++++++++++++++++++++++++++++++
+ qt4/tests/check_orientation.cpp | 40 ------------
+ qt4/tests/check_pagelayout.cpp | 44 +++++++++++++
+ qt4/tests/check_pagelayout_facing.cpp | 22 -------
+ qt4/tests/check_pagelayout_none.cpp | 22 -------
+ qt4/tests/check_pagelayout_single.cpp | 22 -------
+ qt4/tests/check_pagemode.cpp | 64 +++++++++++++++++++
+ qt4/tests/check_pagemode_attach.cpp | 22 -------
+ qt4/tests/check_pagemode_fullscreen.cpp | 22 -------
+ qt4/tests/check_pagemode_none.cpp | 22 -------
+ qt4/tests/check_pagemode_oc.cpp | 22 -------
+ qt4/tests/check_pagemode_thumbs.cpp | 22 -------
+ qt4/tests/check_permissions.cpp | 60 +++++++------------
+ 20 files changed, 354 insertions(+), 362 deletions(-)
+
+commit 3725841417871d1051772068833dc908ca70b7ce
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Sep 2 14:47:24 2005 +0000
+
+ 2005-09-02 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc: Apply Marcos rotation fix.
+
+ ChangeLog | 4 ++++
+ glib/poppler-page.cc | 5 ++++-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+commit ecf3dcadb948013cbc987e464952933daf78e4bf
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Wed Aug 31 15:28:46 2005 +0000
+
+ Merge some missing parts of previous patches, and some other minor
+ cleanups from xpdf 3.0.1
+
+ poppler/Catalog.cc | 16 +--
+ poppler/JPXStream.cc | 380
+ ++++++++++++++++++++++++++++++++----------------
+ poppler/JPXStream.h | 25 ++-
+ poppler/Lexer.cc | 11 ++
+ poppler/Lexer.h | 3 +
+ poppler/PSOutputDev.cc | 31 ++--
+ poppler/Stream.h | 7 +
+ 7 files changed, 309 insertions(+), 164 deletions(-)
+
+commit de78738164319b733e54a9abfb5957870facd6cd
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Wed Aug 31 09:51:41 2005 +0000
+
+ poppler/JArithmeticDecoder.cc
+ poppler/JArithmeticDecoder.h
+ poppler/JBIG2Stream.cc
+ poppler/JBIG2Stream.h: merge in some of the JBIG2 changes from
+ xpdf 3.0.1.
+
+ ChangeLog | 9 ++
+ poppler/JArithmeticDecoder.cc | 42 ++++++--
+ poppler/JArithmeticDecoder.h | 22 ++++-
+ poppler/JBIG2Stream.cc | 227
+ +++++++++++++++++++++++++----------------
+ poppler/JBIG2Stream.h | 4 +-
+ 5 files changed, 201 insertions(+), 103 deletions(-)
+
+commit 55952feb637e300b073691ae95d68e766521a769
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Aug 29 15:24:32 2005 +0000
+
+ 2005-08-29 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac (HAVE_FREETYPE_H): Patch from Hiroyuki
+ Ikezoe: Set
+ HAVE_FREETYPE_217_OR_OLDER to 0 if we found freetype using
+ pkg-config (#4223).
+
+ ChangeLog | 6 ++++++
+ configure.ac | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 244e5c1f8f65da41ba6314028766dfe5973f6132
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sun Aug 28 09:43:18 2005 +0000
+
+ Merge the Goo* improvements from xpdf 3.0.1. This change is based on
+ martink's work (7-xpdf-3.01-goo-improvements.patch), with some
+ tweaking
+ by me.
+
+ ChangeLog | 13 ++++++++
+ fofi/FoFiTrueType.cc | 1 +
+ goo/GooHash.cc | 24 ++++++++++++++
+ goo/GooHash.h | 2 +
+ goo/GooList.cc | 5 +++
+ goo/GooList.h | 5 +++
+ goo/GooString.cc | 85
+ +++++++++++++++++++++++++++++++++++++++++++++++++-
+ goo/GooString.h | 11 ++----
+ goo/gmem.c | 3 ++
+ poppler/Decrypt.cc | 1 +
+ 10 files changed, 142 insertions(+), 8 deletions(-)
+
+commit eb91b274245b4f5f5389bc9ddfde2c2806557665
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sun Aug 28 09:31:53 2005 +0000
+
+ This part of my previous gmallocn merge patch was missing.
+
+ goo/GooHash.cc | 4 ++--
+ goo/GooList.cc | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+commit b3474fd5e0efc96b5814d86e0cdedf39387e7ae3
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Aug 28 03:26:53 2005 +0000
+
+ add note about related bug
+
+ ChangeLog | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit ace2eb6ba518b970b96f30f61c4795c161e0cb79
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Aug 28 03:22:04 2005 +0000
+
+ 2005-08-27 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/FlateStream.cc: Fix predictor leak.
+
+ ChangeLog | 4 ++++
+ poppler/FlateStream.cc | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 96657c5480bf2ecf445ad5a105b8e7393ae53c8b
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Aug 28 03:19:55 2005 +0000
+
+ 2005-08-27 Jeff Muizelaar <jeff@infidigm.net>
+
+ * configure.ac: Disable the zlib-based decoder by default.
+
+ ChangeLog | 4 ++++
+ configure.ac | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit d1d715158223c7ca3ae279cea420a948cfdb0428
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sat Aug 27 08:43:42 2005 +0000
+
+ Merge the gmalloc -> gmallocn changes from xpdf 3.0.1. This change is
+ based on martink's work (13-xpdf-3.01-goo-allocn.patch) with some
+ tweaking by me. There may be some residual gmallocn changes still to
+ be merged.
+
+ ChangeLog | 7 +++++
+ fofi/FoFiTrueType.cc | 12 ++++----
+ fofi/FoFiType1.cc | 2 +-
+ fofi/FoFiType1C.cc | 14 +++++-----
+ goo/gmem.c | 22 ++++++++++++++++
+ goo/gmem.h | 9 +++++++
+ poppler/Annot.cc | 2 +-
+ poppler/Array.cc | 2 +-
+ poppler/BuiltinFont.cc | 2 +-
+ poppler/CMap.cc | 6 ++--
+ poppler/Catalog.cc | 8 +++---
+ poppler/CharCodeToUnicode.cc | 22 ++++++++--------
+ poppler/Dict.cc | 2 +-
+ poppler/Function.cc | 20 +++++++-------
+ poppler/Gfx.cc | 2 +-
+ poppler/GfxFont.cc | 24 +++++++++---------
+ poppler/GfxState.cc | 54
+ ++++++++++++++++++++--------------------
+ poppler/JArithmeticDecoder.cc | 2 +-
+ poppler/JBIG2Stream.cc | 30 +++++++++++-----------
+ poppler/Link.cc | 6 ++--
+ poppler/NameToCharCode.cc | 4 +-
+ poppler/Outline.cc | 4 +-
+ poppler/SplashOutputDev.cc | 8 +++---
+ poppler/Stream.cc | 12 ++++----
+ poppler/TextOutputDev.cc | 48 ++++++++++++++++++------------------
+ poppler/XRef.cc | 18 +++++++-------
+ splash/SplashClip.cc | 12 ++++----
+ splash/SplashFTFontFile.cc | 2 +-
+ splash/SplashFont.cc | 6 ++--
+ splash/SplashPath.cc | 8 +++---
+ splash/SplashScreen.cc | 4 +-
+ splash/SplashState.cc | 4 +-
+ splash/SplashT1FontFile.cc | 4 +-
+ splash/SplashXPath.cc | 4 +-
+ splash/SplashXPathScanner.cc | 4 +-
+ 35 files changed, 214 insertions(+), 176 deletions(-)
+
+commit feb82c60b1f86a9d1260db57534d98c54ee615c4
+Author: Martin Kretzschmar <martink@gnome.org>
+Date: Wed Aug 24 19:41:27 2005 +0000
+
+ * configure.ac: add /usr/include/qt4 to qt4_incdirs. That's what
+ Debian and Ubuntu use. Maybe we should just use pkg-config. If
+ it's usable with qt4.
+
+ * test/.cvsignore: ignore pdf_inspector binary.
+
+ ChangeLog | 8 ++++++++
+ configure.ac | 2 +-
+ test/.cvsignore | 7 ++++---
+ 3 files changed, 13 insertions(+), 4 deletions(-)
+
+commit 8dce80eb74f24f07ac7668905f1631e04a9c5841
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Aug 24 18:57:46 2005 +0000
+
+ 2005-08-24 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/TextOutputDev.cc: Push rotation argument down to
+ GfxState constructor. This is still not completely
+ functional yet.
+
+ * glib/poppler-page.cc (poppler_page_render_selection): Add
+ rotation argument so API is useful. Not yet implemented.
+ (poppler_page_prepare_output_dev): Patch from Marco to fix
+ rotation using the cairo backend.
+
+ ChangeLog | 10 ++++++++++
+ glib/poppler-page.cc | 22 ++++++++++++++++------
+ glib/poppler-page.h | 1 +
+ poppler/TextOutputDev.cc | 11 ++++++++---
+ poppler/TextOutputDev.h | 4 +++-
+ 5 files changed, 38 insertions(+), 10 deletions(-)
+
+commit b909b5ae98bc3e557ef6e658e2b9120e82951259
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Wed Aug 24 03:21:20 2005 +0000
+
+ Tue Aug 23 17:21:02 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * test/Makefile.am (gtk_cairo_test_LDADD): add
+ FREETYPE_{CFLAGS,LIBS} to the cairo deps
+
+ ChangeLog | 5 +++++
+ test/Makefile.am | 4 +++-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+commit da3aac379f07ffedd6078707ec9923800fc0c0a5
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Tue Aug 23 18:20:45 2005 +0000
+
+ Tue Aug 23 13:38:01 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * configure.ac:
+ * poppler/Gfx.cc:
+ * poppler/Gfx.h:
+ * poppler/GlobalParams.cc:
+ * poppler/GlobalParams.h:
+ * poppler/Makefile.am:
+ * poppler/OutputDev.cc:
+ * poppler/OutputDev.h:
+ * poppler/ProfileData.cc:
+ * poppler/ProfileData.h:
+ * test/Makefile.am:
+ * test/pdf-inspector.cc:
+ * test/pdf-inspector.glade:
+ * test/pdf-operators.c: Initial cut at a pdf inspector. This
+ should help us look at PDF files.
+
+ ChangeLog | 18 ++
+ configure.ac | 4 +-
+ poppler/Gfx.cc | 30 ++++
+ poppler/Gfx.h | 1 +
+ poppler/GlobalParams.cc | 16 ++
+ poppler/GlobalParams.h | 3 +
+ poppler/Makefile.am | 2 +
+ poppler/OutputDev.cc | 17 ++
+ poppler/OutputDev.h | 10 +-
+ poppler/ProfileData.cc | 44 +++++
+ poppler/ProfileData.h | 41 +++++
+ test/Makefile.am | 13 ++-
+ test/pdf-inspector.cc | 358 ++++++++++++++++++++++++++++++++++++++
+ test/pdf-inspector.glade | 434
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ test/pdf-operators.c | 81 +++++++++
+ 15 files changed, 1068 insertions(+), 4 deletions(-)
+
+commit 1aad886c6c19a964a3fc9e18f31acc8e115478e0
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Aug 22 18:20:12 2005 +0000
+
+ 2005-08-22 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler-private.h:
+ * glib/test-poppler-glib.c: Patch from Marco to simplify
+ the glib
+ rotation API.
+
+ ChangeLog | 8 +++
+ glib/poppler-page.cc | 136
+ ++++++----------------------------------------
+ glib/poppler-page.h | 4 +-
+ glib/poppler-private.h | 1 -
+ glib/test-poppler-glib.c | 2 +-
+ 5 files changed, 28 insertions(+), 123 deletions(-)
+
+commit 6070b1dc4b76c236f3100fbd255c2d906e61c3c2
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun Aug 21 23:14:04 2005 +0000
+
+ 2005-08-21 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/Makefile.am (INCLUDES): Add FREETYPE_CFLAGS.
+
+ * configure.ac: Make freetype check use pkg-config if
+ possible.
+
+ ChangeLog | 6 ++++++
+ configure.ac | 34 ++++++++++++++++++++++++----------
+ poppler/Makefile.am | 1 +
+ 3 files changed, 31 insertions(+), 10 deletions(-)
+
+commit 2698ca6fa107ea91dc01eb8cfb0c93383fbca125
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Aug 17 16:54:01 2005 +0000
+
+ 2005-08-17 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/GfxFont.cc: Add fix discussed in #3131 to only
+ use the
+ MacRoman char map if the font has one or the font dicts
+ specifies
+ /MacRoman.
+
+ ChangeLog | 6 ++++++
+ poppler/GfxFont.cc | 1 -
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 5dc9b14b99f2efa2fe018e9267dd363d1bcd78b1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Aug 7 23:58:12 2005 +0000
+
+ Fix EOF checking
+
+ ChangeLog | 4 ++++
+ poppler/PDFDoc.cc | 10 +++++++++-
+ 2 files changed, 13 insertions(+), 1 deletions(-)
+
+commit 155d019d7b474f244a3e4bf64d192015f6a266c4
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sat Aug 6 18:09:51 2005 +0000
+
+ 2005-08-06 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h: Use GdkColor for specifying selection
+ colors, we alreay depend on GDK anyway.
+
+ ChangeLog | 6 ++++++
+ glib/poppler-page.cc | 20 +++++++++-----------
+ glib/poppler-page.h | 5 +++--
+ 3 files changed, 18 insertions(+), 13 deletions(-)
+
+commit c710b645c8297d356c101b13a9889bcaba691176
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 6 11:58:59 2005 +0000
+
+ Update comment
+
+ poppler/PDFDoc.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit de7953c8a8360d8bfc99298906c5fc1094684fc3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sat Aug 6 11:47:37 2005 +0000
+
+ Increase EOF searching up to last 1024 characters
+
+ ChangeLog | 7 +++++++
+ poppler/PDFDoc.cc | 23 +++++++++++++----------
+ 2 files changed, 20 insertions(+), 10 deletions(-)
+
+commit 5dd72618688763b50d5f5738d857c9294ef1b1c2
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sat Aug 6 02:15:58 2005 +0000
+
+ Add password arguments to document constructor.
+
+ ChangeLog | 4 ++++
+ qt4/src/poppler-document.cc | 8 ++++++--
+ qt4/src/poppler-qt4.h | 4 +++-
+ 3 files changed, 13 insertions(+), 3 deletions(-)
+
+commit edbd7957b393eb63f48df7db6b220b355d4fc461
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sat Aug 6 02:07:55 2005 +0000
+
+ Make API extraction work again.
+
+ ChangeLog | 3 +++
+ qt4/src/Doxyfile | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+commit f43a6f1d1c27c042f5736746c94430083baa4c1d
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sat Aug 6 01:53:06 2005 +0000
+
+ Add new test code for encrypted files.
+
+ ChangeLog | 5 ++
+ qt4/tests/.cvsignore | 1 +
+ qt4/tests/Makefile.am | 7 ++-
+ qt4/tests/test-password-qt4.cpp | 135
+ +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 147 insertions(+), 1 deletions(-)
+
+commit 2ec26afaf80864b023899b890b8e229448da9bed
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Aug 5 22:30:20 2005 +0000
+
+ 2005-08-05 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/TextOutputDev.cc (visitLine): Round selection
+ coordinates in device space, so selection isn't fuzzy.
+
+ * poppler/GfxState.cc:
+ * poppler/GfxState.h: Add simple Matrix class.
+
+ ChangeLog | 8 ++++++++
+ poppler/CairoOutputDev.cc | 6 +++---
+ poppler/GfxState.cc | 26 ++++++++++++++++++++++++++
+ poppler/GfxState.h | 10 ++++++++++
+ poppler/TextOutputDev.cc | 14 ++++++++++++++
+ 5 files changed, 61 insertions(+), 3 deletions(-)
+
+commit ccba4f0773047eea5e4ad0ac736450160dd97664
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Aug 5 19:04:36 2005 +0000
+
+ 2005-08-05 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * poppler/TextOutputDev.cc:
+ * poppler/TextOutputDev.h: Propagate selection colors to
+ the glib API.
+
+ ChangeLog | 7 +++++
+ glib/poppler-page.cc | 63
+ ++++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-page.h | 4 ++-
+ poppler/TextOutputDev.cc | 25 ++++++++---------
+ poppler/TextOutputDev.h | 7 +++-
+ 5 files changed, 82 insertions(+), 24 deletions(-)
+
+commit 43e97129393f403c41f191ceae9a54793ece005f
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Thu Aug 4 10:15:23 2005 +0000
+
+ Fix problem with drawing filled objects that was introduced in
+ Rev 1.4.
+
+ ChangeLog | 5 +++++
+ poppler/ArthurOutputDev.cc | 13 +++++++++++--
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+commit a75d80333a70d2e1ac7c9032d316034eebed9dd6
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Wed Aug 3 11:44:55 2005 +0000
+
+ Implement paging ability for Qt4, more than a little based
+ on Albert's work for Qt3.
+ Up arrow -> previous page
+ Down arrow -> next page
+ q -> quit.
+
+ What more could you want from a PDF viewer :-)
+
+ ChangeLog | 6 +++++
+ qt4/tests/test-poppler-qt4.cpp | 47
+ +++++++++++++++++++++++++++++++--------
+ 2 files changed, 43 insertions(+), 10 deletions(-)
+
+commit f3e0a163b098da1cc389c2c4f47e28358b1bec77
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Aug 1 19:15:40 2005 +0000
+
+ Fix problem in the patch to fix #3299
+
+ ChangeLog | 4 ++++
+ poppler/DCTStream.cc | 15 ++++++++++-----
+ poppler/DCTStream.h | 1 +
+ 3 files changed, 15 insertions(+), 5 deletions(-)
+
+commit 5f7bd81bedd8c90e3312190256488ff0c15502e1
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Aug 1 15:21:19 2005 +0000
+
+ 2005-08-01 Kristian Høgsberg <krh@redhat.com>
+
+ Patch from Dan Winship <danw@novell.com>
+
+ * glib/poppler-page.cc (poppler_page_copy_to_pixbuf): Set
+ alpha to
+ 0xff (opaque), not 0x00.
+
+ ChangeLog | 7 +++++++
+ glib/poppler-page.cc | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+commit 22f509e60f60ccaea1f91d9ec1ef7ba8200bee8a
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Mon Aug 1 08:09:00 2005 +0000
+
+ Fix up the fill problem with drawing text, where the "middle"
+ of glyphs
+ with a "hole" (like d, o, p, b, g) got filled. Also remove some
+ debugging
+ code. The glyphs are still ugly though.
+
+ ChangeLog | 7 +++++++
+ poppler/ArthurOutputDev.cc | 13 +------------
+ 2 files changed, 8 insertions(+), 12 deletions(-)
+
+commit 7bf5d10c1f6edd538769c3a83a3b3d5df56d604b
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sun Jul 31 09:54:04 2005 +0000
+
+ An initial version of proper font handling, heavily based on work by
+ Albert Astals Cid. I changed it to stroke the glyphs based on the
+ SplashPath. In the longer term, Arthur should use FreeType paths
+ directly - hopefully that will be less ugly, and not fill everything.
+
+ ChangeLog | 8 +
+ poppler/ArthurOutputDev.cc | 407
+ +++++++++++++++++++++++++++++++------------
+ poppler/ArthurOutputDev.h | 15 ++-
+ qt4/src/poppler-page.cc | 2 +-
+ splash/SplashPath.h | 2 +
+ 5 files changed, 317 insertions(+), 117 deletions(-)
+
+commit 8567b794628786b82e8db2a7daf75e4ad2398960
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Fri Jul 29 12:15:19 2005 +0000
+
+ Add some more test cases.
+
+ ChangeLog | 4 ++++
+ qt4/tests/.cvsignore | 4 ++++
+ qt4/tests/Makefile.am | 10 +++++++++-
+ qt4/tests/check_pagelayout_facing.cpp | 22 ++++++++++++++++++++++
+ qt4/tests/check_version.cpp | 22 ++++++++++++++++++++++
+ 5 files changed, 61 insertions(+), 1 deletions(-)
+
+commit 59d660cf4d614fdea09d6a62b8889f7682c2b4f9
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Fri Jul 29 11:41:14 2005 +0000
+
+ Compile fix associated with last change.
+
+ poppler/ArthurOutputDev.cc | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+commit 88c57c73f57820d6a57e26825093fbc688845e67
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Fri Jul 29 11:24:42 2005 +0000
+
+ A couple of minor changes to the Arthur backend.
+
+ ChangeLog | 9 +++++++++
+ poppler/ArthurOutputDev.cc | 18 ++++++++++++++----
+ 2 files changed, 23 insertions(+), 4 deletions(-)
+
+commit 481db9d9eae5ea16e5b382f4ad21e6e624a70dcf
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Jul 29 05:48:33 2005 +0000
+
+ 2005-07-29 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/TextOutputDev.cc: Finish TextSelectionDumper
+ class for
+ extracting the text from a selection. Add
+ TextPage::getSelectionText() and
+ TextOutputDev::getSelectionText()
+ methods to expose the new functionality.
+
+ * glib/poppler-page.cc (poppler_page_get_text): Use
+ TextOutputDev::getSelectionText() to get the text from the
+ selection.
+
+ * glib/poppler-document.cc (poppler_document_new_from_file):
+ * glib/poppler-page.cc (_poppler_page_new): Add extra NULL to
+ g_object_new() constructor to silence gcc warning about
+ missing
+ sentinel.
+
+ ChangeLog | 16 +++++
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-page.cc | 31 ++++-----
+ poppler/TextOutputDev.cc | 164
+ ++++++++++++++++++++++++++++++++++-----------
+ poppler/TextOutputDev.h | 8 ++
+ 5 files changed, 164 insertions(+), 57 deletions(-)
+
+commit ad312dbded4e8f70c3a2eac9a0964fa00ecb6b2c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jul 28 22:56:17 2005 +0000
+
+ Fix memory leaks in PageLabelInfo.cc
+
+ ChangeLog | 4 ++++
+ poppler/PageLabelInfo.cc | 11 +++++++++++
+ poppler/PageLabelInfo.h | 2 ++
+ 3 files changed, 17 insertions(+), 0 deletions(-)
+
+commit b45ad9f3409d7b1ed147135a70553e5255913c61
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jul 28 20:53:36 2005 +0000
+
+ - delete family;
+ + delete[] family;
+ as family is new[]'ed
+
+ When assigning family if the font had "the proper info" and family
+ had to be deleted, do it.
+
+ poppler/GlobalParams.cc | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+commit f93dfc5c5133e0b1bd9f4786cfe18bd796cbac2a
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jul 28 18:51:17 2005 +0000
+
+ Remove the debugging
+
+ poppler/GlobalParams.cc | 5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+commit 8022315004e1623c0be320f7671fcd72c15c0de3
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jul 28 18:37:17 2005 +0000
+
+ Wonder how that slipped here
+
+ poppler/GlobalParams.cc | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+commit 82638babe89e402c0348619ec3205059b977c7e9
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Jul 28 17:34:19 2005 +0000
+
+ Fontconfig patch is here, rejoice
+
+ ChangeLog | 15 ++-
+ glib/poppler-document.cc | 1 -
+ poppler/CairoFontEngine.cc | 95 +---------
+ poppler/CairoFontEngine.h | 2 -
+ poppler/CairoOutputDev.cc | 4 -
+ poppler/GlobalParams.cc | 473
+ ++++++++++++++++++++-----------------------
+ poppler/GlobalParams.h | 17 +--
+ poppler/SplashOutputDev.cc | 132 +------------
+ poppler/SplashOutputDev.h | 3 -
+ qt/poppler-document.cc | 1 -
+ qt4/src/poppler-document.cc | 1 -
+ test/gtk-cairo-test.cc | 1 -
+ test/gtk-splash-test.cc | 1 -
+ 13 files changed, 241 insertions(+), 505 deletions(-)
+
+commit e9015531b1d0e5f2c8d8ca2bc50d5f14aaf954bc
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Jul 28 06:31:57 2005 +0000
+
+ 2005-07-28 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/poppler-config.h.in: Add GCC_PRINTF_FORMAT macro to
+ annotate printf-like functions (#3638).
+
+ * poppler/Error.h: Add GCC_PRINTF_FORMAT to error().
+
+ * poppler/PSOutputDev.h: Add GCC_PRINTF_FORMAT to
+ PSOutputDev::writePSFmt().
+
+ * poppler/PSOutputDev.cc, poppler/GlobalParams.cc: Quiet new
+ printf warnings.
+
+ ChangeLog | 11 +++++++++++
+ poppler/Error.h | 2 +-
+ poppler/GlobalParams.cc | 3 ++-
+ poppler/PSOutputDev.cc | 3 +--
+ poppler/PSOutputDev.h | 2 +-
+ poppler/TextOutputDev.cc | 13 ++++++++++++-
+ poppler/poppler-config.h.in | 12 ++++++++++++
+ 7 files changed, 40 insertions(+), 6 deletions(-)
+
+commit 9df89c495683e229b771b3d008ed25d478465c35
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Jul 28 05:52:43 2005 +0000
+
+ 2005-07-28 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/TextOutputDev.cc (TextBlock::visitSelection): Assign
+ start and stop coordinates in one place so we don't assign the
+ same point to both in some corner cases.
+ (TextWord::visitSelection): Initialize begin to len, not
+ len + 1
+ to fix crash.
+
+ (TextWord::visitSelection, TextLine::visitSelection): Change
+ selection trigger; now midpoint of glyph must be included in
+ selection area for glyph to be in selection.
+
+ ChangeLog | 12 +++++
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/TextOutputDev.cc | 113
+ +++++++++++++++++++++-----------------------
+ 3 files changed, 67 insertions(+), 60 deletions(-)
+
+commit a3d9b5849cedf1316c6fc5859872e957f3f7b593
+Author: Martin Kretzschmar <martink@gnome.org>
+Date: Wed Jul 27 19:21:08 2005 +0000
+
+ * poppler/PSOutputDev.cc (PSOutputDev): change the constructor to
+ take paper size and duplex setting parameters.
+ (init): add paper size and duplex parameters.
+ (writeDocSetup): add duplex parameter.
+
+ * poppler/PSOutputDev.h: update declarations.
+
+ * glib/poppler-private.h (struct _PopplerPSFile): store necessary
+ information to eventually construct a PSOutputDev.
+
+ * glib/poppler-page.cc (poppler_page_render_to_ps): initialize the
+ output dev if it doesn't exist yet.
+
+ * glib/poppler-document.cc (poppler_ps_file_new): don't create the
+ PSOutputDev here, just store filename and page range.
+ (poppler_ps_file_set_paper_size, poppler_ps_file_set_duplex): new
+ functions.
+ (poppler_ps_file_free): free the filename which we strdup now.
+
+ * glib/poppler-document.h: add prototypes.
+
+ ChangeLog | 23 +++++++++++++++++++++
+ glib/poppler-document.cc | 49
+ +++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-document.h | 15 +++++++++----
+ glib/poppler-page.cc | 10 +++++++++
+ glib/poppler-private.h | 6 +++++
+ poppler/PSOutputDev.cc | 23 +++++++++++++--------
+ poppler/PSOutputDev.h | 9 ++++++-
+ 7 files changed, 112 insertions(+), 23 deletions(-)
+
+commit 7be920ecf13698c3cf4ab8df09c8c67f1a04bfa2
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 26 21:52:09 2005 +0000
+
+ Fix mem leak in qt test app
+
+ ChangeLog | 4 ++++
+ qt/test-poppler-qt.cpp | 2 ++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 2bc26dffd9f296799617d319055648c20f748c8a
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Jul 26 20:34:13 2005 +0000
+
+ 2005-07-26 Kristian Høgsberg <krh@redhat.com>
+
+ * fofi/FoFiType1.cc: Make check for end of encoding array
+ a bit
+ more liberal so we don't crash on complex encoding arrays
+ (#3344).
+
+ ChangeLog | 5 +++++
+ fofi/FoFiType1.cc | 21 +++++++--------------
+ 2 files changed, 12 insertions(+), 14 deletions(-)
+
+commit 07911274e4e850a628b1e587cafc2a73c05f93fe
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Jul 25 20:40:37 2005 +0000
+
+ Work on bad jpeg data that have garbage before the start marker. Fixes
+ bug #3299
+
+ ChangeLog | 5 +++++
+ poppler/DCTStream.cc | 38 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+), 0 deletions(-)
+
+commit a1869eca39172fcb42f036a5846b19548be53568
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 22 11:01:25 2005 +0000
+
+ Fix bug #3586
+
+ ChangeLog | 5 +++++
+ poppler/CairoFontEngine.cc | 2 ++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 95529b41272484f08fb54393e1886bf7ff3e02c8
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 22 10:45:19 2005 +0000
+
+ Make it possible to browse pages in test-poppler-qt
+
+ ChangeLog | 13 ++++++++---
+ qt/test-poppler-qt.cpp | 49
+ +++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 49 insertions(+), 13 deletions(-)
+
+commit 2d52650864eab0e9385ed1fe8fb594daac9d8322
+Author: Martin Kretzschmar <martink@gnome.org>
+Date: Fri Jul 22 10:35:56 2005 +0000
+
+ * glib/poppler-document.cc (poppler_fonts_iter_get_name): if the
+ font is a subset, strip the ABCDEF+ tag.
+ (poppler_fonts_iter_get_full_name): does what the old get_name did.
+ (poppler_fonts_iter_get_font_type, poppler_fonts_iter_is_embedded)
+ (poppler_fonts_iter_is_subset): new wrappers.
+
+ * glib/poppler-document.h (PopplerFontType): new enum.
+ Update prototypes.
+
+ ChangeLog | 11 +++++++++
+ glib/poppler-document.cc | 54
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler-document.h | 38 +++++++++++++++++++++++---------
+ 3 files changed, 91 insertions(+), 12 deletions(-)
+
+commit 43bed4aafcf1d291dc96fa5070efbd7936a6122f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Fri Jul 22 10:33:54 2005 +0000
+
+ Fix bugs #3728 and #3750
+
+ ChangeLog | 4 ++++
+ splash/Splash.cc | 10 ++++++++++
+ 2 files changed, 14 insertions(+), 0 deletions(-)
+
+commit c7bcef87493d354a077dd223d76f86640acc0ce3
+Author: Martin Kretzschmar <martink@gnome.org>
+Date: Fri Jul 15 19:55:30 2005 +0000
+
+ update for 2005-06-27 change to actually display something again.
+
+ ChangeLog | 5 +++++
+ test/gtk-cairo-test.cc | 10 ++++++----
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+commit 6623711d2d50dc52454904ee16b25337f0aab130
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Sun Jul 10 09:34:03 2005 +0000
+
+ A general cleanup of the Arthur output renderer.
+
+ ChangeLog | 5 ++
+ poppler/ArthurOutputDev.cc | 105
+ +++++++++++++++-----------------------------
+ 2 files changed, 41 insertions(+), 69 deletions(-)
+
+commit ea1cc9a7b12db9c44b89896c41d07e3ba932d054
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Jul 8 04:59:41 2005 +0000
+
+ 2005-07-08 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_set_selection_alpha): Add
+ this function to initialize the alpha channel when using the
+ splash backend.
+
+ * poppler/TextOutputDev.cc (visitLine): Add missing scaling of
+ intra-line selection edges.
+
+ ChangeLog | 9 +++++++
+ glib/poppler-page.cc | 59
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/TextOutputDev.cc | 17 +++++++-----
+ 3 files changed, 77 insertions(+), 8 deletions(-)
+
+commit 1cd915397c9532ed80b4f905b6ed9c0126aa38f2
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Thu Jul 7 21:15:09 2005 +0000
+
+ Add support for page layout to the Qt4 bindings, plus
+ test cases.
+
+ ChangeLog | 8 ++++++++
+ qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 26 ++++++++++++++++++++++++--
+ qt4/tests/Makefile.am | 10 +++++++++-
+ qt4/tests/check_pagelayout_none.cpp | 22 ++++++++++++++++++++++
+ qt4/tests/check_pagelayout_single.cpp | 22 ++++++++++++++++++++++
+ 6 files changed, 107 insertions(+), 3 deletions(-)
+
+commit 4e050aef7ba132900f84205be221fd48808848c3
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Jul 7 17:19:36 2005 +0000
+
+ 2005-07-07 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_prepare_output_dev):
+ Account
+ for page rotation when creating the cairo surface.
+
+ ChangeLog | 5 +++++
+ glib/poppler-page.cc | 17 +++++++++++++++--
+ 2 files changed, 20 insertions(+), 2 deletions(-)
+
+commit 2eeab0b8afeb4897806df2de6e496889c25dda5e
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Jul 7 15:58:43 2005 +0000
+
+ 2005-07-06 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_copy_to_pixbuf): Add
+ out of
+ bounds checking (from Marco).
+
+ ChangeLog | 6 +++++-
+ glib/poppler-page.cc | 5 +++++
+ 2 files changed, 10 insertions(+), 1 deletions(-)
+
+commit b1015f6bdbd93b2a2574a9f0e0e1cd7dbae9af78
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Thu Jul 7 11:13:24 2005 +0000
+
+ At least try to fix glib issues. If you care about glib,
+ then you should review this.
+
+ ChangeLog | 4 ++++
+ glib/poppler-document.cc | 2 ++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 8bf787031e7a2e93b4e1202918bd1aee86675082
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Thu Jul 7 11:04:08 2005 +0000
+
+ Update for page mode - new mode from PDF-1.6, API docs fixes
+ and some tests.
+
+ ChangeLog | 15 +++++++++++++++
+ poppler/Catalog.cc | 2 ++
+ poppler/Catalog.h | 3 ++-
+ qt4/src/poppler-document.cc | 2 ++
+ qt4/src/poppler-qt4.h | 14 +++++++++-----
+ qt4/tests/Makefile.am | 22 +++++++++++++++++++++-
+ qt4/tests/check_pagemode_attach.cpp | 22 ++++++++++++++++++++++
+ qt4/tests/check_pagemode_fullscreen.cpp | 22 ++++++++++++++++++++++
+ qt4/tests/check_pagemode_none.cpp | 22 ++++++++++++++++++++++
+ qt4/tests/check_pagemode_oc.cpp | 22 ++++++++++++++++++++++
+ qt4/tests/check_pagemode_thumbs.cpp | 22 ++++++++++++++++++++++
+ 11 files changed, 161 insertions(+), 7 deletions(-)
+
+commit 695e27fb4d6fcc3466e2c9c95b4f02821b07e823
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Thu Jul 7 11:01:27 2005 +0000
+
+ Suppress noise from new test files.
+
+ qt4/tests/.cvsignore | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit 8a8d57bdcf11ed2903913d938b9711053b9bb9f1
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 6 17:12:36 2005 +0000
+
+ Extract family, stretch and weight from the font descriptor
+
+ ChangeLog | 2 ++
+ poppler/GfxFont.cc | 41 +++++++++++++++++++++++++++++++++++++++++
+ poppler/GfxFont.h | 36 ++++++++++++++++++++++++++++++++++++
+ 3 files changed, 79 insertions(+), 0 deletions(-)
+
+commit 3a1646c2f776f5a07b0e830fcb8e1b0a80efb41c
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Wed Jul 6 13:29:00 2005 +0000
+
+ Add checkFooter to check the document ends with %%EOF
+
+ ChangeLog | 5 +++++
+ poppler/PDFDoc.cc | 28 ++++++++++++++++++++++++++++
+ poppler/PDFDoc.h | 1 +
+ 3 files changed, 34 insertions(+), 0 deletions(-)
+
+commit 377c023d31cf74d8240aa5be9dba8e3838459a8c
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Wed Jul 6 11:15:16 2005 +0000
+
+ Add unit tests for the isLinearized() property.
+
+ ChangeLog | 4 ++++
+ qt4/tests/Makefile.am | 6 +++++-
+ qt4/tests/check_linearised.cpp | 23 +++++++++++++++++++++++
+ 3 files changed, 32 insertions(+), 1 deletions(-)
+
+commit 5fa869887a840a585340993718df0841010666cf
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Wed Jul 6 09:52:30 2005 +0000
+
+ Remove boolean for unicode table lookup from Font
+
+ ChangeLog | 14 ++++++++++++++
+ qt4/src/poppler-document.cc | 2 --
+ qt4/src/poppler-qt4.h | 14 +-------------
+ qt4/tests/poppler-fonts.cpp | 16 +++++++---------
+ 4 files changed, 22 insertions(+), 24 deletions(-)
+
+commit 40469c5883e17e734f3d54872c59e76b95bc0f95
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Wed Jul 6 09:00:39 2005 +0000
+
+ Update to reflect recent changes.
+
+ qt4/tests/.cvsignore | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 6cea437208f913085a6a8c7183b0826a107cefb5
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jul 5 21:15:48 2005 +0000
+
+ Don't crash with files that have fonts with no name
+
+ ChangeLog | 7 +++++++
+ qt4/src/poppler-document.cc | 13 ++++++++++---
+ qt4/src/poppler-qt4.h | 2 +-
+ 3 files changed, 18 insertions(+), 4 deletions(-)
+
+commit 1323c74479848f5b87a3a13fa26e8b9e096e9f6a
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Tue Jul 5 12:31:59 2005 +0000
+
+ Check in a couple more test apps
+
+ qt4/tests/Makefile.am | 10 ++++++-
+ qt4/tests/check_author.cpp | 25 ++++++++++++++++
+ qt4/tests/check_permissions.cpp | 59
+ +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 93 insertions(+), 1 deletions(-)
+
+commit 839a798ec3725427185de5a48c58ac448596b25d
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Tue Jul 5 12:25:00 2005 +0000
+
+ Add Qt4 bindings for new user permission properties.
+
+ ChangeLog | 4 +++
+ qt4/src/poppler-document.cc | 25 +++++++++++++++++++++
+ qt4/src/poppler-qt4.h | 51
+ ++++++++++++++++++++++++++++++++++++++----
+ 3 files changed, 75 insertions(+), 5 deletions(-)
+
+commit e10f6990d3339e3a7adeaa50b1754cf7ecf82f87
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Tue Jul 5 12:15:04 2005 +0000
+
+ Add some more user permissions properties - high resolution
+ printing, document assembly, extraction for accessibility
+ and form completion.
+
+ ChangeLog | 8 +++++++
+ poppler/PDFDoc.h | 9 ++++++++
+ poppler/XRef.cc | 55
+ ++++++++++++++++++++++++++++++++++++++++++++++++++---
+ poppler/XRef.h | 4 +++
+ 4 files changed, 72 insertions(+), 4 deletions(-)
+
+commit 3a8e1ba03cdec6412dd0b79f0cc59a4cd97dd4e7
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Mon Jul 4 11:38:22 2005 +0000
+
+ A couple more little changes.
+
+ ChangeLog | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+commit a44bd0b45bb89f29ddca5d0e8986a8de50f9db39
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Mon Jul 4 11:37:21 2005 +0000
+
+ Change path to sample file to point to test module
+
+ qt4/tests/check_orientation.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 2a7079087c35651c242d3843c94703a3199e61ca
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Mon Jul 4 11:36:13 2005 +0000
+
+ Fix typo causing failure to pick up upside down pages.
+
+ qt4/src/poppler-page.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 529a548044ae721a414c5b8e768c0498b1e6830b
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Mon Jul 4 08:30:29 2005 +0000
+
+ Update to reflect recent changes
+
+ ChangeLog | 30 +++++++++++++++++++++++++++++-
+ qt4/tests/.cvsignore | 2 ++
+ 2 files changed, 31 insertions(+), 1 deletions(-)
+
+commit 08cca4670f8ae65333beacda85834112e76489d1
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Mon Jul 4 08:21:27 2005 +0000
+
+ Add in a simple demo/test application, similar to the pdffonts
+ application in xpdf.
+
+ qt4/tests/Makefile.am | 9 ++++-
+ qt4/tests/poppler-fonts.cpp | 76
+ +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 84 insertions(+), 1 deletions(-)
+
+commit 52af89d8303b50c45d5e4584d19ec8b7d7ebcf9b
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Mon Jul 4 08:18:52 2005 +0000
+
+ Update to reflect changes to rendering API.
+
+ qt4/tests/stress-poppler-qt4.cpp | 4 ++--
+ qt4/tests/test-poppler-qt4.cpp | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+commit d42998d0fc32b1e21a2aeef1311e0baf508ade3f
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Mon Jul 4 08:16:17 2005 +0000
+
+ Qt4 update.
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-document.cc complete Qt4 font metadata handling
+
+ * qt4/src/poppler-qt4.h:
+ * qt4/src/poppler-page.cc: change the render API to make it more
+ Qt-like.
+
+ qt4/src/poppler-document.cc | 7 +++-
+ qt4/src/poppler-page.cc | 5 +--
+ qt4/src/poppler-qt4.h | 73
+ ++++++++++++++++++++++++++++++++++++++++--
+ 3 files changed, 77 insertions(+), 8 deletions(-)
+
+commit 5d194b926d1ed642ed4bbd3304befa073d389cd4
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Mon Jul 4 08:10:16 2005 +0000
+
+ Change FontInfo::type() to return an enumerated value,
+ rather than a GooString.
+
+ poppler/FontInfo.cc | 16 ++--------------
+ poppler/FontInfo.h | 16 +++++++++++++---
+ 2 files changed, 15 insertions(+), 17 deletions(-)
+
+commit 1303020b2e97bc110ccf045cd2811daf59ec72ce
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Mon Jul 4 07:42:32 2005 +0000
+
+ Fix up the unit test, now that I have a real sample
+ file.
+
+ qt4/tests/check_orientation.cpp | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 96fc0ea3fc6c9c7d933e9e0c02a622b2aeef7617
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Jul 1 04:57:49 2005 +0000
+
+ 2005-07-01 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/TextOutputDev.cc: Make selection also work when
+ dragging
+ backwards in the text flow. Currently this is a big pile of
+ if-statements, and there is certainly room for improvement.
+
+ ChangeLog | 6 ++
+ poppler/TextOutputDev.cc | 129
+ +++++++++++++++++++++++++++++++++++++---------
+ 2 files changed, 111 insertions(+), 24 deletions(-)
+
+commit 06c49c496f28aba608101adcecd8cec34937ac78
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Jun 30 19:44:33 2005 +0000
+
+ 2005-06-30 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.h: * glib/poppler-page.cc
+ (poppler_page_copy_to_pixbuf): Fix splash compilation
+ (patch from
+ Marco).
+ (poppler_page_render_to_pixbuf): Drop dest_x and dest_y
+ coordinates from this function. This functionality can be
+ achieved using a sub-GdkPixbuf.
+
+ * glib/test-poppler-glib.c (main): Update test case.
+
+ ChangeLog | 11 +++++++++++
+ NEWS | 6 ++++++
+ glib/poppler-page.cc | 27 ++++++++++-----------------
+ glib/poppler-page.h | 4 +---
+ glib/test-poppler-glib.c | 2 +-
+ 5 files changed, 29 insertions(+), 21 deletions(-)
+
+commit b126785aeda6b5576a13fc3f3853b027bd7dd306
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Jun 30 00:36:01 2005 +0000
+
+ 2005-06-29 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-private.h: Move TextOutputDev.h include
+ here from
+ poppler-page.cc
+
+ ChangeLog | 5 +++++
+ glib/poppler-page.cc | 1 -
+ glib/poppler-private.h | 1 +
+ 3 files changed, 6 insertions(+), 1 deletions(-)
+
+commit b15a8caf003d7d0631d4f78db5ab54e55a5a000a
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Jun 29 21:24:48 2005 +0000
+
+ 2005-06-29 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac:
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler-private.h:
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h:
+ * poppler/Page.cc:
+ * poppler/Page.h:
+ * poppler/TextOutputDev.cc:
+ * poppler/TextOutputDev.h: Add support for rendering real
+ selection (based on text flow).
+
+ ChangeLog | 20 ++-
+ configure.ac | 4 +-
+ glib/poppler-page.cc | 224 +++++++++++++++++++------
+ glib/poppler-page.h | 65 ++++---
+ glib/poppler-private.h | 3 +
+ poppler/CairoOutputDev.cc | 13 +-
+ poppler/CairoOutputDev.h | 2 +-
+ poppler/Page.cc | 59 +++++--
+ poppler/Page.h | 12 ++
+ poppler/TextOutputDev.cc | 414
+ ++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/TextOutputDev.h | 38 ++++-
+ 11 files changed, 743 insertions(+), 111 deletions(-)
+
+commit 3b5e20465e482eb0e75a106697ee94d60aea2fdc
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 28 22:51:29 2005 +0000
+
+ Forgot assigning type on copy constructor
+
+ poppler/FontInfo.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit e512cd1832a0e6d15149e12e8e67a39d335efc86
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 28 22:49:14 2005 +0000
+
+ Add FontInfo::getType()
+
+ ChangeLog | 3 +++
+ poppler/FontInfo.cc | 4 ++++
+ poppler/FontInfo.h | 2 ++
+ 3 files changed, 9 insertions(+), 0 deletions(-)
+
+commit 8aeb5205f2876a9dc36eb1dc1e361bb87adf4e31
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Jun 28 22:00:05 2005 +0000
+
+ use transformation matrix for image rendering in Arthur backend
+
+ ChangeLog | 4 ++++
+ poppler/ArthurOutputDev.cc | 12 +++++++-----
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+commit a221d06fdc7b0688ca0744a1d6ad49d472c7f12c
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Tue Jun 28 10:59:14 2005 +0000
+
+ Reduce cvs up noise
+
+ .cvsignore | 1 +
+ ChangeLog | 7 +++++++
+ qt4/.cvsignore | 3 +++
+ qt4/src/.cvsignore | 7 +++++++
+ qt4/tests/.cvsignore | 8 ++++++++
+ 5 files changed, 26 insertions(+), 0 deletions(-)
+
+commit ea58a20bbcf450a1ecb8fe00e8162cfdf76105f1
+Author: Brad Hards <bradh@frogmouth.net>
+Date: Tue Jun 28 10:00:09 2005 +0000
+
+ Initial import of Qt4 bindings, and for a Qt4 "Arthur" (QPainter)
+ backend renderer.
+
+ The bindings are currently unstable - you can expect substantial
+ change
+ in both source and binary interfaces.
+
+ The Arthur renderer currently does a reasonable job of rendering path
+ and fill, but the image rendering doesn't work (for reasons that
+ aren't
+ clear to me) and text rendering doesn't use the right glyphs - it just
+ draws with the current font. There is a lot of work to do on this
+ too. Help is, of coure, welcome.
+
+ ChangeLog | 12 +
+ Makefile.am | 10 +-
+ configure.ac | 94 +++-
+ poppler-qt4.pc.in | 12 +
+ poppler/ArthurOutputDev.cc | 604 +++++++++++++++++++
+ poppler/ArthurOutputDev.h | 133 +++++
+ poppler/Makefile.am | 20 +
+ qt4/Makefile.am | 1 +
+ qt4/src/Doxyfile | 1212
+ ++++++++++++++++++++++++++++++++++++++
+ qt4/src/Makefile.am | 22 +
+ qt4/src/poppler-document.cc | 309 ++++++++++
+ qt4/src/poppler-page.cc | 170 ++++++
+ qt4/src/poppler-private.h | 36 ++
+ qt4/src/poppler-qt4.h | 286 +++++++++
+ qt4/tests/Makefile.am | 34 ++
+ qt4/tests/check_orientation.cpp | 40 ++
+ qt4/tests/stress-poppler-qt4.cpp | 70 +++
+ qt4/tests/test-poppler-qt4.cpp | 121 ++++
+ 18 files changed, 3183 insertions(+), 3 deletions(-)
+
+commit 61e9bc76eb2fcb0b4b899ebfad1cc71c59fc8274
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Jun 28 03:44:12 2005 +0000
+
+ 2005-06-27 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: Change CairoOutputDev to render
+ to a
+ given surface and let the user create that surface.
+
+ * glib/poppler-document.cc:
+ * glib/poppler-page.cc:
+ * glib/poppler-private.h: Create the cairo image surface here
+ instead and pass it to the CairoOutputDev for rendering.
+
+ * poppler/CairoOutputDevImage.cc:
+ * poppler/CairoOutputDevImage.h:
+ * poppler/CairoOutputDevX.cc:
+ * poppler/CairoOutputDevX.h:
+ * poppler/Makefile.am: Remove specialized cairo output
+ devices.
+
+ ChangeLog | 17 +++
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-page.cc | 21 +++-
+ glib/poppler-private.h | 4 +-
+ poppler/CairoOutputDev.cc | 24 ++---
+ poppler/CairoOutputDev.h | 8 +-
+ poppler/CairoOutputDevImage.cc | 80 ---------------
+ poppler/CairoOutputDevImage.h | 44 --------
+ poppler/CairoOutputDevX.cc | 216
+ ----------------------------------------
+ poppler/CairoOutputDevX.h | 117 ----------------------
+ poppler/Makefile.am | 8 +-
+ 11 files changed, 54 insertions(+), 487 deletions(-)
+
+commit 8079dce3f0ed91dd531465f45c6d3c568ab4ecd1
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jun 27 01:04:32 2005 +0000
+
+ 2005-06-26 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDev.h: Switch back to using drawChar()
+ for
+ text, but utilize the beginString() and endString() hooks
+ so we
+ can use cairo_show_glyphs() efficiently.
+
+ ChangeLog | 7 +++
+ poppler/CairoOutputDev.cc | 107
+ +++++++++++++--------------------------------
+ poppler/CairoOutputDev.h | 12 ++++-
+ 3 files changed, 48 insertions(+), 78 deletions(-)
+
+commit 1aa48d6b7907a1d53830f0cf28085041f685368d
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jun 26 23:35:26 2005 +0000
+
+ Add PageTransition class and PageTransition* Page::getTransition()
+ const; to the qt frontend. Code almost 100% copied from xpdf code
+ inside kpdf
+
+ ChangeLog | 5 ++
+ qt/poppler-page.cc | 121
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ qt/poppler-qt.h | 78 +++++++++++++++++++++++++++++++++
+ 3 files changed, 204 insertions(+), 0 deletions(-)
+
+commit 9d4327eecd94299a3629b0814e84f981a4be1dfb
+Author: Martin Kretzschmar <martink@gnome.org>
+Date: Sun Jun 26 15:54:16 2005 +0000
+
+ add poppler-enums.[ch].
+
+ ChangeLog | 2 ++
+ glib/.cvsignore | 8 +++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+commit 768186514b9fc175cf330344408bb89ab4c909f3
+Author: Martin Kretzschmar <martink@gnome.org>
+Date: Sun Jun 26 11:40:35 2005 +0000
+
+ require glib 2.4+ for g_value_take_string and G_DEFINE_TYPE.
+
+ ChangeLog | 5 +++++
+ configure.ac | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 5d40e34a367212c39af06332879f26824d6d62d2
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Jun 26 00:01:39 2005 +0000
+
+ 2005-06-25 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/Error.h: Maybe fix build on Solaris.
+
+ ChangeLog | 4 ++++
+ poppler/Error.h | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit c2780a3b3f4615bb28bfe394d649b388db4ccf4d
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jun 20 21:33:09 2005 +0000
+
+ 2005-06-20 Kristian Høgsberg <krh@redhat.com>
+
+ * NEWS:
+ * configure.ac: Bump version to 0.3.3 and sum up changes since
+ last release.
+
+ * glib/poppler-page.cc (poppler_page_find_text): Initialize
+ xMin
+ and yMin to avoid referencing unintialized memory (#3582).
+
+ ChangeLog | 9 +++++++++
+ NEWS | 10 ++++++++++
+ configure.ac | 2 +-
+ glib/poppler-page.cc | 2 ++
+ 4 files changed, 22 insertions(+), 1 deletions(-)
+
+commit 9023891f314ac37811b5c973be2e36b6de353cf2
+Author: Martin Kretzschmar <martink@gnome.org>
+Date: Mon Jun 20 18:45:41 2005 +0000
+
+ (info_dict_get_string): convert from PDFDocEncoding to UTF-8.
+
+ ChangeLog | 5 +++++
+ glib/poppler-document.cc | 16 +++++++++++++++-
+ 2 files changed, 20 insertions(+), 1 deletions(-)
+
+commit bbf2fe757f0fd08d0e90e3810709ab7152c779c0
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jun 20 17:58:38 2005 +0000
+
+ 2005-06-20 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler.h: Clean up glib rotation implementation and
+ add a
+ getter for rotation. Patch from Marco.
+
+ ChangeLog | 7 +++++
+ glib/poppler-page.cc | 69
+ ++++++++++++++++++++++++++++---------------------
+ glib/poppler-page.h | 57 +++++++++++++++++++++--------------------
+ glib/poppler.h | 1 -
+ 4 files changed, 75 insertions(+), 59 deletions(-)
+
+commit c264d8a9f84587cd0f2ef67683a01fc8dd9395af
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jun 20 17:38:27 2005 +0000
+
+ 2005-06-20 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc:
+ * poppler/FontInfo.cc: Fixes from Marco to handle fonts
+ without
+ name (typically type 3 fonts) and fix an iterator bug.
+
+ ChangeLog | 6 ++++++
+ glib/poppler-document.cc | 8 +++++++-
+ poppler/FontInfo.cc | 13 ++++++++++---
+ 3 files changed, 23 insertions(+), 4 deletions(-)
+
+commit 4746e63a793a2881e904ac54d58b7d3e48b07dcf
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jun 20 17:22:35 2005 +0000
+
+ 2005-06-20 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_get_link_mapping): Adjust
+ link coordinates so they're relative to bounding box
+ lower left
+ corner (#3396).
+
+ ChangeLog | 6 ++++++
+ glib/poppler-page.cc | 6 ++++++
+ 2 files changed, 12 insertions(+), 0 deletions(-)
+
+commit bada3d03583ef6ed34d2aa743de8fd9ca4a5c748
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Jun 17 05:30:56 2005 +0000
+
+ 2005-06-17 Kristian Høgsberg <krh@redhat.com>
+
+ * autogen.sh: Patch from Emil Soleyman-Zomalan to enable
+ checks
+ for automake >= 1.7 (#3554).
+
+ ChangeLog | 5 +++
+ autogen.sh | 104
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 109 insertions(+), 0 deletions(-)
+
+commit 25db42831ddde500697126352458e092a9b0ab9b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Jun 15 15:02:46 2005 +0000
+
+ 2005-06-15 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h: Patch from Marco to get initial
+ status
+ (open or closed) for bookmark subtrees.
+ -----------------------------------------------------------
+
+ ChangeLog | 6 ++++++
+ glib/poppler-document.cc | 9 +++++++++
+ glib/poppler-document.h | 1 +
+ 3 files changed, 16 insertions(+), 0 deletions(-)
+
+commit e54e306ac5d603001fefda3b9ecd81821e4bd09e
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jun 13 17:18:32 2005 +0000
+
+ Forgot to add new files.
+
+ poppler/FontInfo.cc | 197
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/FontInfo.h | 51 +++++++++++++
+ 2 files changed, 248 insertions(+), 0 deletions(-)
+
+commit 23e8ed5cbf4d7d999a8a1dcf714aaddaf339ceff
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Jun 13 16:09:33 2005 +0000
+
+ 2005-06-13 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ * glib/poppler-private.h:
+ * glib/poppler.h:
+ * glib/test-poppler-glib.c:
+ * poppler/Makefile.am: Patch from Marco to extract font
+ info from
+ document.
+
+ ChangeLog | 10 ++++
+ glib/poppler-document.cc | 131
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h | 13 +++++
+ glib/poppler-private.h | 7 +++
+ glib/poppler.h | 2 +
+ glib/test-poppler-glib.c | 14 +++++
+ poppler/Makefile.am | 2 +
+ 7 files changed, 179 insertions(+), 0 deletions(-)
+
+commit fbb86d2983a28ad2c46b8c5d475a2df1f0f0e4b9
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Jun 8 14:35:46 2005 +0000
+
+ 2005-06-08 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoFontEngine.cc: Remember to delete tmpFileName.
+ Patch from Nikolai Weibull (#3491).
+
+ ChangeLog | 5 +++++
+ poppler/CairoFontEngine.cc | 37 +++++++++++++++++++------------------
+ 2 files changed, 24 insertions(+), 18 deletions(-)
+
+commit 699b03025c1d38a42a49e39017097c5d0315fd6f
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Jun 7 20:25:48 2005 +0000
+
+ 2005-06-07 Kristian Høgsberg <krh@redhat.com>
+
+ * qt/test-poppler-qt.cpp: Add stdlib.h include for exit().
+
+ ChangeLog | 4 ++++
+ qt/test-poppler-qt.cpp | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 0017b1a72c58e2d016d22451079c466abdfff15c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Jun 2 19:14:45 2005 +0000
+
+ 2005-06-02 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/TextOutputDev.h:
+ * qt/poppler-qt.h: Patch from Stanislav Brabec
+ <sbrabec@suse.cz>
+ to fix gcc 4.0.1 warnings on undeclared friend classes.
+
+ * test/gtk-splash-test.cc: Fix from Martin Kretzschmar
+ <martink@gnome.org> to compile with OPI enabled (#2911).
+
+ ChangeLog | 9 +++++++++
+ poppler/TextOutputDev.h | 3 +++
+ qt/poppler-qt.h | 2 ++
+ test/gtk-splash-test.cc | 2 +-
+ 4 files changed, 15 insertions(+), 1 deletions(-)
+
+commit 47c3b4ec2c7691e44f5100b1f5956df0005467c8
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Jun 2 18:49:55 2005 +0000
+
+ 2005-06-02 Kristian Høgsberg <krh@redhat.com>
+
+ Patch from Stanislav Brabec <sbrabec@suse.cz>:
+
+ * configure.ac:
+ * poppler-cairo.pc.in:
+ * poppler-glib.pc.in:
+ * poppler-qt.pc.in:
+ * poppler-splash.pc.in: Misc fixes to pkg-config files.
+
+ ChangeLog | 10 ++++++++++
+ configure.ac | 6 ++++--
+ poppler-cairo.pc.in | 3 +--
+ poppler-glib.pc.in | 4 ++--
+ poppler-qt.pc.in | 1 +
+ poppler-splash.pc.in | 3 +--
+ 6 files changed, 19 insertions(+), 8 deletions(-)
+
+commit 9f0da96dd005defd5d82dd05b627ff1925430215
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Jun 2 00:35:44 2005 +0000
+
+ 2005-06-01 Jeff Muizelaar <jeff@infidigm.net>
+
+ * poppler/Error.cc:
+ * poppler/Error.h: Make error handling function setable through
+ setErrorFunction.
+
+ Based on a patch by Albert Astals Cid.
+
+ ChangeLog | 8 ++++++++
+ poppler/Error.cc | 29 ++++++++++++++++++++---------
+ poppler/Error.h | 2 ++
+ 3 files changed, 30 insertions(+), 9 deletions(-)
+
+commit f688aa11d066f1c6f4115cbdb604ac61fb8b5146
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun May 29 14:59:34 2005 +0000
+
+ 2005-05-29 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/*: Add more meta data properties to poppler document.
+ Patch by Emil Soleyman-Zomalan (#3359).
+
+ ChangeLog | 5 ++
+ glib/poppler-document.cc | 155
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler.gidl | 5 ++
+ glib/test-poppler-glib.c | 46 ++++++++++----
+ 4 files changed, 194 insertions(+), 17 deletions(-)
+
+commit 9e6eeec574d48d2341ee620e16360d3b21c40103
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu May 26 13:03:35 2005 +0000
+
+ 2005-05-26 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDev.cc (clip): Remove snapToGrid
+ so clip()
+ prototype matches what Gfx actually calls (fixes clipping).
+
+ * poppler/CairoOutputDev.cc: Update fill color, stroke
+ color, fill
+ opacity and stroke opacity from GfxState on restore,
+ since they
+ aren't handled by cairo_restore() (#3362).
+
+ * poppler/CairoOutputDev.cc: Comment out tolerance setting
+ until
+ we figure out how cairo settings relate to pdf settings.
+
+ * poppler/CairoOutputDev.cc: Support fill and stroke opacity.
+
+ ChangeLog | 12 ++++++++++++
+ poppler/CairoOutputDev.cc | 41
+ ++++++++++++++++++++++++++++++-----------
+ poppler/CairoOutputDev.h | 6 +++++-
+ 3 files changed, 47 insertions(+), 12 deletions(-)
+
+commit 89a633edd860e3c6ded1e468edf6f28cfcb43d0e
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu May 26 12:52:38 2005 +0000
+
+ 2005-05-26 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/GfxState.cc:
+ * poppler/GfxState.h: Add GfxColorSpace::getRGBLine here and
+ implement in subclasses.
+
+ * poppler/CairoOutputDev.cc (drawImage): Use getRGBLine here.
+
+ ChangeLog | 8 ++
+ poppler/CairoOutputDev.cc | 66 +++++++++----------
+ poppler/GfxState.cc | 160
+ ++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/GfxState.h | 14 ++++
+ 4 files changed, 212 insertions(+), 36 deletions(-)
+
+commit 4d8224819da7a85e4d99f96c9bbb047ece58130a
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Mon May 23 04:23:53 2005 +0000
+
+ Mon May 23 00:22:41 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/poppler-document.h: Add a permissions flag to the glib
+ bindings.
+
+ ChangeLog | 5 +++++
+ glib/poppler-document.cc | 24 ++++++++++++++++++++++++
+ glib/poppler-document.h | 16 +++++++++-------
+ 3 files changed, 38 insertions(+), 7 deletions(-)
+
+commit 1f677e2f60634a7d0c5e0e0d2125ab15c2722979
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sat May 21 21:33:06 2005 +0000
+
+ 2005-05-21 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc (poppler_ps_file_new): Fix
+ off-by-one
+ error spotted by Jürg Billeter.
+ -----------------------------------------------------
+
+ ChangeLog | 5 +++++
+ glib/poppler-document.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 0bbf2f08173866cde9b097eeeb1f4218a396588d
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 20 20:48:52 2005 +0000
+
+ 2005-05-20 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDev.cc: Account for different row
+ vs. column
+ vector conventions between cairo and poppler.
+
+ ChangeLog | 3 +++
+ poppler/CairoOutputDev.cc | 18 +++++++++---------
+ 2 files changed, 12 insertions(+), 9 deletions(-)
+
+commit da44ec7e8de58e55e55b1f780bc3f4bc8307874f
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 20 18:38:10 2005 +0000
+
+ 2005-05-20 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoFontEngine.cc: Only get the code to gid map if
+ we're using freetype 2.1.7 or older (#3340).
+
+ ChangeLog | 5 +++++
+ poppler/CairoFontEngine.cc | 13 ++++++++-----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+commit 6fe29cf0a7e54b8d294471a0f94eb9e989ad1d7f
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu May 19 05:18:04 2005 +0000
+
+ Add bugzilla number.
+
+ ChangeLog | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 42de1348622cf86a87bc22941bd48bffa943dac9
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu May 19 05:16:22 2005 +0000
+
+ 2005-05-19 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoFontEngine.cc: Only cast to Gfx8BitFont when we
+ know for sure we have a truetype font.
+ GfxCIDFont::getCIDToGIDLen() can return 0 in which case
+ codeToGID
+ will be NULL, and we end up casting it to a Gfx8BitFont.
+
+ ChangeLog | 7 +++++++
+ poppler/CairoFontEngine.cc | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+commit afc05387c94a76ff0ed69b3f5d9a69ddd1448e83
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 18 17:39:59 2005 +0000
+
+ 2005-05-18 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Require cairo 0.5.0, bump release to 0.3.2.
+
+ * NEWS: Sum up latest changes.
+
+ * glib/poppler-document.cc (poppler_ps_file_new): Take a page
+ range here instead of just number of pages.
+
+ ChangeLog | 9 +++++++++
+ NEWS | 7 +++++++
+ configure.ac | 6 +++---
+ glib/poppler-document.cc | 15 ++++++++++-----
+ glib/poppler-document.h | 1 +
+ 5 files changed, 30 insertions(+), 8 deletions(-)
+
+commit 420134a194af9161282ccfe329d17adef8d325f2
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue May 17 23:38:27 2005 +0000
+
+ 2005-05-17 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDevX.cc:
+ * test/gtk-cairo-test.cc: Chase the cairo xlib constructor
+ again.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDevX.cc | 5 +++--
+ test/gtk-cairo-test.cc | 5 +++--
+ 3 files changed, 11 insertions(+), 4 deletions(-)
+
+commit 6fd62953a910dcfb4abd9de5ea18285b8fa5d202
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon May 16 23:16:15 2005 +0000
+
+ Add bug number and attribution to ChangeLog entry.
+
+ ChangeLog | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 6d7f624c13e8a9a8251ac97388cd80e418c70250
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon May 16 21:56:31 2005 +0000
+
+ 2005-05-16 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Check for glib-mkenums.
+
+ * glib/Makefile.am (poppler-enums.h): Generate glib enums at
+ compile time.
+
+ * glib/poppler-enums.c:
+ * glib/poppler-enums.h: Removed.
+
+ ChangeLog | 8 ++
+ configure.ac | 3 +
+ glib/.cvsignore | 1 +
+ glib/Makefile.am | 67 ++++++++++++------
+ glib/poppler-enums.c | 189
+ --------------------------------------------------
+ glib/poppler-enums.h | 49 -------------
+ 6 files changed, 57 insertions(+), 260 deletions(-)
+
+commit 2801b54a944fc9e1072c5dcb9f1153a0c9f42de5
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon May 16 20:27:51 2005 +0000
+
+ 2005-05-16 Kristian Høgsberg <krh@redhat.com>
+
+ * test/gtk-cairo-test.cc: Update this test case also.
+
+ ChangeLog | 2 ++
+ test/gtk-cairo-test.cc | 5 +++--
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 8753ae8ba20fcceaef3ef1dda89129f0456fccf6
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon May 16 19:06:00 2005 +0000
+
+ 2005-05-16 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDevX.cc: Track changes to cairo Xlib
+ surface
+ constructors.
+
+ * poppler/CairoFontEngine.cc (cairo_font_face_destroy):
+ Make this
+ static.
+
+ ChangeLog | 8 ++++++++
+ poppler/CairoFontEngine.cc | 2 +-
+ poppler/CairoOutputDevX.cc | 5 +++--
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+commit 2e17106ef4711097104a561d5be49980f8b2f5ab
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Fri May 13 03:47:36 2005 +0000
+
+ whoops! commit the right file.
+
+ glib/poppler.gidl | 212
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/test.gidl | 23 ------
+ 2 files changed, 212 insertions(+), 23 deletions(-)
+
+commit 19b62e1c8ea8ce042ac089defe94f756dcaf194e
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Fri May 13 03:25:32 2005 +0000
+
+ Thu May 12 23:10:45 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/poppler.gidl: add metadata file.
+
+ ChangeLog | 4 ++++
+ glib/test.gidl | 23 +++++++++++++++++++++++
+ 2 files changed, 27 insertions(+), 0 deletions(-)
+
+commit bef5a548f3b21e7220079155e9b5054fb0c6c3c7
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu May 12 21:26:25 2005 +0000
+
+ 2005-05-12 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDev.cc:
+ * poppler/CairoOutputDevX.cc:
+ * poppler/CairoOutputDevImage.cc:
+ * test/gtk-cairo-test.cc: Update to latest cairo changes,
+ patch
+ from Jens Taprogge (#3281)
+
+ ChangeLog | 8 ++++++++
+ poppler/CairoOutputDev.cc | 22 +++++++++++-----------
+ poppler/CairoOutputDevImage.cc | 11 ++++++-----
+ poppler/CairoOutputDevX.cc | 7 +++++--
+ test/gtk-cairo-test.cc | 8 +++++---
+ 5 files changed, 35 insertions(+), 21 deletions(-)
+
+commit c10ea2dd9bffaf9af023612ef196bab2b204d3e1
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 11 20:01:43 2005 +0000
+
+ 2005-05-11 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler.cc (poppler_get_backend, poppler_get_version):
+ Add
+ these functions so it's easy to tell if poppler is using
+ cairo or
+ splash and what version.
+
+ * glib/test-poppler-glib.c (main): Print out version and
+ backend.
+
+ ChangeLog | 8 ++++++++
+ glib/poppler-enums.c | 26 ++++++++++++++++++++++++++
+ glib/poppler-enums.h | 15 +++++++++++++++
+ glib/poppler.cc | 21 +++++++++++++++++++++
+ glib/poppler.h | 11 +++++++++++
+ glib/test-poppler-glib.c | 9 ++++++++-
+ 6 files changed, 89 insertions(+), 1 deletions(-)
+
+commit 7d189e33cfa68e722561e9398ad85a77b538ab14
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri May 6 16:38:57 2005 +0000
+
+ 2005-05-06 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/Makefile.am (libpoppler_glib_la_LIBADD): Link
+ poppler-glib
+ against poppler.
+
+ * qt/Makefile.am (libpoppler_qt_la_LIBADD): Ditto for qt.
+
+ * poppler-glib.pc (Libs): Drop -lpoppler from link.
+
+ * poppler-qt.pc (Libs): Ditto for qt.
+
+ * configure.ac: Test for both libqt-mt.la and libqt-mt.so
+ in that
+ order.
+
+ ChangeLog | 14 ++++++++++++++
+ configure.ac | 8 +++++++-
+ glib/Makefile.am | 1 +
+ poppler-glib.pc.in | 2 +-
+ poppler-qt.pc.in | 2 +-
+ qt/Makefile.am | 1 +
+ qt/test-poppler-qt.cpp | 1 +
+ 7 files changed, 26 insertions(+), 3 deletions(-)
+
+commit c937e63f17a096b94a554103476ecb9ab1b71b90
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 4 20:08:41 2005 +0000
+
+ 2005-05-04 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask,
+ CairoOutputDev::drawImage): Track cairo cvs API changes; use
+ cairo_mask() and cairo_paint() for drawing image masks
+ and images.
+
+ ChangeLog | 6 +++
+ poppler/CairoOutputDev.cc | 98
+ +++++++++++++++++++++++---------------------
+ 2 files changed, 57 insertions(+), 47 deletions(-)
+
+commit c142773ad30b409d8169a53921e731305de46e50
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 4 19:28:07 2005 +0000
+
+ 2005-05-04 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoOutputDev.cc: Fix matrix convention confusion.
+
+ ChangeLog | 4 ++++
+ poppler/CairoOutputDev.cc | 4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 28760927d724231d0137ca7ecc66c6c2250dff0d
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed May 4 19:11:11 2005 +0000
+
+ 2005-05-04 Kristian Høgsberg <krh@redhat.com>
+
+ Patches from Albert Astals Cid:
+
+ * qt/poppler-page.cc (getText): Use QString::fromUtf8()
+ instead of
+ implicit latin1 cast constructor.
+
+ * qt/test-poppler-qt.cpp (main): Use a QLabel for showing text
+ instead of qDebug.
+
+ ChangeLog | 10 ++++++++++
+ qt/poppler-page.cc | 5 ++---
+ qt/test-poppler-qt.cpp | 6 +++++-
+ 3 files changed, 17 insertions(+), 4 deletions(-)
+
+commit fd36522375bcf436639b8731acb3ad22c03c03f4
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Wed May 4 06:32:38 2005 +0000
+
+ Wed May 4 02:31:05 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ * glib/poppler-enums.c: (poppler_permissions_get_type):
+ * glib/poppler-enums.h:
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler.h:
+
+ Register a bunch of boxed types to test introspection, and for
+ LBs. Also, remove unused 'popper_document_save()' (-:
+
+ ChangeLog | 13 +++++++
+ glib/poppler-document.cc | 48 +++++++++++++++-----------
+ glib/poppler-document.h | 18 +++++++++-
+ glib/poppler-enums.c | 19 ++++++++++
+ glib/poppler-enums.h | 2 +
+ glib/poppler-page.cc | 83
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h | 36 ++++++++++++++------
+ glib/poppler.h | 12 ++++---
+ 8 files changed, 193 insertions(+), 38 deletions(-)
+
+commit 132647f8311c07b1f95ee4fca185e9774aae4913
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon May 2 05:39:11 2005 +0000
+
+ 2005-05-01 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoFontEngine.cc:
+ * poppler/CairoFontEngine.h:
+ * poppler/CairoOutputDev.cc: Back out workaround for cairo
+ 0.4.0
+ font API and port to new cairo head.
+
+ ChangeLog | 7 ++++
+ configure.ac | 4 +-
+ poppler/CairoFontEngine.cc | 67
+ ++++++++++++++++------------------------
+ poppler/CairoFontEngine.h | 12 +++----
+ poppler/CairoOutputDev.cc | 39 ++++++++++++++---------
+ poppler/CairoOutputDevImage.cc | 2 +-
+ 6 files changed, 66 insertions(+), 65 deletions(-)
+
+commit 595c18c038f8dcef73fe58612fc8b93f891e65a1
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Mon May 2 00:44:26 2005 +0000
+
+ 2005-05-01 Jeff Muizelaar <jeff@infidigm.net>
+
+ * splash/SplashFTFont.cc (SplashFTFont::getGlyphPath):
+ Use FT_LOAD_NO_BITMAP to make sure we get outlines loaded instead
+ of bitmaps for use in FT_Outline_Decompose.
+
+ Patch from Albert Astals Cid.
+
+ ChangeLog | 8 ++++++++
+ splash/SplashFTFont.cc | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+commit 49d89ca0ed3986bec7468f6c0ed295e84ba67239
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun May 1 21:54:55 2005 +0000
+
+ 2005-05-01 Jeff Muizelaar <jeff@infidigm.net>
+
+ * goo/gmem.c: (gmalloc), (grealloc), (gfree):
+ * goo/gmem.h: make memory functions use size_t instead of int.
+
+ Patch from Takashi Iwai through Albert Astals Cid.
+
+ ChangeLog | 7 +++++++
+ goo/gmem.c | 10 +++++-----
+ goo/gmem.h | 4 ++--
+ 3 files changed, 14 insertions(+), 7 deletions(-)
+
+commit 14d618bece894e4c6bed0f179a8fda4db5a67c9d
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Apr 30 19:53:57 2005 +0000
+
+ 2005-04-30 Jeff Muizelaar <jeff@infidigm.net>
+
+ * qt/poppler-document.cc (Document::unlock) :
+ * qt/poppler-qt.h (Document::unlock):
+ Add const to the password argument.
+
+ Patch from Albert Astals Cid.
+
+ ChangeLog | 8 ++++++++
+ qt/poppler-document.cc | 2 +-
+ qt/poppler-qt.h | 2 +-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+commit 1e66da32964cc76c6ed3773574f422b4608cb0e1
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Apr 30 17:31:47 2005 +0000
+
+ 2005-04-30 Jeff Muizelaar <jeff@infidigm.net>
+
+ * fofi/FoFiType1.cc (FoFiType1::parse):
+ Don't assume Encoding array of Type1 fonts end in "foo def".
+ http://partners.adobe.com/public/developer/en/font/T1_SPEC.PDF
+ says
+ "This sequence of assignments must be followed by an instance
+ of the
+ token def or readonly; such a token may not occur within the
+ sequence
+ of assignments." so it must end with "readonly" "def" "readonly
+ def"
+ (That is what most fonts are using and this is why it was not
+ crashing)
+
+ Patch from Albert Astals Cid.
+
+ ChangeLog | 13 +++++++++++++
+ fofi/FoFiType1.cc | 14 +++++++++++---
+ 2 files changed, 24 insertions(+), 3 deletions(-)
+
+commit 0b532db77ef41937dd5be30d15c96557d81eceb2
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Fri Apr 29 19:37:07 2005 +0000
+
+ Fri Apr 29 14:54:44 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * goo/GooTimer.h: New class to do simple timing checks.
+
+ * glib/poppler-document.c: Patch from Martin Kretzschmar
+ to really
+ set the PDF version correct. Third time's the charm.
+
+ ChangeLog | 7 +++++
+ glib/poppler-document.cc | 4 ++-
+ goo/GooTimer.cc | 63
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ goo/GooTimer.h | 40 +++++++++++++++++++++++++++++
+ goo/Makefile.am | 2 +
+ 5 files changed, 115 insertions(+), 1 deletions(-)
+
+commit 38948ea6f9ef76dae9b8a7156fe1ef32a0457380
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Apr 29 03:57:16 2005 +0000
+
+ 2005-04-29 Kristian Høgsberg <krh@bitplanet.net>
+
+ * configure.ac: Bump release to 0.3.1.
+
+ * NEWS: Write up news for 0.3.1 release.
+
+ ChangeLog | 6 ++++++
+ NEWS | 6 ++++++
+ configure.ac | 2 +-
+ 3 files changed, 13 insertions(+), 1 deletions(-)
+
+commit af65146c92682a3af06e9d3147426445c78309de
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Apr 28 23:03:06 2005 +0000
+
+ 2005-04-28 Kristian Høgsberg <krh@redhat.com>
+
+ Patch from Martin Kretzschmar:
+
+ * poppler/GlobalParams.cc: use UTF-8 as the default text
+ encoding.
+ Fixes Bug 2934.
+
+ ChangeLog | 7 +++++++
+ poppler/GlobalParams.cc | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+commit c2db3e1b297a9dc0accd0d8a1366970d45705c8f
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Apr 27 20:56:18 2005 +0000
+
+ 2005-04-27 Jeff Muizelaar <jeff@infidigm.net>
+
+ * configure.ac:
+ * poppler/FlateStream.cc:
+ * poppler/FlateStream.h:
+ * poppler/Makefile.am:
+ * poppler/Stream.cc:
+ * poppler/Stream.h: Add a reimplementation of FlateStream using
+ zlib.
+
+ ChangeLog | 10 ++++
+ configure.ac | 29 +++++++++++++
+ poppler/FlateStream.cc | 107
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/FlateStream.h | 68 ++++++++++++++++++++++++++++++
+ poppler/Makefile.am | 17 +++++++-
+ poppler/Stream.cc | 6 +++
+ poppler/Stream.h | 2 +
+ 7 files changed, 237 insertions(+), 2 deletions(-)
+
+commit bc0afe524c2b87af191d83fc9e9bcdc8a6ce4042
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Apr 27 18:53:20 2005 +0000
+
+ 2005-04-27 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/Catalog.cc (NameTree::lookup): Fix bsearch return
+ value
+ NULL check. Found by Albert Astals Cid.
+
+ ChangeLog | 5 +++++
+ poppler/Catalog.cc | 8 ++++----
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+commit 3c37dc350d54e5a1035aecfba5bfa394f931cf51
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Tue Apr 26 17:17:05 2005 +0000
+
+ Tue Apr 26 13:13:42 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/test-poppler-glib.c (main): add a quick dump-to-text
+ test.
+
+ ChangeLog | 4 ++++
+ glib/test-poppler-glib.c | 20 ++++++++++++++++++++
+ 2 files changed, 24 insertions(+), 0 deletions(-)
+
+commit 44b800d520f90ffd143255d2c23835ea357c195b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Apr 25 18:04:32 2005 +0000
+
+ Actually commit the qt/Makefile.am change advertised in the ChangeLog.
+
+ qt/Makefile.am | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+commit 437bec03dd2ab3cdf6215f9ad443b7f21ce84e18
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun Apr 24 19:56:17 2005 +0000
+
+ 2005-04-24 Kristian Høgsberg <krh@redhat.com>
+
+ * qt/Makefile.am (libpoppler_qt_la_SOURCES): Add
+ poppler-private.h
+ to SOURCES.
+
+ ChangeLog | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+commit 9b2b1244ed5f30a99120aaee49c72f7cb6a4f556
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sat Apr 23 20:16:02 2005 +0000
+
+ 2005-04-23 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoFontEngine.cc: Use the right fileName for
+ loading
+ CID fonts (#3114).
+
+ ChangeLog | 5 +++++
+ poppler/CairoFontEngine.cc | 11 +++++++++--
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+commit e4516d728a4d1bc85831d5d00b6d6b8d49c79308
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sat Apr 23 00:09:05 2005 +0000
+
+ 2005-04-22 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Actually commit version number bump.
+
+ ChangeLog | 4 ++++
+ NEWS | 2 +-
+ configure.ac | 2 +-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+commit c20448cb26fa1c309d726f272ddf1227f5a0e6ea
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Apr 22 17:29:49 2005 +0000
+
+ 2005-04-22 Martin Kretzschmar <martink@gnome.org>
+
+ * poppler/CairoFontEngine.cc: declare matrix variable
+ before the
+ first goto. Fixes build with gcc 3.3.
+
+ ChangeLog | 5 +++++
+ poppler/CairoFontEngine.cc | 3 ++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+commit 42ecccf9b454893797e3d62f0f1c0a3276689e51
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Apr 22 04:09:23 2005 +0000
+
+ Fri Apr 22 00:01:40 2005 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoFontEngine.cc: Hack around semi-broken
+ cairo-0.4.0
+ font API to fix the problem where some glyphs would show up
+ at the
+ wrong sizes. We now create an FT_Face for each size and font
+ combination we encounter, since an FT_Face can't be shared
+ between
+ several cairo_font_t.
+
+ ChangeLog | 8 ++++
+ poppler/CairoFontEngine.cc | 79
+ +++++++++++++++++++------------------------
+ poppler/CairoFontEngine.h | 23 +++++--------
+ poppler/CairoOutputDev.cc | 18 +++++-----
+ 4 files changed, 61 insertions(+), 67 deletions(-)
+
+commit 7a703616d9497eba4d7d318da9918dae9cbe8f12
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Apr 21 19:50:45 2005 +0000
+
+ Thu Apr 21 15:43:52 2005 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/Outline.cc:
+ * poppler/Outline.h: Implement the documented behaviour for
+ Outline::getItems() and OutlineItem::getKids() and make
+ documentation more precise (Patch from Marco).
+
+ ChangeLog | 7 +++++++
+ poppler/Outline.cc | 6 ++++++
+ poppler/Outline.h | 7 ++++---
+ 3 files changed, 17 insertions(+), 3 deletions(-)
+
+commit 5c89902c5ee2cf13536225c141768b29505815ce
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Apr 21 06:35:33 2005 +0000
+
+ Thu Apr 21 02:25:20 2005 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/CairoFontEngine.cc (CairoFont::getFont): Cache
+ cairo_font_t's for a given CairoFont. With this patch
+ cairo will
+ recognize glyphs coming from the same font as such and
+ the glyph
+ cache will actually work.
+
+ * glib/poppler-document.cc (poppler_document_new_from_file):
+ Add
+ output device (cairo or splash) to PopplerDocument and
+ initialize
+ it in the constructor.
+
+ * glib/poppler-page.cc (splash_render_to_pixbuf,
+ cairo_render_to_pixbuf): Use output device from associated
+ poppler
+ document instead of creating a new one.
+
+ * poppler-glib.pc.in (Requires): Add Requires: field.
+
+ * poppler/Page.cc (loadThumb): Remove unecessary and buggy
+ call to
+ Stream::addFilters(), reported by Ryan Lortie (#3046).
+
+ ChangeLog | 7 +++++-
+ NEWS | 12 ++--------
+ poppler/CairoFontEngine.cc | 45
+ ++++++++++++++++++++++++++++++++++++++-----
+ poppler/CairoFontEngine.h | 9 +++++++-
+ poppler/CairoOutputDev.cc | 9 +-------
+ 5 files changed, 57 insertions(+), 25 deletions(-)
+
+commit 71c1563bb0462154cb7caa4356d8f8d049073ac4
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Apr 21 05:20:24 2005 +0000
+
+ Thu Apr 21 00:15:30 2005 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc (poppler_document_new_from_file):
+ Add
+ output device (cairo or splash) to PopplerDocument and
+ initialize
+ it in the constructor.
+
+ * glib/poppler-page.cc (splash_render_to_pixbuf,
+ cairo_render_to_pixbuf): Use output device from associated
+ poppler
+ document instead of creating a new one.
+
+ * poppler-glib.pc.in (Requires): Add Requires: field.
+
+ * poppler/Page.cc (loadThumb): Remove unecessary and buggy
+ call to
+ Stream::addFilters(), reported by Ryan Lortie (#3046).
+
+ ChangeLog | 15 +++++++++++++++
+ NEWS | 15 +++++++++++++++
+ glib/poppler-document.cc | 10 ++++++++++
+ glib/poppler-page.cc | 22 ++--------------------
+ glib/poppler-private.h | 13 +++++++++++++
+ poppler-glib.pc.in | 1 +
+ poppler/CairoFontEngine.cc | 2 +-
+ poppler/Page.cc | 2 --
+ 8 files changed, 57 insertions(+), 23 deletions(-)
+
+commit c6328cbc6cea05890b52a8302f8deba443959c03
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Apr 20 22:48:52 2005 +0000
+
+ 2005-04-13 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * qt/poppler-page.cc (Page::getText):
+ * qt/poppler-qt.h: add a getText method for getting
+ the text on a page
+
+ * qt/test-poppler-qt.c (PDFDisplay::PDFDisplay):
+ add the option to display the text on a page
+
+ Patch from Albert Astals Cid.
+
+ ChangeLog | 11 +++++++++++
+ qt/poppler-page.cc | 37 +++++++++++++++++++++++++++++++++++++
+ qt/poppler-qt.h | 20 ++++++++++++++++++++
+ qt/test-poppler-qt.cpp | 40 ++++++++++++++++++++++++++++++----------
+ 4 files changed, 98 insertions(+), 10 deletions(-)
+
+commit 86a32b65100a5baedd18ce0135703289839a317c
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Tue Apr 19 21:22:26 2005 +0000
+
+ Tue Apr 19 17:21:19 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/poppler-document.cc (poppler_document_get_property):
+ Use
+ %.2g instead.
+
+ ChangeLog | 5 +++++
+ glib/poppler-document.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 4e81624dcc2d5218f2f8bb4eaa992e724014a853
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Tue Apr 19 21:13:22 2005 +0000
+
+ Tue Apr 19 17:11:52 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/poppler-document.cc (poppler_document_get_property):
+ Use %g
+ instead of %f to avoid versioning like PDF-1.50000
+
+ ChangeLog | 5 +++++
+ glib/poppler-document.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 6ef9d30f06be2bd8a9e1470d70f49843a7e432ac
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Apr 19 19:48:49 2005 +0000
+
+ Tue Apr 19 15:43:35 2005 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-action.cc (_poppler_action_new): Handle
+ NULL links
+ gracefully (fix from Jeff).
+
+ ChangeLog | 5 +++++
+ glib/poppler-action.cc | 7 ++++++-
+ 2 files changed, 11 insertions(+), 1 deletions(-)
+
+commit 770b7310ce8b07f95960c2014bf3f6040c060ac4
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Apr 19 04:28:15 2005 +0000
+
+ Tue Apr 19 00:20:08 2005 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/Catalog.cc: Fix from Marco to make sure we always
+ initialize Catalog::pageLabelInfo.
+
+ ChangeLog | 5 +++++
+ poppler/Catalog.cc | 3 +--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 49c10d9f2c4e0cef031f96929e38a14d7ce5af19
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Sat Apr 16 18:57:43 2005 +0000
+
+ Sat Apr 16 14:53:15 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/Makefile.am: Create poppler-enums.[ch]
+
+ * glib/poppler.h:
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler-action.h: Try to clean up the headers a bit
+
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h: Add support for document data.
+ Implemented as a lot of GObject properties.
+
+ * glib/poppler-enums.c:
+ * glib/poppler-enums.h: New autogenerated files.
+
+ * glib/test-poppler-glib.c: Test the new document metadata.
+ Seems
+ to work nicely, other than the PDF string and View Prefs.
+
+ * poppler/Catalog.cc:
+ * poppler/Catalog.h: Extend to support PageLayout.
+
+ ChangeLog | 22 +++++
+ glib/Makefile.am | 32 +++++++-
+ glib/poppler-action.h | 15 ++--
+ glib/poppler-document.cc | 196
+ +++++++++++++++++++++++++++++++++++++++++-----
+ glib/poppler-document.h | 43 +++++++++--
+ glib/poppler-enums.c | 144 ++++++++++++++++++++++++++++++++++
+ glib/poppler-enums.h | 32 ++++++++
+ glib/poppler-page.cc | 3 -
+ glib/poppler-page.h | 1 +
+ glib/poppler.h | 7 ++
+ glib/test-poppler-glib.c | 48 ++++++++++-
+ poppler/Catalog.cc | 17 ++++
+ poppler/Catalog.h | 11 +++
+ 13 files changed, 529 insertions(+), 42 deletions(-)
+
+commit f35c76cd3528f1e1de594e85e734ca23624b3a62
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Apr 15 02:25:10 2005 +0000
+
+ 2005-04-14 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler-private.h:
+ * glib/poppler.h: Patch from Marco Pesenti Gritti to set page
+ orientaton.
+
+ ChangeLog | 8 ++++
+ glib/poppler-page.cc | 109
+ ++++++++++++++++++++++++++++++++++++++++++++----
+ glib/poppler-page.h | 45 ++++++++++----------
+ glib/poppler-private.h | 1 +
+ glib/poppler.h | 9 ++++
+ 5 files changed, 142 insertions(+), 30 deletions(-)
+
+commit 538408a8845e167cc2d796ac8b8129d0a2e6a894
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Apr 14 01:34:38 2005 +0000
+
+ 2005-04-13 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * poppler/CairoOutputDevImage.cc (getBitmap): remove unused
+ SplashBitmap. Patch from Albert Astals Cid.
+
+ ChangeLog | 5 +++++
+ poppler/CairoOutputDevImage.cc | 2 --
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit 2903530492c24f3c7cb3bf3b993500694aaa27a8
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Apr 12 15:37:39 2005 +0000
+
+ 2005-04-12 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Add fontconfig to PKG_CHECK_MODULES for
+ the cairo
+ backend too, since we shouldn't depend on cairo.pc to pull
+ that in
+ for us.
+
+ * poppler/Makefile.am (INCLUDES): Add $(splash_includes) to
+ INCLUDES to make sure the fontconfig include path is
+ added when
+ using the splash backend.
+
+ ChangeLog | 10 ++++++++++
+ configure.ac | 4 ++--
+ poppler/Makefile.am | 1 +
+ 3 files changed, 13 insertions(+), 2 deletions(-)
+
+commit 0f7dd9a0512ff97293ee3f8a762b0049393b3cc1
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Apr 9 18:14:39 2005 +0000
+
+ 2005-04-09 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * poppler-qt.h:
+ * poppler-document.cc (okToPrint, okToChange, okToCopy):
+ Patch from Albert Astals Cid adding more metadata exports
+
+ ChangeLog | 6 ++++++
+ qt/poppler-document.cc | 20 ++++++++++++++++++++
+ qt/poppler-qt.h | 4 ++++
+ 3 files changed, 30 insertions(+), 0 deletions(-)
+
+commit dee72b531dab83a29c7675ae06ffe376e4498a4e
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Apr 8 21:09:27 2005 +0000
+
+ 2005-04-08 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler-qt.pc.in (Libs): Add -lpoppler to Libs.
+
+ ChangeLog | 4 ++++
+ poppler-qt.pc.in | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+commit df59ce3b1d5ca8cd46aaf5f189bc78953e21e1a9
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Fri Apr 8 03:30:33 2005 +0000
+
+ 2005-04-07 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * configure.ac: redo the qt tests from Albert Astals Cid
+
+ ChangeLog | 4 +++
+ configure.ac | 78
+ +++++++++++++++++++++++++++++++++++-----------------------
+ 2 files changed, 51 insertions(+), 31 deletions(-)
+
+commit 3f9dde10e4778255c468895942e45d1a2637af3a
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Fri Apr 8 03:11:00 2005 +0000
+
+ 2005-04-07 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * qt/poppler-document.cc:
+ * qt/poppler-page.cc:
+ * qt/poppler-qt.h:
+ Patch from Albert Astals Cid adding consts and exporting some more
+ metadata.
+
+ ChangeLog | 8 ++++++++
+ qt/poppler-document.cc | 21 ++++++++++++++++++---
+ qt/poppler-page.cc | 6 +++---
+ qt/poppler-qt.h | 15 +++++++++------
+ 4 files changed, 38 insertions(+), 12 deletions(-)
+
+commit e79a8b946e0d04b32da0b4ceea1649efd203cb07
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Apr 7 22:01:51 2005 +0000
+
+ 2005-04-07 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler-private.h: Print to PS support from Marco
+ Pesenti
+ Gritti.
+
+ ChangeLog | 9 +++++++++
+ glib/poppler-document.cc | 45
+ +++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h | 8 ++++++--
+ glib/poppler-page.cc | 19 +++++++++++++++++++
+ glib/poppler-page.h | 40 +++++++++++++++++++++-------------------
+ glib/poppler-private.h | 7 +++++++
+ 6 files changed, 107 insertions(+), 21 deletions(-)
+
+commit 7319b66eb64e735ae8b811306eb76755f088385b
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Thu Apr 7 16:26:15 2005 +0000
+
+ Thu Apr 7 12:25:39 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * configure.ac: check for qt, not glib, when enabling the qt
+ subdir
+
+ ChangeLog | 5 +++++
+ configure.ac | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit e258ed0cb42d524ee39451f680ad4c067e7721da
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Apr 6 20:49:19 2005 +0000
+
+ 2005-04-06 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * .cvsignore, glib/.cvsignore, qt/.cvsignore:
+ Add more things to .cvsignore.
+ Patch from Martin Kretzschmar.
+
+ .cvsignore | 2 ++
+ ChangeLog | 6 ++++++
+ glib/.cvsignore | 7 +++++++
+ qt/.cvsignore | 7 +++++++
+ 4 files changed, 22 insertions(+), 0 deletions(-)
+
+commit 2a5624a81aa84677a57e098d7d4045f44e3b6f3a
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Apr 6 20:35:03 2005 +0000
+
+ 2005-04-06 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * poppler-page.cc (Page::Page, Page::~Page):
+ Construct and deconstruct the PageData object.
+ Patch from Albert Astals Cid.
+
+ ChangeLog | 6 ++++++
+ qt/poppler-page.cc | 6 ++++++
+ qt/poppler-qt.h | 1 +
+ 3 files changed, 13 insertions(+), 0 deletions(-)
+
+commit f983e3d317660653f2bfc56f9b06e2cec675beca
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Apr 6 14:39:40 2005 +0000
+
+ 2005-04-06 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * Makefile.am, configure.ac: Add configuration for qt wrapper.
+
+ * poppler-qt.pc.in:
+ * qt/Makefile.am:
+ * qt/poppler-document.cc:
+ * qt/poppler-page.cc:
+ * qt/poppler-private.h:
+ * qt/poppler-qt.h:
+ * qt/test-poppler-qt.cpp:
+ New files.
+
+ ChangeLog | 13 +++
+ Makefile.am | 13 ++-
+ configure.ac | 64 +++++++++++++-
+ poppler-qt.pc.in | 11 +++
+ qt/Makefile.am | 32 +++++++
+ qt/poppler-document.cc | 232
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt/poppler-page.cc | 66 ++++++++++++++
+ qt/poppler-private.h | 32 +++++++
+ qt/poppler-qt.h | 75 ++++++++++++++++
+ qt/test-poppler-qt.cpp | 63 +++++++++++++
+ 10 files changed, 597 insertions(+), 4 deletions(-)
+
+commit d91dd69a7a0dd581c26728d2640e4d36a7ffe75f
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Apr 5 17:46:44 2005 +0000
+
+ 2005-04-05 Kristian Høgsberg <krh@redhat.com>
+
+ * NEWS: Attempt to sum up changes since 0.1.2.
+
+ * configure.ac: Bump release to 0.2.0, add AC_DEFINEs
+ for cairo
+ and splash availability.
+
+ * poppler/CairoFontEngine.cc: Disable hinting.
+
+ * glib/poppler-page.cc (poppler_page_render_to_pixbuf): Choose
+ either splash or cairo rendering, based on configure choice.
+ (cairo_render_to_pixbuf): New function to render using
+ the cairo
+ backend.
+ (splash_render_to_pixbuf): Split out the splash code to this
+ function.
+
+ ChangeLog | 16 ++++
+ NEWS | 6 +-
+ configure.ac | 16 +++-
+ glib/Makefile.am | 17 ++++-
+ glib/poppler-page.cc | 152
+ ++++++++++++++++++++++++++++++++--------
+ poppler/CairoFontEngine.cc | 2 +-
+ poppler/CairoOutputDevImage.cc | 20 ++----
+ poppler/CairoOutputDevImage.h | 3 +-
+ 8 files changed, 179 insertions(+), 53 deletions(-)
+
+commit b62b0cec2335d987b31fbb0043cb33db29cc6a13
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Apr 5 02:56:32 2005 +0000
+
+ 2005-04-04 Kristian Høgsberg <krh@redhat.com>
+
+ * ChangeLog: Add this entry to test commit mailer script.
+
+ ChangeLog | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 50b494266ce197fe88468ca2917b9910d77e5f98
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Apr 5 02:49:18 2005 +0000
+
+ 2005-04-04 Kristian Høgsberg <krh@redhat.com>
+
+ * TODO: Add reminder about using PDF font descriptors with
+ fontconfig.
+
+ ChangeLog | 3 +++
+ TODO | 2 ++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit d3d12235bf4de48363571b3d992ea3bfc29e6529
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Apr 4 21:50:56 2005 +0000
+
+ 2005-04-04 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Add checks for mkstemp() and mkstemps().
+
+ * glib/poppler-page.cc (poppler_page_find_text): Reverse
+ y-coordinates so we return PDF style coordinates.
+
+ From Maro Pesenti Gritti <mpgritti@gmail.com>:
+
+ * configure.ac, poppler/Makefile.am: Check for fontconfig when
+ we're building the splash backend.
+
+ * glib/poppler-page.cc (poppler_page_get_text): New
+ function to
+ select text on page.
+
+ ChangeLog | 15 +++++++++++++++
+ configure.ac | 5 ++++-
+ glib/poppler-page.cc | 48
+ +++++++++++++++++++++++++++++++++++++++++++++---
+ glib/poppler-page.h | 3 +++
+ poppler/Makefile.am | 4 ++++
+ 5 files changed, 71 insertions(+), 4 deletions(-)
+
+commit 2cb9d70678e33504246cbfbe0525c33f5e3b7736
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Apr 4 05:56:29 2005 +0000
+
+ 2005-04-04 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_find_text): Reverse
+ list of
+ matches so we get them in the right order.
+
+ ChangeLog | 5 +++++
+ glib/poppler-page.cc | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit 8c2a5ffb73c0f2d84adebcfbd43f8347ae8c8bbc
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sun Apr 3 18:17:55 2005 +0000
+
+ 2005-04-03 Martin Kretzschmar <martink@gnome.org>
+
+ * poppler/DCTStream.h: Wrap #include <jpeglib.h> in extern "C"
+ Fixes build with unpatched libjpeg.
+
+ ChangeLog | 5 +++++
+ poppler/DCTStream.h | 2 ++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+commit 1879d82d9088aa36ef5e677f4bae44c84f90caa6
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Sat Apr 2 22:16:38 2005 +0000
+
+ 2005-04-02 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * poppler/Page.h:
+ * poppler/Page.cc (Page::Page):
+ Some initial infrastructure for supporting transitions.
+
+ ChangeLog | 6 ++++++
+ poppler/Page.cc | 10 ++++++++++
+ poppler/Page.h | 4 ++++
+ 3 files changed, 20 insertions(+), 0 deletions(-)
+
+commit fa4efbed51e12811070798a7cfb6b1f9e8d57abc
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Apr 1 00:32:34 2005 +0000
+
+ 2005-03-31 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_render_to_pixbuf): Clip
+ output to destination pixbuf and fix RGB order.
+
+ ChangeLog | 5 +++++
+ glib/poppler-page.cc | 38 +++++++++++++++++++++++---------------
+ 2 files changed, 28 insertions(+), 15 deletions(-)
+
+commit bb508ded0b8c5806a9db1ec73e57b14268896911
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Mar 31 22:45:05 2005 +0000
+
+ 2005-03-31 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc (poppler_page_find_text): New
+ function to
+ seach a page for occurrences of a given text string.
+
+ * glib/poppler-page.cc: Add g_return_if_fail() checks to
+ a couple
+ of functions.
+
+ ChangeLog | 8 ++++
+ glib/poppler-page.cc | 82
+ ++++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-page.h | 18 +++++++---
+ glib/test-poppler-glib.c | 19 +++++++++--
+ 4 files changed, 109 insertions(+), 18 deletions(-)
+
+commit 0b4d481e9c79cb18cf41b503970801bbf4b95b3c
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Thu Mar 31 05:29:42 2005 +0000
+
+ Thu Mar 31 00:26:20 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h (poppler_page_get_link_mapping,
+ poppler_page_free_link_mapping): New functions to get a
+ mapping of
+ links to locations on the current document.
+ :s
+
+ ChangeLog | 7 ++++
+ glib/poppler-page.cc | 85
+ +++++++++++++++++++++++++++++++++++++++++++++++---
+ glib/poppler-page.h | 15 +++++++++
+ 3 files changed, 102 insertions(+), 5 deletions(-)
+
+commit c4e18f5a454794bd5e226f1106a54ccf807c6c3d
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Thu Mar 31 02:28:46 2005 +0000
+
+ 2005-03-30 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * poppler/DCTStream.h: change x to unsigned int to eliminate
+ comparision warning
+
+ ChangeLog | 5 +++++
+ poppler/DCTStream.h | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+commit e6a2a588305b4797af901599eb6854028f2be476
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Mar 30 18:43:44 2005 +0000
+
+ 2005-03-30 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ * poppler/Catalog.cc: delete pageLabelInfo on deconstruction
+
+ ChangeLog | 4 ++++
+ poppler/Catalog.cc | 1 +
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+commit a52905c0f0bf4d10d2103b80924a4de204d03836
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Wed Mar 30 04:08:26 2005 +0000
+
+ add this
+
+ glib/poppler-action.cc | 285
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 285 insertions(+), 0 deletions(-)
+
+commit 9542860a74076020b5727d4b761c08cdab42d69e
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Wed Mar 30 04:07:57 2005 +0000
+
+ add these
+
+ glib/poppler-action.h | 157
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 157 insertions(+), 0 deletions(-)
+
+commit 07720f98eca8736695f7d0d8e98465d301e6b7cf
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Wed Mar 30 04:07:39 2005 +0000
+
+ Tue Mar 29 23:07:17 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/poppler-page.h: Reformat.
+
+ ChangeLog | 4 ++++
+ glib/poppler-page.h | 34 +++++++++++++++++-----------------
+ 2 files changed, 21 insertions(+), 17 deletions(-)
+
+commit 3437b9e122aa05f4ede24664ee5a9b2d423ef9c4
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Wed Mar 30 04:04:53 2005 +0000
+
+ Tue Mar 29 22:49:15 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/poppler-action.[ch]: New item to encapsulate links.
+ * glib/poppler-document.[ch] (poppler_index_iter_get_action):
+ New
+ function to get the action. Also, fix some warnings.
+ * glib/poppler-private.h (_poppler_action_new): New function.
+ * glib/test-poppler-glib.c: Fix warnings.
+
+ ChangeLog | 8 ++++++
+ glib/Makefile.am | 2 +
+ glib/poppler-document.cc | 57
+ ++++++++++-----------------------------------
+ glib/poppler-document.h | 7 +----
+ glib/poppler-private.h | 12 ++++++++-
+ glib/poppler.h | 1 +
+ glib/test-poppler-glib.c | 4 ++-
+ 7 files changed, 39 insertions(+), 52 deletions(-)
+
+commit cab0ec4d011c34b571050a446c6e3286cc8749c8
+Author: Jonathan Blandford <jrb@redhat.com>
+Date: Tue Mar 29 18:49:26 2005 +0000
+
+ Tue Mar 29 02:36:00 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/poppler-document.[ch] (PopplerIndexIter): Add an
+ iter to
+ extract the index from the doc. Includes a bad hack, for now.
+
+ Mon Mar 28 22:02:07 2005 Jonathan Blandford <jrb@redhat.com>
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h (poppler_page_get_thumbnail_size): New
+ function.
+ * poppler-glib.pc.in: add -lpoppler-glib to the libs line.
+
+ ChangeLog | 12 ++++
+ glib/poppler-document.cc | 160
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler-document.h | 15 ++++
+ glib/poppler-page.cc | 48 ++++++++++++++-
+ glib/poppler-page.h | 3 +
+ poppler-glib.pc.in | 2 +-
+ 6 files changed, 236 insertions(+), 4 deletions(-)
+
+commit 2de98f3871bc4ea3e361ca4fe37f5b6561918c77
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Mar 28 07:49:54 2005 +0000
+
+ 2005-03-28 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/Page.cc (loadThumb): Backend agnostic method for
+ extracting an embedded thumbnail iamge.
+
+ * poppler/Dict.cc (lookupInt): New convenience method.
+
+ * glib/poppler-page.cc (poppler_page_get_thumbnail): New glib
+ function for getting the embedded thumbnail image for a page.
+
+ ChangeLog | 10 ++++
+ glib/poppler-page.cc | 23 ++++++++++
+ glib/poppler-page.h | 32 ++++++-------
+ glib/test-poppler-glib.c | 24 +++++++---
+ poppler/Dict.cc | 20 ++++++++
+ poppler/Dict.h | 1 +
+ poppler/Page.cc | 109
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Page.h | 1 +
+ 8 files changed, 196 insertions(+), 24 deletions(-)
+
+commit 591055d1fbcd0b9c2bb11f14040568051c5976d1
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sat Mar 26 00:34:21 2005 +0000
+
+ 2005-03-25 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/Makefile.am (libpoppler_glib_la_SOURCES): Add
+
+ * configure.ac: Check for fontconfig for glib bindings.
+
+ ChangeLog | 4 ++++
+ configure.ac | 4 ++--
+ glib/Makefile.am | 7 +++++--
+ 3 files changed, 11 insertions(+), 4 deletions(-)
+
+commit 1e30abe94a96b91df05716ea079c58782d767951
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Mar 24 22:24:41 2005 +0000
+
+ 2005-03-24 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/Makefile.am: Use POPPLER_GLIB_CFLAGS and
+ POPPLER_GLIB_LIBS
+ instead of GTK_TEST_*. Reported by Adam Jackson
+ <ajax@nwnk.net>.
+
+ ChangeLog | 5 +++++
+ glib/Makefile.am | 7 +++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+commit 1d9fcaa34222b2ccd53280148561917dbb8d95d9
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Mar 23 05:53:08 2005 +0000
+
+ File Edit Options Buffers Tools Help
+ 2005-03-23 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/Catalog.cc (indexToLabel, labelToIndex): Add
+ stricter
+ checking of incoming labels and indices.
+
+ * glib/test-poppler-glib.c (main): Change test program to
+ take the
+ page label from the command line.
+
+ ChangeLog | 6 ++++++
+ glib/test-poppler-glib.c | 5 ++++-
+ poppler/Catalog.cc | 31 +++++++++++++++++++++++++++++--
+ 3 files changed, 39 insertions(+), 3 deletions(-)
+
+commit a9bbb465a0ee6ab320f76d322a3f575327ad1148
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Mar 23 05:38:34 2005 +0000
+
+ 2005-03-23 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h: Add poppler_page_get_index() and rename
+ popper_page_get_dimension() to popper_page_get_size()
+
+ ChangeLog | 6 ++++++
+ glib/poppler-page.cc | 12 +++++++++---
+ glib/poppler-page.h | 32 +++++++++++++++++---------------
+ glib/test-poppler-glib.c | 5 ++---
+ 4 files changed, 34 insertions(+), 21 deletions(-)
+
+commit 178bff27d09d1e18d1fc00c975fa235b0e9f93d3
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Mar 23 04:14:28 2005 +0000
+
+ 2005-03-22 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc: Implement poppler_document_save().
+
+ * glib/poppler-document.h: Add prototype and format headers
+ properly.
+
+ ChangeLog | 7 +++++++
+ glib/poppler-document.cc | 20 ++++++++++++++++++++
+ glib/poppler-document.h | 30 +++++++++++++-----------------
+ 3 files changed, 40 insertions(+), 17 deletions(-)
+
+commit e40c6f69c9466df4cc70840b959f72cb0809c777
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Mar 23 01:30:04 2005 +0000
+
+ 2005-03-22 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Fix --disable-popper typo reported by Albert.
+ Require exactly cairo 0.4 since CVS cairo has API changes.
+
+ ChangeLog | 5 +++++
+ configure.ac | 6 +++---
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+commit 2a1e4f6f6dd87dc59b3579175a87215fd7350ee0
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Mar 22 22:46:37 2005 +0000
+
+ 2005-03-22 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/Array.cc:
+ * poppler/Array.h: Add getString() convenience method.
+
+ * poppler/Catalog.cc:
+ * poppler/Catalog.h: Optimize lookup of named destinations.
+
+ ChangeLog | 8 +++
+ poppler/Array.cc | 15 ++++++
+ poppler/Array.h | 1 +
+ poppler/Catalog.cc | 142
+ +++++++++++++++++++++++++++++++++-------------------
+ poppler/Catalog.h | 32 +++++++++++-
+ 5 files changed, 146 insertions(+), 52 deletions(-)
+
+commit 4dfe0ce4a1ca09d632943f0f6315e31135957ada
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Tue Mar 22 01:50:05 2005 +0000
+
+ 2005-03-21 Kristian Høgsberg <krh@redhat.com>
+
+ * NEWS, TODO: Update these.
+
+ ChangeLog | 4 ++++
+ NEWS | 1 +
+ TODO | 29 ++++++++++++++++++++---------
+ 3 files changed, 25 insertions(+), 9 deletions(-)
+
+commit c158de90a5a8c6514d8aa22efa0b891a1801e822
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Mar 21 07:53:19 2005 +0000
+
+ 2005-03-21 Kristian Høgsberg <krh@redhat.com>
+
+ From Albert Astals Cid <tsdgeos@yahoo.es>:
+
+ * poppler/Catalog.cc, poppler/Catalog.h: Parse PageMode
+ setting
+ from the Catalog dict and expose it through getPageMode()
+ method.
+
+ ChangeLog | 10 ++++++++--
+ poppler/Catalog.cc | 16 ++++++++++++++++
+ poppler/Catalog.h | 12 ++++++++++++
+ 3 files changed, 36 insertions(+), 2 deletions(-)
+
+commit 9887679ca195714d71cbedde9297e9dcea04eb13
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Mar 21 07:36:11 2005 +0000
+
+ 2005-03-21 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc:
+
+ * glib/poppler-document.h: Expose the documenttitle as
+ a GObject
+ property.
+
+ * glib/poppler-page.cc: Expose the page label as a GObject
+ property.
+
+ * glib/poppler-private.h: Add the page index to PopplerPage.
+
+ * glib/test-poppler-glib.c: Print out page label and document
+ title.
+
+ * poppler/Catalog.cc:
+ * poppler/Catalog.h: Add page label accessors.
+
+ * poppler/PageLabelInfo.cc:
+ * poppler/PageLabelInfo.h: New files.
+
+ * poppler/Makefile.am: Add new files to sources.
+
+ ChangeLog | 23 +++
+ glib/poppler-document.cc | 95 ++++++++++++-
+ glib/poppler-document.h | 3 +
+ glib/poppler-page.cc | 37 +++++-
+ glib/poppler-private.h | 3 +-
+ glib/test-poppler-glib.c | 13 ++-
+ poppler/Catalog.cc | 15 ++
+ poppler/Catalog.h | 6 +
+ poppler/Makefile.am | 4 +-
+ poppler/PageLabelInfo.cc | 346
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PageLabelInfo.h | 37 +++++
+ 11 files changed, 573 insertions(+), 9 deletions(-)
+
+commit 2cfe917de909254bc3a114a6add68a14b5885fd0
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun Mar 20 05:44:06 2005 +0000
+
+ 2005-03-20 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/poppler-document.cc:
+ * glib/poppler-page.h:
+ * glib/poppler.cc:
+ * poppler/Array.cc:
+ * poppler/Array.h:
+ * poppler/Catalog.cc: Fix up filenames in #include statements
+ and
+ comments.
+
+ ChangeLog | 10 ++++++++++
+ glib/poppler-document.cc | 2 +-
+ glib/poppler-document.h | 2 +-
+ glib/poppler-page.cc | 2 +-
+ glib/poppler-page.h | 2 +-
+ glib/poppler.cc | 2 +-
+ glib/poppler.h | 2 +-
+ 7 files changed, 16 insertions(+), 6 deletions(-)
+
+commit f9b6017cfaf8f814ae2fc027927477c29f24af71
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sun Mar 20 00:35:21 2005 +0000
+
+ 2005-03-19 Kristian Høgsberg <krh@redhat.com>
+
+ Land the first bits of the glib wrapper.
+
+ * Makefile.am:
+ * configure.ac: Add new glib subdirectory and configure
+ options
+ for glib wrapper.
+
+ * glib/Makefile.am:
+ * glib/poppler-document.cc:
+ * glib/poppler-document.h:
+ * glib/poppler-page.cc:
+ * glib/poppler-page.h:
+ * glib/poppler-private.h:
+ * glib/poppler.cc:
+ * glib/poppler.h:
+ * glib/test-poppler-glib.c:
+ * poppler-glib.pc.in: New files.
+
+ ChangeLog | 19 +++++
+ Makefile.am | 27 ++++----
+ NEWS | 4 +
+ configure.ac | 25 ++++++-
+ glib/Makefile.am | 33 +++++++++
+ glib/poppler-document.cc | 165
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h | 52 ++++++++++++++
+ glib/poppler-page.cc | 158
+ ++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h | 50 ++++++++++++++
+ glib/poppler-private.h | 20 ++++++
+ glib/poppler.cc | 29 ++++++++
+ glib/poppler.h | 42 ++++++++++++
+ glib/test-poppler-glib.c | 43 ++++++++++++
+ poppler-glib.pc.in | 11 +++
+ 14 files changed, 661 insertions(+), 17 deletions(-)
+
+commit 2a31446b227b5cdc8334e672a71835b6ea14713a
+Author: Jeff Muizelaar <jeff@infidigm.net>
+Date: Wed Mar 16 15:51:36 2005 +0000
+
+ 2005-03-16 Jeff Muizelaar <jrmuizel@nit.ca>
+
+ From Dan Sheridan <dan.sheridan@postman.org.uk>
+
+ * poppler/XRef.cc (XRef::checkEncrypted):
+ The key length should be 5 for revision 2 documents.
+
+ ChangeLog | 7 +++++++
+ poppler/XRef.cc | 6 ++++++
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+commit e632a1d4b2f685993bda407458c34ef8e6b74136
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Mar 11 22:43:29 2005 +0000
+
+ 2005-03-11 Kristian Høgsberg <krh@redhat.com>
+
+ From Jeff Muizelaar <jrmuizel@nit.ca>:
+
+ * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask):
+ Use
+ getLine instead of getPixel.
+
+ ChangeLog | 3 +++
+ poppler/CairoOutputDev.cc | 18 ++++++++----------
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+commit 83e904452f205a2c0cd2723cb12b7fd4640ce342
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Mar 11 21:42:52 2005 +0000
+
+ 2005-03-11 Kristian Høgsberg <krh@redhat.com>
+
+ From Jeff Muizelaar <jrmuizel@nit.ca>:
+
+ * configure.ac: Add checks for libjpeg.
+
+ * DCTStream.cc, DCTStream.h, Stream.cc, Stream.h, Makefile.am:
+ Conditionally use libjpeg instead of xpdf jpeg decoder.
+
+ ChangeLog | 9 ++++
+ configure.ac | 34 +++++++++++++++-
+ poppler/DCTStream.cc | 110
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/DCTStream.h | 70 ++++++++++++++++++++++++++++++++
+ poppler/Makefile.am | 14 ++++++-
+ poppler/Stream.cc | 8 ++++
+ poppler/Stream.h | 2 +
+ 7 files changed, 245 insertions(+), 2 deletions(-)
+
+commit e2af71338fd89760c4ac76999985efc5eb92817f
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Mar 11 16:42:20 2005 +0000
+
+ 2005-03-10 Kristian Høgsberg <krh@redhat.com>
+
+ From Jeff Muizelaar <jrmuizel@nit.ca>:
+
+ * poppler/CairoFontEngine.cc (CairoFontEngine::getFont):
+ Don't print "Type 3 font!" message.
+
+ * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask):
+ Enable image mask drawing and do it properly, albeit slowly.
+
+ * poppler/CairoOutputDev.h
+ (CairoOutputDev::interpretType3Chars): Return true so that
+ Gfx.cc turns type3 characters into calls to drawImageMask
+
+ ChangeLog | 14 ++++++++++++++
+ poppler/CairoFontEngine.cc | 1 -
+ poppler/CairoOutputDev.cc | 25 ++++++++++---------------
+ poppler/CairoOutputDev.h | 2 +-
+ 4 files changed, 25 insertions(+), 17 deletions(-)
+
+commit 3dc52373346e448077d2539163e873eef6406ed7
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Mar 9 15:47:00 2005 +0000
+
+ 2005-03-09 Kristian Høgsberg <krh@redhat.com>
+
+ * NEWS: Describe 0.1.2 (and 0.1.1) release.
+
+ * configure.ac: Bump poppler version to 0.1.2
+
+ ChangeLog | 6 ++++++
+ NEWS | 12 ++++++++++++
+ configure.ac | 2 +-
+ 3 files changed, 19 insertions(+), 1 deletions(-)
+
+commit 5c6a2d34fc25df28ca5326e6910d7cf664f0c3d7
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Mar 9 15:35:31 2005 +0000
+
+ 2005-03-09 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Bump cairo requirement to 0.4.
+
+ ChangeLog | 4 ++++
+ configure.ac | 4 ++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit 5b2d9a61e79cefd819888c8c89231a5fafccd114
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sat Mar 5 04:57:49 2005 +0000
+
+ 2005-03-04 Kristian Høgsberg <krh@redhat.com>
+
+ Patch from Jeff Muizelaar <jrmuizel@nit.ca>. Changed to
+ allocate
+ glyphs using gmalloc.
+
+ * poppler/CairoOutputDev.cc (CairoOutputDev::drawString):
+ Implement drawString instead of drawChar. This change should
+ make clipping to a text path work and has a performance
+ improvement. Currently the code is a little ugly because we
+ can't concat matrices to cairo without losing our current
+ font.
+
+ * poppler/CairoOutputDev.h (CairoOutputDev::useDrawChar):
+ Tell Gfx.cc that it should use drawString instead of drawChar.
+
+ ChangeLog | 14 ++++++
+ TODO | 3 +
+ poppler/CairoOutputDev.cc | 110
+ ++++++++++++++++++++++++++++++++++-----------
+ poppler/CairoOutputDev.h | 7 +--
+ 4 files changed, 102 insertions(+), 32 deletions(-)
+
+commit 60d190ef80a0dcd9cc3a67306e2c65c5dd482f24
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sat Mar 5 04:37:14 2005 +0000
+
+ 2005-03-04 Kristian Høgsberg <krh@redhat.com>
+
+ * test/gtk-cairo-test.cc (view_load):
+ * test/gtk-splash-test.cc (view_load): Fix missing return
+ statement, and remove unused variables.
+
+ * configure.ac: Add configure option to enable the default KDE
+ flags as described by Albert Astals Cid <tsdgeos@yahoo.es>.
+
+ * TODO: Update with Jeff's items.
+
+ * .cvsignore:
+ * */.cvsignore: Add these to silence CVS.
+
+ ChangeLog | 9 +++++++++
+ TODO | 15 +++++++++++----
+ configure.ac | 21 +++++++++++++++++++++
+ test/gtk-cairo-test.cc | 6 ++----
+ test/gtk-splash-test.cc | 5 ++---
+ 5 files changed, 45 insertions(+), 11 deletions(-)
+
+commit e6706e505c1675724c8870f7c58079932661db5f
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Sat Mar 5 02:19:50 2005 +0000
+
+ 2005-03-04 Kristian Høgsberg <krh@redhat.com>
+
+ * .cvsignore:
+ * */.cvsignore: Add these to silence CVS.
+
+ .cvsignore | 21 +++++++++++++++++++++
+ ChangeLog | 3 +++
+ fofi/.cvsignore | 8 ++++++++
+ goo/.cvsignore | 8 ++++++++
+ poppler/.cvsignore | 10 ++++++++++
+ splash/.cvsignore | 8 ++++++++
+ test/.cvsignore | 10 ++++++++++
+ 7 files changed, 68 insertions(+), 0 deletions(-)
+
+commit 932edfc3c5c61e3b3e98957b717abbf8055e1c5e
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Mar 4 19:47:13 2005 +0000
+
+ 2005-03-04 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Implement same check for gtk+-2.0 tests as for
+ cairo.
+
+ ChangeLog | 5 +++++
+ configure.ac | 11 ++++++++---
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+commit c632b35ad9345f280d78c268f84ae3fd5a3921b9
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Mar 4 16:33:43 2005 +0000
+
+ 2005-03-04 Kristian Høgsberg <krh@redhat.com>
+
+ * configure.ac: Only fail hard in check for cairo if the user
+ specified --enable-cairo-output (from Brad Hards
+ <bradh@frogmouth.net>). Print summary of configure results
+ at the
+ end of configure script.
+
+ * poppler/poppler-config.h: Remove this file (noticed by Brad
+ Hards <bradh@frogmouth.net>).
+
+ ChangeLog | 5 +++++
+ configure.ac | 17 ++++++++++++++---
+ 2 files changed, 19 insertions(+), 3 deletions(-)
+
+commit 80f9c90273eb31ac349c46bf86dedff7daf21db4
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Mar 4 15:32:32 2005 +0000
+
+ 2005-03-04 Kristian Høgsberg <krh@redhat.com>
+
+ * poppler/poppler-config.h: Remove this file (noticed by Brad
+ Hards <bradh@frogmouth.net>).
+
+ ChangeLog | 5 ++
+ poppler/poppler-config.h | 146
+ ----------------------------------------------
+ 2 files changed, 5 insertions(+), 146 deletions(-)
+
+commit 338b83b6f08a7212fdde2bbce94385e9a71a3d23
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Fri Mar 4 02:46:44 2005 +0000
+
+ 2005-03-03 Kristian Høgsberg <krh@redhat.com>
+
+ Patch from Jeff Muizelaar <jrmuizel@nit.ca>:
+
+ * poppler/CairoOutputDev.cc (CairoOutputDev::drawImage,
+ CairoOutputDev::drawImageMask): destroy the image surface and
+ free the image buffer.
+
+ ChangeLog | 10 ++++++++++
+ autogen.sh | 2 +-
+ poppler/CairoOutputDev.cc | 8 +++++---
+ 3 files changed, 16 insertions(+), 4 deletions(-)
+
+commit 062aa51487f539406b54458885b4c9501da3c44d
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Mar 3 20:01:14 2005 +0000
+
+ 2005-03-03 Kristian Høgsberg <krh@redhat.com>
+
+ * autogen.sh: Add to CVS.
+
+ ChangeLog | 4 ++++
+ autogen.sh | 4 ++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+commit cb02d5d0e770e2a8cbe5a8ac810820a2ce5fec0c
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Thu Mar 3 19:45:58 2005 +0000
+
+ Initial revision
+
+ AUTHORS | 3 +
+ COPYING | 340 ++++
+ ChangeLog | 33 +
+ INSTALL | 236 +++
+ Makefile.am | 29 +
+ NEWS | 4 +
+ README | 37 +
+ README-XPDF | 376 ++++
+ TODO | 21 +
+ configure.ac | 139 ++
+ fofi/FoFiBase.cc | 156 ++
+ fofi/FoFiBase.h | 55 +
+ fofi/FoFiEncodings.cc | 994 ++++++++++
+ fofi/FoFiEncodings.h | 34 +
+ fofi/FoFiTrueType.cc | 1438 ++++++++++++++
+ fofi/FoFiTrueType.h | 131 ++
+ fofi/FoFiType1.cc | 207 ++
+ fofi/FoFiType1.h | 57 +
+ fofi/FoFiType1C.cc | 2385 ++++++++++++++++++++++
+ fofi/FoFiType1C.h | 224 +++
+ fofi/Makefile.am | 16 +
+ goo/GooHash.cc | 356 ++++
+ goo/GooHash.h | 74 +
+ goo/GooList.cc | 92 +
+ goo/GooList.h | 89 +
+ goo/GooMutex.h | 49 +
+ goo/GooString.cc | 236 +++
+ goo/GooString.h | 98 +
+ goo/Makefile.am | 20 +
+ goo/gfile.cc | 705 +++++++
+ goo/gfile.h | 140 ++
+ goo/gmem.c | 204 ++
+ goo/gmem.h | 53 +
+ goo/gmempp.cc | 32 +
+ goo/gtypes.h | 29 +
+ poppler-cairo.pc.in | 10 +
+ poppler-splash.pc.in | 10 +
+ poppler.pc.in | 11 +
+ poppler/Annot.cc | 137 ++
+ poppler/Annot.h | 79 +
+ poppler/Array.cc | 73 +
+ poppler/Array.h | 56 +
+ poppler/BaseFile.h | 82 +
+ poppler/BuiltinFont.cc | 65 +
+ poppler/BuiltinFont.h | 55 +
+ poppler/BuiltinFontTables.cc | 4284
+ ++++++++++++++++++++++++++++++++++++++++
+ poppler/BuiltinFontTables.h | 23 +
+ poppler/CMap.cc | 384 ++++
+ poppler/CMap.h | 101 +
+ poppler/CairoFontEngine.cc | 367 ++++
+ poppler/CairoFontEngine.h | 61 +
+ poppler/CairoOutputDev.cc | 569 ++++++
+ poppler/CairoOutputDev.h | 146 ++
+ poppler/CairoOutputDevImage.cc | 87 +
+ poppler/CairoOutputDevImage.h | 43 +
+ poppler/CairoOutputDevX.cc | 211 ++
+ poppler/CairoOutputDevX.h | 117 ++
+ poppler/Catalog.cc | 364 ++++
+ poppler/Catalog.h | 87 +
+ poppler/CharCodeToUnicode.cc | 533 +++++
+ poppler/CharCodeToUnicode.h | 112 ++
+ poppler/CharTypes.h | 24 +
+ poppler/CompactFontTables.h | 464 +++++
+ poppler/Decrypt.cc | 399 ++++
+ poppler/Decrypt.h | 59 +
+ poppler/Dict.cc | 95 +
+ poppler/Dict.h | 75 +
+ poppler/Error.cc | 38 +
+ poppler/Error.h | 21 +
+ poppler/ErrorCodes.h | 36 +
+ poppler/FontEncodingTables.cc | 1824 +++++++++++++++++
+ poppler/FontEncodingTables.h | 20 +
+ poppler/Function.cc | 1525 ++++++++++++++
+ poppler/Function.h | 181 ++
+ poppler/Gfx.cc | 3079 +++++++++++++++++++++++++++++
+ poppler/Gfx.h | 279 +++
+ poppler/GfxFont.cc | 1508 ++++++++++++++
+ poppler/GfxFont.h | 313 +++
+ poppler/GfxState.cc | 2782 ++++++++++++++++++++++++++
+ poppler/GfxState.h | 1053 ++++++++++
+ poppler/GlobalParams.cc | 1764 +++++++++++++++++
+ poppler/GlobalParams.h | 312 +++
+ poppler/JArithmeticDecoder.cc | 300 +++
+ poppler/JArithmeticDecoder.h | 89 +
+ poppler/JBIG2Stream.cc | 3337 +++++++++++++++++++++++++++++++
+ poppler/JBIG2Stream.h | 141 ++
+ poppler/JPXStream.cc | 2822 ++++++++++++++++++++++++++
+ poppler/JPXStream.h | 338 ++++
+ poppler/Lexer.cc | 474 +++++
+ poppler/Lexer.h | 75 +
+ poppler/Link.cc | 851 ++++++++
+ poppler/Link.h | 407 ++++
+ poppler/Makefile.am | 140 ++
+ poppler/NameToCharCode.cc | 116 ++
+ poppler/NameToCharCode.h | 40 +
+ poppler/NameToUnicodeTable.h | 1097 ++++++++++
+ poppler/Object.cc | 231 +++
+ poppler/Object.h | 301 +++
+ poppler/Outline.cc | 151 ++
+ poppler/Outline.h | 74 +
+ poppler/OutputDev.cc | 104 +
+ poppler/OutputDev.h | 162 ++
+ poppler/PDFDoc.cc | 322 +++
+ poppler/PDFDoc.h | 176 ++
+ poppler/PDFDocEncoding.cc | 44 +
+ poppler/PDFDocEncoding.h | 16 +
+ poppler/PSOutputDev.cc | 3803 +++++++++++++++++++++++++++++++++++
+ poppler/PSOutputDev.h | 312 +++
+ poppler/PSTokenizer.cc | 135 ++
+ poppler/PSTokenizer.h | 39 +
+ poppler/Page.cc | 370 ++++
+ poppler/Page.h | 176 ++
+ poppler/Parser.cc | 231 +++
+ poppler/Parser.h | 58 +
+ poppler/SplashOutputDev.cc | 1348 +++++++++++++
+ poppler/SplashOutputDev.h | 194 ++
+ poppler/Stream-CCITT.h | 459 +++++
+ poppler/Stream.cc | 3979
+ +++++++++++++++++++++++++++++++++++++
+ poppler/Stream.h | 841 ++++++++
+ poppler/TextOutputDev.cc | 3529 +++++++++++++++++++++++++++++++++
+ poppler/TextOutputDev.h | 569 ++++++
+ poppler/UTF8.h | 56 +
+ poppler/UnicodeMap.cc | 293 +++
+ poppler/UnicodeMap.h | 122 ++
+ poppler/UnicodeMapTables.h | 361 ++++
+ poppler/UnicodeTypeTable.cc | 299 +++
+ poppler/UnicodeTypeTable.h | 18 +
+ poppler/XRef.cc | 1026 ++++++++++
+ poppler/XRef.h | 133 ++
+ poppler/poppler-config.h | 146 ++
+ poppler/poppler-config.h.in | 145 ++
+ splash/Makefile.am | 52 +
+ splash/Splash.cc | 1732 ++++++++++++++++
+ splash/Splash.h | 174 ++
+ splash/SplashBitmap.cc | 157 ++
+ splash/SplashBitmap.h | 46 +
+ splash/SplashClip.cc | 270 +++
+ splash/SplashClip.h | 86 +
+ splash/SplashErrorCodes.h | 30 +
+ splash/SplashFTFont.cc | 289 +++
+ splash/SplashFTFont.h | 53 +
+ splash/SplashFTFontEngine.cc | 141 ++
+ splash/SplashFTFontEngine.h | 58 +
+ splash/SplashFTFontFile.cc | 111 ++
+ splash/SplashFTFontFile.h | 68 +
+ splash/SplashFont.cc | 166 ++
+ splash/SplashFont.h | 87 +
+ splash/SplashFontEngine.cc | 245 +++
+ splash/SplashFontEngine.h | 83 +
+ splash/SplashFontFile.cc | 55 +
+ splash/SplashFontFile.h | 58 +
+ splash/SplashFontFileID.cc | 23 +
+ splash/SplashFontFileID.h | 28 +
+ splash/SplashGlyphBitmap.h | 24 +
+ splash/SplashMath.h | 45 +
+ splash/SplashPath.cc | 177 ++
+ splash/SplashPath.h | 105 +
+ splash/SplashPattern.cc | 64 +
+ splash/SplashPattern.h | 79 +
+ splash/SplashScreen.cc | 107 +
+ splash/SplashScreen.h | 38 +
+ splash/SplashState.cc | 99 +
+ splash/SplashState.h | 86 +
+ splash/SplashT1Font.cc | 251 +++
+ splash/SplashT1Font.h | 49 +
+ splash/SplashT1FontEngine.cc | 124 ++
+ splash/SplashT1FontEngine.h | 51 +
+ splash/SplashT1FontFile.cc | 96 +
+ splash/SplashT1FontFile.h | 55 +
+ splash/SplashTypes.h | 80 +
+ splash/SplashXPath.cc | 417 ++++
+ splash/SplashXPath.h | 90 +
+ splash/SplashXPathScanner.cc | 271 +++
+ splash/SplashXPathScanner.h | 72 +
+ test/Makefile.am | 48 +
+ test/gtk-cairo-test.cc | 298 +++
+ test/gtk-splash-test.cc | 314 +++
+ 177 files changed, 70512 insertions(+), 0 deletions(-)
diff --git a/Build/source/libs/poppler/poppler-0.12.4/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.18.0/ConfigureChecks.cmake
index 1ba656aa4c9..04de970c4e1 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.0/ConfigureChecks.cmake
@@ -12,12 +12,14 @@ include(CheckTypeSize)
include(CheckCSourceCompiles)
check_include_files(dlfcn.h HAVE_DLFCN_H)
+check_include_files(fcntl.h HAVE_FCNTL_H)
check_include_files(inttypes.h HAVE_INTTYPES_H)
check_include_files(memory.h HAVE_MEMORY_H)
check_include_files(stdint.h HAVE_STDINT_H)
check_include_files(stdlib.h HAVE_STDLIB_H)
check_include_files(strings.h HAVE_STRINGS_H)
check_include_files(string.h HAVE_STRING_H)
+check_include_files(sys/mman.h HAVE_SYS_MMAN_H)
check_include_files(sys/stat.h HAVE_SYS_STAT_H)
check_include_files(sys/types.h HAVE_SYS_TYPES_H)
check_include_files(unistd.h HAVE_UNISTD_H)
@@ -25,7 +27,9 @@ check_include_files(unistd.h HAVE_UNISTD_H)
check_function_exists(fseek64 HAVE_FSEEK64)
check_function_exists(fseeko HAVE_FSEEKO)
check_function_exists(ftell64 HAVE_FTELL64)
+check_function_exists(gmtime_r HAVE_GMTIME_R)
check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
+check_function_exists(localtime_r HAVE_LOCALTIME_R)
check_function_exists(popen HAVE_POPEN)
check_function_exists(mkstemp HAVE_MKSTEMP)
check_function_exists(mkstemps HAVE_MKSTEMPS)
@@ -45,3 +49,8 @@ check_for_dir("dirent.h" HAVE_DIRENT_H)
check_for_dir("ndir.h" HAVE_NDIR_H)
check_for_dir("sys/dir.h" HAVE_SYS_DIR_H)
check_for_dir("sys/ndir.h" HAVE_SYS_NDIR_H)
+
+check_function_exists("nanosleep" HAVE_NANOSLEEP)
+if(NOT HAVE_NANOSLEEP)
+ check_library_exists("rt" "nanosleep" "" LIB_RT_HAS_NANOSLEEP)
+endif(NOT HAVE_NANOSLEEP)
diff --git a/Build/source/libs/poppler/poppler-0.12.4/INSTALL b/Build/source/libs/poppler/poppler-0.18.0/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.18.0/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.12.4/Makefile.am b/Build/source/libs/poppler/poppler-0.18.0/Makefile.am
index 2a752622b9e..60c82dca908 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.18.0/Makefile.am
@@ -15,28 +15,34 @@ glib_subdir = glib
glib_pc_file = poppler-glib.pc
endif
-if BUILD_POPPLER_QT
-qt_subdir = qt
-qt_pc_file = poppler-qt.pc
-endif
-
if BUILD_POPPLER_QT4
qt4_subdir = qt4
qt4_pc_file = poppler-qt4.pc
endif
+if BUILD_POPPLER_CPP
+cpp_subdir = cpp
+cpp_pc_file = poppler-cpp.pc
+endif
+
if BUILD_UTILS
utils_subdir = utils
endif
-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(cpp_subdir)
EXTRA_DIST = \
README-XPDF \
poppler.pc.in \
+ poppler-uninstalled.pc.in \
poppler-cairo.pc.in \
+ poppler-cairo-uninstalled.pc.in \
poppler-splash.pc.in \
- poppler-qt.pc.in
+ poppler-splash-uninstalled.pc.in \
+ poppler-qt4.pc.in \
+ poppler-qt4-uninstalled.pc.in \
+ poppler-cpp.pc.in \
+ poppler-cpp-uninstalled.pc.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
@@ -44,15 +50,16 @@ pkgconfig_DATA = \
$(cairo_pc_file) \
$(splash_pc_file) \
$(glib_pc_file) \
- $(qt_pc_file) \
- $(qt4_pc_file)
+ $(qt4_pc_file) \
+ $(cpp_pc_file)
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST += \
+ cpp/tests/CMakeLists.txt \
+ cpp/CMakeLists.txt \
glib/demo/CMakeLists.txt \
glib/CMakeLists.txt \
glib/poppler-features.h.cmake \
- qt/CMakeLists.txt \
qt4/src/CMakeLists.txt \
qt4/tests/CMakeLists.txt \
qt4/CMakeLists.txt \
@@ -64,10 +71,13 @@ EXTRA_DIST += \
cmake/modules/COPYING-CMAKE-SCRIPTS \
cmake/modules/FindCairo.cmake \
cmake/modules/FindFontconfig.cmake \
+ cmake/modules/FindGLIB.cmake \
+ cmake/modules/FindGObjectIntrospection.cmake \
cmake/modules/FindGTK.cmake \
+ cmake/modules/FindIconv.cmake \
cmake/modules/FindLCMS.cmake \
- cmake/modules/FindQt3.cmake \
cmake/modules/FindQt4.cmake \
+ cmake/modules/GObjectIntrospectionMacros.cmake \
cmake/modules/MacroBoolTo01.cmake \
cmake/modules/MacroEnsureVersion.cmake \
cmake/modules/MacroOptionalFindPackage.cmake \
@@ -77,16 +87,32 @@ EXTRA_DIST += \
cmake/modules/FindLIBOPENJPEG.cmake \
config.h.cmake \
poppler-cairo.pc.cmake \
- poppler-config.h.cmake \
+ poppler/poppler-config.h.cmake \
+ poppler-cpp.pc.cmake \
poppler-glib.pc.cmake \
- poppler-qt.pc.cmake \
poppler-qt4.pc.cmake \
poppler-splash.pc.cmake \
poppler.pc.cmake
-dist-hook: ChangeLog
+distclean-local:
+ if test "$(srcdir)" = "."; then :; else \
+ rm -f ChangeLog; \
+ fi
+
+ChangeLog:
+ $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
+ (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \
+ && mv -f $@.tmp $@ \
+ || ($(RM) $@.tmp; \
+ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+ (test -f $@ || echo git log is required to generate this file >> $@)); \
+ else \
+ test -f $@ || \
+ (echo A git checkout and git log is required to generate ChangeLog >&2 && \
+ echo A git checkout and git log is required to generate this file >> $@); \
+ fi
+
+.PHONY: ChangeLog
-ChangeLog : .git/HEAD
- $(AM_V_GEN) git log --stat > ChangeLog
diff --git a/Build/source/libs/poppler/poppler-0.12.4/Makefile.in b/Build/source/libs/poppler/poppler-0.18.0/Makefile.in
index 5b9a487ee04..a86154e84aa 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37,19 +37,27 @@ host_triplet = @host@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/poppler-cairo.pc.in $(srcdir)/poppler-glib.pc.in \
- $(srcdir)/poppler-qt.pc.in $(srcdir)/poppler-qt4.pc.in \
- $(srcdir)/poppler-splash.pc.in $(srcdir)/poppler.pc.in \
+ $(srcdir)/poppler-cairo-uninstalled.pc.in \
+ $(srcdir)/poppler-cairo.pc.in \
+ $(srcdir)/poppler-cpp-uninstalled.pc.in \
+ $(srcdir)/poppler-cpp.pc.in \
+ $(srcdir)/poppler-glib-uninstalled.pc.in \
+ $(srcdir)/poppler-glib.pc.in \
+ $(srcdir)/poppler-qt4-uninstalled.pc.in \
+ $(srcdir)/poppler-qt4.pc.in \
+ $(srcdir)/poppler-splash-uninstalled.pc.in \
+ $(srcdir)/poppler-splash.pc.in \
+ $(srcdir)/poppler-uninstalled.pc.in $(srcdir)/poppler.pc.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
TODO config.guess config.sub depcomp install-sh ltmain.sh \
missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
- $(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libpng.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/qt.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
+ $(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -57,8 +65,12 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h $(top_builddir)/poppler/poppler-config.h
-CONFIG_CLEAN_FILES = poppler.pc poppler-cairo.pc poppler-splash.pc \
- poppler-glib.pc poppler-qt.pc poppler-qt4.pc
+CONFIG_CLEAN_FILES = poppler.pc poppler-uninstalled.pc \
+ poppler-cairo.pc poppler-cairo-uninstalled.pc \
+ poppler-splash.pc poppler-splash-uninstalled.pc \
+ poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc \
+ poppler-qt4-uninstalled.pc poppler-cpp.pc \
+ poppler-cpp-uninstalled.pc
CONFIG_CLEAN_VPATH_FILES =
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -105,7 +117,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = goo fofi splash poppler utils glib qt test qt4
+DIST_SUBDIRS = goo fofi splash poppler utils glib test qt4 cpp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -142,8 +154,6 @@ DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
-ABIWORD_CFLAGS = @ABIWORD_CFLAGS@
-ABIWORD_LIBS = @ABIWORD_LIBS@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -184,12 +194,12 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
FREETYPE_CONFIG = @FREETYPE_CONFIG@
FREETYPE_LIBS = @FREETYPE_LIBS@
-GDK_CFLAGS = @GDK_CFLAGS@
-GDK_FEATURE = @GDK_FEATURE@
-GDK_LIBS = @GDK_LIBS@
GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQ = @GLIB_REQ@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
GTK_TEST_LIBS = @GTK_TEST_LIBS@
HTML_DIR = @HTML_DIR@
@@ -198,20 +208,35 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LCMS_CFLAGS = @LCMS_CFLAGS@
LCMS_LIBS = @LCMS_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
+LIBICONV = @LIBICONV@
LIBJPEG_LIBS = @LIBJPEG_LIBS@
LIBOBJS = @LIBOBJS@
LIBOPENJPEG_LIBS = @LIBOPENJPEG_LIBS@
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBTIFF_LIBS = @LIBTIFF_LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MOCQT4 = @MOCQT4@
NM = @NM@
@@ -231,6 +256,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PC_REQUIRES = @PC_REQUIRES@
PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POPPLER_DATADIR = @POPPLER_DATADIR@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_DISABLE_DEPRECATED = @POPPLER_GLIB_DISABLE_DEPRECATED@
@@ -244,8 +271,7 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
-POPPLER_QT_CXXFLAGS = @POPPLER_QT_CXXFLAGS@
-POPPLER_QT_LIBS = @POPPLER_QT_LIBS@
+POPPLER_VERSION = @POPPLER_VERSION@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -265,6 +291,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -301,7 +328,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -325,43 +351,51 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
@BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
@BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
@BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
-@BUILD_POPPLER_QT_TRUE@qt_subdir = qt
-@BUILD_POPPLER_QT_TRUE@qt_pc_file = poppler-qt.pc
@BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
@BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
+@BUILD_POPPLER_CPP_TRUE@cpp_subdir = cpp
+@BUILD_POPPLER_CPP_TRUE@cpp_pc_file = poppler-cpp.pc
@BUILD_UTILS_TRUE@utils_subdir = utils
-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(cpp_subdir)
# Add CMake buildsystem files here so they get added on make dist
-EXTRA_DIST = README-XPDF poppler.pc.in poppler-cairo.pc.in \
- poppler-splash.pc.in poppler-qt.pc.in glib/demo/CMakeLists.txt \
- glib/CMakeLists.txt glib/poppler-features.h.cmake \
- qt/CMakeLists.txt qt4/src/CMakeLists.txt \
+EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
+ poppler-cairo.pc.in poppler-cairo-uninstalled.pc.in \
+ poppler-splash.pc.in poppler-splash-uninstalled.pc.in \
+ poppler-qt4.pc.in poppler-qt4-uninstalled.pc.in \
+ poppler-cpp.pc.in poppler-cpp-uninstalled.pc.in \
+ cpp/tests/CMakeLists.txt cpp/CMakeLists.txt \
+ glib/demo/CMakeLists.txt glib/CMakeLists.txt \
+ glib/poppler-features.h.cmake qt4/src/CMakeLists.txt \
qt4/tests/CMakeLists.txt qt4/CMakeLists.txt \
qt4/demos/CMakeLists.txt test/CMakeLists.txt \
utils/CMakeLists.txt CMakeLists.txt ConfigureChecks.cmake \
cmake/modules/COPYING-CMAKE-SCRIPTS \
cmake/modules/FindCairo.cmake \
- cmake/modules/FindFontconfig.cmake cmake/modules/FindGTK.cmake \
- cmake/modules/FindLCMS.cmake cmake/modules/FindQt3.cmake \
- cmake/modules/FindQt4.cmake cmake/modules/MacroBoolTo01.cmake \
+ cmake/modules/FindFontconfig.cmake \
+ cmake/modules/FindGLIB.cmake \
+ cmake/modules/FindGObjectIntrospection.cmake \
+ cmake/modules/FindGTK.cmake cmake/modules/FindIconv.cmake \
+ cmake/modules/FindLCMS.cmake cmake/modules/FindQt4.cmake \
+ cmake/modules/GObjectIntrospectionMacros.cmake \
+ cmake/modules/MacroBoolTo01.cmake \
cmake/modules/MacroEnsureVersion.cmake \
cmake/modules/MacroOptionalFindPackage.cmake \
cmake/modules/MacroPushRequiredVars.cmake \
cmake/modules/PopplerDefaults.cmake \
cmake/modules/PopplerMacros.cmake \
cmake/modules/FindLIBOPENJPEG.cmake config.h.cmake \
- poppler-cairo.pc.cmake poppler-config.h.cmake \
- poppler-glib.pc.cmake poppler-qt.pc.cmake poppler-qt4.pc.cmake \
- poppler-splash.pc.cmake poppler.pc.cmake
+ poppler-cairo.pc.cmake poppler/poppler-config.h.cmake \
+ poppler-cpp.pc.cmake poppler-glib.pc.cmake \
+ poppler-qt4.pc.cmake poppler-splash.pc.cmake poppler.pc.cmake
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
poppler.pc \
$(cairo_pc_file) \
$(splash_pc_file) \
$(glib_pc_file) \
- $(qt_pc_file) \
- $(qt4_pc_file)
+ $(qt4_pc_file) \
+ $(cpp_pc_file)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -420,16 +454,28 @@ distclean-hdr:
-rm -f config.h stamp-h1
poppler.pc: $(top_builddir)/config.status $(srcdir)/poppler.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+poppler-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/poppler-uninstalled.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
poppler-cairo.pc: $(top_builddir)/config.status $(srcdir)/poppler-cairo.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+poppler-cairo-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/poppler-cairo-uninstalled.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
poppler-splash.pc: $(top_builddir)/config.status $(srcdir)/poppler-splash.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+poppler-splash-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/poppler-splash-uninstalled.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-poppler-qt.pc: $(top_builddir)/config.status $(srcdir)/poppler-qt.pc.in
+poppler-glib-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib-uninstalled.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
poppler-qt4.pc: $(top_builddir)/config.status $(srcdir)/poppler-qt4.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+poppler-qt4-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/poppler-qt4-uninstalled.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+poppler-cpp.pc: $(top_builddir)/config.status $(srcdir)/poppler-cpp.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+poppler-cpp-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/poppler-cpp-uninstalled.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -467,7 +513,7 @@ uninstall-pkgconfigDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -492,7 +538,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -655,11 +701,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -703,17 +747,17 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
@@ -813,7 +857,7 @@ distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-hdr \
- distclean-libtool distclean-tags
+ distclean-libtool distclean-local distclean-tags
dvi: dvi-recursive
@@ -881,25 +925,41 @@ uninstall-am: uninstall-pkgconfigDATA
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
- dist-zip distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-pkgconfigDATA
-
-
-dist-hook: ChangeLog
-
-ChangeLog : .git/HEAD
- $(AM_V_GEN) git log --stat > ChangeLog
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+ distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-local distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pkgconfigDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-pkgconfigDATA
+
+
+distclean-local:
+ if test "$(srcdir)" = "."; then :; else \
+ rm -f ChangeLog; \
+ fi
+
+ChangeLog:
+ $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
+ (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \
+ && mv -f $@.tmp $@ \
+ || ($(RM) $@.tmp; \
+ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+ (test -f $@ || echo git log is required to generate this file >> $@)); \
+ else \
+ test -f $@ || \
+ (echo A git checkout and git log is required to generate ChangeLog >&2 && \
+ echo A git checkout and git log is required to generate this file >> $@); \
+ fi
+
+.PHONY: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/poppler/poppler-0.12.4/NEWS b/Build/source/libs/poppler/poppler-0.18.0/NEWS
index 5e39ba006a1..2df22081c48 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/NEWS
+++ b/Build/source/libs/poppler/poppler-0.18.0/NEWS
@@ -1,21 +1,583 @@
-Release 0.12.4
+Release 0.18.0
+ core:
+ * Fix small memory leak when dealing with marked content
+ * Remove DCTStream::getRawStream since Stream::getNextStream does the same
+
+ utils:
+ * Rename pdfmerge to pdfunite
+ * Rename pdfextract to pdfseparate
+ * pdfseparate: Complain if %d is not present and it should
+ * Add pdfseparate and pdfunite man pages
+
+ build system:
+ * Minor cleanup in regarding removed qt code
+
+Release 0.17.4 (0.18 RC)
+ core:
+ * SplashOutputDev: Compile when defining USE_FIXEDPOINT
+ * PNGWriter: Compile with libpng >= 1.5.0
+
+Release 0.17.3 (0.18 Beta 3)
+ core:
+ * PSOutputDev: Use Patterns for tiling fill when PS level >= 2
+ * PSOutputDev: Avoid using /PatternType if only one instance of the pattern is used
+ * PSOutputDev: Add poppler version as comment in the file
+ * CairoOutputDev: Set mime data for soft masked images (Bug #40192)
+ * CairoOutputDev: Assume printer pixel size is 1/600" when stroking 0 width lines (Bug #39067)
+ * CairoOutputDev: Use cairo_show_text_glyphs() when printing
+ * CairoOutputDev: Fix stroke patterns (Bug #11719)
+ * CairoOutputDev: Fix unique id mime data
+ * CairoOutputDev: fix stroking of very thin lines
+ * CairoOutputDev: align strokes when Stroke Adjust is true and line width <= 1 (Bug #4536)
+ * TextOutputDev: Add TextFontInfo::matches()
+ * Improve PNGWriter
+ * Rework writing of PDF files
+
+ utils:
+ * Introduce pdftocairo - utility for creating png/jpeg/ps/eps/pdf/svg using CairoOutputDev
+ * Introduce pdfextract - utility to extract PDF pages
+ * Introduce pdfmerge - utility to merge PDF files
+ * Fix compilation warning
+ * pdftohtml: Support text rotation (Bug #38586)
+ * Update SEE ALSO section of man pages
+
+ glib:
+ * Add poppler_page_get_text_attributes()
+ * Add text attributes information to text demo
+
+ qt4:
+ * Add a way to get the fully qualified name of a FormField
+ * Minor documentation improvements
+
+Release 0.17.2 (0.18 Beta 2)
+ core:
+ * EmbeddedFile improvements
+ * don't gmalloc(-1) upon ftell failure
+ * Fix missing content in some pages (Bug #39637)
+ * Improve selection of CJK fonts (Bug #36474)
+ * SplashOutputDev: Implement overprint
+ * SplashOutputDev: Render dots for 0 length dashed lines (Bug #34150)
+ * SplashOutputDev: Fix bad memory access when not using antialias (Bug #37189)
+ * PSOutputDev: Make level2sep and level3sep write cmyk instead of rgb
+ * PSOutputDev: Make level1sep, level2sep and level3sep write gray instead of rgb for gray images
+ * Fix numerical overflow in libopenjpeg JPXStream (Bug #39361)
+ * Fix crash on truncated JPEG/DCT stream (Bug #36693)
+ * Make sure the dict is a page dict (Bugs #35925 #39072)
+ * Fix calculation of startXRefPos
+ * Handle missing startxref properly (Bug #38209)
+ * Parse the "Medium" modifier when asking fontconfig for a font
+ * Header cleanup
+ * Include cleanup
+ * Define cleanup
+
+ glib:
+ * Add missing permissions flags to PopplerPermissions
+ * Add missing permission flags to info demo
+ * Update gtk-doc.make
+ * Add poppler_document_get_n_attachments()
+
+ utils:
+ * pdftohtml: Fix encoding of PDF document metadata (Bug #37900)
+ * pdftohtml: Fix vertical spacing issues (Bug #38019)
+ * pdftotext: Fix -htmlmeta to correctly output U+2019 in PDF metadata (Bug #37900)
+ * pdftoppm: Implement overprint
+
+ qt4:
+ * Rework EmbeddedFile internals
+ * Fix possible crash in test
+
+Release 0.17.1 (0.18 Beta 1)
+ core:
+ * Rework the way form fields tree is built
+ * Cleanup unused parameters/variables
+
+ glib:
+ * Add JavaScript actions
+ * demo: Show javascript actions in actions view
+
+ qt4:
+ * tests: Turn some assignments to bool into QVERIFY checks
+
+Release 0.17.0 (0.18 Alpha)
+ core:
+ * Splash: Implement tiling patterns
+ * Splash: Support slight hinting
+ * Splash: Radial shading improvements
+ * Splash: General speed improvements
+ * Arthur: Add Hinting API
+ * Cairo: Implement Type 4,5,6,7 shadings using cairo mesh gradients
+ * Cairo: Use the new cairo unique id to set the surface id when printing
+ * PS: Add PS level1 non standard binary output option
+ * PS: Allow setting the rasterization resolution
+ * Form support improvements
+ * Annotation support improvements
+ * General speed improvements
+ * Add support for handling ViewerPreferences
+ * Remove abiword output device
+
+ utils:
+ * pdftoppm: Add -singlefile option (Bug #32025)
+ * pdftoppm: Add TIFF output format support (Bug #32027)
+ * pdftops: Add PS level1 non standard binary output option
+ * pdftops: Allow setting the rasterization resolution
+ * pdftoabw has been removed
+
+ glib:
+ * Add poppler_form_field_get_action() (Bug 33174)
+ * Remove GDK API
+ * Remove test-poppler-glib
+ * demo: Add a tooltip with current selected character in text demo
+ * demo: show the activation action of form fields if there's one
+
+ cpp:
+ * Add TIFF output possibility
+ * Add PNM output possibility
+
+ qt4:
+ * Support slight hinting
+ * Form support improvements
+
+ qt3:
+ * The Qt3 frontend has been removed
+
+ tests:
+ * Merge splash and cairo tests into a single gtk-test tool
+
+Release 0.16.4
+ core:
+ * Small improvements in Annot parsing
+
+ glib:
+ * Add g_return macros to make sure index is correct in form field choice methods
+ * Fix a crash when a choice form field has no items selected in glib-demo
+
+ utils:
+ * Small fixes to the pdftohtml manpage
+ * Fix copyright years
+
+ qt4:
+ * Fix caption of push button fields
+
+Release 0.16.3
+ core:
+ * Increase precision in PS output device
+ * Workaround bug when converting pdf to ps with level1 (Bug #31926)
+ * Fix crash in Splash output device in some broken pdf
+ * Fix infinite loop in some broken files
+ * Fix rendering of some substituted fonts (Bug #34522)
+ * Do not ask Freetype for 0x0 fonts in Splash output device (Bug #34602)
+ * Don't assume y1 > y3 for points of a highlight annotation (Gnome Bug #643028)
+ * Handle fontCIDType2OT when creating freetype font in Cairo output device (Gnome Bug #643273)
+ * Fix crash in some pdf that use ICC color space (Bug #34357)
+
+ glib:
+ * Don't use an uninitialized local variable in demo
+ * Add some introspection markers
+
+ qt4:
+ * Fix crash regression in unicodeToQString (again)
+
+ utils:
+ * pdftotext: Do not crash when using -bbox
+
+Release 0.16.2
+ core:
+ * Fix text extraction for some files
+
+ qt4:
+ * Fix crash regression in unicodeToQString
+
+Release 0.16.1
+ core:
+ * Fix colorspace issues in the Cairo backend (Bug #32746)
+ * Remove declaration of function without implementation
+ * Do not crash in case jpeg_create_decompress fails (Bug #32890)
+ * Fix variable access mismatch (Bug #33063)
+ * Fix converting some pdf to ps with -level1sep (Bug #32365)
+ * Fix line selection, dont check y for Line selections
+ * Include zlib header in PNGWriter.cc
+ * Fix leak in Splash backend when doing axial shaded fills
+ * Fix label to index conversion on multiple prefixes
+
+ glib:
+ * Use NULL instead of FALSE for functions returning a pointer
+ * Fix memory leak in poppler_page_get_text_layout() for pages with no text
+
+ qt4:
+ * Fix unicodeToQString() to correctly decode the Unicode sequence
+
+Release 0.16.0
+
+ core:
+ * Improve the correctness of radial shadings (Bug #32349)
+ * Adapt the zlib-based FlateStream code to API changes (Bug #32065)
+ * Make PreScanOutputDev be less agressive when deciding to rasterize (Bug #30107)
+ * Fix some warnings in newer gcc in Splash backend
+ * Fix the preliminary bbox/clip calculation in Splash backend
+ * Use A1 instead of A8 for imagemask in the Cairo backend
+ * Windows compile fixes
+
+ utils:
+ * Do not return 99 (or 1) with -h, -v and -printenc (Bug #32149)
+ * Misc style improvements to pdftohtml code
+ * pdftohtml: Remove the -resolution flag introduced in 0.15.0 and fix the
+ existing -zoom flag
+
+ build system:
+ * Add more warning flags to the default gcc builds
+ * Enable GObject introspection support in the cmake build system
+
+ qt4:
+ * Windows compile fixes
+
+Release 0.15.3 (0.16 RC)
+
+ core:
+ * Improve rendering of radial shadings
+ * Open a broken file (Bug #31861)
+ * Correct parsing of linearization table (Bug #31627)
+ * Find fonts inside patterns (Bug #31948)
+ * [win32] Simplify strtok_r implementation
+ * Use a std::vector<char> instead of a var-length-array of chars
+ * Fix crashes in broken files
+ * Use sets instead of arrays for looking for duplicate fonts
+
+ cpp:
+ * Include correction
+
+ utils:
+ * pdffonts: Remove duplicated code
+
+Release 0.15.2 (0.16 Beta 2)
+
+ core:
+ * Improve shadings and antialias in the Splash backend (Bug #30436)
+ * Linearization improvements
+ * Small improvements to the Arthur backend
+ * Fix calculation of the size of some pages (Bug #30784)
+ * Fix crashes in broken documents
+
+ qt4:
+ * Add Page::renderToPainter() method
+ * Add setDebugErrorFunction() method
+
+ cpp:
+ * Add the hability to render pages to an image
+
+ utils:
+ * Add -p flag to pdfimages
+
+ build system:
+ * Remove -ansi flag for cywin and mingw
+
+Release 0.15.1 (0.16 Beta 1)
core:
- * Fix Uncover and Fade transition parsing. Bug #26034
- * Fix GfxRadialShading::GfxRadialShading. KDE bug #223359
- * Fix a memory leak in CairoFontEngine
- * Use the right matrix for the mask in drawMaskedImage() in CairoOutputDev. Bug #16906
- * Only assume a OC is not visible if it exists and is set to no. Bug #26532
- * Guard agains malloc returning NULL in SplashFTFont
+ * Consider render value when colorizing text (Bug #2807)
+ * Improve rendering of Shading Type 6 and 7
+ * Improve dict lookup speed for big dicts
+ * Fix multiple crashes in malformed PDF files
+ * Fix memory leak in in malformed PDF files
+ * Fix memory leak in the Catalog names
+ * Fix uninitialized uses on DCTScanInfo
+ * Fix a crash when drawing square/circle annots without a border (Bug #30580)
+ * Only clip boxes to mediabox if we are at the page level (Bug #30784)
+ * Do not omit the notdef glyph in the Splash backend
+ * Fix a crash when redering documents with invalid type 3 fonts in the Cairo backend
+ * Form improvements
+ * Add a method to get the PDF file identifier
+
+ glib:
+ * Add more printing options to the API
+ * Add a method to get the PDF file identifier
+ * Add accessor for all PopplerDocument properties
+ * Form improvements
+ * Documentation improvements
+ * Improvements to the demo
qt4:
- * Update requirement to Qt 4.4
+ * Add a callback to know which page has been printed
+ * Add a method to get the PDF file identifier
+ * Optimize GooString to QString conversion
+ * Some more autotests
+ * Update Doxyfile (enables .qch file for assistant)
+
+ build system:
+ * Require Cairo 1.10
+
+ utils:
+ * pdftohtml: Add -s option to generate a single HTML page
+ * pdftotext: Add -bbox option
+
+ cpp:
+ * Add the possibility of loading a document from raw data
+ * Add a method to get the PDF file identifier
+ * Improve Unicode to ustring conversion
+ * Documentation improvements
+ * Update Doxyfile
+
+Release 0.15.0 (0.16 Alpha)
+
+ core:
+ * Remove exception support
+ * Improve creation of Annotations
+ * Fix failure to parse PDF with damaged internal structure. (Bugs #29189 #3870)
+ * Add a way to access the raw text of a page
+ * Speed improvements when reading multiple characters from a given Stream
+ * Speed improvements in the Splash backend
+ * Speed improvement in gray color space calculations
+ * Speed improvement in ICC color space calculations
+ * Speed improvement when reading some fonts
+ * Make GBool a bool instead of an int
+
+ glib:
+ * Add GObject introspection support
+ * Improve creation of Annotations
+ * Add a way to get the coordinates of each character of a page
+ * Add a way to get the page label
+ * Documentation improvements
+ * Support password protected documents in the demo
+ * Support for selection in the demo
+ * Support for adding annotationss in the demo
+ * Misc improvements in the internals
+
+ qt4:
+ * Add a way to access the raw text of a page
+ * Recognize "Print" as named action
+ * Documentation improvements
+
+ build system:
+ * Add option for autogen.sh to skip configure
+ * Nicer autogen.sh output
+ * Improvements when build the glib frontend with CMake
+
+ utils:
+ * pdftohtml: Use splash instead of external gs invocation to render the background
+ * pdftohtml: Let the user specify the resolution of the background. (Bug #29551)
+
+ cpp:
+ * Add a way to access the raw text of a page
+
+Release 0.14.3
+
+ core:
+ * Tell Windows we are writing/reading binary data from stdout/stdio (Bug #29329)
+ * Fix crash when parsing some Movie elements (KDE Bug #249586)
+
+Release 0.14.2
+
+ core:
+ * Fix rendering of some documents involving tilingPatternFill in the cairo output device
+ * Improve rendering of some annotations
+ * Handle ColorTransform in DCT streams when using libjpeg (Bug #28873)
+ * Fix crash in the ps output device in some files (KDE Bug #246269)
+ * Fix crash in some malformed files (Bug #28842)
+
+ build system:
+ * Improve build on windows
+ * Add uninstalled .pc file support when using autoconf
glib:
- * Use PDFDoc(wchar_t *, ...) on Windows. Bug #25032
+ * Fix a crash when a layer doesn't have a name (Bug #28842)
+
+ utils:
+ * Fix padding of names in pdftoppm
+Release 0.14.1
+
+ core:
+ * Add ObjectStream caching, makes opening some files ten times faster (Bug #26759)
+ * Fix crash when writing to negative coordinates (Bug #28480)
+ * Check objects are the type we want them to be when parsing GfxICCBasedColorSpace
+ * Optimize Splash::compositeBackground
+ * Optimize color space calculations by using sqrt instead of pow 0.5
+ * Fix crash in JBIG2Stream with malformed documents
+
build system:
- * fix typo: "MULTITHREAD" -> "MULTITHREADED" in CMake
+ * Make sure we ship two needed cmake files
+ * Do not distribute glib/poppler-features.h and poppler/poppler-config.h
+ * Improve compilation with Sun Studio
+ * Fix linking of the cpp frontend when using autotools
+
+ glib:
+ * Fix links/annots area for some documents (Bug #28588)
+ * Fix poppler_page_find_tex() when called more than once (Bug #27927)
+
+ utils:
+ * Add -cropbox to pdftoppm manual
+
+Release 0.14.0
+
+ core:
+ * Fix crash when parsing pdf with broken JBIG2Stream (Bug #28170)
+ * Do not follow loops blindly when parsing XRef (Bug #28172)
+ * Allow quality & progressive mode to be utilised in JpegWriter
+ * Fix potential assert in Lexer code (KDE bug #240208)
+ * Fix opening of files whose /P is stored as unsigned integer
+ * Do not exit() when trying to allocate memory for the XRef fails
+
+ cpp:
+ * Minor bugfixes
+ * Documentation improvements
+
+ build system:
+ * Fix build in mingw32 when using autotools
+ * Preserve compiler flags when using cmake
+
+Release 0.13.4 (0.14 RC 1)
+
+ core:
+ * Include standard float.h instead of unportable values.h
+ * Fix first color stop offset of linear gradients. Bug #27837
+ * Fix compilation if JPEG nor PNG is used
+ * Use fabs for doubles instead of abs
+ * Use strtok_r instead strtok
+ * Adjust bbox for line annots when y1 = y2
+ * Some fixes and regressions in the cairo output device
+ * Better check of overlapping of table cells when selecting text
+
+ cpp:
+ * Make the pkg-config files really work
+ * Fix in/out buffer sizes in some functions
+
+Release 0.13.3 (0.14 Beta 2)
+
+ core:
+ * Fix roll optimization in the PS function interpreter
+ * Correctly parse numbers with '+' sign. Gnome bug #614549
+ * Add support for cached files
+ * Add support for reading a cached file from stdin
+ * Add HTTP support using libcurl, disabled by default
+ * Add some const correctnes to GooString
+ * Rework DCTStream error handling. Bug #26280
+ * Use current fill_opacity when drawing soft masked images in Cairo backend. Gnome bug #614915
+ * Use the topleft of the Rect of text annots to draw
+ * Fix saving update docs that have a compressed xref table. Bug #27450
+ * Parse varius part of the document catalog on demand
+ * Implement colorizing image masks with pattern colorspace in Cairo backend
+ * Fix a crash when rendering 0x0 images in Cairo backend
+ * Check pattern status after setting matrix when rendering images
+ * Improve text selection/extraction order. Bug #3188
+ * Fix pattern size when bbox is not at 0,0
+ * Improve colorizing text and masks in pattern colorspace. Bug #27482
+ * Silence some Illegal entry in bfrange block in ToUnicode CMap. Bug #27728
+
+ utils:
+ * Add the -o[dd] and -e[ven] options to pdftoppm
+ * Allow read from stdin using the new cached files feature
+ * Fix crash in pdftohtml when output filename was shorter than 5 characters
+
+ glib:
+ * Use existing cairo api when rendering to a pixbuf
+ * Compile with -DGSEAL_ENABLE. Bug #27579
+
+Release 0.13.2 (0.14 Beta 1)
+
+ core:
+ * Improve Movie support
+ * Fix experimental Arthur backend to compile when if Splash backend is disable
+ * Fix usage of some streams in the Cairo backend
+ * Small improvements in the experimental Arthur backend
+ * Minor annotation improvements
+ * Rework LinkRendition to follow the spec
+ * Add support for Set-OCG-State actions
+ * Correctly initialize the grayscale softmask color in the Splash backend
+ * Correctly initialize actualText in TextOutputDev when initialization fails
+ * Various MSVC fixes
+
+ glib:
+ * Add support for Movie objects
+ * Add support for Screen annotations
+ * Add support for rendition actions
+ * Add support for OCG State actions
+ * Improvements to the demo
+
+ qt4:
+ * Always compile the experimental Arthur backend
+ * Minor speed improvement in QPainter usage
+ * Add a search overload that takes doubles instead of QRectF
+
+ cpp:
+ * Fix iconv usage
+ * use gmtime() when gmtime_r() is not available
+ * Fix building in autotools in windows
+ * {from,to}_utf_8() -> {from,to}_utf8()
+
+ build system:
+ * Multiple CMake build system fixes
+ * Fix of some DIST targets in autotools
+ * Make finding of Qt3 in autotools use pkg-config
+
+Release 0.13.1 (0.14 Alpha 2)
+
+ core:
+ * New C++ frontend to interface with Poppler using only STL
+ * Use the right matrix for the mask in drawMaskedImage in Cairo output device. Bug #16906
+ * Fix downscaling images when document is rotated in Cairo output device. Bug #26264
+ * GooVector rewrite, old version had "unknown" origins/license
+ * Fix use after free in a error condition
+ * Improve handling of broken commands. Bug #24575
+ * Fix potential use after free in Cairo output device.
+ * Fix regression in painting. Bug #26243
+ * Improve handling of FontConfig. Bug #26544
+ * Only assume the OC is not visible if it exists and is set to no. Bug #26532
+ * Fix a potential crash in Splash font handling on out of memory conditions
+ * Implement writeImgFile for splashModeXBGR8
+ * Several speed increases (around 40% in some documents) in the Splash output device
+ * Improve printing on the Cairo output device
+ * Do not use '\' character in PostScript names
+ * Omit writing of embedded fonts into temporary files in the Cairo output device. Bug #26694
+ * Improve filtering of some images in the Cairo output device. Bugs #25268, #9860
+
+ utils:
+ * pdftoppm: Only swap w with h if rotation is 90 or 270
+
+ build system:
+ * Add POPPLER_WITH_GDK in cmake build system. Bug #26247
+ * Fix typo: "MULTITHREAD" -> "MULTITHREADED in cmake build system
+ * Wrap #include <jpeglib.h> in extern "C" to fix build. Bug #26351
+ * Add the Win32-specific ENABLE_RELOCATABLE option to cmake build system
+ * Reflect that poppler-glib needs cairo now in cmake build system
+ * Use pkgconfig to detect libpng on autotools build system
+ * Detect the need for nanosleep in solaris in cmake build system. Bug #26650
+
+Release 0.13.0 (0.14 Alpha)
+
+ core:
+ * Improvements to Annotation rendering. Bug #23108
+ * Do not give an error when opening files without pages. Bug #24720
+ * Try to read streams without Length
+ * Do not crop the transformation matrix at an arbitrary value. Bug #25763
+ * Make poppler (optionally) relocatable on Windows
+ * Use a small object cache in GfxResources to cache GState objects
+ * Reduce the number of redundant pattern creations in the Cairo output device
+ * Use colToDbl() to avoid rounding error in the Cairo output device
+ * Fix problems with mask handling in the Cairo output device. Bug #8474
+ * Use a better scale down implementation in the Cairo output device
+ * Various optimizations to the Splash output device
+ * Add the possibility to use floats instead of doubles in the Splash output device. Bug #25578
+ * Write out fixed-content portion of Type 1 fonts in the PS output device
+
+ build system:
+ * Improvements to the CMake build system
+ * Enable AM_SILENT_RULES by default in autotools
+ * Require glib 2.18
+ * Require GTK+ 2.14
+ * Make fontconfig optional with mingw compiler
+ * Remove makefile.vc
+
+ glib:
+ * Add support for file attachment annotations
+ * Improvements to the demo
+ * Use TextOutputDev to get TextPage when we haven't rendered the page
+ * Remove support for the Splash output device
+
+ utils:
+ * pdftoppm can now write to jpeg
+ * pdftoppm embeds the correct resolution in png and jpeg files
+
+ qt4:
+ * Minor improvements to the tests
Release 0.12.3
diff --git a/Build/source/libs/poppler/poppler-0.12.4/README b/Build/source/libs/poppler/poppler-0.18.0/README
index e5b30a6d9ca..e5b30a6d9ca 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/README
+++ b/Build/source/libs/poppler/poppler-0.18.0/README
diff --git a/Build/source/libs/poppler/poppler-0.12.4/README-XPDF b/Build/source/libs/poppler/poppler-0.18.0/README-XPDF
index ff674a2a7b7..ff674a2a7b7 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.18.0/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.12.4/TODO b/Build/source/libs/poppler/poppler-0.18.0/TODO
index 2991be7e060..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/TODO
+++ b/Build/source/libs/poppler/poppler-0.18.0/TODO
@@ -16,13 +16,13 @@
- use Q_GLOBAL_STATIC for GlobalParams?
- use QSettings or another system for loading/saving Document/global settings?
- expose API for lcms/color management system
+ - make the ArthurOutputDev optional
* glib frontend:
- Sound/Movie actions support
- API to create annotations
* new frontends:
- - toolkit-agnostic C or C++ frontend
- Java/JNI-based frontend for Android
* cairo backend:
diff --git a/Build/source/libs/poppler/poppler-0.18.0/aclocal.m4 b/Build/source/libs/poppler/poppler-0.18.0/aclocal.m4
new file mode 100644
index 00000000000..33d6b62ddbd
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/aclocal.m4
@@ -0,0 +1,2161 @@
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# lib-link.m4 serial 21 (gettext-0.18)
+dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ([2.54])
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+ pushdef([Name],[translit([$1],[./-], [___])])
+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+ ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+ ])
+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+ LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ AC_SUBST([LIB]NAME[_PREFIX])
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+ popdef([NAME])
+ popdef([Name])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ AC_REQUIRE([AC_LIB_RPATH])
+ pushdef([Name],[translit([$1],[./-], [___])])
+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+ dnl accordingly.
+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+ dnl because if the user has installed lib[]Name and not disabled its use
+ dnl via --without-lib[]Name-prefix, he wants to use it.
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+ ac_save_LIBS="$LIBS"
+ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+ dnl because these -l options might require -L options that are present in
+ dnl LIBS. -l options benefit only from the -L options listed before it.
+ dnl Otherwise, add it to the front of LIBS, because it may be a static
+ dnl library that depends on another static library that is present in LIBS.
+ dnl Static libraries benefit only from the static libraries listed after
+ dnl it.
+ case " $LIB[]NAME" in
+ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+ *) LIBS="$LIB[]NAME $LIBS" ;;
+ esac
+ AC_TRY_LINK([$3], [$4],
+ [ac_cv_lib[]Name=yes],
+ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+ LIBS="$ac_save_LIBS"
+ ])
+ if test "$ac_cv_lib[]Name" = yes; then
+ HAVE_LIB[]NAME=yes
+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+ AC_MSG_CHECKING([how to link with lib[]$1])
+ AC_MSG_RESULT([$LIB[]NAME])
+ else
+ HAVE_LIB[]NAME=no
+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+ dnl $INC[]NAME either.
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LIB[]NAME=
+ LTLIB[]NAME=
+ LIB[]NAME[]_PREFIX=
+ fi
+ AC_SUBST([HAVE_LIB]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
+ AC_SUBST([LIB]NAME[_PREFIX])
+ popdef([NAME])
+ popdef([Name])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl acl_libext,
+dnl acl_shlibext,
+dnl acl_hardcode_libdir_flag_spec,
+dnl acl_hardcode_libdir_separator,
+dnl acl_hardcode_direct,
+dnl acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+ dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+ ])
+ wl="$acl_cv_wl"
+ acl_libext="$acl_cv_libext"
+ acl_shlibext="$acl_cv_shlibext"
+ acl_libname_spec="$acl_cv_libname_spec"
+ acl_library_names_spec="$acl_cv_library_names_spec"
+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ acl_hardcode_direct="$acl_cv_hardcode_direct"
+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ dnl Determine whether the user wants rpath handling at all.
+ AC_ARG_ENABLE([rpath],
+ [ --disable-rpath do not hardcode runtime library paths],
+ :, enable_rpath=yes)
+])
+
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ define([acl_frompackage_]NAME, [$2])
+ popdef([NAME])
+ pushdef([PACK],[$2])
+ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ define([acl_libsinpackage_]PACKUP,
+ m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+ popdef([PACKUP])
+ popdef([PACK])
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+ pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+ pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+ dnl Autoconf >= 2.61 supports dots in --with options.
+ pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_ARG_WITH(P_A_C_K[-prefix],
+[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
+ --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
+ && ! test -d "$withval/$acl_libdirstem"; then
+ additional_libdir="$withval/$acl_libdirstem2"
+ fi
+ fi
+ fi
+])
+ dnl Search the library and its dependencies in $additional_libdir and
+ dnl $LDFLAGS. Using breadth-first-seach.
+ LIB[]NAME=
+ LTLIB[]NAME=
+ INC[]NAME=
+ LIB[]NAME[]_PREFIX=
+ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+ dnl computed. So it has to be reset here.
+ HAVE_LIB[]NAME=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='$1 $2'
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+ dnl or AC_LIB_HAVE_LINKFLAGS call.
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+ else
+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+ dnl that this library doesn't exist. So just drop it.
+ :
+ fi
+ else
+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ dnl The same code as in the loop below:
+ dnl First look for a shared library.
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ dnl Then look for a static library.
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ dnl First look for a shared library.
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ dnl Then look for a static library.
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ dnl Found the library.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+ if test "$enable_rpath" = no \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+ if test "$acl_hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+ dnl resulting binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ dnl Rely on "-L$found_dir".
+ dnl But don't add it if it's already contained in the LDFLAGS
+ dnl or the already constructed $LIBNAME
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+ dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+ dnl here, because this doesn't fit in flags passed to the
+ dnl compiler. So give up. No hardcoding. This affects only
+ dnl very old systems.
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ dnl Linking with a static library.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+ else
+ dnl We shouldn't come here, but anyway it's good to have a
+ dnl fallback.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+ fi
+ fi
+ dnl Assume the include files are nearby.
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ if test "$name" = '$1'; then
+ LIB[]NAME[]_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ */$acl_libdirstem2 | */$acl_libdirstem2/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+ if test "$name" = '$1'; then
+ LIB[]NAME[]_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ dnl Potentially add $additional_includedir to $INCNAME.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 3. if it's already present in $CPPFLAGS or the already
+ dnl constructed $INCNAME,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INC[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ dnl Really add $additional_includedir to $INCNAME.
+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ dnl Look for dependencies.
+ if test -n "$found_la"; then
+ dnl Read the .la file. It defines the variables
+ dnl dlname, library_names, old_library, dependency_libs, current,
+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ dnl We use only dependency_libs.
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/lib,
+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 3. if it's already present in $LDFLAGS or the already
+ dnl constructed $LIBNAME,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LIBNAME.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIB[]NAME; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LTLIBNAME.
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ dnl Potentially add DIR to rpathdirs.
+ dnl The rpathdirs will be appended to $LIBNAME at the end.
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ dnl Potentially add DIR to ltrpathdirs.
+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ dnl Handle this in the next round.
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ dnl Handle this in the next round. Throw away the .la's
+ dnl directory; it is already contained in a preceding -L
+ dnl option.
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ dnl Most likely an immediate library name.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ dnl Didn't find the library; assume it is in the system directories
+ dnl known to the linker and runtime loader. (All the system
+ dnl directories known to the linker should also be known to the
+ dnl runtime loader, otherwise the system is severely misconfigured.)
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ dnl Weird platform: only the last -rpath option counts, the user must
+ dnl pass all path elements in one option. We can arrange that for a
+ dnl single library, but not when more than one $LIBNAMEs are used.
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+ else
+ dnl The -rpath options are cumulative.
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ dnl When using libtool, the option that works for both libraries and
+ dnl executables is -R. The -R options are cumulative.
+ for found_dir in $ltrpathdirs; do
+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+ done
+ fi
+ popdef([P_A_C_K])
+ popdef([PACKLIBS])
+ popdef([PACKUP])
+ popdef([PACK])
+ popdef([NAME])
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+ for element in [$2]; do
+ haveit=
+ for x in $[$1]; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ [$1]="${[$1]}${[$1]:+ }$element"
+ fi
+ done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+ AC_REQUIRE([AC_LIB_RPATH])
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+ $1=
+ if test "$enable_rpath" != no; then
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode directories into the resulting
+ dnl binary.
+ rpathdirs=
+ next=
+ for opt in $2; do
+ if test -n "$next"; then
+ dir="$next"
+ dnl No need to hardcode the standard /usr/lib.
+ if test "X$dir" != "X/usr/$acl_libdirstem" \
+ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next=
+ else
+ case $opt in
+ -L) next=yes ;;
+ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+ dnl No need to hardcode the standard /usr/lib.
+ if test "X$dir" != "X/usr/$acl_libdirstem" \
+ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ next= ;;
+ *) next= ;;
+ esac
+ fi
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n ""$3""; then
+ dnl libtool is used for linking. Use -R options.
+ for dir in $rpathdirs; do
+ $1="${$1}${$1:+ }-R$dir"
+ done
+ else
+ dnl The linker is used for linking directly.
+ if test -n "$acl_hardcode_libdir_separator"; then
+ dnl Weird platform: only the last -rpath option counts, the user
+ dnl must pass all path elements in one option.
+ alldirs=
+ for dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ $1="$flag"
+ else
+ dnl The -rpath options are cumulative.
+ for dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ $1="${$1}${$1:+ }$flag"
+ done
+ fi
+ fi
+ fi
+ fi
+ fi
+ AC_SUBST([$1])
+])
+
+# lib-prefix.m4 serial 7 (gettext-0.18)
+dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ AC_LIB_ARG_WITH([lib-prefix],
+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+ --without-lib-prefix don't search for libraries in includedir and libdir],
+[
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ fi
+ fi
+])
+ if test $use_additional = yes; then
+ dnl Potentially add $additional_includedir to $CPPFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/include,
+ dnl 2. if it's already present in $CPPFLAGS,
+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ for x in $CPPFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ dnl Really add $additional_includedir to $CPPFLAGS.
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ dnl Potentially add $additional_libdir to $LDFLAGS.
+ dnl But don't add it
+ dnl 1. if it's the standard /usr/lib,
+ dnl 2. if it's already present in $LDFLAGS,
+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
+ dnl 4. if it doesn't exist as a directory.
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+ haveit=
+ for x in $LDFLAGS; do
+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ dnl Really add $additional_libdir to $LDFLAGS.
+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+ dnl Unfortunately, prefix and exec_prefix get only finally determined
+ dnl at the end of configure.
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ $1
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
+dnl "lib" or "lib64" or "lib/64",
+dnl - a variable acl_libdirstem2, as a secondary possible value for
+dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
+dnl "lib/amd64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+ dnl There is no formal standard regarding lib and lib64.
+ dnl On glibc systems, the current practice is that on a system supporting
+ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
+ dnl the compiler's default mode by looking at the compiler's library search
+ dnl path. If at least one of its elements ends in /lib64 or points to a
+ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
+ dnl Otherwise we use the default, namely "lib".
+ dnl On Solaris systems, the current practice is that on a system supporting
+ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ acl_libdirstem=lib
+ acl_libdirstem2=
+ case "$host_os" in
+ solaris*)
+ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+ dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+ dnl symlink is missing, so we set acl_libdirstem2 too.
+ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+ [AC_EGREP_CPP([sixtyfour bits], [
+#ifdef _LP64
+sixtyfour bits
+#endif
+ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+ ])
+ if test $gl_cv_solaris_64bit = yes; then
+ acl_libdirstem=lib/64
+ case "$host_cpu" in
+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+ esac
+ fi
+ ;;
+ *)
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ */../ | */.. )
+ # Better ignore directories of this form. They are misleading.
+ ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+ ;;
+ esac
+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+])
+
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+#
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_default([$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+ ])
+elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ $3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 9
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 10
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+ fi
+ am__universal=false
+ m4_case([$1], [CC],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac],
+ [CXX],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
+
+# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+#serial 5
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+ done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+# Do all the work for Automake. -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 16
+
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.62])dnl
+dnl Autoconf wants to disallow AM_ names. We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Check to see how 'make' treats includes. -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 6
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
+
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# (`yes' being less verbose, `no' or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules],
+[ --enable-silent-rules less verbose build output (undo: `make V=1')
+ --disable-silent-rules verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no) AM_DEFAULT_VERBOSITY=1;;
+*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball. -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+# $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([m4/acx_pthread.m4])
+m4_include([m4/define-dir.m4])
+m4_include([m4/gtk-doc.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/introspection.m4])
+m4_include([m4/libjpeg.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
diff --git a/Build/source/libs/poppler/poppler-0.12.4/config.h.cmake b/Build/source/libs/poppler/poppler-0.18.0/config.h.cmake
index 7b57de094f9..cae2e71f18a 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.0/config.h.cmake
@@ -1,26 +1,39 @@
/* config.h. Generated from config.h.cmake by cmake. */
+/* Build against libcurl. */
+#cmakedefine ENABLE_LIBCURL 1
+
/* Use libjpeg instead of builtin jpeg decoder. */
#cmakedefine ENABLE_LIBJPEG 1
-/* Use zlib instead of builtin zlib decoder. */
-#cmakedefine ENABLE_ZLIB 1
+/* Use libopenjpeg instead of builtin jpeg2000 decoder. */
+#cmakedefine ENABLE_LIBOPENJPEG 1
-/* Use libpng to export images in pdftohtml. */
+/* Build against libtiff. */
+#cmakedefine ENABLE_LIBTIFF 1
+
+/* Build against libpng. */
#cmakedefine ENABLE_LIBPNG 1
-/* Use liblcms for color management. */
-#cmakedefine USE_CMS 1
+/* Do not hardcode the library location */
+#cmakedefine ENABLE_RELOCATABLE 1
+
+/* Use zlib instead of builtin zlib decoder. */
+#cmakedefine ENABLE_ZLIB 1
/* Use cairo for rendering. */
#cmakedefine HAVE_CAIRO 1
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
#cmakedefine HAVE_DIRENT_H 1
/* Define to 1 if you have the <dlfcn.h> header file. */
#cmakedefine HAVE_DLFCN_H 1
+/* Define to 1 if you have the <fcntl.h> header file. */
+#cmakedefine HAVE_FCNTL_H 1
+
/* Have FreeType2 include files */
#cmakedefine HAVE_FREETYPE_H 1
@@ -36,12 +49,24 @@
/* Defines if gettimeofday is available on your system */
#cmakedefine HAVE_GETTIMEOFDAY 1
+/* Defines if gmtime_r is available on your system */
+#cmakedefine HAVE_GMTIME_R 1
+
+/* Define if you have the iconv() function and it works. */
+#cmakedefine HAVE_ICONV 1
+
/* Define to 1 if you have the <inttypes.h> header file. */
#cmakedefine HAVE_INTTYPES_H 1
+/* Define to 1 if you have the `openjpeg' library (-lopenjpeg). */
+#cmakedefine HAVE_LIBOPENJPEG 1
+
/* Define to 1 if you have the `z' library (-lz). */
#cmakedefine HAVE_LIBZ 1
+/* Defines if localtime_r is available on your system */
+#cmakedefine HAVE_LOCALTIME_R 1
+
/* Define to 1 if you have the <memory.h> header file. */
#cmakedefine HAVE_MEMORY_H 1
@@ -54,9 +79,15 @@
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
#cmakedefine HAVE_NDIR_H 1
+/* Define to 1 if you have the <openjpeg.h> header file. */
+#cmakedefine HAVE_OPENJPEG_H 1
+
/* Define to 1 if you have the `popen' function. */
#cmakedefine HAVE_POPEN 1
+/* Define if you have POSIX threads libraries and header files. */
+#cmakedefine HAVE_PTHREAD 1
+
/* Use splash for rendering. */
#cmakedefine HAVE_SPLASH 1
@@ -72,10 +103,15 @@
/* Define to 1 if you have the <string.h> header file. */
#cmakedefine HAVE_STRING_H 1
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
#cmakedefine HAVE_SYS_DIR_H 1
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#cmakedefine HAVE_SYS_MMAN_H 1
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
#cmakedefine HAVE_SYS_NDIR_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */
@@ -90,8 +126,11 @@
/* Define to 1 if you have the <zlib.h> header file. */
#cmakedefine HAVE_ZLIB_H 1
-/* Define to 1 if gdk was found */
-#cmakedefine POPPLER_WITH_GDK 1
+/* Define to 1 if you have a big endian machine */
+#cmakedefine WORDS_BIGENDIAN 1
+
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST ${ICONV_CONST}
/* Enable multithreading support. */
#cmakedefine MULTITHREADED 1
@@ -103,7 +142,7 @@
#define PACKAGE "poppler"
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
+#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=poppler"
/* Define to the full name of this package. */
#define PACKAGE_NAME "poppler"
@@ -114,27 +153,42 @@
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "poppler"
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
#define PACKAGE_VERSION "${POPPLER_VERSION}"
/* Poppler data dir */
#define POPPLER_DATADIR "${CMAKE_INSTALL_PREFIX}/share/poppler"
+/* Support for curl based doc builder is compiled in. */
+#cmakedefine POPPLER_HAS_CURL_SUPPORT 1
+
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Enable word list support. */
#cmakedefine TEXTOUT_WORD_LIST 1
-/* Throw exceptions to deal with not enough memory and similar problems */
-#cmakedefine USE_EXCEPTIONS 1
+/* Defines if use cms */
+#cmakedefine USE_CMS 1
-/* Use fixed point arithmetic */
+/* Use fixed point arithmetic in the Splash backend */
#cmakedefine USE_FIXEDPOINT 1
+/* Use single precision arithmetic in the Splash backend */
+#cmakedefine USE_FLOAT 1
+
/* Version number of package */
#define VERSION "${POPPLER_VERSION}"
+/* Use fontconfig font configuration backend */
+#cmakedefine WITH_FONTCONFIGURATION_FONTCONFIG 1
+
+/* Use win32 font configuration backend */
+#cmakedefine WITH_FONTCONFIGURATION_WIN32 1
+
/* Define to 1 if the X Window System is missing or not being used. */
/* #undef X_DISPLAY_MISSING */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/config.h.in b/Build/source/libs/poppler/poppler-0.18.0/config.h.in
index 4eca14d88b9..6150ad72a08 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/config.h.in
@@ -1,7 +1,10 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-/* Whether cairo has blend modes support */
-#undef CAIRO_HAS_BLEND_MODES
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Build against libcurl. */
+#undef ENABLE_LIBCURL
/* Use libjpeg instead of builtin jpeg decoder. */
#undef ENABLE_LIBJPEG
@@ -12,6 +15,12 @@
/* Build against libpng. */
#undef ENABLE_LIBPNG
+/* Build against libtiff. */
+#undef ENABLE_LIBTIFF
+
+/* Do not hardcode the library location */
+#undef ENABLE_RELOCATABLE
+
/* Use zlib instead of builtin zlib decoder. */
#undef ENABLE_ZLIB
@@ -46,12 +55,18 @@
/* Defines if gmtime_r is available on your system */
#undef HAVE_GMTIME_R
+/* Define if you have the iconv() function and it works. */
+#undef HAVE_ICONV
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `openjpeg' library (-lopenjpeg). */
#undef HAVE_LIBOPENJPEG
+/* Define to 1 if you have the `tiff' library (-ltiff). */
+#undef HAVE_LIBTIFF
+
/* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ
@@ -111,12 +126,18 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if you have the <tiffio.h> header file. */
+#undef HAVE_TIFFIO_H
+
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the <zlib.h> header file. */
#undef HAVE_ZLIB_H
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
+
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
@@ -151,8 +172,8 @@
/* Poppler data dir */
#undef POPPLER_DATADIR
-/* Have GDK */
-#undef POPPLER_WITH_GDK
+/* Support for curl based doc builder is compiled in. */
+#undef POPPLER_HAS_CURL_SUPPORT
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -167,15 +188,33 @@
/* Defines if use cms */
#undef USE_CMS
-/* Throw exceptions to deal with not enough memory and similar problems */
-#undef USE_EXCEPTIONS
-
-/* Use fixed point arithmetic */
+/* Use fixed point arithmetic in the Splash backend */
#undef USE_FIXEDPOINT
+/* Use single precision arithmetic in the Splash backend */
+#undef USE_FLOAT
+
/* Version number of package */
#undef VERSION
+/* Use fontconfig font configuration backend */
+#undef WITH_FONTCONFIGURATION_FONTCONFIG
+
+/* Use win32 font configuration backend */
+#undef WITH_FONTCONFIGURATION_WIN32
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+# undef WORDS_BIGENDIAN
+# endif
+#endif
+
/* Define to 1 if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
diff --git a/Build/source/libs/poppler/poppler-0.12.4/configure b/Build/source/libs/poppler/poppler-0.18.0/configure
index b2cd9bf9d4b..2898d089882 100755
--- a/Build/source/libs/poppler/poppler-0.12.4/configure
+++ b/Build/source/libs/poppler/poppler-0.18.0/configure
@@ -1,13 +1,15 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for poppler 0.12.4.
+# Generated by GNU Autoconf 2.68 for poppler 0.18.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>.
#
+#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
# Foundation, Inc.
#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## -------------------- ##
@@ -89,6 +91,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -171,7 +174,15 @@ test x\$exitcode = x0 || exit 1"
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
+test \$(( 1 + 1 )) = 2 || exit 1
+
+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
else
@@ -214,11 +225,18 @@ IFS=$as_save_IFS
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
+ # Preserve -v and -x to the replacement shell.
BASH_ENV=/dev/null
ENV=/dev/null
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+ esac
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -318,7 +336,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -358,19 +376,19 @@ else
fi # as_fn_arith
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -527,160 +545,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-case X$lt_ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
- ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X$1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
- # Yippee, $ECHO works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<_LT_EOF
-$*
-_LT_EOF
- exit 0
-fi
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
- then
- break
- fi
- done
- fi
-
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
- else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$ECHO" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- ECHO='print -r'
- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
- else
- # Try using printf.
- ECHO='printf %s\n'
- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- ECHO="$CONFIG_SHELL $0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
-
- if test "$prev" != 'sed 50q "$0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
- else
- # Oops. We lost completely, so just stick with echo.
- ECHO=echo
- fi
- fi
- fi
- fi
- fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -699,8 +571,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='poppler'
PACKAGE_TARNAME='poppler'
-PACKAGE_VERSION='0.12.4'
-PACKAGE_STRING='poppler 0.12.4'
+PACKAGE_VERSION='0.18.0'
+PACKAGE_STRING='poppler 0.18.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler'
PACKAGE_URL=''
@@ -744,6 +616,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+POPPLER_VERSION
POPPLER_MICRO_VERSION
POPPLER_MINOR_VERSION
POPPLER_MAJOR_VERSION
@@ -755,14 +628,14 @@ LCMS_LIBS
LCMS_CFLAGS
BUILD_UTILS_FALSE
BUILD_UTILS_TRUE
-BUILD_ABIWORD_OUTPUT_FALSE
-BUILD_ABIWORD_OUTPUT_TRUE
-ABIWORD_LIBS
-ABIWORD_CFLAGS
BUILD_GTK_TEST_FALSE
BUILD_GTK_TEST_TRUE
GTK_TEST_LIBS
GTK_TEST_CFLAGS
+BUILD_POPPLER_CPP_FALSE
+BUILD_POPPLER_CPP_TRUE
+LTLIBICONV
+LIBICONV
BUILD_POPPLER_QT4_FALSE
BUILD_POPPLER_QT4_TRUE
MOCQT4
@@ -771,26 +644,36 @@ POPPLER_QT4_TEST_LIBS
POPPLER_QT4_TEST_CFLAGS
POPPLER_QT4_LIBS
POPPLER_QT4_CFLAGS
-BUILD_POPPLER_QT_FALSE
-BUILD_POPPLER_QT_TRUE
-POPPLER_QT_LIBS
-POPPLER_QT_CXXFLAGS
-POPPLER_GLIB_DISABLE_SINGLE_INCLUDES
-POPPLER_GLIB_DISABLE_DEPRECATED
-GDK_FEATURE
-BUILD_WITH_GDK_FALSE
-BUILD_WITH_GDK_TRUE
-GDK_LIBS
-GDK_CFLAGS
+GTK_DOC_USE_REBASE_FALSE
+GTK_DOC_USE_REBASE_TRUE
GTK_DOC_USE_LIBTOOL_FALSE
GTK_DOC_USE_LIBTOOL_TRUE
+GTK_DOC_BUILD_PDF_FALSE
+GTK_DOC_BUILD_PDF_TRUE
+GTK_DOC_BUILD_HTML_FALSE
+GTK_DOC_BUILD_HTML_TRUE
ENABLE_GTK_DOC_FALSE
ENABLE_GTK_DOC_TRUE
-GTKDOC_CHECK
HTML_DIR
+GTKDOC_MKPDF
+GTKDOC_REBASE
+GTKDOC_CHECK
+POPPLER_GLIB_DISABLE_SINGLE_INCLUDES
+POPPLER_GLIB_DISABLE_DEPRECATED
+GLIB_REQ
BUILD_POPPLER_GLIB_FALSE
BUILD_POPPLER_GLIB_TRUE
GLIB_MKENUMS
+HAVE_INTROSPECTION_FALSE
+HAVE_INTROSPECTION_TRUE
+INTROSPECTION_MAKEFILE
+INTROSPECTION_LIBS
+INTROSPECTION_CFLAGS
+INTROSPECTION_TYPELIBDIR
+INTROSPECTION_GIRDIR
+INTROSPECTION_GENERATE
+INTROSPECTION_COMPILER
+INTROSPECTION_SCANNER
POPPLER_GLIB_LIBS
POPPLER_GLIB_CFLAGS
CAIRO_REQ
@@ -802,6 +685,8 @@ CAIRO_CFLAGS
CAIRO_VERSION
BUILD_SPLASH_OUTPUT_FALSE
BUILD_SPLASH_OUTPUT_TRUE
+BUILD_WITH_WIN32_FONTCONFIGURATION_FALSE
+BUILD_WITH_WIN32_FONTCONFIGURATION_TRUE
FONTCONFIG_LIBS
FONTCONFIG_CFLAGS
FREETYPE_CONFIG
@@ -810,12 +695,20 @@ FREETYPE_CFLAGS
BUILD_LIBPNG_FALSE
BUILD_LIBPNG_TRUE
LIBPNG_LIBS
+LIBPNG_CFLAGS
BUILD_LIBJPEG_FALSE
BUILD_LIBJPEG_TRUE
LIBJPEG_LIBS
+BUILD_LIBCURL_FALSE
+BUILD_LIBCURL_TRUE
+LIBCURL_LIBS
+LIBCURL_CFLAGS
BUILD_ZLIB_FALSE
BUILD_ZLIB_TRUE
ZLIB_LIBS
+BUILD_LIBTIFF_FALSE
+BUILD_LIBTIFF_TRUE
+LIBTIFF_LIBS
BUILD_LIBOPENJPEG_FALSE
BUILD_LIBOPENJPEG_TRUE
LIBOPENJPEG_LIBS
@@ -834,6 +727,8 @@ acx_pthread_config
auto_import_flags
create_shared_lib
win32_libs
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
PKG_CONFIG
CXXCPP
am__fastdepCXX_FALSE
@@ -842,14 +737,14 @@ CXXDEPMODE
ac_ct_CXX
CXXFLAGS
CXX
-CPP
OTOOL64
OTOOL
LIPO
NMEDIT
DSYMUTIL
-lt_ECHO
+MANIFEST_TOOL
RANLIB
+ac_ct_AR
AR
LN_S
NM
@@ -857,9 +752,22 @@ ac_ct_DUMPBIN
DUMPBIN
LD
FGREP
+SED
+LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
EGREP
GREP
-SED
+CPP
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
@@ -876,18 +784,6 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
-LIBTOOL
-OBJDUMP
-DLLTOOL
-AS
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
am__untar
@@ -955,32 +851,39 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_silent_rules
+enable_dependency_tracking
enable_shared
enable_static
with_pic
enable_fast_install
-enable_dependency_tracking
with_gnu_ld
+with_sysroot
enable_libtool_lock
enable_xpdf_headers
+enable_single_precision
enable_fixedpoint
+enable_relocatable
with_x
-enable_exceptions
enable_libopenjpeg
+enable_libtiff
enable_largefile
enable_zlib
+enable_libcurl
enable_libjpeg
enable_libpng
+with_font_configuration
enable_splash_output
enable_cairo_output
enable_poppler_glib
+enable_introspection
with_html_dir
enable_gtk_doc
-enable_gdk
-enable_poppler_qt
+enable_gtk_doc_html
+enable_gtk_doc_pdf
enable_poppler_qt4
+enable_poppler_cpp
+with_libiconv_prefix
enable_gtk_test
-enable_abiword_output
enable_utils
enable_compile_warnings
enable_cms
@@ -999,7 +902,13 @@ CXXFLAGS
CCC
CXXCPP
PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
XMKMF
+LIBCURL_CFLAGS
+LIBCURL_LIBS
+LIBPNG_CFLAGS
+LIBPNG_LIBS
FREETYPE_CFLAGS
FREETYPE_LIBS
FONTCONFIG_CFLAGS
@@ -1008,16 +917,12 @@ CAIRO_CFLAGS
CAIRO_LIBS
POPPLER_GLIB_CFLAGS
POPPLER_GLIB_LIBS
-GDK_CFLAGS
-GDK_LIBS
POPPLER_QT4_CFLAGS
POPPLER_QT4_LIBS
POPPLER_QT4_TEST_CFLAGS
POPPLER_QT4_TEST_LIBS
GTK_TEST_CFLAGS
GTK_TEST_LIBS
-ABIWORD_CFLAGS
-ABIWORD_LIBS
LCMS_CFLAGS
LCMS_LIBS'
@@ -1082,8 +987,9 @@ do
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1128,7 +1034,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1154,7 +1060,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1358,7 +1264,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1374,7 +1280,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1404,8 +1310,8 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
@@ -1413,7 +1319,7 @@ Try \`$0 --help' for more information."
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1423,7 +1329,7 @@ Try \`$0 --help' for more information."
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
esac
@@ -1431,13 +1337,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error "missing argument to $ac_option"
+ as_fn_error $? "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1460,7 +1366,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1474,8 +1380,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1490,9 +1396,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error "working directory cannot be determined"
+ as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error "pwd does not report name of working directory"
+ as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1531,11 +1437,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1561,7 +1467,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 0.12.4 to adapt to many kinds of systems.
+\`configure' configures poppler 0.18.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1575,7 +1481,7 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1635,7 +1541,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler 0.12.4:";;
+ short | recursive ) echo "Configuration of poppler 0.18.0:";;
esac
cat <<\_ACEOF
@@ -1645,31 +1551,35 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-silent-rules less verbose build output (undo: `make V=1')
--disable-silent-rules verbose build output (undo: `make V=0')
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-xpdf-headers Install unsupported xpdf headers.
- --enable-fixedpoint use fixed point (instead of floating point) arithmetic
- --enable-exceptions use C++ exceptions
+ --enable-single-precision use single precision arithmetic (instead of double precision) in the Splash backend
+ --enable-fixedpoint use fixed point (instead of double precision) arithmetic in the Splash backend
+ --disable-relocatable Hardcode the poppler library location (on Windows).
--disable-libopenjpeg Don't build against libopenjpeg.
+ --disable-libtiff Don't build against libtiff.
--disable-largefile omit support for large files
--enable-zlib Build with zlib
+ --enable-libcurl Build with libcurl based HTTP support.
--disable-libjpeg Don't build against libjpeg.
- --disable-libpng Don't build against libpng.
+ --disable-libpng Do not build against libpng.
--disable-splash-output Don't build the Splash graphics backend.
--disable-cairo-output Don't build the cairo graphics backend.
--disable-poppler-glib Don't compile poppler glib wrapper.
- --enable-gtk-doc use gtk-doc to build documentation [default=no]
- --disable-gdk Compile without gdk.
- --disable-poppler-qt Don't compile poppler qt wrapper.
+ --enable-introspection=[no/auto/yes]
+ Enable introspection for this build
+ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
+ --enable-gtk-doc-html build documentation in html format [[default=yes]]
+ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
--disable-poppler-qt4 Don't compile poppler Qt4 wrapper.
+ --disable-poppler-cpp Don't compile poppler cpp wrapper.
--disable-gtk-test Don't compile GTK+ test program.
- --disable-abiword-output
- Don't build the abiword backend.
--disable-utils Don't compile poppler command line utils.
--enable-compile-warnings=[no/yes/kde]
Turn on compiler warnings.
@@ -1682,8 +1592,14 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-sysroot=DIR Search for dependent libraries within DIR
+ (or the compiler's sysroot if not specified).
--with-x use the X Window System
+ --with-font-configuration=fontconfig|win32
+ Select font configuration backend
--with-html-dir=PATH path to installed docs
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir
Some influential environment variables:
CC C compiler command
@@ -1691,14 +1607,25 @@ Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
CXX C++ compiler command
CXXFLAGS C++ compiler flags
CXXCPP C++ preprocessor
PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
XMKMF Path to xmkmf, Makefile generator for X Window System
+ LIBCURL_CFLAGS
+ C compiler flags for LIBCURL, overriding pkg-config
+ LIBCURL_LIBS
+ linker flags for LIBCURL, overriding pkg-config
+ LIBPNG_CFLAGS
+ C compiler flags for LIBPNG, overriding pkg-config
+ LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config
FREETYPE_CFLAGS
C compiler flags for FREETYPE, overriding pkg-config
FREETYPE_LIBS
@@ -1714,8 +1641,6 @@ Some influential environment variables:
C compiler flags for POPPLER_GLIB, overriding pkg-config
POPPLER_GLIB_LIBS
linker flags for POPPLER_GLIB, overriding pkg-config
- GDK_CFLAGS C compiler flags for GDK, overriding pkg-config
- GDK_LIBS linker flags for GDK, overriding pkg-config
POPPLER_QT4_CFLAGS
C compiler flags for POPPLER_QT4, overriding pkg-config
POPPLER_QT4_LIBS
@@ -1728,10 +1653,6 @@ Some influential environment variables:
C compiler flags for GTK_TEST, overriding pkg-config
GTK_TEST_LIBS
linker flags for GTK_TEST, overriding pkg-config
- ABIWORD_CFLAGS
- C compiler flags for ABIWORD, overriding pkg-config
- ABIWORD_LIBS
- linker flags for ABIWORD, overriding pkg-config
LCMS_CFLAGS C compiler flags for LCMS, overriding pkg-config
LCMS_LIBS linker flags for LCMS, overriding pkg-config
@@ -1801,10 +1722,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler configure 0.12.4
-generated by GNU Autoconf 2.64
+poppler configure 0.18.0
+generated by GNU Autoconf 2.68
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1848,18 +1769,18 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -1867,7 +1788,48 @@ case "(($ac_try" in
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
ac_status=$?
if test -s conftest.err; then
grep -v '^ *+' conftest.err >conftest.er1
@@ -1875,29 +1837,21 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
+ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
}; then :
ac_retval=0
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
+ ac_retval=1
fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-} # ac_fn_c_try_link
+} # ac_fn_c_try_cpp
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
@@ -1908,7 +1862,7 @@ ac_fn_c_check_header_compile ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1926,24 +1880,25 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ (eval "$ac_link") 2>conftest.err
ac_status=$?
if test -s conftest.err; then
grep -v '^ *+' conftest.err >conftest.er1
@@ -1951,63 +1906,29 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
}; then :
ac_retval=0
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1
-fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
+ ac_retval=1
fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-} # ac_fn_c_try_run
+} # ac_fn_c_try_link
# ac_fn_c_check_func LINENO FUNC VAR
# ----------------------------------
@@ -2017,7 +1938,7 @@ ac_fn_c_check_func ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2072,7 +1993,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_func
@@ -2109,8 +2030,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_cxx_try_compile
@@ -2135,7 +2056,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } >/dev/null && {
+ test $ac_status = 0; } > conftest.i && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
}; then :
@@ -2146,8 +2067,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_cxx_try_cpp
@@ -2192,90 +2113,23 @@ fi
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
} # ac_fn_cxx_try_link
-# ac_fn_cxx_check_func LINENO FUNC VAR
-# ------------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_cxx_check_func ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_cxx_check_func
-
-# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
-# ---------------------------------------------------------
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
# the include files in INCLUDES and setting the cache variable VAR
# accordingly.
-ac_fn_cxx_check_header_mongrel ()
+ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval \${$3+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2290,7 +2144,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
$4
#include <$2>
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
ac_header_compiler=yes
else
ac_header_compiler=no
@@ -2306,17 +2160,17 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <$2>
_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"; then :
ac_header_preproc=yes
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
yes:no: )
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -2334,17 +2188,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ------------------------------------------------------------------------- ##
+( $as_echo "## ------------------------------------------------------------------------- ##
## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=poppler ##
-## ------------------------------------------------------------------------- ##
-_ASBOX
+## ------------------------------------------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2353,22 +2205,135 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-} # ac_fn_cxx_check_header_mongrel
+} # ac_fn_c_check_header_mongrel
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
+# ac_fn_cxx_check_decl LINENO SYMBOL VAR INCLUDES
+# -----------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_cxx_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+ (void) $as_decl_use;
+#else
+ (void) $as_decl_name;
+#endif
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_decl
+
+# ac_fn_cxx_check_func LINENO FUNC VAR
+# ------------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_cxx_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_func
+
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
# the include files in INCLUDES and setting the cache variable VAR
# accordingly.
-ac_fn_c_check_header_mongrel ()
+ac_fn_cxx_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ if eval \${$3+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -2383,7 +2348,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
$4
#include <$2>
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_header_compiler=yes
else
ac_header_compiler=no
@@ -2399,17 +2364,17 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <$2>
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
ac_header_preproc=yes
else
ac_header_preproc=no
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
yes:no: )
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -2427,17 +2392,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ------------------------------------------------------------------------- ##
+( $as_echo "## ------------------------------------------------------------------------- ##
## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=poppler ##
-## ------------------------------------------------------------------------- ##
-_ASBOX
+## ------------------------------------------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -2446,15 +2409,15 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-} # ac_fn_c_check_header_mongrel
+} # ac_fn_cxx_check_header_mongrel
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 $as_me 0.12.4, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+It was created by poppler $as_me 0.18.0, which was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2564,11 +2527,9 @@ trap 'exit_status=$?
{
echo
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -2602,11 +2563,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
- cat <<\_ASBOX
-## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
@@ -2619,11 +2578,9 @@ _ASBOX
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
+ $as_echo "## ------------------- ##
## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
@@ -2637,11 +2594,9 @@ _ASBOX
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
echo
cat confdefs.h
echo
@@ -2696,7 +2651,12 @@ _ACEOF
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- ac_site_file1=$CONFIG_SITE
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -2707,18 +2667,22 @@ fi
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
fi
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -2787,7 +2751,7 @@ if $ac_cache_corrupted; then
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -2805,16 +2769,22 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- for ac_t in install-sh install.sh shtool; do
- if test -f "$ac_dir/$ac_t"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/$ac_t -c"
- break 2
- fi
- done
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2843,7 +2813,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2930,11 +2900,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2956,7 +2926,7 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -2966,7 +2936,7 @@ then
# Ok.
:
else
- as_fn_error "newly created file is older than distributed files!
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3020,7 +2990,7 @@ if test "$cross_compiling" != no; then
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -3060,7 +3030,7 @@ if test -z "$ac_cv_prog_STRIP"; then
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -3113,7 +3083,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then :
+ if ${ac_cv_path_mkdir+:} false; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3138,6 +3108,7 @@ IFS=$as_save_IFS
fi
+ test -d ./--version && rmdir ./--version
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
@@ -3145,7 +3116,6 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -3164,7 +3134,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -3204,7 +3174,7 @@ done
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -3212,7 +3182,7 @@ SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3246,7 +3216,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
@@ -3262,7 +3232,7 @@ fi
# Define the identity of the package.
PACKAGE='poppler'
- VERSION='0.12.4'
+ VERSION='0.18.0'
cat >>confdefs.h <<_ACEOF
@@ -3310,7 +3280,7 @@ fi
case $enable_silent_rules in
yes) AM_DEFAULT_VERBOSITY=0;;
no) AM_DEFAULT_VERBOSITY=1;;
-*) AM_DEFAULT_VERBOSITY=1;;
+*) AM_DEFAULT_VERBOSITY=0;;
esac
AM_BACKSLASH='\'
@@ -3318,407 +3288,6 @@ ac_config_headers="$ac_config_headers config.h"
ac_config_headers="$ac_config_headers poppler/poppler-config.h"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
-else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AS+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$AS"; then
- ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AS="${ac_tool_prefix}as"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AS"; then
- ac_ct_AS=$AS
- # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_AS"; then
- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AS="as"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-$as_echo "$ac_ct_AS" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_AS" = x; then
- AS="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- AS=$ac_ct_AS
- fi
-else
- AS="$ac_cv_prog_AS"
-fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$DLLTOOL"; then
- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
- ac_ct_DLLTOOL=$DLLTOOL
- # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_DLLTOOL"; then
- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_DLLTOOL" = x; then
- DLLTOOL="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- DLLTOOL=$ac_ct_DLLTOOL
- fi
-else
- DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$OBJDUMP"; then
- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
- ac_ct_OBJDUMP=$OBJDUMP
- # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_OBJDUMP"; then
- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_OBJDUMP="objdump"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_OBJDUMP" = x; then
- OBJDUMP="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- OBJDUMP=$ac_ct_OBJDUMP
- fi
-else
- OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
- ;;
-esac
-
-test -z "$AS" && AS=as
-
-
-
-
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-case `pwd` in
- *\ * | *\ *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.2.6'
-macro_revision='1.3012'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -3791,7 +3360,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3831,7 +3400,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -3884,7 +3453,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3924,7 +3493,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -3983,7 +3552,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4027,7 +3596,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4081,8 +3650,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4103,32 +3672,30 @@ $as_echo "$ac_try_echo"; } >&5
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdio.h>
+
int
main ()
{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -4190,62 +3757,28 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
else
ac_file=''
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
if { { ac_try="$ac_link"
@@ -4275,19 +3808,78 @@ done
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4327,8 +3919,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -4338,7 +3930,7 @@ OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4375,7 +3967,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4453,7 +4045,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -4552,7 +4144,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4675,91 +4267,148 @@ else
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if ${ac_cv_prog_CPP+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
- for ac_i in 1 2 3 4 5 6 7; do
- ac_script="$ac_script$as_nl$ac_script"
- done
- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
- { ac_script=; unset ac_script;}
- if test -z "$SED"; then
- ac_path_SED_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
- # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo '' >> "conftest.nl"
- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_SED_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_SED="$ac_path_SED"
- ac_path_SED_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
- $ac_path_SED_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_SED"; then
- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
- fi
else
- ac_cv_path_SED=$SED
+ # Broken: fails on valid input.
+continue
fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
- rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
+rm -f conftest.err conftest.i conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
+ done
+ ac_cv_prog_CPP=$CPP
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -4808,7 +4457,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -4822,7 +4471,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4874,7 +4523,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
@@ -4887,9 +4536,914 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_c_bigendian=unknown
+ # See if we're dealing with a universal compiler.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __APPLE_CC__
+ not a universal capable compiler
+ #endif
+ typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+ # Check for potential -arch flags. It is not universal unless
+ # there are at least two -arch flags with different values.
+ ac_arch=
+ ac_prev=
+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+ if test -n "$ac_prev"; then
+ case $ac_word in
+ i?86 | x86_64 | ppc | ppc64)
+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+ ac_arch=$ac_word
+ else
+ ac_cv_c_bigendian=universal
+ break
+ fi
+ ;;
+ esac
+ ac_prev=
+ elif test "x$ac_word" = "x-arch"; then
+ ac_prev=arch
+ fi
+ done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+ && LITTLE_ENDIAN)
+ bogus endian macros
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ #include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
+else
+ ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+ bogus endian macros
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ # It does; now see whether it defined to _BIG_ENDIAN or not.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+ not big endian
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_bigendian=yes
+else
+ ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test $ac_cv_c_bigendian = unknown; then
+ # Compile a test program.
+ if test "$cross_compiling" = yes; then :
+ # Try to guess by grepping values from an object file.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+short int ascii_mm[] =
+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+ short int ascii_ii[] =
+ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ int use_ascii (int i) {
+ return ascii_mm[i] + ascii_ii[i];
+ }
+ short int ebcdic_ii[] =
+ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+ short int ebcdic_mm[] =
+ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ int use_ebcdic (int i) {
+ return ebcdic_mm[i] + ebcdic_ii[i];
+ }
+ extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+ ac_cv_c_bigendian=yes
+ fi
+ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+ if test "$ac_cv_c_bigendian" = unknown; then
+ ac_cv_c_bigendian=no
+ else
+ # finding both strings is unlikely to happen, but who knows?
+ ac_cv_c_bigendian=unknown
+ fi
+ fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+
+ /* Are we little or big endian? From Harbison&Steele. */
+ union
+ {
+ long int l;
+ char c[sizeof (long int)];
+ } u;
+ u.l = 1;
+ return u.c[sizeof (long int) - 1] == 1;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ ac_cv_c_bigendian=no
+else
+ ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+ yes)
+ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+ no)
+ ;; #(
+ universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+ ;; #(
+ *)
+ as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
+else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AS"; then
+ ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AS="${ac_tool_prefix}as"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+ ac_ct_AS=$AS
+ # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AS"; then
+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AS="as"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_AS" = x; then
+ AS="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AS=$ac_ct_AS
+ fi
+else
+ AS="$ac_cv_prog_AS"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DLLTOOL=$ac_ct_DLLTOOL
+ fi
+else
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OBJDUMP=$ac_ct_OBJDUMP
+ fi
+else
+ OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+ ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+case `pwd` in
+ *\ * | *\ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4'
+macro_revision='1.3293'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
+else
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO ""
+}
+
+case "$ECHO" in
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ { ac_script=; unset ac_script;}
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_SED_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+else
+ ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
+if ${ac_cv_path_FGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -4941,7 +5495,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
@@ -5020,7 +5574,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then :
+if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -5057,10 +5611,10 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+if ${lt_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -5087,7 +5641,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
+if ${lt_cv_path_NM+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
@@ -5140,14 +5694,17 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$ac_tool_prefix"; then
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
@@ -5185,13 +5742,13 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
- for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ for ac_prog in dumpbin "link -dump"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
@@ -5240,6 +5797,15 @@ esac
fi
fi
+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
@@ -5254,18 +5820,18 @@ test -z "$NM" && NM=nm
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
+if ${lt_cv_nm_interface+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5262: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5265: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5268: output\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5289,7 +5855,7 @@ fi
# find the maximum length of command line arguments
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
@@ -5322,6 +5888,11 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
@@ -5386,8 +5957,8 @@ else
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
@@ -5429,8 +6000,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,, \
+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+ = c,a/b,b/c, \
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -5479,9 +6050,83 @@ esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+ ;;
+ esac
+ ;;
+ *-*-cygwin* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+ ;;
+ esac
+ ;;
+ * ) # unhandled hosts (and "normal" native builds)
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ esac
+ ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
+if ${lt_cv_ld_reload_flag+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
@@ -5495,6 +6140,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ if test "$GCC" != yes; then
+ reload_cmds=false
+ fi
+ ;;
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -5517,7 +6167,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
@@ -5557,7 +6207,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
set dummy objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
@@ -5613,7 +6263,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
+if ${lt_cv_deplibs_check_method+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -5655,16 +6305,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- if ( file / ) >/dev/null 2>&1; then
+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
-cegcc)
+cegcc*)
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -5694,6 +6346,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
@@ -5702,11 +6358,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
@@ -5728,11 +6384,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -5809,6 +6465,21 @@ esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+ case $host_os in
+ mingw* | pw32*)
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+ want_nocaseglob=yes
+ else
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+ fi
+ ;;
+ esac
+fi
+
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -5824,12 +6495,162 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DLLTOOL=$ac_ct_DLLTOOL
+ fi
+else
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+ # two different shell functions defined in ltmain.sh
+ # decide which to use based on capabilities of $DLLTOOL
+ case `$DLLTOOL --help 2>&1` in
+ *--identify-strict*)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+ ;;
+ *)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+ ;;
+ esac
+ ;;
+*)
+ # fallback: assume linklib IS sharedlib
+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+ for ac_prog in ar
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -5842,7 +6663,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -5862,14 +6683,18 @@ $as_echo "no" >&6; }
fi
+ test -n "$AR" && break
+ done
fi
-if test -z "$ac_cv_prog_AR"; then
+if test -z "$AR"; then
ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+ for ac_prog in ar
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
@@ -5882,7 +6707,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
+ ac_cv_prog_ac_ct_AR="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -5901,6 +6726,10 @@ else
$as_echo "no" >&6; }
fi
+
+ test -n "$ac_ct_AR" && break
+done
+
if test "x$ac_ct_AR" = x; then
AR="false"
else
@@ -5912,12 +6741,10 @@ ac_tool_warned=yes ;;
esac
AR=$ac_ct_AR
fi
-else
- AR="$ac_cv_prog_AR"
fi
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
+: ${AR=ar}
+: ${AR_FLAGS=cru}
@@ -5929,12 +6756,70 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ar_at_file=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ echo conftest.$ac_objext > conftest.lst
+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+ (eval $lt_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -eq 0; then
+ # Ensure the archiver fails upon bogus file names.
+ rm -f conftest.$ac_objext libconftest.a
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+ (eval $lt_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -ne 0; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+ rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+ archiver_list_spec=
+else
+ archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -5974,7 +6859,7 @@ if test -z "$ac_cv_prog_STRIP"; then
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -6033,7 +6918,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -6073,7 +6958,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -6144,6 +7029,18 @@ if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
@@ -6190,7 +7087,7 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -6251,8 +7148,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -6288,6 +7185,7 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -6313,8 +7211,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
@@ -6329,6 +7227,18 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data. */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -6340,7 +7250,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
-const struct {
+LT_DLSYM_CONST struct {
const char *name;
void *address;
}
@@ -6366,8 +7276,8 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -6377,8 +7287,8 @@ _LT_EOF
test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
+ LIBS=$lt_globsym_save_LIBS
+ CFLAGS=$lt_globsym_save_CFLAGS
else
echo "cannot find nm_test_func in $nlist" >&5
fi
@@ -6415,6 +7325,19 @@ else
$as_echo "ok" >&6; }
fi
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+ nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
@@ -6435,6 +7358,41 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+ withval=$with_sysroot;
+else
+ with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+ if test "$GCC" = yes; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+ /*)
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+ ;; #(
+ no|'')
+ ;; #(
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+ ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
# Check whether --enable-libtool-lock was given.
@@ -6468,7 +7426,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6471 "configure"' > conftest.$ac_ext
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6562,7 +7520,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
+if ${lt_cv_cc_needs_belf+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_ext=c
@@ -6630,6 +7588,123 @@ esac
need_locks="$enable_libtool_lock"
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$MANIFEST_TOOL"; then
+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+ # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_MANIFEST_TOOL"; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
+ MANIFEST_TOOL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+ fi
+else
+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_path_mainfest_tool=no
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+ cat conftest.err >&5
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+ MANIFEST_TOOL=:
+fi
+
+
+
+
+
case $host_os in
rhapsody* | darwin*)
@@ -6638,7 +7713,7 @@ need_locks="$enable_libtool_lock"
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
@@ -6678,7 +7753,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
set dummy dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
@@ -6730,7 +7805,7 @@ fi
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
@@ -6770,7 +7845,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
set dummy nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
@@ -6822,7 +7897,7 @@ fi
set dummy ${ac_tool_prefix}lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
+if ${ac_cv_prog_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
@@ -6862,7 +7937,7 @@ if test -z "$ac_cv_prog_LIPO"; then
set dummy lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
@@ -6914,7 +7989,7 @@ fi
set dummy ${ac_tool_prefix}otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
+if ${ac_cv_prog_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
@@ -6954,7 +8029,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
set dummy otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
@@ -7006,7 +8081,7 @@ fi
set dummy ${ac_tool_prefix}otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
@@ -7046,7 +8121,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
set dummy otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
@@ -7121,7 +8196,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
@@ -7150,7 +8225,7 @@ fi
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
@@ -7180,6 +8255,38 @@ rm -f core conftest.err conftest.$ac_objext \
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+ echo "$AR cru libconftest.a conftest.o" >&5
+ $AR cru libconftest.a conftest.o 2>&5
+ echo "$RANLIB libconftest.a" >&5
+ $RANLIB libconftest.a 2>&5
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -7207,7 +8314,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- if test "$DSYMUTIL" != ":"; then
+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -7215,279 +8322,11 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
;;
esac
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
-
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
for ac_header in dlfcn.h
do :
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
_ACEOF
@@ -7498,6 +8337,8 @@ done
+
+
# Set options
@@ -7648,6 +8489,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
test -z "$LN_S" && LN_S="ln -s"
@@ -7669,7 +8511,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
+if ${lt_cv_objdir+:} false; then :
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
@@ -7697,19 +8539,6 @@ _ACEOF
-
-
-
-
-
-
-
-
-
-
-
-
-
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
@@ -7722,23 +8551,6 @@ aix3*)
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
# Global variables:
ofile=libtool
can_build_shared=yes
@@ -7767,7 +8579,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
# Only perform the check for file, if the check method requires it
@@ -7777,7 +8589,7 @@ file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -7843,7 +8655,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
@@ -7976,11 +8788,16 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ case $cc_basename in
+ nvcc*)
+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+ *)
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
@@ -7996,15 +8813,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7999: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8003: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
@@ -8033,8 +8850,6 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
@@ -8082,6 +8897,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fno-common'
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ lt_prog_compiler_static=
+ ;;
+
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -8124,6 +8945,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fPIC'
;;
esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ lt_prog_compiler_wl='-Xlinker '
+ lt_prog_compiler_pic='-Xcompiler -fPIC'
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
@@ -8165,7 +8993,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -8186,7 +9014,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
- pgcc* | pgf77* | pgf90* | pgf95*)
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
@@ -8198,25 +9032,25 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
- xl*)
- # IBM XL C 8.0/Fortran 10.1 on PPC
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-qpic'
lt_prog_compiler_static='-qstaticlink'
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C 5.9
+ *Sun\ F* | *Sun*Fortran*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_wl=''
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ *Sun\ C*)
+ # Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
+ lt_prog_compiler_wl='-Wl,'
;;
esac
;;
@@ -8248,7 +9082,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
- f77* | f90* | f95*)
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
@@ -8305,13 +9139,17 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
#
# Check to make sure the PIC flag actually works.
@@ -8319,7 +9157,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
if test -n "$lt_prog_compiler_pic"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
@@ -8335,15 +9173,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8338: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8342: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
@@ -8372,13 +9210,18 @@ fi
+
+
+
+
+
#
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
@@ -8391,7 +9234,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
@@ -8421,7 +9264,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -8440,16 +9283,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8443: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8447: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -8476,7 +9319,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
@@ -8495,16 +9338,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8498: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8502: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
@@ -8614,13 +9457,36 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
+
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
if test "$with_gnu_ld" = yes; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+ *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test "$lt_use_gnu_ld_interface" = yes; then
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8638,6 +9504,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -8653,11 +9520,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
*** to be unable to reliably create shared libraries on AIX.
*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
_LT_EOF
fi
@@ -8693,10 +9561,12 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
+ export_dynamic_flag_spec='${wl}--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -8714,6 +9584,11 @@ _LT_EOF
fi
;;
+ haiku*)
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -8729,7 +9604,7 @@ _LT_EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- gnu* | linux* | tpf* | k*bsd*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
@@ -8739,15 +9614,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
- tmp_addflag=
+ tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -8758,13 +9634,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ ;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
@@ -8780,17 +9660,17 @@ _LT_EOF
fi
case $cc_basename in
- xlf*)
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
hardcode_libdir_flag_spec=
hardcode_libdir_flag_spec_ld='-rpath $libdir'
- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -8799,13 +9679,13 @@ _LT_EOF
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -8823,8 +9703,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -8870,8 +9750,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -8911,8 +9791,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global
+ # defined symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
@@ -8974,7 +9856,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -9000,7 +9881,13 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -9013,25 +9900,32 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_="/usr/lib:/lib"
+ fi
+
+fi
+
+ aix_libpath=$lt_cv_aix_libpath_
+fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -9040,7 +9934,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -9053,30 +9953,42 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_="/usr/lib:/lib"
+ fi
+
+fi
+
+ aix_libpath=$lt_cv_aix_libpath_
+fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
+ fi
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -9108,20 +10020,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
- hardcode_libdir_flag_spec=' '
- allow_undefined_flag=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_from_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes=yes
+ case $cc_basename in
+ cl*)
+ # Native MSVC
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ always_export_symbols=yes
+ file_list_spec='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+ else
+ sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+ enable_shared_with_static_runtimes=yes
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ # Don't use ranlib
+ old_postinstall_cmds='chmod 644 $oldlib'
+ postlink_cmds='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile="$lt_outputfile.exe"
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
+ ;;
+ esac~
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+ ;;
+ *)
+ # Assume MSVC wrapper
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_from_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ enable_shared_with_static_runtimes=yes
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -9131,7 +10086,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ else
+ whole_archive_flag_spec=''
+ fi
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -9139,7 +10098,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -9182,7 +10141,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
@@ -9190,7 +10149,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hpux9*)
if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
@@ -9205,8 +10164,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -9224,16 +10183,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then
case $host_cpu in
hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
@@ -9245,7 +10204,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler__b=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -b"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler__b=yes
+ fi
+ else
+ lt_cv_prog_compiler__b=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
;;
esac
fi
@@ -9273,26 +10271,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ # This should be the same for all languages, so no per-tag cache variable.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-int foo(void) {}
+int foo (void) { return 0; }
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+ lt_cv_irix_exported_symbol=yes
+else
+ lt_cv_irix_exported_symbol=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+ if test "$lt_cv_irix_exported_symbol" = yes; then
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ fi
else
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -9301,7 +10312,7 @@ rm -f core conftest.err conftest.$ac_objext \
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -9354,17 +10365,17 @@ rm -f core conftest.err conftest.$ac_objext \
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -9374,13 +10385,13 @@ rm -f core conftest.err conftest.$ac_objext \
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -9393,9 +10404,9 @@ rm -f core conftest.err conftest.$ac_objext \
no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
@@ -9583,44 +10594,50 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl
- pic_flag=$lt_prog_compiler_pic
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag
+ allow_undefined_flag=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- then
- archive_cmds_need_lc=no
- else
- archive_cmds_need_lc=yes
- fi
- allow_undefined_flag=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+ then
+ lt_cv_archive_cmds_need_lc=no
+ else
+ lt_cv_archive_cmds_need_lc=yes
+ fi
+ allow_undefined_flag=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
;;
esac
fi
@@ -9791,16 +10808,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ case $host_os in
+ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+ *) lt_sed_strip_eq="s,=/,/,g" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+ *\;*)
# if the path contains ";" then we assume it to be the separator
# otherwise default to the standard path separator (i.e. ":") - it is
# assumed that no part of a normal pathname contains ";" but that should
# okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
@@ -9813,7 +10837,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
@@ -9833,7 +10857,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
@@ -9921,7 +10951,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -9952,8 +10982,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -9974,36 +11005,83 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ *)
+ sys_lib_search_path_spec="$LIB"
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+ # It is most probably a Windows format PATH.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ esac
+
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
;;
*)
+ # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
;;
esac
- dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -10090,6 +11168,19 @@ gnu*)
hardcode_into_libs=yes
;;
+haiku*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -10132,8 +11223,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[3-9]*)
@@ -10191,7 +11284,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -10200,12 +11293,17 @@ linux* | k*bsd*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -10218,13 +11316,17 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
- shlibpath_overrides_runpath=yes
+ lt_cv_shlibpath_overrides_runpath=yes
fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
+fi
+
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -10233,7 +11335,7 @@ rm -f core conftest.err conftest.$ac_objext \
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -10246,18 +11348,6 @@ rm -f core conftest.err conftest.$ac_objext \
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -10548,6 +11638,11 @@ fi
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
@@ -10620,7 +11715,7 @@ else
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10654,7 +11749,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
@@ -10668,12 +11763,12 @@ fi
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
lt_cv_dlopen="shl_load"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10707,16 +11802,16 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
lt_cv_dlopen="dlopen"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10750,12 +11845,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+if ${ac_cv_lib_svld_dlopen+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10789,12 +11884,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+if ${ac_cv_lib_dld_dld_link+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10828,7 +11923,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -10869,7 +11964,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
+if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -10878,7 +11973,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10881 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10919,7 +12014,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -10928,7 +12029,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -10965,7 +12070,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
+if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
@@ -10974,7 +12079,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10977 "configure"
+#line $LINENO "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11015,7 +12120,13 @@ else
# endif
#endif
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11024,7 +12135,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
/* dlclose (self); */
}
else
@@ -11212,7 +12327,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -11252,7 +12367,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -11305,7 +12420,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -11345,7 +12460,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -11404,7 +12519,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -11448,7 +12563,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -11502,8 +12617,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -11524,15 +12639,15 @@ $as_echo "$ac_try_echo"; } >&5
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11569,7 +12684,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -11647,7 +12762,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -11746,7 +12861,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -11885,7 +13000,7 @@ if test -z "$CXX"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -11929,7 +13044,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -11999,15 +13114,15 @@ $as_echo "$ac_try_echo"; } >&5
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12044,7 +13159,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -12130,7 +13245,7 @@ depcc="$CXX" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -12254,391 +13369,16 @@ fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
- if test -n "$CCC"; then
- CXX=$CCC
- else
- if test -n "$ac_tool_prefix"; then
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$CXX" && break
- done
-fi
-if test -z "$CXX"; then
- ac_ct_CXX=$CXX
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_CXX" && break
-done
-
- if test "x$ac_ct_CXX" = x; then
- CXX="g++"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CXX=$ac_ct_CXX
- fi
-fi
-
- fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-#ifndef __GNUC__
- choke me
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
- GXX=yes
-else
- GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- ac_cxx_werror_flag=yes
- ac_cv_prog_cxx_g=no
- CXXFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_prog_cxx_g=yes
-else
- CXXFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-int
-main ()
+func_stripname_cnf ()
{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ esac
+} # func_stripname_cnf
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- CXXFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CXX" am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CXX_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CXX_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
- am__fastdepCXX_FALSE='#'
-else
- am__fastdepCXX_TRUE='#'
- am__fastdepCXX_FALSE=
-fi
-
-
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
ac_ext=cpp
@@ -12649,7 +13389,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
if test -z "$CXXCPP"; then
- if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+ if ${ac_cv_prog_CXXCPP+:} false; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
@@ -12679,7 +13419,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -12695,11 +13435,11 @@ else
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
break
fi
@@ -12738,7 +13478,7 @@ else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -12754,17 +13494,18 @@ else
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-_lt_caught_CXX_error=yes; }
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -12777,9 +13518,6 @@ else
_lt_caught_CXX_error=yes
fi
-
-
-
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12805,6 +13543,8 @@ module_cmds_CXX=
module_expsym_cmds_CXX=
link_all_deplibs_CXX=unknown
old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
no_undefined_flag_CXX=
whole_archive_flag_spec_CXX=
enable_shared_with_static_runtimes_CXX=no
@@ -12860,6 +13600,7 @@ $RM -r conftest*
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
+ lt_save_CFLAGS=$CFLAGS
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
@@ -12877,6 +13618,7 @@ $RM -r conftest*
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
+ CFLAGS=$CXXFLAGS
compiler=$CC
compiler_CXX=$CC
for cc_temp in $compiler""; do
@@ -12887,7 +13629,7 @@ $RM -r conftest*
*) break;;
esac
done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
if test -n "$compiler"; then
@@ -12950,7 +13692,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${lt_cv_path_LD+set}" = set; then :
+if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
@@ -12987,10 +13729,10 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+if ${lt_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -13016,8 +13758,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -13049,7 +13791,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
GXX=no
@@ -13159,7 +13901,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath__CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -13172,26 +13920,33 @@ main ()
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath__CXX"; then
+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ if test -z "$lt_cv_aix_libpath__CXX"; then
+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ fi
+
+fi
+
+ aix_libpath=$lt_cv_aix_libpath__CXX
+fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
@@ -13200,7 +13955,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath__CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -13213,30 +13974,42 @@ main ()
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath__CXX"; then
+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ if test -z "$lt_cv_aix_libpath__CXX"; then
+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ fi
+
+fi
+
+ aix_libpath=$lt_cv_aix_libpath__CXX
+fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_CXX='$convenience'
+ if test "$with_gnu_ld" = yes; then
+ # We only use this code for GNU lds that support --whole-archive.
+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec_CXX='$convenience'
+ fi
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
@@ -13266,28 +14039,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
- # as there is no search path for DLLs.
- hardcode_libdir_flag_spec_CXX='-L$libdir'
- allow_undefined_flag_CXX=unsupported
- always_export_symbols_CXX=no
- enable_shared_with_static_runtimes_CXX=yes
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
- ld_shlibs_CXX=no
- fi
- ;;
+ case $GXX,$cc_basename in
+ ,cl* | no,cl*)
+ # Native MSVC
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec_CXX=' '
+ allow_undefined_flag_CXX=unsupported
+ always_export_symbols_CXX=yes
+ file_list_spec_CXX='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+ else
+ $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+ enable_shared_with_static_runtimes_CXX=yes
+ # Don't use ranlib
+ old_postinstall_cmds_CXX='chmod 644 $oldlib'
+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile="$lt_outputfile.exe"
+ lt_tool_outputfile="$lt_tool_outputfile.exe"
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+ ;;
+ *)
+ # g++
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+ allow_undefined_flag_CXX=unsupported
+ always_export_symbols_CXX=no
+ enable_shared_with_static_runtimes_CXX=yes
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs_CXX=no
+ fi
+ ;;
+ esac
+ ;;
darwin* | rhapsody*)
@@ -13295,7 +14115,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
- whole_archive_flag_spec_CXX=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ else
+ whole_archive_flag_spec_CXX=''
+ fi
link_all_deplibs_CXX=yes
allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
case $cc_basename in
@@ -13303,7 +14127,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -13356,6 +14180,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
gnu*)
;;
+ haiku*)
+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ link_all_deplibs_CXX=yes
+ ;;
+
hpux9*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_separator_CXX=:
@@ -13380,11 +14209,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes; then
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -13445,7 +14274,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes; then
@@ -13455,10 +14284,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -13488,7 +14317,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $cc_basename in
CC*)
# SGI C++
- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -13499,9 +14328,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
fi
fi
link_all_deplibs_CXX=yes
@@ -13512,7 +14341,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
inherit_rpath_CXX=yes
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -13530,7 +14359,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -13567,26 +14396,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
- *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+ *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
prelink_cmds_CXX='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
old_archive_cmds_CXX='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
$RANLIB $oldlib'
archive_cmds_CXX='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='tpldir=Template.dir~
rm -rf $tpldir~
$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
- *) # Version 6 will use weak symbols
+ *) # Version 6 and above use weak symbols
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
@@ -13594,7 +14423,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
# Compaq C++
@@ -13613,9 +14442,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
- xl*)
+ xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -13635,13 +14464,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
hardcode_libdir_flag_spec_CXX='-R$libdir'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
compiler_needs_object_CXX=yes
# Not sure whether something based on
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
# would be better.
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -13710,7 +14539,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
export_dynamic_flag_spec_CXX='${wl}-E'
whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
- output_verbose_link_cmd=echo
+ output_verbose_link_cmd=func_echo_all
else
ld_shlibs_CXX=no
fi
@@ -13745,15 +14574,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
case $host in
osf3*)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
;;
*)
allow_undefined_flag_CXX=' -expect_unresolved \*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
@@ -13769,17 +14598,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
case $host in
osf3*)
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
*)
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
;;
esac
@@ -13789,7 +14618,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# FIXME: insert proper C++ library support
@@ -13825,7 +14654,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
@@ -13846,7 +14675,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
esac
link_all_deplibs_CXX=yes
- output_verbose_link_cmd='echo'
+ output_verbose_link_cmd='func_echo_all'
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -13866,14 +14695,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -13884,7 +14713,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -13938,6 +14767,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
CC*)
archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+ '"$old_archive_cmds_CXX"
+ reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+ '"$reload_cmds_CXX"
;;
*)
archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -13999,6 +14832,13 @@ private:
};
_LT_EOF
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+esac
+
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14012,7 +14852,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case $p in
+ case ${prev}${p} in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
@@ -14021,13 +14861,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
test $p = "-R"; then
prev=$p
continue
- else
- prev=
fi
+ # Expand the sysroot to ease extracting the directories later.
+ if test -z "$prev"; then
+ case $p in
+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+ esac
+ fi
+ case $p in
+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+ esac
if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
+ case ${prev} in
+ -L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
@@ -14047,8 +14896,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
postdeps_CXX="${postdeps_CXX} ${prev}${p}"
fi
fi
+ prev=
;;
+ *.lto.$objext) ;; # Ignore GCC LTO objects
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
@@ -14084,6 +14935,7 @@ else
fi
$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -14119,7 +14971,7 @@ linux*)
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
@@ -14184,8 +15036,6 @@ fi
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
@@ -14235,6 +15085,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ lt_prog_compiler_static_CXX=
+ ;;
interix[3-9]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
@@ -14284,6 +15139,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
esac
;;
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ ;;
dgux*)
case $cc_basename in
ec++*)
@@ -14340,7 +15200,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
esac
;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -14373,8 +15233,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX='-non_shared'
;;
- xlc* | xlC*)
- # IBM XL 8.0 on PPC
+ xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+ # IBM XL 8.0, 9.0 on PPC and BlueGene
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-qpic'
lt_prog_compiler_static_CXX='-qstaticlink'
@@ -14404,7 +15264,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -14436,7 +15296,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
;;
solaris*)
case $cc_basename in
- CC*)
+ CC* | sunCC*)
# Sun C++ 4.2, 5.x and Centerline C++
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-Bstatic'
@@ -14501,10 +15361,17 @@ case $host_os in
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
#
# Check to make sure the PIC flag actually works.
@@ -14512,7 +15379,7 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
if test -n "$lt_prog_compiler_pic_CXX"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
@@ -14528,15 +15395,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14531: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14535: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works_CXX=yes
@@ -14562,13 +15429,15 @@ fi
+
+
#
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
@@ -14581,7 +15450,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works_CXX=yes
@@ -14608,7 +15477,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
@@ -14627,16 +15496,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14630: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14634: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
@@ -14660,7 +15529,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
@@ -14679,16 +15548,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14682: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14686: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
@@ -14739,30 +15608,35 @@ fi
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
case $host_os in
aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ # Also, AIX nm treats weak defined symbols like other global defined
+ # symbols, whereas GNU nm marks them as "W".
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
export_symbols_cmds_CXX="$ltdll_cmds"
- ;;
+ ;;
cygwin* | mingw* | cegcc*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- linux* | k*bsd*-gnu)
- link_all_deplibs_CXX=no
- ;;
+ case $cc_basename in
+ cl*) ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+ ;;
+ esac
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+ ;;
esac
- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
@@ -14794,44 +15668,50 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
- $RM conftest*
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl_CXX
- pic_flag=$lt_prog_compiler_pic_CXX
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
- allow_undefined_flag_CXX=
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl_CXX
+ pic_flag=$lt_prog_compiler_pic_CXX
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+ allow_undefined_flag_CXX=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
(eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- then
- archive_cmds_need_lc_CXX=no
- else
- archive_cmds_need_lc_CXX=yes
- fi
- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $RM conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+ then
+ lt_cv_archive_cmds_need_lc_CXX=no
+ else
+ lt_cv_archive_cmds_need_lc_CXX=yes
+ fi
+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+ archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
;;
esac
fi
@@ -14988,7 +15868,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
@@ -15019,8 +15899,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
@@ -15041,36 +15922,82 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='${libname}.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ *)
+ sys_lib_search_path_spec="$LIB"
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+ # It is most probably a Windows format PATH.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ esac
+
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
;;
*)
+ # Assume MSVC wrapper
library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ dynamic_linker='Win32 ld.exe'
;;
esac
- dynamic_linker='Win32 ld.exe'
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
@@ -15156,6 +16083,19 @@ gnu*)
hardcode_into_libs=yes
;;
+haiku*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
@@ -15198,8 +16138,10 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
;;
interix[3-9]*)
@@ -15257,7 +16199,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -15266,12 +16208,17 @@ linux* | k*bsd*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+
# Some binutils ld are patched to set DT_RUNPATH
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -15284,13 +16231,17 @@ main ()
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
- shlibpath_overrides_runpath=yes
+ lt_cv_shlibpath_overrides_runpath=yes
fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
+fi
+
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
@@ -15299,7 +16250,7 @@ rm -f core conftest.err conftest.$ac_objext \
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
@@ -15312,18 +16263,6 @@ rm -f core conftest.err conftest.$ac_objext \
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -15563,6 +16502,8 @@ fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
@@ -15610,6 +16551,7 @@ fi
fi # test -n "$compiler"
CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
@@ -15629,7 +16571,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
$as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -15663,11 +16605,11 @@ for ac_lib in '' cposix; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if test "${ac_cv_search_strerror+set}" = set; then :
+ if ${ac_cv_search_strerror+:} false; then :
break
fi
done
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
else
ac_cv_search_strerror=no
@@ -15689,7 +16631,7 @@ fi
*) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
-if test "${ac_cv_prog_cc_c99+set}" = set; then :
+if ${ac_cv_prog_cc_c99+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c99=no
@@ -15864,7 +16806,7 @@ if test "x$ac_cv_prog_cc_c99" != xno; then :
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -15960,7 +16902,7 @@ fi
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
- if test "${ac_cv_prog_cc_stdc+set}" = set; then :
+ if ${ac_cv_prog_cc_stdc+:} false; then :
$as_echo_n "(cached) " >&6
fi
@@ -15995,7 +16937,7 @@ if test -z "$CXX"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -16039,7 +16981,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -16109,15 +17051,15 @@ $as_echo "$ac_try_echo"; } >&5
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16154,7 +17096,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -16240,7 +17182,7 @@ depcc="$CXX" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -16363,27 +17305,20 @@ else
fi
-
-ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-if test "x$ac_cv_func_gettimeofday" = x""yes; then :
-
-$as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h
-
+if test "x$GXX" = "xyes"; then
+ case "$host_os" in
+ cygwin* | mingw*)
+ ;;
+ *)
+ CXXFLAGS="$CXXFLAGS -ansi"
+ ;;
+ esac
fi
-ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
-if test "x$ac_cv_func_localtime_r" = x""yes; then :
-$as_echo "#define HAVE_LOCALTIME_R 1" >>confdefs.h
-fi
-ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
-if test "x$ac_cv_func_gmtime_r" = x""yes; then :
-$as_echo "#define HAVE_GMTIME_R 1" >>confdefs.h
-
-fi
@@ -16394,7 +17329,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -16437,7 +17372,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -16500,7 +17435,6 @@ $as_echo "yes" >&6; }
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-
fi
@@ -16521,6 +17455,7 @@ case "$host_os" in
create_shared_lib="-no-undefined"
;;
mingw*)
+ os_win32=yes
win32_libs="-lgdi32"
create_shared_lib="-no-undefined"
auto_import_flags="-Wl,--enable-auto-import"
@@ -16656,7 +17591,7 @@ $as_echo_n "checking whether pthreads work with $flag... " >&6; }
set dummy pthread-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_acx_pthread_config+set}" = set; then :
+if ${ac_cv_prog_acx_pthread_config+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$acx_pthread_config"; then
@@ -16812,7 +17747,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :
+if ${ac_cv_prog_PTHREAD_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$PTHREAD_CC"; then
@@ -16894,6 +17829,14 @@ else
fi
+# Check whether --enable-single-precision was given.
+if test "${enable_single_precision+set}" = set; then :
+ enableval=$enable_single_precision;
+$as_echo "#define USE_FLOAT 1" >>confdefs.h
+
+fi
+
+
# Check whether --enable-fixedpoint was given.
if test "${enable_fixedpoint+set}" = set; then :
enableval=$enable_fixedpoint;
@@ -16902,6 +17845,33 @@ $as_echo "#define USE_FIXEDPOINT 1" >>confdefs.h
fi
+# Check whether --enable-relocatable was given.
+if test "${enable_relocatable+set}" = set; then :
+ enableval=$enable_relocatable; enable_relocatable=$enableval
+else
+ if test x$os_win32 = xyes; then
+ # default to yes on native Windows.
+ enable_relocatable="yes"
+ else
+ # default to no everywhere else.
+ enable_relocatable="no"
+ fi
+
+
+fi
+
+
+if test x$enable_relocatable = xyes; then
+ if test x$os_win32 = xyes; then
+
+$as_echo "#define ENABLE_RELOCATABLE 1" >>confdefs.h
+
+ else
+ as_fn_error $? "Invalid setting for relocatable, only supported on windows" "$LINENO" 5
+
+ fi
+fi
+
prefix_NONE=
exec_prefix_NONE=
@@ -16935,8 +17905,8 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
- *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+ *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
@@ -16953,7 +17923,7 @@ libdir:
@echo libdir='${LIBDIR}'
_ACEOF
if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
for ac_var in incroot usrlibdir libdir; do
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
@@ -17039,7 +18009,7 @@ else
fi
done
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
fi # $ac_x_includes = no
if test "$ac_x_libraries" = no; then
@@ -17213,7 +18183,7 @@ if ac_fn_c_try_link "$LINENO"; then :
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17247,14 +18217,14 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17288,7 +18258,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
@@ -17307,14 +18277,14 @@ rm -f core conftest.err conftest.$ac_objext \
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+if test "x$ac_cv_func_gethostbyname" = xyes; then :
fi
if test $ac_cv_func_gethostbyname = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17348,14 +18318,14 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
fi
if test $ac_cv_lib_nsl_gethostbyname = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17389,7 +18359,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
@@ -17404,14 +18374,14 @@ fi
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = x""yes; then :
+if test "x$ac_cv_func_connect" = xyes; then :
fi
if test $ac_cv_func_connect = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then :
+if ${ac_cv_lib_socket_connect+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17445,7 +18415,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+if test "x$ac_cv_lib_socket_connect" = xyes; then :
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
@@ -17453,14 +18423,14 @@ fi
# Guillermo Gomez says -lposix is necessary on A/UX.
ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = x""yes; then :
+if test "x$ac_cv_func_remove" = xyes; then :
fi
if test $ac_cv_func_remove = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
$as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then :
+if ${ac_cv_lib_posix_remove+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17494,7 +18464,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+if test "x$ac_cv_lib_posix_remove" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
@@ -17502,14 +18472,14 @@ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = x""yes; then :
+if test "x$ac_cv_func_shmat" = xyes; then :
fi
if test $ac_cv_func_shmat = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
$as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+if ${ac_cv_lib_ipc_shmat+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17543,7 +18513,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
@@ -17561,7 +18531,7 @@ fi
# John Interrante, Karl Berry
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17595,7 +18565,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
@@ -17608,7 +18578,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Header+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17635,8 +18605,7 @@ fi
eval ac_res=\$$as_ac_Header
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
_ACEOF
@@ -17649,7 +18618,7 @@ done
if test $ac_header_dirent = dirent.h; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -17683,11 +18652,11 @@ for ac_lib in '' dir; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then :
+ if ${ac_cv_search_opendir+:} false; then :
break
fi
done
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
else
ac_cv_search_opendir=no
@@ -17706,7 +18675,7 @@ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
$as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -17740,11 +18709,11 @@ for ac_lib in '' x; do
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then :
+ if ${ac_cv_search_opendir+:} false; then :
break
fi
done
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
else
ac_cv_search_opendir=no
@@ -17762,14 +18731,18 @@ fi
fi
-
-# Check whether --enable-exceptions was given.
-if test "${enable_exceptions+set}" = set; then :
- enableval=$enable_exceptions;
-$as_echo "#define USE_EXCEPTIONS 1" >>confdefs.h
+for ac_header in stdint.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_STDINT_H 1
+_ACEOF
fi
+done
+
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -17778,15 +18751,42 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_fn_cxx_check_decl "$LINENO" "gettimeofday" "ac_cv_have_decl_gettimeofday" "#include <sys/time.h>
+"
+if test "x$ac_cv_have_decl_gettimeofday" = xyes; then :
+ ac_fn_cxx_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
+if test "x$ac_cv_func_gettimeofday" = xyes; then :
+
+$as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h
+
+fi
+
+fi
+
+ac_fn_cxx_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
+if test "x$ac_cv_func_localtime_r" = xyes; then :
+
+$as_echo "#define HAVE_LOCALTIME_R 1" >>confdefs.h
+
+fi
+
+ac_fn_cxx_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
+if test "x$ac_cv_func_gmtime_r" = xyes; then :
+
+$as_echo "#define HAVE_GMTIME_R 1" >>confdefs.h
+
+fi
+
+
ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+if test "x$ac_cv_func_gethostbyname" = xyes; then :
fi
if test $ac_cv_func_gethostbyname = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17820,14 +18820,14 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
fi
ac_fn_cxx_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
-if test "x$ac_cv_func_nanosleep" = x""yes; then :
+if test "x$ac_cv_func_nanosleep" = xyes; then :
fi
@@ -17835,7 +18835,7 @@ if test x$ac_cv_func_nanosleep = xno
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
$as_echo_n "checking for nanosleep in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_nanosleep+set}" = set; then :
+if ${ac_cv_lib_rt_nanosleep+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17869,7 +18869,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5
$as_echo "$ac_cv_lib_rt_nanosleep" >&6; }
-if test "x$ac_cv_lib_rt_nanosleep" = x""yes; then :
+if test "x$ac_cv_lib_rt_nanosleep" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lrt"
fi
@@ -17879,7 +18879,7 @@ if test x$ac_cv_func_nanosleep = xno && test x$ac_cv_lib_rt_nanosleep = xno
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lposix4" >&5
$as_echo_n "checking for nanosleep in -lposix4... " >&6; }
-if test "${ac_cv_lib_posix4_nanosleep+set}" = set; then :
+if ${ac_cv_lib_posix4_nanosleep+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17913,7 +18913,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_nanosleep" >&5
$as_echo "$ac_cv_lib_posix4_nanosleep" >&6; }
-if test "x$ac_cv_lib_posix4_nanosleep" = x""yes; then :
+if test "x$ac_cv_lib_posix4_nanosleep" = xyes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix4"
fi
@@ -17930,7 +18930,7 @@ fi
if test x$enable_libopenjpeg = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_cio_open in -lopenjpeg" >&5
$as_echo_n "checking for opj_cio_open in -lopenjpeg... " >&6; }
-if test "${ac_cv_lib_openjpeg_opj_cio_open+set}" = set; then :
+if ${ac_cv_lib_openjpeg_opj_cio_open+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -17964,7 +18964,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjpeg_opj_cio_open" >&5
$as_echo "$ac_cv_lib_openjpeg_opj_cio_open" >&6; }
-if test "x$ac_cv_lib_openjpeg_opj_cio_open" = x""yes; then :
+if test "x$ac_cv_lib_openjpeg_opj_cio_open" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBOPENJPEG 1
_ACEOF
@@ -17972,20 +18972,20 @@ _ACEOF
LIBS="-lopenjpeg $LIBS"
else
- as_fn_error "\"*** libopenjpeg library not found ***\"" "$LINENO" 5
+ as_fn_error $? "\"*** libopenjpeg library not found ***\"" "$LINENO" 5
fi
for ac_header in openjpeg.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "openjpeg.h" "ac_cv_header_openjpeg_h" "$ac_includes_default"
-if test "x$ac_cv_header_openjpeg_h" = x""yes; then :
+if test "x$ac_cv_header_openjpeg_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENJPEG_H 1
_ACEOF
else
- as_fn_error "\"*** libopenjpeg headers not found ***\"" "$LINENO" 5
+ as_fn_error $? "\"*** libopenjpeg headers not found ***\"" "$LINENO" 5
fi
done
@@ -17993,7 +18993,7 @@ done
elif test x$enable_libopenjpeg = xtry; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_cio_open in -lopenjpeg" >&5
$as_echo_n "checking for opj_cio_open in -lopenjpeg... " >&6; }
-if test "${ac_cv_lib_openjpeg_opj_cio_open+set}" = set; then :
+if ${ac_cv_lib_openjpeg_opj_cio_open+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -18027,7 +19027,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjpeg_opj_cio_open" >&5
$as_echo "$ac_cv_lib_openjpeg_opj_cio_open" >&6; }
-if test "x$ac_cv_lib_openjpeg_opj_cio_open" = x""yes; then :
+if test "x$ac_cv_lib_openjpeg_opj_cio_open" = xyes; then :
enable_libopenjpeg="yes"
else
enable_libopenjpeg="no"
@@ -18036,7 +19036,7 @@ fi
for ac_header in openjpeg.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "openjpeg.h" "ac_cv_header_openjpeg_h" "$ac_includes_default"
-if test "x$ac_cv_header_openjpeg_h" = x""yes; then :
+if test "x$ac_cv_header_openjpeg_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENJPEG_H 1
_ACEOF
@@ -18066,13 +19066,162 @@ fi
+# Check whether --enable-libtiff was given.
+if test "${enable_libtiff+set}" = set; then :
+ enableval=$enable_libtiff; enable_libtiff=$enableval
+else
+ enable_libtiff="try"
+fi
+
+
+if test x$enable_libtiff = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5
+$as_echo_n "checking for TIFFOpen in -ltiff... " >&6; }
+if ${ac_cv_lib_tiff_TIFFOpen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltiff $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char TIFFOpen ();
+int
+main ()
+{
+return TIFFOpen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_tiff_TIFFOpen=yes
+else
+ ac_cv_lib_tiff_TIFFOpen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFOpen" >&5
+$as_echo "$ac_cv_lib_tiff_TIFFOpen" >&6; }
+if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBTIFF 1
+_ACEOF
+
+ LIBS="-ltiff $LIBS"
+
+else
+ as_fn_error $? "\"*** libtiff library not found ***\"" "$LINENO" 5
+fi
+
+ for ac_header in tiffio.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
+if test "x$ac_cv_header_tiffio_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_TIFFIO_H 1
+_ACEOF
+
+else
+ as_fn_error $? "\"*** libtiff headers not found ***\"" "$LINENO" 5
+fi
+
+done
+
+elif test x$enable_libtiff = xtry; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5
+$as_echo_n "checking for TIFFOpen in -ltiff... " >&6; }
+if ${ac_cv_lib_tiff_TIFFOpen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltiff $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char TIFFOpen ();
+int
+main ()
+{
+return TIFFOpen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+ ac_cv_lib_tiff_TIFFOpen=yes
+else
+ ac_cv_lib_tiff_TIFFOpen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFOpen" >&5
+$as_echo "$ac_cv_lib_tiff_TIFFOpen" >&6; }
+if test "x$ac_cv_lib_tiff_TIFFOpen" = xyes; then :
+ enable_libtiff="yes"
+else
+ enable_libtiff="no"
+fi
+
+ for ac_header in tiffio.h
+do :
+ ac_fn_cxx_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
+if test "x$ac_cv_header_tiffio_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_TIFFIO_H 1
+_ACEOF
+
+else
+ enable_libtiff="no"
+fi
+
+done
+
+fi
+
+if test x$enable_libtiff = xyes; then
+ LIBTIFF_LIBS="-ltiff"
+
+ $as_echo "#define ENABLE_LIBTIFF 1" >>confdefs.h
+
+fi
+
+ if test x$enable_libtiff = xyes; then
+ BUILD_LIBTIFF_TRUE=
+ BUILD_LIBTIFF_FALSE='#'
+else
+ BUILD_LIBTIFF_TRUE='#'
+ BUILD_LIBTIFF_FALSE=
+fi
+
+
+if test x$enable_libtiff = xyes; then
+
+$as_echo "#define ENABLE_LIBTIFF 1" >>confdefs.h
+
+fi
for ac_func in popen mkstemp mkstemps
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -18097,7 +19246,7 @@ if test "$enable_largefile" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
+if ${ac_cv_sys_largefile_CC+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
@@ -18148,7 +19297,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+if ${ac_cv_sys_file_offset_bits+:} false; then :
$as_echo_n "(cached) " >&6
else
while :; do
@@ -18217,7 +19366,7 @@ rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then :
+if ${ac_cv_sys_large_files+:} false; then :
$as_echo_n "(cached) " >&6
else
while :; do
@@ -18288,7 +19437,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_source+set}" = set; then :
+if ${ac_cv_sys_largefile_source+:} false; then :
$as_echo_n "(cached) " >&6
else
while :; do
@@ -18357,7 +19506,7 @@ fi
for ac_func in fseek64
do :
ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64"
-if test "x$ac_cv_func_fseek64" = x""yes; then :
+if test "x$ac_cv_func_fseek64" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_FSEEK64 1
_ACEOF
@@ -18370,7 +19519,7 @@ done
for ac_func in ftell64
do :
ac_fn_c_check_func "$LINENO" "ftell64" "ac_cv_func_ftell64"
-if test "x$ac_cv_func_ftell64" = x""yes; then :
+if test "x$ac_cv_func_ftell64" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_FTELL64 1
_ACEOF
@@ -18395,7 +19544,7 @@ fi
if test x$enable_zlib = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
$as_echo_n "checking for inflate in -lz... " >&6; }
-if test "${ac_cv_lib_z_inflate+set}" = set; then :
+if ${ac_cv_lib_z_inflate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -18429,7 +19578,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
$as_echo "$ac_cv_lib_z_inflate" >&6; }
-if test "x$ac_cv_lib_z_inflate" = x""yes; then :
+if test "x$ac_cv_lib_z_inflate" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
@@ -18437,19 +19586,19 @@ _ACEOF
LIBS="-lz $LIBS"
else
- as_fn_error "\"*** zlib library not found ***\"" "$LINENO" 5
+ as_fn_error $? "\"*** zlib library not found ***\"" "$LINENO" 5
fi
for ac_header in zlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
+if test "x$ac_cv_header_zlib_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ZLIB_H 1
_ACEOF
else
- as_fn_error "\"*** zlib headers not found ***\"" "$LINENO" 5
+ as_fn_error $? "\"*** zlib headers not found ***\"" "$LINENO" 5
fi
done
@@ -18457,7 +19606,7 @@ done
elif test x$enable_zlib = xtry; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
$as_echo_n "checking for inflate in -lz... " >&6; }
-if test "${ac_cv_lib_z_inflate+set}" = set; then :
+if ${ac_cv_lib_z_inflate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -18491,7 +19640,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
$as_echo "$ac_cv_lib_z_inflate" >&6; }
-if test "x$ac_cv_lib_z_inflate" = x""yes; then :
+if test "x$ac_cv_lib_z_inflate" = xyes; then :
enable_zlib="yes"
else
enable_zlib="no"
@@ -18500,7 +19649,7 @@ fi
for ac_header in zlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
+if test "x$ac_cv_header_zlib_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ZLIB_H 1
_ACEOF
@@ -18530,6 +19679,122 @@ fi
+# Check whether --enable-libcurl was given.
+if test "${enable_libcurl+set}" = set; then :
+ enableval=$enable_libcurl; enable_libcurl=$enableval
+else
+ enable_libcurl="no"
+fi
+
+
+if test x$enable_libcurl = xyes; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5
+$as_echo_n "checking for LIBCURL... " >&6; }
+
+if test -n "$LIBCURL_CFLAGS"; then
+ pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBCURL_LIBS"; then
+ pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBCURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl" 2>&1`
+ else
+ LIBCURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBCURL_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (libcurl) were not met:
+
+$LIBCURL_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBCURL_CFLAGS
+and LIBCURL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBCURL_CFLAGS
+and LIBCURL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS
+ LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+$as_echo "#define ENABLE_LIBCURL 1" >>confdefs.h
+
+
+$as_echo "#define POPPLER_HAS_CURL_SUPPORT 1" >>confdefs.h
+
+fi
+
+ if test x$enable_libcurl = xyes; then
+ BUILD_LIBCURL_TRUE=
+ BUILD_LIBCURL_FALSE='#'
+else
+ BUILD_LIBCURL_TRUE='#'
+ BUILD_LIBCURL_FALSE=
+fi
+
# Check whether --enable-libjpeg was given.
if test "${enable_libjpeg+set}" = set; then :
@@ -18543,7 +19808,7 @@ if test x$enable_libjpeg != xno; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg6b" >&5
$as_echo_n "checking for libjpeg6b... " >&6; }
-if test "${ac_cv_lib_jpeg_6b+set}" = set; then :
+if ${ac_cv_lib_jpeg_6b+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -18594,7 +19859,7 @@ $as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
$as_echo_n "checking for libjpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_normal+set}" = set; then :
+if ${ac_cv_lib_jpeg_normal+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -18653,7 +19918,7 @@ fi
ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
+if test "x$ac_cv_header_jpeglib_h" = xyes; then :
jpeg_incdir=yes
else
jpeg_incdir=NO
@@ -18715,167 +19980,84 @@ else
enable_libpng="try"
fi
-if test x$enable_libpng != xno; then
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
-$as_echo_n "checking for libpng... " >&6; }
-if test "${ac_cv_lib_png+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
-
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lpng -lm"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+if test x$enable_libpng != xno; then
-#ifdef __cplusplus
-extern "C" {
-#endif
-void png_access_version_number();
-#ifdef __cplusplus
-}
-#endif
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPNG" >&5
+$as_echo_n "checking for LIBPNG... " >&6; }
-int
-main ()
-{
-png_access_version_number();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "ac_cv_lib_png=-lpng"
+if test -n "$LIBPNG_CFLAGS"; then
+ pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
- eval "ac_cv_lib_png=no"
+ pkg_failed=yes
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS="$ac_save_LIBS"
-CFLAGS="$ac_save_CFLAGS"
-
+ else
+ pkg_failed=untried
fi
-
-
-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
- enable_libpng=yes
- LIBPNG_LIBS="$ac_cv_lib_png"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png" >&5
-$as_echo "$ac_cv_lib_png" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
-$as_echo_n "checking for libpng... " >&6; }
-if test "${ac_cv_lib_png+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
-
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lpng -lm"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-void png_access_version_number();
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-png_access_version_number();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "ac_cv_lib_png=-lpng"
+if test -n "$LIBPNG_LIBS"; then
+ pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
- eval "ac_cv_lib_png=no"
+ pkg_failed=yes
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS="$ac_save_LIBS"
-CFLAGS="$ac_save_CFLAGS"
-
+ else
+ pkg_failed=untried
fi
-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
- enable_libpng=yes
- LIBPNG_LIBS="$ac_cv_lib_png"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png" >&5
-$as_echo "$ac_cv_lib_png" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- normal
-fi
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng" 2>&1`
+ else
+ LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBPNG_PKG_ERRORS" >&5
-
-png_incdirs="`eval echo $includedir` /usr/include /usr/local/include "
-
-png_incdir=NO
-for i in $png_incdirs;
-do
- for j in png.h;
- do
- echo "configure: 18836: $i/$j" >&5
- if test -r "$i/$j"; then
- echo "taking that" >&5
- png_incdir=$i
- break 2
- fi
- done
-done
-
-test "x$png_incdir" = xNO && png_incdir=
-
-if test -n "$png_incdir" && test -n "$LIBPNG_LIBS" ; then
-
-cat >>confdefs.h <<_ACEOF
-#define ENABLE_LIBPNG 1
-_ACEOF
-
+ enable_libpng="no"
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ enable_libpng="no"
else
- if test -n "$png_incdir" || test -n "$LIBPNG_LIBS" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
-There is an installation error in png support. You seem to have only one of
-either the headers _or_ the libraries installed. You may need to either provide
-correct --with-extra-... options, or the development package of libpng. You
-can get a source package of libpng from http://www.libpng.org/pub/png/libpng.html
-Disabling PNG support.
-" >&5
-$as_echo "$as_me: WARNING:
-There is an installation error in png support. You seem to have only one of
-either the headers _or_ the libraries installed. You may need to either provide
-correct --with-extra-... options, or the development package of libpng. You
-can get a source package of libpng from http://www.libpng.org/pub/png/libpng.html
-Disabling PNG support.
-" >&2;}
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libpng not found. disable PNG support." >&5
-$as_echo "$as_me: WARNING: libpng not found. disable PNG support." >&2;}
- fi
- png_incdir=
- enable_libpng=no
- LIBPNG_LIBS=
+ LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS
+ LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ enable_libpng="yes"
+fi
fi
+if test x$enable_libpng = xyes; then
+$as_echo "#define ENABLE_LIBPNG 1" >>confdefs.h
fi
@@ -18888,7 +20070,6 @@ else
fi
-
FREETYPE_LIBS=
FREETYPE_CFLAGS=
@@ -18897,46 +20078,46 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
$as_echo_n "checking for FREETYPE... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$FREETYPE_CFLAGS"; then
- pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$FREETYPE_CFLAGS"; then
+ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$FREETYPE_LIBS"; then
- pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$FREETYPE_LIBS"; then
+ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18944,17 +20125,17 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "freetype2"`
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2" 2>&1`
else
- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"`
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$FREETYPE_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- freetype_pkgconfig=no
+ freetype_pkgconfig=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
freetype_pkgconfig=no
else
FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
@@ -18976,7 +20157,7 @@ else
set dummy freetype-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then :
+if ${ac_cv_path_FREETYPE_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $FREETYPE_CONFIG in
@@ -19028,51 +20209,84 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which font configuration to use" >&5
+$as_echo_n "checking which font configuration to use... " >&6; }
+
+# Check whether --with-font_configuration was given.
+if test "${with_font_configuration+set}" = set; then :
+ withval=$with_font_configuration;
+else
+ if test x$os_win32 = xyes; then
+ # default to win32 on native Windows.
+ with_font_configuration=win32
+ else
+ # default to fontconig everywhere else.
+ with_font_configuration=fontconfig
+ fi
+
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_font_configuration" >&5
+$as_echo "$with_font_configuration" >&6; }
+
+case $with_font_configuration in
+ win32)
+
+$as_echo "#define WITH_FONTCONFIGURATION_WIN32 1" >>confdefs.h
+
+ # Set the minimum required Internet Explorer version to 5.0
+ CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x0500"
+ ;;
+ fontconfig)
+
+$as_echo "#define WITH_FONTCONFIGURATION_FONTCONFIG 1" >>confdefs.h
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FONTCONFIG" >&5
$as_echo_n "checking for FONTCONFIG... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$FONTCONFIG_CFLAGS"; then
- pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$FONTCONFIG_CFLAGS"; then
+ pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "fontconfig >= 2.0.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.0.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$FONTCONFIG_LIBS"; then
- pkg_cv_FONTCONFIG_LIBS="$FONTCONFIG_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$FONTCONFIG_LIBS"; then
+ pkg_cv_FONTCONFIG_LIBS="$FONTCONFIG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.0.0\""; } >&5
($PKG_CONFIG --exists --print-errors "fontconfig >= 2.0.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.0.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19080,14 +20294,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fontconfig >= 2.0.0"`
+ FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig >= 2.0.0" 2>&1`
else
- FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig >= 2.0.0"`
+ FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig >= 2.0.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$FONTCONFIG_PKG_ERRORS" >&5
- as_fn_error "Package requirements (fontconfig >= 2.0.0) were not met:
+ as_fn_error $? "Package requirements (fontconfig >= 2.0.0) were not met:
$FONTCONFIG_PKG_ERRORS
@@ -19096,12 +20310,13 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables FONTCONFIG_CFLAGS
and FONTCONFIG_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -19110,15 +20325,29 @@ and FONTCONFIG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS
FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
+fi
+ ;;
+ *)
+ as_fn_error $? "Invalid font configuration setting: $with_font_configuration" "$LINENO" 5
+ ;;
+esac
+
+ if test x$with_font_configuration = xwin32; then
+ BUILD_WITH_WIN32_FONTCONFIGURATION_TRUE=
+ BUILD_WITH_WIN32_FONTCONFIGURATION_FALSE='#'
+else
+ BUILD_WITH_WIN32_FONTCONFIGURATION_TRUE='#'
+ BUILD_WITH_WIN32_FONTCONFIGURATION_FALSE=
fi
+
# Check whether --enable-splash-output was given.
if test "${enable_splash_output+set}" = set; then :
enableval=$enable_splash_output;
@@ -19140,7 +20369,7 @@ if test x$enable_splash_output = xyes; then
fi
-CAIRO_VERSION="1.8.4"
+CAIRO_VERSION="1.10.0"
# Check whether --enable-cairo-output was given.
if test "${enable_cairo_output+set}" = set; then :
@@ -19155,46 +20384,46 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
$as_echo_n "checking for CAIRO... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_CFLAGS"; then
- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CAIRO_CFLAGS"; then
+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_LIBS"; then
- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CAIRO_LIBS"; then
+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19202,14 +20431,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo >= $CAIRO_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1`
else
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= $CAIRO_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
- as_fn_error "Package requirements (cairo >= $CAIRO_VERSION) were not met:
+ as_fn_error $? "Package requirements (cairo >= $CAIRO_VERSION) were not met:
$CAIRO_PKG_ERRORS
@@ -19218,12 +20447,13 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables CAIRO_CFLAGS
and CAIRO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -19232,13 +20462,13 @@ and CAIRO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
elif test x$enable_cairo_output = xtry; then
@@ -19246,46 +20476,46 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
$as_echo_n "checking for CAIRO... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_CFLAGS"; then
- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CAIRO_CFLAGS"; then
+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_LIBS"; then
- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CAIRO_LIBS"; then
+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19293,17 +20523,17 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo >= $CAIRO_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1`
else
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= $CAIRO_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_cairo_output="no"
+ enable_cairo_output="no"
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
enable_cairo_output="no"
else
CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
@@ -19335,8 +20565,7 @@ if test x$enable_cairo_output = xyes; then
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -19345,54 +20574,6 @@ fi
done
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- _SAVE_CFLAGS=$CFLAGS
- _SAVE_LIBS=$LIBS
- CFLAGS="$CFLAGS $CAIRO_CFLAGS"
- LIBS="$LIBS $CAIRO_LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo blend modes support" >&5
-$as_echo_n "checking for cairo blend modes support... " >&6; }
-if test "${ac_cv_cairo_has_blend_modes+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <cairo.h>
-int main() {
- cairo_t *cr;
- cairo_set_operator(cr, CAIRO_OPERATOR_MULTIPLY);
- return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_cairo_has_blend_modes="yes"
-else
- ac_cv_cairo_has_blend_modes="no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cairo_has_blend_modes" >&5
-$as_echo "$ac_cv_cairo_has_blend_modes" >&6; }
- CFLAGS=$_SAVE_CFLAGS
- LIBS=$_SAVE_LIBS
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- if test "$ac_cv_cairo_has_blend_modes" = "yes"; then
-
-$as_echo "#define CAIRO_HAS_BLEND_MODES 1" >>confdefs.h
-
- fi
else
CAIRO_FEATURE="#undef POPPLER_HAS_CAIRO"
CAIRO_REQ=""
@@ -19400,63 +20581,65 @@ fi
-POPPLER_GLIB_DISABLE_DEPRECATED=""
-POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
+found_introspection=no
+if test x$enable_cairo_output = xyes; then
+ POPPLER_GLIB_DISABLE_DEPRECATED=""
+ POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
-GLIB_REQUIRED=2.6
-# Check whether --enable-poppler-glib was given.
+ GLIB_REQUIRED=2.18
+ # Check whether --enable-poppler-glib was given.
if test "${enable_poppler_glib+set}" = set; then :
enableval=$enable_poppler_glib; enable_poppler_glib=$enableval
else
enable_poppler_glib="try"
fi
-if test x$enable_poppler_glib = xyes; then
+ if test x$enable_poppler_glib = xyes; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_GLIB" >&5
$as_echo_n "checking for POPPLER_GLIB... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_GLIB_CFLAGS"; then
- pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED") 2>&5
+if test -n "$POPPLER_GLIB_CFLAGS"; then
+ pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED cairo >= \$CAIRO_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
+ pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_GLIB_LIBS"; then
- pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED") 2>&5
+if test -n "$POPPLER_GLIB_LIBS"; then
+ pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED cairo >= \$CAIRO_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
+ pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19464,14 +20647,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED"`
+ POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION" 2>&1`
else
- POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED"`
+ POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_GLIB_PKG_ERRORS" >&5
- as_fn_error "Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED) were not met:
+ as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION) were not met:
$POPPLER_GLIB_PKG_ERRORS
@@ -19480,12 +20663,13 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables POPPLER_GLIB_CFLAGS
and POPPLER_GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -19494,60 +20678,60 @@ and POPPLER_GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
POPPLER_GLIB_CFLAGS=$pkg_cv_POPPLER_GLIB_CFLAGS
POPPLER_GLIB_LIBS=$pkg_cv_POPPLER_GLIB_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
-elif test x$enable_poppler_glib = xtry; then
+ elif test x$enable_poppler_glib = xtry; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_GLIB" >&5
$as_echo_n "checking for POPPLER_GLIB... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_GLIB_CFLAGS"; then
- pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED") 2>&5
+if test -n "$POPPLER_GLIB_CFLAGS"; then
+ pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED cairo >= \$CAIRO_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
+ pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_GLIB_LIBS"; then
- pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED") 2>&5
+if test -n "$POPPLER_GLIB_LIBS"; then
+ pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED cairo >= \$CAIRO_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
+ pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19555,17 +20739,17 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED"`
+ POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION" 2>&1`
else
- POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED"`
+ POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_GLIB_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_poppler_glib="no"
+ enable_poppler_glib="no"
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
enable_poppler_glib="no"
else
POPPLER_GLIB_CFLAGS=$pkg_cv_POPPLER_GLIB_CFLAGS
@@ -19574,13 +20758,109 @@ else
$as_echo "yes" >&6; }
enable_poppler_glib="yes"
fi
+ fi
+ if test x$enable_poppler_glib = xyes; then
+ # Check for introspection
+
+
+
+ # Check whether --enable-introspection was given.
+if test "${enable_introspection+set}" = set; then :
+ enableval=$enable_introspection;
+else
+ enable_introspection=auto
fi
-if test x$enable_poppler_glib = xyes; then
- # Extract the first word of "glib-mkenums", so it can be a program name with args.
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
+$as_echo_n "checking for gobject-introspection... " >&6; }
+
+ case $enable_introspection in #(
+ no) :
+ found_introspection="no (disabled, use --enable-introspection to enable)"
+ ;; #(
+ yes) :
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ :
+else
+ as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
+fi
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ found_introspection=yes
+else
+ as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build poppler" "$LINENO" 5
+fi
+ ;; #(
+ auto) :
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ found_introspection=yes
+else
+ found_introspection=no
+fi
+ ;; #(
+ *) :
+ as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
+$as_echo "$found_introspection" >&6; }
+
+ INTROSPECTION_SCANNER=
+ INTROSPECTION_COMPILER=
+ INTROSPECTION_GENERATE=
+ INTROSPECTION_GIRDIR=
+ INTROSPECTION_TYPELIBDIR=
+ if test "x$found_introspection" = "xyes"; then
+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+ fi
+
+
+
+
+
+
+
+
+
+ if test "x$found_introspection" = "xyes"; then
+ HAVE_INTROSPECTION_TRUE=
+ HAVE_INTROSPECTION_FALSE='#'
+else
+ HAVE_INTROSPECTION_TRUE='#'
+ HAVE_INTROSPECTION_FALSE=
+fi
+
+
+
+
+ GLIB_REQ="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION"
+ # Extract the first word of "glib-mkenums", so it can be a program name with args.
set dummy glib-mkenums; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then :
+if ${ac_cv_path_GLIB_MKENUMS+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
@@ -19616,8 +20896,15 @@ $as_echo "no" >&6; }
fi
- POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
- POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
+ POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
+ POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
+ fi
+else
+ if test x$enable_poppler_glib = xyes; then
+ as_fn_error $? "\"Cairo output is required to build glib frontend\"" "$LINENO" 5
+ fi
+ enable_poppler_glib="no"
+ GLIB_REQ=""
fi
if test x$enable_poppler_glib = xyes; then
BUILD_POPPLER_GLIB_TRUE=
@@ -19627,52 +20914,25 @@ else
BUILD_POPPLER_GLIB_FALSE=
fi
-
-
-
-# Check whether --with-html-dir was given.
-if test "${with_html_dir+set}" = set; then :
- withval=$with_html_dir;
+ if test "x$found_introspection" = "xyes"; then
+ HAVE_INTROSPECTION_TRUE=
+ HAVE_INTROSPECTION_FALSE='#'
else
- with_html_dir='${datadir}/gtk-doc/html'
+ HAVE_INTROSPECTION_TRUE='#'
+ HAVE_INTROSPECTION_FALSE=
fi
- HTML_DIR="$with_html_dir"
- # Check whether --enable-gtk-doc was given.
-if test "${enable_gtk_doc+set}" = set; then :
- enableval=$enable_gtk_doc;
-else
- enable_gtk_doc=no
-fi
- if test x$enable_gtk_doc = xyes; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- :
-else
- as_fn_error "You need to have gtk-doc >= 1.0 installed to build gtk-doc" "$LINENO" 5
-fi
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
-$as_echo "$enable_gtk_doc" >&6; }
- for ac_prog in gtkdoc-check
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+ # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+set dummy gtkdoc-check; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
+if ${ac_cv_path_GTKDOC_CHECK+:} false; then :
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
@@ -19708,695 +20968,192 @@ $as_echo "no" >&6; }
fi
- test -n "$GTKDOC_CHECK" && break
-done
-
-
- if test x$enable_gtk_doc = xyes; then
- ENABLE_GTK_DOC_TRUE=
- ENABLE_GTK_DOC_FALSE='#'
-else
- ENABLE_GTK_DOC_TRUE='#'
- ENABLE_GTK_DOC_FALSE=
-fi
-
- if test -n "$LIBTOOL"; then
- GTK_DOC_USE_LIBTOOL_TRUE=
- GTK_DOC_USE_LIBTOOL_FALSE='#'
-else
- GTK_DOC_USE_LIBTOOL_TRUE='#'
- GTK_DOC_USE_LIBTOOL_FALSE=
-fi
-
-
-
-# Check whether --enable-gdk was given.
-if test "${enable_gdk+set}" = set; then :
- enableval=$enable_gdk; enable_gdk=$enableval
+ for ac_prog in gtkdoc-rebase
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GTKDOC_REBASE+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- enable_gdk="try"
-fi
-
-
-if test x$enable_poppler_glib = xyes; then
- if test x$enable_gdk = xyes; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK" >&5
-$as_echo_n "checking for GDK... " >&6; }
+ case $GTKDOC_REBASE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDK_CFLAGS"; then
- pkg_cv_GDK_CFLAGS="$GDK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdk-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GDK_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDK_LIBS"; then
- pkg_cv_GDK_LIBS="$GDK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdk-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GDK_LIBS=`$PKG_CONFIG --libs "gdk-2.0" 2>/dev/null`
-else
- pkg_failed=yes
+ ;;
+esac
fi
- fi
+GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
+if test -n "$GTKDOC_REBASE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
+$as_echo "$GTKDOC_REBASE" >&6; }
else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- if test $_pkg_short_errors_supported = yes; then
- GDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0"`
- else
- GDK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GDK_PKG_ERRORS" >&5
-
- as_fn_error "Package requirements (gdk-2.0) were not met:
-$GDK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-Alternatively, you may set the environment variables GDK_CFLAGS
-and GDK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
-elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDK_CFLAGS
-and GDK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+ test -n "$GTKDOC_REBASE" && break
+done
+test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+ # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
+set dummy gtkdoc-mkpdf; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GTKDOC_MKPDF+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- GDK_CFLAGS=$pkg_cv_GDK_CFLAGS
- GDK_LIBS=$pkg_cv_GDK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- :
-fi
- elif test x$enable_gdk = xtry; then
- if test x$enable_splash_output = xyes; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK" >&5
-$as_echo_n "checking for GDK... " >&6; }
+ case $GTKDOC_MKPDF in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDK_CFLAGS"; then
- pkg_cv_GDK_CFLAGS="$GDK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdk-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GDK_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDK_LIBS"; then
- pkg_cv_GDK_LIBS="$GDK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdk-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GDK_LIBS=`$PKG_CONFIG --libs "gdk-2.0" 2>/dev/null`
-else
- pkg_failed=yes
+ ;;
+esac
fi
- fi
+GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
+if test -n "$GTKDOC_MKPDF"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
+$as_echo "$GTKDOC_MKPDF" >&6; }
else
- pkg_failed=untried
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0"`
- else
- GDK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GDK_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_gdk="no"
-elif test $pkg_failed = untried; then
- enable_gdk="no"
-else
- GDK_CFLAGS=$pkg_cv_GDK_CFLAGS
- GDK_LIBS=$pkg_cv_GDK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- enable_gdk="yes"
-fi
- elif test x$enable_cairo_output = xyes; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK" >&5
-$as_echo_n "checking for GDK... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDK_CFLAGS"; then
- pkg_cv_GDK_CFLAGS="$GDK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdk-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GDK_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDK_LIBS"; then
- pkg_cv_GDK_LIBS="$GDK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdk-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GDK_LIBS=`$PKG_CONFIG --libs "gdk-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
+# Check whether --with-html-dir was given.
+if test "${with_html_dir+set}" = set; then :
+ withval=$with_html_dir;
else
- pkg_failed=untried
+ with_html_dir='${datadir}/gtk-doc/html'
fi
+ HTML_DIR="$with_html_dir"
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
+ # Check whether --enable-gtk-doc was given.
+if test "${enable_gtk_doc+set}" = set; then :
+ enableval=$enable_gtk_doc;
else
- _pkg_short_errors_supported=no
+ enable_gtk_doc=no
fi
- if test $_pkg_short_errors_supported = yes; then
- GDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0"`
- else
- GDK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GDK_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_gdk="no"
-elif test $pkg_failed = untried; then
- enable_gdk="no"
-else
- GDK_CFLAGS=$pkg_cv_GDK_CFLAGS
- GDK_LIBS=$pkg_cv_GDK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- enable_gdk="yes"
-fi
- fi
- elif test x$enable_splash_output = xyes; then
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK" >&5
-$as_echo_n "checking for GDK... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDK_CFLAGS"; then
- pkg_cv_GDK_CFLAGS="$GDK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdk-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GDK_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDK_LIBS"; then
- pkg_cv_GDK_LIBS="$GDK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdk-2.0") 2>&5
+ if test x$enable_gtk_doc = xyes; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.14\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.14") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GDK_LIBS=`$PKG_CONFIG --libs "gdk-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0"`
- else
- GDK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GDK_PKG_ERRORS" >&5
-
- as_fn_error "Package requirements (gdk-2.0) were not met:
-
-$GDK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDK_CFLAGS
-and GDK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
-elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDK_CFLAGS
-and GDK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+ :
else
- GDK_CFLAGS=$pkg_cv_GDK_CFLAGS
- GDK_LIBS=$pkg_cv_GDK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- :
+ as_fn_error $? "You need to have gtk-doc >= 1.14 installed to build $PACKAGE_NAME" "$LINENO" 5
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"GDK is required by the glib wrapper when splash output device is
- enabled. If you want to comppile popler without GDK use --disable-splash-output too\"" >&5
-$as_echo "$as_me: WARNING: \"GDK is required by the glib wrapper when splash output device is
- enabled. If you want to comppile popler without GDK use --disable-splash-output too\"" >&2;}
- enable_gdk=yes
- fi
- if test x$enable_gdk = xyes; then
-
-$as_echo "#define POPPLER_WITH_GDK 1" >>confdefs.h
-
- GDK_FEATURE="#define POPPLER_WITH_GDK 1"
- POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
- POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
- else
- GDK_FEATURE=""
fi
-fi
- if test x$enable_gdk = xyes; then
- BUILD_WITH_GDK_TRUE=
- BUILD_WITH_GDK_FALSE='#'
-else
- BUILD_WITH_GDK_TRUE='#'
- BUILD_WITH_GDK_FALSE=
-fi
-
-
-
-
-
-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+$as_echo "$enable_gtk_doc" >&6; }
-# Check whether --enable-poppler-qt was given.
-if test "${enable_poppler_qt+set}" = set; then :
- enableval=$enable_poppler_qt; enable_poppler_qt=$enableval
+ # Check whether --enable-gtk-doc-html was given.
+if test "${enable_gtk_doc_html+set}" = set; then :
+ enableval=$enable_gtk_doc_html;
else
- enable_poppler_qt="try"
+ enable_gtk_doc_html=yes
fi
-
-if test x$enable_poppler_qt = xyes; then
-
-if test "$build_cpu" != "x86_64" ; then
- qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
- qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
+ # Check whether --enable-gtk-doc-pdf was given.
+if test "${enable_gtk_doc_pdf+set}" = set; then :
+ enableval=$enable_gtk_doc_pdf;
else
- qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include"
- qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
+ enable_gtk_doc_pdf=no
fi
-if test -n "$QTDIR" ; then
- qt_incdirs="$QTDIR/include $qt_incdirs"
- if test "$build_cpu" != "x86_64" ; then
- qt_libdirs="$QTDIR/lib $qt_libdirs"
- else
- qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
- fi
-fi
-
-qt_test_include="qstyle.h"
-qt_test_la_library="libqt-mt.la"
-qt_test_library="libqt-mt.so"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt headers" >&5
-$as_echo_n "checking for Qt headers... " >&6; }
-qt_incdir="no"
-for it in $qt_incdirs ; do
- if test -r "$it/$qt_test_include" ; then
- qt_incdir="$it"
- break
- fi
-done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_incdir" >&5
-$as_echo "$qt_incdir" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt libraries" >&5
-$as_echo_n "checking for Qt libraries... " >&6; }
-qt_libdir="no"
-for qt_check in $qt_libdirs ; do
- if test -r "$qt_check/$qt_test_la_library" ; then
- qt_libdir="$qt_check"
- break
- fi
-
- if test -r "$qt_check/$qt_test_library" ; then
- qt_libdir="$qt_check"
- break
- fi
-done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_libdir" >&5
-$as_echo "$qt_libdir" >&6; }
-if test "x$qt_libdir" != "xno" ; then
- if test "x$qt_incdir" != "xno" ; then
- have_qt=yes
- fi
-fi
-if test "x$have_qt" = "xyes"; then
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ if test -z "$GTKDOC_MKPDF"; then
+ enable_gtk_doc_pdf=no
+ fi
- pthread_needed=no
- save_LDFLAGS=$LDFLAGS
- save_CXXFLAGS=$CXXFLAGS
- save_LIBS=$LIBS
- CXXFLAGS="$CXXFLAGS -I$qt_incdir"
- LIBS="$LIBS -L$qt_libdir -lqt-mt"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Qt needs -pthread" >&5
-$as_echo_n "checking if Qt needs -pthread... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <qt.h>
-int
-main ()
-{
-QString s;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- pthread_needed=no
-else
- pthread_needed=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- if test "x$pthread_needed" = "xyes"; then
- LDFLAGS="$LDFLAGS -pthread"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <qt.h>
-int
-main ()
-{
-QString s;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- pthread_needed=yes
+ if test x$enable_gtk_doc = xyes; then
+ ENABLE_GTK_DOC_TRUE=
+ ENABLE_GTK_DOC_FALSE='#'
else
- pthread_needed=no
+ ENABLE_GTK_DOC_TRUE='#'
+ ENABLE_GTK_DOC_FALSE=
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pthread_needed" >&5
-$as_echo "$pthread_needed" >&6; }
- LDFLAGS=$save_LDFLAGS
- CXXFLAGS=$save_CXXFLAGS
- LIBS=$save_LIBS
-
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- qtpthread=''
- if test "x$pthread_needed" = "xyes"; then
- qtpthread="-pthread"
- fi
- POPPLER_QT_CXXFLAGS="-I$qt_incdir"
- POPPLER_QT_LIBS="$qtpthread -L$qt_libdir -lqt-mt"
- :
+ if test x$enable_gtk_doc_html = xyes; then
+ GTK_DOC_BUILD_HTML_TRUE=
+ GTK_DOC_BUILD_HTML_FALSE='#'
else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "Qt development libraries not found
-See \`config.log' for more details." "$LINENO" 5; }
+ GTK_DOC_BUILD_HTML_TRUE='#'
+ GTK_DOC_BUILD_HTML_FALSE=
fi
-elif test x$enable_poppler_qt = xtry; then
-
-if test "$build_cpu" != "x86_64" ; then
- qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
- qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
+ if test x$enable_gtk_doc_pdf = xyes; then
+ GTK_DOC_BUILD_PDF_TRUE=
+ GTK_DOC_BUILD_PDF_FALSE='#'
else
- qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib64/qt3/include /usr/lib64/qt/include /usr/share/qt3/include /usr/lib/qt3/include /usr/lib/qt/include"
- qt_libdirs="$QTLIB /usr/local/qt/lib64 /usr/lib64/qt /usr/lib64 /usr/X11R6/lib64/X11/qt /usr/X11R6/lib64/qt /usr/lib64/qt3/lib64 /usr/lib64/qt/lib64 /usr/share/qt3/lib64 /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
+ GTK_DOC_BUILD_PDF_TRUE='#'
+ GTK_DOC_BUILD_PDF_FALSE=
fi
-if test -n "$QTDIR" ; then
- qt_incdirs="$QTDIR/include $qt_incdirs"
- if test "$build_cpu" != "x86_64" ; then
- qt_libdirs="$QTDIR/lib $qt_libdirs"
- else
- qt_libdirs="$QTDIR/lib64 $QTDIR/lib $qt_libdirs"
- fi
-fi
-
-qt_test_include="qstyle.h"
-qt_test_la_library="libqt-mt.la"
-qt_test_library="libqt-mt.so"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt headers" >&5
-$as_echo_n "checking for Qt headers... " >&6; }
-qt_incdir="no"
-for it in $qt_incdirs ; do
- if test -r "$it/$qt_test_include" ; then
- qt_incdir="$it"
- break
- fi
-done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_incdir" >&5
-$as_echo "$qt_incdir" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt libraries" >&5
-$as_echo_n "checking for Qt libraries... " >&6; }
-qt_libdir="no"
-for qt_check in $qt_libdirs ; do
- if test -r "$qt_check/$qt_test_la_library" ; then
- qt_libdir="$qt_check"
- break
- fi
- if test -r "$qt_check/$qt_test_library" ; then
- qt_libdir="$qt_check"
- break
- fi
-done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_libdir" >&5
-$as_echo "$qt_libdir" >&6; }
-
-if test "x$qt_libdir" != "xno" ; then
- if test "x$qt_incdir" != "xno" ; then
- have_qt=yes
- fi
-fi
-
-if test "x$have_qt" = "xyes"; then
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- pthread_needed=no
-
- save_LDFLAGS=$LDFLAGS
- save_CXXFLAGS=$CXXFLAGS
- save_LIBS=$LIBS
- CXXFLAGS="$CXXFLAGS -I$qt_incdir"
- LIBS="$LIBS -L$qt_libdir -lqt-mt"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Qt needs -pthread" >&5
-$as_echo_n "checking if Qt needs -pthread... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <qt.h>
-int
-main ()
-{
-QString s;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- pthread_needed=no
-else
- pthread_needed=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- if test "x$pthread_needed" = "xyes"; then
- LDFLAGS="$LDFLAGS -pthread"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <qt.h>
-int
-main ()
-{
-QString s;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- pthread_needed=yes
+ if test -n "$LIBTOOL"; then
+ GTK_DOC_USE_LIBTOOL_TRUE=
+ GTK_DOC_USE_LIBTOOL_FALSE='#'
else
- pthread_needed=no
+ GTK_DOC_USE_LIBTOOL_TRUE='#'
+ GTK_DOC_USE_LIBTOOL_FALSE=
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pthread_needed" >&5
-$as_echo "$pthread_needed" >&6; }
- LDFLAGS=$save_LDFLAGS
- CXXFLAGS=$save_CXXFLAGS
- LIBS=$save_LIBS
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- qtpthread=''
- if test "x$pthread_needed" = "xyes"; then
- qtpthread="-pthread"
- fi
-
- POPPLER_QT_CXXFLAGS="-I$qt_incdir"
- POPPLER_QT_LIBS="$qtpthread -L$qt_libdir -lqt-mt"
- enable_poppler_qt="yes"
+ if test -n "$GTKDOC_REBASE"; then
+ GTK_DOC_USE_REBASE_TRUE=
+ GTK_DOC_USE_REBASE_FALSE='#'
else
- enable_poppler_qt="no"
-fi
-
+ GTK_DOC_USE_REBASE_TRUE='#'
+ GTK_DOC_USE_REBASE_FALSE=
fi
- if test "x$enable_poppler_qt" = "xyes"; then
- BUILD_POPPLER_QT_TRUE=
- BUILD_POPPLER_QT_FALSE='#'
-else
- BUILD_POPPLER_QT_TRUE='#'
- BUILD_POPPLER_QT_FALSE=
-fi
-
-
# Check whether --enable-poppler-qt4 was given.
if test "${enable_poppler_qt4+set}" = set; then :
@@ -20411,46 +21168,46 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_QT4" >&5
$as_echo_n "checking for POPPLER_QT4... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_QT4_CFLAGS"; then
- pkg_cv_POPPLER_QT4_CFLAGS="$POPPLER_QT4_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$POPPLER_QT4_CFLAGS"; then
+ pkg_cv_POPPLER_QT4_CFLAGS="$POPPLER_QT4_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_POPPLER_QT4_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_QT4_LIBS"; then
- pkg_cv_POPPLER_QT4_LIBS="$POPPLER_QT4_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$POPPLER_QT4_LIBS"; then
+ pkg_cv_POPPLER_QT4_LIBS="$POPPLER_QT4_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_POPPLER_QT4_LIBS=`$PKG_CONFIG --libs "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20458,14 +21215,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0"`
+ POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0" 2>&1`
else
- POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0"`
+ POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_QT4_PKG_ERRORS" >&5
- as_fn_error "Package requirements (QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0) were not met:
+ as_fn_error $? "Package requirements (QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0) were not met:
$POPPLER_QT4_PKG_ERRORS
@@ -20474,12 +21231,13 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables POPPLER_QT4_CFLAGS
and POPPLER_QT4_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -20488,59 +21246,59 @@ and POPPLER_QT4_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
POPPLER_QT4_CFLAGS=$pkg_cv_POPPLER_QT4_CFLAGS
POPPLER_QT4_LIBS=$pkg_cv_POPPLER_QT4_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_QT4_TEST" >&5
$as_echo_n "checking for POPPLER_QT4_TEST... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_QT4_TEST_CFLAGS"; then
- pkg_cv_POPPLER_QT4_TEST_CFLAGS="$POPPLER_QT4_TEST_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$POPPLER_QT4_TEST_CFLAGS"; then
+ pkg_cv_POPPLER_QT4_TEST_CFLAGS="$POPPLER_QT4_TEST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtTest >= 4.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "QtTest >= 4.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_POPPLER_QT4_TEST_CFLAGS=`$PKG_CONFIG --cflags "QtTest >= 4.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_QT4_TEST_LIBS"; then
- pkg_cv_POPPLER_QT4_TEST_LIBS="$POPPLER_QT4_TEST_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$POPPLER_QT4_TEST_LIBS"; then
+ pkg_cv_POPPLER_QT4_TEST_LIBS="$POPPLER_QT4_TEST_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtTest >= 4.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "QtTest >= 4.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_POPPLER_QT4_TEST_LIBS=`$PKG_CONFIG --libs "QtTest >= 4.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20548,14 +21306,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtTest >= 4.4.0"`
+ POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtTest >= 4.4.0" 2>&1`
else
- POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtTest >= 4.4.0"`
+ POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtTest >= 4.4.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_QT4_TEST_PKG_ERRORS" >&5
- as_fn_error "Package requirements (QtTest >= 4.4.0) were not met:
+ as_fn_error $? "Package requirements (QtTest >= 4.4.0) were not met:
$POPPLER_QT4_TEST_PKG_ERRORS
@@ -20564,12 +21322,13 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables POPPLER_QT4_TEST_CFLAGS
and POPPLER_QT4_TEST_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -20578,13 +21337,13 @@ and POPPLER_QT4_TEST_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
POPPLER_QT4_TEST_CFLAGS=$pkg_cv_POPPLER_QT4_TEST_CFLAGS
POPPLER_QT4_TEST_LIBS=$pkg_cv_POPPLER_QT4_TEST_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
elif test x$enable_poppler_qt4 = xtry; then
@@ -20592,46 +21351,46 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_QT4" >&5
$as_echo_n "checking for POPPLER_QT4... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_QT4_CFLAGS"; then
- pkg_cv_POPPLER_QT4_CFLAGS="$POPPLER_QT4_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$POPPLER_QT4_CFLAGS"; then
+ pkg_cv_POPPLER_QT4_CFLAGS="$POPPLER_QT4_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_POPPLER_QT4_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_QT4_LIBS"; then
- pkg_cv_POPPLER_QT4_LIBS="$POPPLER_QT4_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$POPPLER_QT4_LIBS"; then
+ pkg_cv_POPPLER_QT4_LIBS="$POPPLER_QT4_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_POPPLER_QT4_LIBS=`$PKG_CONFIG --libs "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20639,17 +21398,17 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0"`
+ POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0" 2>&1`
else
- POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0"`
+ POPPLER_QT4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_QT4_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_poppler_qt4="no"
+ enable_poppler_qt4="no"
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
enable_poppler_qt4="no"
else
POPPLER_QT4_CFLAGS=$pkg_cv_POPPLER_QT4_CFLAGS
@@ -20664,46 +21423,46 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_QT4_TEST" >&5
$as_echo_n "checking for POPPLER_QT4_TEST... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_QT4_TEST_CFLAGS"; then
- pkg_cv_POPPLER_QT4_TEST_CFLAGS="$POPPLER_QT4_TEST_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$POPPLER_QT4_TEST_CFLAGS"; then
+ pkg_cv_POPPLER_QT4_TEST_CFLAGS="$POPPLER_QT4_TEST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtTest >= 4.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "QtTest >= 4.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_POPPLER_QT4_TEST_CFLAGS=`$PKG_CONFIG --cflags "QtTest >= 4.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$POPPLER_QT4_TEST_LIBS"; then
- pkg_cv_POPPLER_QT4_TEST_LIBS="$POPPLER_QT4_TEST_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$POPPLER_QT4_TEST_LIBS"; then
+ pkg_cv_POPPLER_QT4_TEST_LIBS="$POPPLER_QT4_TEST_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtTest >= 4.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "QtTest >= 4.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_POPPLER_QT4_TEST_LIBS=`$PKG_CONFIG --libs "QtTest >= 4.4.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20711,17 +21470,17 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtTest >= 4.4.0"`
+ POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtTest >= 4.4.0" 2>&1`
else
- POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtTest >= 4.4.0"`
+ POPPLER_QT4_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtTest >= 4.4.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$POPPLER_QT4_TEST_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_poppler_qt4="no"
+ enable_poppler_qt4="no"
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
enable_poppler_qt4="no"
else
POPPLER_QT4_TEST_CFLAGS=$pkg_cv_POPPLER_QT4_TEST_CFLAGS
@@ -20768,239 +21527,880 @@ else
fi
-# Check whether --enable-gtk-test was given.
-if test "${enable_gtk_test+set}" = set; then :
- enableval=$enable_gtk_test; enable_gtk_test=$enableval
+
+# Check whether --enable-poppler-cpp was given.
+if test "${enable_poppler_cpp+set}" = set; then :
+ enableval=$enable_poppler_cpp; enable_poppler_cpp=$enableval
else
- enable_gtk_test="try"
+ enable_poppler_cpp="yes"
fi
-if test x$enable_gtk_test = xyes; then
+if test x$enable_poppler_cpp = xyes; then
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_TEST" >&5
-$as_echo_n "checking for GTK_TEST... " >&6; }
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_TEST_CFLAGS"; then
- pkg_cv_GTK_TEST_CFLAGS="$GTK_TEST_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTK_TEST_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
+
+
+ acl_libdirstem=lib
+ acl_libdirstem2=
+ case "$host_os" in
+ solaris*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+$as_echo_n "checking for 64-bit host... " >&6; }
+if ${gl_cv_solaris_64bit+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_TEST_LIBS"; then
- pkg_cv_GTK_TEST_LIBS="$GTK_TEST_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTK_TEST_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0" 2>/dev/null`
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifdef _LP64
+sixtyfour bits
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
+ gl_cv_solaris_64bit=yes
else
- pkg_failed=yes
+ gl_cv_solaris_64bit=no
fi
- fi
-else
- pkg_failed=untried
+rm -f conftest*
+
+
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+$as_echo "$gl_cv_solaris_64bit" >&6; }
+ if test $gl_cv_solaris_64bit = yes; then
+ acl_libdirstem=lib/64
+ case "$host_cpu" in
+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+ esac
+ fi
+ ;;
+ *)
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ */../ | */.. )
+ # Better ignore directories of this form. They are misleading.
+ ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
+ ;;
+ esac
+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-if test $pkg_failed = yes; then
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
+
+
+
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then :
+ withval=$with_libiconv_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/$acl_libdirstem"
+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
+ && ! test -d "$withval/$acl_libdirstem"; then
+ additional_libdir="$withval/$acl_libdirstem2"
+ fi
+ fi
+ fi
+
fi
- if test $_pkg_short_errors_supported = yes; then
- GTK_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0"`
+
+ LIBICONV=
+ LTLIBICONV=
+ INCICONV=
+ LIBICONV_PREFIX=
+ HAVE_LIBICONV=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='iconv '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+ else
+ :
+ fi
else
- GTK_TEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0"`
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
+ if test -n "$acl_shlibext"; then
+ shrext=".$acl_shlibext" # typically: shrext=.so
+ else
+ shrext=
+ fi
+ if test $use_additional = yes; then
+ dir="$additional_libdir"
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext"
+ else
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+ ver=`(cd "$dir" && \
+ for f in "$libname$shrext".*; do echo "$f"; done \
+ | sed -e "s,^$libname$shrext\\\\.,," \
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+ | sed 1q ) 2>/dev/null`
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+ found_dir="$dir"
+ found_so="$dir/$libname$shrext.$ver"
+ fi
+ else
+ eval library_names=\"$acl_library_names_spec\"
+ for f in $library_names; do
+ if test -f "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext"; then
+ found_dir="$dir"
+ found_a="$dir/$libname.$acl_libext"
+ fi
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$acl_hardcode_direct" = yes; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+ fi
+ if test "$acl_hardcode_minus_L" != no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+ if test "$name" = 'iconv'; then
+ LIBICONV_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ */$acl_libdirstem2 | */$acl_libdirstem2/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+ if test "$name" = 'iconv'; then
+ LIBICONV_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+ fi
fi
- # Put the nasty error message in config.log where it belongs
- echo "$GTK_TEST_PKG_ERRORS" >&5
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$acl_hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ done
+ fi
- as_fn_error "Package requirements (gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0) were not met:
-$GTK_TEST_PKG_ERRORS
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-Alternatively, you may set the environment variables GTK_TEST_CFLAGS
-and GTK_TEST_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
-elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-Alternatively, you may set the environment variables GTK_TEST_CFLAGS
-and GTK_TEST_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
-else
- GTK_TEST_CFLAGS=$pkg_cv_GTK_TEST_CFLAGS
- GTK_TEST_LIBS=$pkg_cv_GTK_TEST_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- :
-fi
-elif test x$enable_gtk_test = xtry; then
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_TEST" >&5
-$as_echo_n "checking for GTK_TEST... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_TEST_CFLAGS"; then
- pkg_cv_GTK_TEST_CFLAGS="$GTK_TEST_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTK_TEST_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0" 2>/dev/null`
-else
- pkg_failed=yes
-fi
+
+
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
fi
+ done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if ${am_cv_func_iconv+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- pkg_failed=untried
+
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_func_iconv=yes
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_TEST_LIBS"; then
- pkg_cv_GTK_TEST_LIBS="$GTK_TEST_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GTK_TEST_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0" 2>/dev/null`
-else
- pkg_failed=yes
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$am_save_LIBS"
fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if ${am_cv_func_iconv_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+ fi
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+ returns. */
+ {
+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+ if (cd_utf8_to_88591 != (iconv_t)(-1))
+ {
+ static const char input[] = "\342\202\254"; /* EURO SIGN */
+ char buf[10];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_utf8_to_88591,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ return 1;
+ }
+ }
+#if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ char buf[50];
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_88591_to_utf8,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if ((int)res > 0)
+ return 1;
+ }
+ }
+#endif
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ if (/* Try standardized names. */
+ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+ /* Try IRIX, OSF/1 names. */
+ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+ /* Try AIX names. */
+ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+ /* Try HP-UX names. */
+ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+ return 1;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ am_cv_func_iconv_works=yes
else
- pkg_failed=untried
+ am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+ LIBS="$am_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+ case "$am_cv_func_iconv_works" in
+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+ *) am_func_iconv=yes ;;
+ esac
+ else
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
-if test $pkg_failed = yes; then
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
+
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+ if ${am_cv_proto_iconv+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GTK_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0"`
- else
- GTK_TEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GTK_TEST_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_gtk_test="no"
-elif test $pkg_failed = untried; then
- enable_gtk_test="no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ am_cv_proto_iconv_arg1=""
else
- GTK_TEST_CFLAGS=$pkg_cv_GTK_TEST_CFLAGS
- GTK_TEST_LIBS=$pkg_cv_GTK_TEST_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- enable_gtk_test="yes"
+ am_cv_proto_iconv_arg1="const"
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
fi
- if test x$enable_gtk_test = xyes -a x$enable_poppler_glib = xyes; then
- BUILD_GTK_TEST_TRUE=
- BUILD_GTK_TEST_FALSE='#'
+
+ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
+ }$am_cv_proto_iconv" >&5
+$as_echo "${ac_t:-
+ }$am_cv_proto_iconv" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
+_ACEOF
+
+ fi
+
+ if test x$am_func_iconv != xyes; then
+ enable_poppler_cpp=no
+ fi
+fi
+
+ if test "x$enable_poppler_cpp" = "xyes"; then
+ BUILD_POPPLER_CPP_TRUE=
+ BUILD_POPPLER_CPP_FALSE='#'
else
- BUILD_GTK_TEST_TRUE='#'
- BUILD_GTK_TEST_FALSE=
+ BUILD_POPPLER_CPP_TRUE='#'
+ BUILD_POPPLER_CPP_FALSE=
fi
-# Check whether --enable-abiword-output was given.
-if test "${enable_abiword_output+set}" = set; then :
- enableval=$enable_abiword_output; enable_abiword_output=$enableval
+
+# Check whether --enable-gtk-test was given.
+if test "${enable_gtk_test+set}" = set; then :
+ enableval=$enable_gtk_test; enable_gtk_test=$enableval
else
- enable_abiword_output="try"
+ enable_gtk_test="try"
fi
-if test x$enable_abiword_output = xyes; then
+if test x$enable_gtk_test = xyes; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ABIWORD" >&5
-$as_echo_n "checking for ABIWORD... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_TEST" >&5
+$as_echo_n "checking for GTK_TEST... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$ABIWORD_CFLAGS"; then
- pkg_cv_ABIWORD_CFLAGS="$ABIWORD_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+if test -n "$GTK_TEST_CFLAGS"; then
+ pkg_cv_GTK_TEST_CFLAGS="$GTK_TEST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_ABIWORD_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
+ pkg_cv_GTK_TEST_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$ABIWORD_LIBS"; then
- pkg_cv_ABIWORD_LIBS="$ABIWORD_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+if test -n "$GTK_TEST_LIBS"; then
+ pkg_cv_GTK_TEST_LIBS="$GTK_TEST_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_ABIWORD_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
+ pkg_cv_GTK_TEST_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21008,90 +22408,91 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ABIWORD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0"`
+ GTK_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0" 2>&1`
else
- ABIWORD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0"`
+ GTK_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$ABIWORD_PKG_ERRORS" >&5
+ echo "$GTK_TEST_PKG_ERRORS" >&5
- as_fn_error "Package requirements (libxml-2.0) were not met:
+ as_fn_error $? "Package requirements (gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0) were not met:
-$ABIWORD_PKG_ERRORS
+$GTK_TEST_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables ABIWORD_CFLAGS
-and ABIWORD_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+Alternatively, you may set the environment variables GTK_TEST_CFLAGS
+and GTK_TEST_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables ABIWORD_CFLAGS
-and ABIWORD_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables GTK_TEST_CFLAGS
+and GTK_TEST_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
- ABIWORD_CFLAGS=$pkg_cv_ABIWORD_CFLAGS
- ABIWORD_LIBS=$pkg_cv_ABIWORD_LIBS
+ GTK_TEST_CFLAGS=$pkg_cv_GTK_TEST_CFLAGS
+ GTK_TEST_LIBS=$pkg_cv_GTK_TEST_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
-elif test x$enable_abiword_output = xtry; then
+elif test x$enable_gtk_test = xtry; then
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ABIWORD" >&5
-$as_echo_n "checking for ABIWORD... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_TEST" >&5
+$as_echo_n "checking for GTK_TEST... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$ABIWORD_CFLAGS"; then
- pkg_cv_ABIWORD_CFLAGS="$ABIWORD_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+if test -n "$GTK_TEST_CFLAGS"; then
+ pkg_cv_GTK_TEST_CFLAGS="$GTK_TEST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_ABIWORD_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
+ pkg_cv_GTK_TEST_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$ABIWORD_LIBS"; then
- pkg_cv_ABIWORD_LIBS="$ABIWORD_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+if test -n "$GTK_TEST_LIBS"; then
+ pkg_cv_GTK_TEST_LIBS="$GTK_TEST_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_ABIWORD_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
+ pkg_cv_GTK_TEST_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21099,33 +22500,32 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ABIWORD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0"`
+ GTK_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0" 2>&1`
else
- ABIWORD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0"`
+ GTK_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$ABIWORD_PKG_ERRORS" >&5
+ echo "$GTK_TEST_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_abiword_output="no"
+ enable_gtk_test="no"
elif test $pkg_failed = untried; then
- enable_abiword_output="no"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ enable_gtk_test="no"
else
- ABIWORD_CFLAGS=$pkg_cv_ABIWORD_CFLAGS
- ABIWORD_LIBS=$pkg_cv_ABIWORD_LIBS
+ GTK_TEST_CFLAGS=$pkg_cv_GTK_TEST_CFLAGS
+ GTK_TEST_LIBS=$pkg_cv_GTK_TEST_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- enable_abiword_output="yes"
+ enable_gtk_test="yes"
fi
fi
-
- if test x$enable_abiword_output = xyes; then
- BUILD_ABIWORD_OUTPUT_TRUE=
- BUILD_ABIWORD_OUTPUT_FALSE='#'
+ if test x$enable_gtk_test = xyes -a x$enable_poppler_glib = xyes; then
+ BUILD_GTK_TEST_TRUE=
+ BUILD_GTK_TEST_FALSE='#'
else
- BUILD_ABIWORD_OUTPUT_TRUE='#'
- BUILD_ABIWORD_OUTPUT_FALSE=
+ BUILD_GTK_TEST_TRUE='#'
+ BUILD_GTK_TEST_FALSE=
fi
@@ -21167,46 +22567,46 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS" >&5
$as_echo_n "checking for LCMS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LCMS_CFLAGS"; then
- pkg_cv_LCMS_CFLAGS="$LCMS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LCMS_CFLAGS"; then
+ pkg_cv_LCMS_CFLAGS="$LCMS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms\""; } >&5
($PKG_CONFIG --exists --print-errors "lcms") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LCMS_LIBS"; then
- pkg_cv_LCMS_LIBS="$LCMS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LCMS_LIBS"; then
+ pkg_cv_LCMS_LIBS="$LCMS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms\""; } >&5
($PKG_CONFIG --exists --print-errors "lcms") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21214,14 +22614,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lcms"`
+ LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms" 2>&1`
else
- LCMS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lcms"`
+ LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LCMS_PKG_ERRORS" >&5
- as_fn_error "Package requirements (lcms) were not met:
+ as_fn_error $? "Package requirements (lcms) were not met:
$LCMS_PKG_ERRORS
@@ -21230,12 +22630,13 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables LCMS_CFLAGS
and LCMS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -21244,13 +22645,13 @@ and LCMS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
LCMS_CFLAGS=$pkg_cv_LCMS_CFLAGS
LCMS_LIBS=$pkg_cv_LCMS_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
elif test x$enable_cms = xtry; then
@@ -21258,46 +22659,46 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS" >&5
$as_echo_n "checking for LCMS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LCMS_CFLAGS"; then
- pkg_cv_LCMS_CFLAGS="$LCMS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LCMS_CFLAGS"; then
+ pkg_cv_LCMS_CFLAGS="$LCMS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms\""; } >&5
($PKG_CONFIG --exists --print-errors "lcms") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LCMS_LIBS"; then
- pkg_cv_LCMS_LIBS="$LCMS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LCMS_LIBS"; then
+ pkg_cv_LCMS_LIBS="$LCMS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms\""; } >&5
($PKG_CONFIG --exists --print-errors "lcms") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21305,17 +22706,17 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lcms"`
+ LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms" 2>&1`
else
- LCMS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lcms"`
+ LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LCMS_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- enable_cms=no
+ enable_cms=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
enable_cms=no
else
LCMS_CFLAGS=$pkg_cv_LCMS_CFLAGS
@@ -21345,10 +22746,10 @@ if test "x$GCC" != xyes; then
fi
case "$enable_compile_warnings" in
no) ;;
- yes) CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual $CXXFLAGS" ;;
- kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi \
- -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align \
- -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith \
+ yes) CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-check-new -fno-common $CXXFLAGS" ;;
+ kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef \
+ -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
+ -Wconversion -Wall -W -Wpointer-arith \
-Wwrite-strings -O2 -Wformat-security \
-Wmissing-format-attribute -fno-exceptions -fno-check-new \
-fno-common $CXXFLAGS" ;;
@@ -21368,12 +22769,14 @@ esac
POPPLER_MAJOR_VERSION=0
-POPPLER_MINOR_VERSION=12
+POPPLER_MINOR_VERSION=18
+
+POPPLER_MICRO_VERSION=0
-POPPLER_MICRO_VERSION=4
+POPPLER_VERSION=0.18.0
-ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/demo/Makefile test/Makefile qt/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile poppler.pc poppler-cairo.pc poppler-splash.pc poppler-glib.pc poppler-qt.pc poppler-qt4.pc"
+ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile cpp/Makefile cpp/poppler-version.h cpp/tests/Makefile poppler.pc poppler-uninstalled.pc poppler-cairo.pc poppler-cairo-uninstalled.pc poppler-splash.pc poppler-splash-uninstalled.pc poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc poppler-qt4-uninstalled.pc poppler-cpp.pc poppler-cpp-uninstalled.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21439,10 +22842,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
+ if test "x$cache_file" != "x/dev/null"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -21458,6 +22872,7 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -21481,99 +22896,120 @@ else
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error "conditional \"AMDEP\" was never defined.
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCC\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_XPDF_HEADERS_TRUE}" && test -z "${ENABLE_XPDF_HEADERS_FALSE}"; then
- as_fn_error "conditional \"ENABLE_XPDF_HEADERS\" was never defined.
+ as_fn_error $? "conditional \"ENABLE_XPDF_HEADERS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_LIBOPENJPEG_TRUE}" && test -z "${BUILD_LIBOPENJPEG_FALSE}"; then
- as_fn_error "conditional \"BUILD_LIBOPENJPEG\" was never defined.
+ as_fn_error $? "conditional \"BUILD_LIBOPENJPEG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_LIBTIFF_TRUE}" && test -z "${BUILD_LIBTIFF_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_LIBTIFF\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_ZLIB_TRUE}" && test -z "${BUILD_ZLIB_FALSE}"; then
- as_fn_error "conditional \"BUILD_ZLIB\" was never defined.
+ as_fn_error $? "conditional \"BUILD_ZLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_LIBCURL_TRUE}" && test -z "${BUILD_LIBCURL_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_LIBCURL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_LIBJPEG_TRUE}" && test -z "${BUILD_LIBJPEG_FALSE}"; then
- as_fn_error "conditional \"BUILD_LIBJPEG\" was never defined.
+ as_fn_error $? "conditional \"BUILD_LIBJPEG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_LIBPNG_TRUE}" && test -z "${BUILD_LIBPNG_FALSE}"; then
- as_fn_error "conditional \"BUILD_LIBPNG\" was never defined.
+ as_fn_error $? "conditional \"BUILD_LIBPNG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_WITH_WIN32_FONTCONFIGURATION_TRUE}" && test -z "${BUILD_WITH_WIN32_FONTCONFIGURATION_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_WITH_WIN32_FONTCONFIGURATION\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_SPLASH_OUTPUT_TRUE}" && test -z "${BUILD_SPLASH_OUTPUT_FALSE}"; then
- as_fn_error "conditional \"BUILD_SPLASH_OUTPUT\" was never defined.
+ as_fn_error $? "conditional \"BUILD_SPLASH_OUTPUT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_CAIRO_OUTPUT_TRUE}" && test -z "${BUILD_CAIRO_OUTPUT_FALSE}"; then
- as_fn_error "conditional \"BUILD_CAIRO_OUTPUT\" was never defined.
+ as_fn_error $? "conditional \"BUILD_CAIRO_OUTPUT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_POPPLER_GLIB_TRUE}" && test -z "${BUILD_POPPLER_GLIB_FALSE}"; then
- as_fn_error "conditional \"BUILD_POPPLER_GLIB\" was never defined.
+ as_fn_error $? "conditional \"BUILD_POPPLER_GLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
- as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+ as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
- as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
+ as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
+ as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${BUILD_WITH_GDK_TRUE}" && test -z "${BUILD_WITH_GDK_FALSE}"; then
- as_fn_error "conditional \"BUILD_WITH_GDK\" was never defined.
+if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
+ as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${BUILD_POPPLER_QT_TRUE}" && test -z "${BUILD_POPPLER_QT_FALSE}"; then
- as_fn_error "conditional \"BUILD_POPPLER_QT\" was never defined.
+if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
+ as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_POPPLER_QT4_TRUE}" && test -z "${BUILD_POPPLER_QT4_FALSE}"; then
- as_fn_error "conditional \"BUILD_POPPLER_QT4\" was never defined.
+ as_fn_error $? "conditional \"BUILD_POPPLER_QT4\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${BUILD_GTK_TEST_TRUE}" && test -z "${BUILD_GTK_TEST_FALSE}"; then
- as_fn_error "conditional \"BUILD_GTK_TEST\" was never defined.
+if test -z "${BUILD_POPPLER_CPP_TRUE}" && test -z "${BUILD_POPPLER_CPP_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_POPPLER_CPP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${BUILD_ABIWORD_OUTPUT_TRUE}" && test -z "${BUILD_ABIWORD_OUTPUT_FALSE}"; then
- as_fn_error "conditional \"BUILD_ABIWORD_OUTPUT\" was never defined.
+if test -z "${BUILD_GTK_TEST_TRUE}" && test -z "${BUILD_GTK_TEST_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_GTK_TEST\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${BUILD_UTILS_TRUE}" && test -z "${BUILD_UTILS_FALSE}"; then
- as_fn_error "conditional \"BUILD_UTILS\" was never defined.
+ as_fn_error $? "conditional \"BUILD_UTILS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_CMS_TRUE}" && test -z "${USE_CMS_FALSE}"; then
- as_fn_error "conditional \"USE_CMS\" was never defined.
+ as_fn_error $? "conditional \"USE_CMS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -21674,6 +23110,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -21719,19 +23156,19 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
as_fn_error ()
{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
- $as_echo "$as_me: error: $1" >&2
+ $as_echo "$as_me: error: $2" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -21927,7 +23364,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -21980,8 +23417,8 @@ 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 $as_me 0.12.4, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+This file was extended by poppler $as_me 0.18.0, which was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -22021,6 +23458,7 @@ Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -22043,12 +23481,13 @@ Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>."
_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 config.status 0.12.4
-configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+poppler config.status 0.18.0
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -22066,11 +23505,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
@@ -22084,12 +23528,15 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -22102,7 +23549,7 @@ do
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error "ambiguous option: \`$1'
+ as_fn_error $? "ambiguous option: \`$1'
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
@@ -22111,7 +23558,7 @@ Try \`$0 --help' for more information.";;
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error "unrecognized option: \`$1'
+ -*) as_fn_error $? "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -22165,186 +23612,212 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
-AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
# Quote evaled strings.
-for var in SED \
+for var in AS \
+DLLTOOL \
+OBJDUMP \
+SHELL \
+ECHO \
+SED \
GREP \
EGREP \
FGREP \
@@ -22356,8 +23829,12 @@ lt_NL2SP \
reload_flag \
deplibs_check_method \
file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+sharedlib_from_linklib_cmd \
AR \
AR_FLAGS \
+archiver_list_spec \
STRIP \
RANLIB \
CC \
@@ -22367,14 +23844,14 @@ lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
+nm_file_list_spec \
lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
lt_prog_compiler_pic \
+lt_prog_compiler_wl \
lt_prog_compiler_static \
lt_cv_prog_compiler_c_o \
need_locks \
+MANIFEST_TOOL \
DSYMUTIL \
NMEDIT \
LIPO \
@@ -22390,7 +23867,6 @@ no_undefined_flag \
hardcode_libdir_flag_spec \
hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
-fix_srcfile_path \
exclude_expsyms \
include_expsyms \
file_list_spec \
@@ -22398,6 +23874,7 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
+install_override_mode \
finish_eval \
old_striplib \
striplib \
@@ -22408,10 +23885,11 @@ predeps \
postdeps \
compiler_lib_search_path \
LD_CXX \
+reload_flag_CXX \
compiler_CXX \
lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_wl_CXX \
lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
lt_prog_compiler_static_CXX \
lt_cv_prog_compiler_c_o_CXX \
export_dynamic_flag_spec_CXX \
@@ -22423,7 +23901,6 @@ no_undefined_flag_CXX \
hardcode_libdir_flag_spec_CXX \
hardcode_libdir_flag_spec_ld_CXX \
hardcode_libdir_separator_CXX \
-fix_srcfile_path_CXX \
exclude_expsyms_CXX \
include_expsyms_CXX \
file_list_spec_CXX \
@@ -22433,9 +23910,9 @@ postdep_objects_CXX \
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -22457,11 +23934,13 @@ module_cmds \
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
+postlink_cmds \
postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
sys_lib_dlsearch_path_spec \
+reload_cmds_CXX \
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
old_archive_from_expsyms_cmds_CXX \
@@ -22470,10 +23949,11 @@ archive_expsym_cmds_CXX \
module_cmds_CXX \
module_expsym_cmds_CXX \
export_symbols_cmds_CXX \
-prelink_cmds_CXX; do
- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -22481,12 +23961,6 @@ prelink_cmds_CXX; do
esac
done
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
- ;;
-esac
-
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
@@ -22530,21 +24004,30 @@ do
"glib/Makefile") CONFIG_FILES="$CONFIG_FILES glib/Makefile" ;;
"glib/poppler-features.h") CONFIG_FILES="$CONFIG_FILES glib/poppler-features.h" ;;
"glib/reference/Makefile") CONFIG_FILES="$CONFIG_FILES glib/reference/Makefile" ;;
+ "glib/reference/version.xml") CONFIG_FILES="$CONFIG_FILES glib/reference/version.xml" ;;
"glib/demo/Makefile") CONFIG_FILES="$CONFIG_FILES glib/demo/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
- "qt/Makefile") CONFIG_FILES="$CONFIG_FILES qt/Makefile" ;;
"qt4/Makefile") CONFIG_FILES="$CONFIG_FILES qt4/Makefile" ;;
"qt4/src/Makefile") CONFIG_FILES="$CONFIG_FILES qt4/src/Makefile" ;;
"qt4/tests/Makefile") CONFIG_FILES="$CONFIG_FILES qt4/tests/Makefile" ;;
"qt4/demos/Makefile") CONFIG_FILES="$CONFIG_FILES qt4/demos/Makefile" ;;
+ "cpp/Makefile") CONFIG_FILES="$CONFIG_FILES cpp/Makefile" ;;
+ "cpp/poppler-version.h") CONFIG_FILES="$CONFIG_FILES cpp/poppler-version.h" ;;
+ "cpp/tests/Makefile") CONFIG_FILES="$CONFIG_FILES cpp/tests/Makefile" ;;
"poppler.pc") CONFIG_FILES="$CONFIG_FILES poppler.pc" ;;
+ "poppler-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES poppler-uninstalled.pc" ;;
"poppler-cairo.pc") CONFIG_FILES="$CONFIG_FILES poppler-cairo.pc" ;;
+ "poppler-cairo-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES poppler-cairo-uninstalled.pc" ;;
"poppler-splash.pc") CONFIG_FILES="$CONFIG_FILES poppler-splash.pc" ;;
+ "poppler-splash-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES poppler-splash-uninstalled.pc" ;;
"poppler-glib.pc") CONFIG_FILES="$CONFIG_FILES poppler-glib.pc" ;;
- "poppler-qt.pc") CONFIG_FILES="$CONFIG_FILES poppler-qt.pc" ;;
+ "poppler-glib-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES poppler-glib-uninstalled.pc" ;;
"poppler-qt4.pc") CONFIG_FILES="$CONFIG_FILES poppler-qt4.pc" ;;
+ "poppler-qt4-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES poppler-qt4-uninstalled.pc" ;;
+ "poppler-cpp.pc") CONFIG_FILES="$CONFIG_FILES poppler-cpp.pc" ;;
+ "poppler-cpp-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES poppler-cpp-uninstalled.pc" ;;
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -22567,9 +24050,10 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp=
+ tmp= ac_tmp=
trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -22577,12 +24061,13 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -22599,12 +24084,12 @@ if test "x$ac_cr" = x; then
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\r'
+ ac_cs_awk_cr='\\r'
else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_ACEOF
@@ -22613,18 +24098,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -22632,7 +24117,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -22646,7 +24131,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -22660,7 +24145,7 @@ s/.\{148\}//
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
@@ -22680,7 +24165,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -22712,21 +24197,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[ ]*\):*/\1/
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -22738,7 +24231,7 @@ fi # test -n "$CONFIG_FILES"
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -22750,11 +24243,11 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_t"; then
+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_tt"; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -22839,7 +24332,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
@@ -22852,7 +24345,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -22871,7 +24364,7 @@ do
for ac_f
do
case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -22880,7 +24373,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -22906,8 +24399,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -23043,23 +24536,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&5
+which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&2;}
+which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
case $ac_file in
- -) cat "$tmp/out" && rm -f "$tmp/out";;
- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
esac \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
:H)
#
@@ -23068,21 +24562,21 @@ which seems to be undefined. Please make sure it is defined." >&2;}
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- } >"$tmp/config.h" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+ } >"$ac_tmp/config.h" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$tmp/config.h" "$ac_file" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ mv "$ac_tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error "could not create -" "$LINENO" 5
+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
@@ -23243,7 +24737,8 @@ $as_echo X"$file" |
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+# Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -23276,13 +24771,13 @@ available_tags="CXX "
# ### BEGIN LIBTOOL CONFIG
# Assembler program.
-AS=$AS
+AS=$lt_AS
# DLL creation program.
-DLLTOOL=$DLLTOOL
+DLLTOOL=$lt_DLLTOOL
# Object dumper program.
-OBJDUMP=$OBJDUMP
+OBJDUMP=$lt_OBJDUMP
# Which release of libtool.m4 was used?
macro_version=$macro_version
@@ -23300,6 +24795,12 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
# The host system.
host_alias=$host_alias
host=$host
@@ -23349,20 +24850,36 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-# Command to use when deplibs_check_method == "file_magic".
+# Command to use when deplibs_check_method = "file_magic".
file_magic_cmd=$lt_file_magic_cmd
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
# The archiver.
AR=$lt_AR
+
+# Flags to create an archive.
AR_FLAGS=$lt_AR_FLAGS
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
# A symbol stripping program.
STRIP=$lt_STRIP
@@ -23371,6 +24888,9 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
# A C compiler.
LTCC=$lt_CC
@@ -23389,14 +24909,14 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
@@ -23404,6 +24924,9 @@ MAGIC_CMD=$MAGIC_CMD
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
@@ -23460,6 +24983,9 @@ library_names_spec=$lt_library_names_spec
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
@@ -23499,6 +25025,10 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
@@ -23511,12 +25041,12 @@ with_gcc=$GCC
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
# Additional compiler flags for building library objects.
pic_flag=$lt_lt_prog_compiler_pic
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
@@ -23603,9 +25133,6 @@ inherit_rpath=$inherit_rpath
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
@@ -23621,6 +25148,9 @@ include_expsyms=$lt_include_expsyms
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
@@ -23667,212 +25197,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- case $xsi_shell in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=${1%%=*}
- func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=${#1}
-}
-
-_LT_EOF
- ;;
- *) # Bourne compatible functions.
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-}
-
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "X${3}" \
- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
- esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
- yes)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$1+=\$2"
-}
-_LT_EOF
- ;;
- *)
- cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
- eval "$1=\$$1\$2"
-}
-
-_LT_EOF
- ;;
- esac
-
-
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- mv -f "$cfgfile" "$ofile" ||
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ if test x"$xsi_shell" = xyes; then
+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\ case ${1} in\
+\ */*) func_dirname_result="${1%/*}${2}" ;;\
+\ * ) func_dirname_result="${3}" ;;\
+\ esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\ func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\ case ${1} in\
+\ */*) func_dirname_result="${1%/*}${2}" ;;\
+\ * ) func_dirname_result="${3}" ;;\
+\ esac\
+\ func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\ # positional parameters, so assign one to ordinary parameter first.\
+\ func_stripname_result=${3}\
+\ func_stripname_result=${func_stripname_result#"${1}"}\
+\ func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\ func_split_long_opt_name=${1%%=*}\
+\ func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\ func_split_short_opt_arg=${1#??}\
+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\ case ${1} in\
+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\ *) func_lo2o_result=${1} ;;\
+\ esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+ func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+ func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+ func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+ sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+ eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\ func_quote_for_eval "${2}"\
+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+ # Save a `func_append' function call where possible by direct use of '+='
+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+ test 0 -eq $? || _lt_function_replace_fail=:
+else
+ # Save a `func_append' function call even when '+=' is not available
+ sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+ && mv -f "$cfgfile.tmp" "$cfgfile" \
+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+ test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
+
+
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -23884,6 +25371,10 @@ _LT_EOF
# The linker used to build libraries.
LD=$lt_LD_CXX
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds_CXX
@@ -23896,12 +25387,12 @@ with_gcc=$GCC_CXX
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
# Additional compiler flags for building library objects.
pic_flag=$lt_lt_prog_compiler_pic_CXX
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static_CXX
@@ -23988,9 +25479,6 @@ inherit_rpath=$inherit_rpath_CXX
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs_CXX
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path_CXX
-
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
@@ -24006,6 +25494,9 @@ include_expsyms=$lt_include_expsyms_CXX
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds_CXX
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec_CXX
@@ -24040,7 +25531,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -24061,7 +25552,7 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit $?
+ $ac_cs_success || as_fn_exit 1
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
@@ -24072,17 +25563,19 @@ fi
echo ""
echo "Building poppler with support for:"
+echo " font configuration: $with_font_configuration"
echo " splash output: $enable_splash_output"
echo " cairo output: $enable_cairo_output"
-echo " abiword output: $enable_abiword_output"
-echo " qt wrapper: $enable_poppler_qt"
echo " qt4 wrapper: $enable_poppler_qt4"
echo " glib wrapper: $enable_poppler_glib"
-echo " use GDK: $enable_gdk"
+echo " introspection: $found_introspection"
+echo " cpp wrapper: $enable_poppler_cpp"
echo " use gtk-doc: $enable_gtk_doc"
echo " use libjpeg: $enable_libjpeg"
echo " use libpng: $enable_libpng"
+echo " use libtiff: $enable_libtiff"
echo " use zlib: $enable_zlib"
+echo " use libcurl: $enable_libcurl"
echo " use libopenjpeg: $enable_libopenjpeg"
echo " use cms: $enable_cms"
echo " command line utils: $enable_utils"
@@ -24092,6 +25585,10 @@ if test x$enable_splash_output = xno -a x$enable_cairo_output = xno; then
echo " Warning: There is no rendering backend enabled"
fi
+if test x$enable_single_precision = xyes -a x$enable_fixedpoint = xyes; then
+ echo " Warning: Single precision and fixed point options should not be enabled at the same time"
+fi
+
if test x$enable_libjpeg != xyes; then
echo " Warning: Using libjpeg is recommended"
fi
diff --git a/Build/source/libs/poppler/poppler-0.12.4/configure.ac b/Build/source/libs/poppler/poppler-0.18.0/configure.ac
index 9315973c01e..7293d1f4082 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.18.0/configure.ac
@@ -1,15 +1,16 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[12])
-m4_define([poppler_version_micro],[4])
+m4_define([poppler_version_minor],[18])
+m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
AC_INIT([poppler],[poppler_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=poppler])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AM_CONFIG_HEADER(config.h)
AM_CONFIG_HEADER(poppler/poppler-config.h)
+AC_C_BIGENDIAN
dnl ##### Initialize libtool.
AC_LIBTOOL_WIN32_DLL
@@ -25,10 +26,16 @@ AC_PROG_CC_STDC
# CXX="gcc"
#fi
AC_PROG_CXX
+if test "x$GXX" = "xyes"; then
+ case "$host_os" in
+ cygwin* | mingw*)
+ ;;
+ *)
+ CXXFLAGS="$CXXFLAGS -ansi"
+ ;;
+ esac
+fi
AC_PROG_INSTALL
-AC_CHECK_FUNC(gettimeofday, AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Defines if gettimeofday is available on your system]))
-AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_r is available on your system]))
-AC_CHECK_FUNC(gmtime_r, AC_DEFINE(HAVE_GMTIME_R, 1, [Defines if gmtime_r is available on your system]))
dnl ##### Check for pkgconfig
PKG_PROG_PKG_CONFIG
@@ -47,6 +54,7 @@ case "$host_os" in
create_shared_lib="-no-undefined"
;;
mingw*)
+ os_win32=yes
win32_libs="-lgdi32"
create_shared_lib="-no-undefined"
auto_import_flags="-Wl,--enable-auto-import"
@@ -67,25 +75,56 @@ AC_ARG_ENABLE(xpdf-headers,
enable_xpdf_headers="no")
AM_CONDITIONAL(ENABLE_XPDF_HEADERS, test x$enable_xpdf_headers = xyes)
+AC_ARG_ENABLE(single-precision,
+[ --enable-single-precision use single precision arithmetic (instead of double precision) in the Splash backend],
+AC_DEFINE(USE_FLOAT, [1], [Use single precision arithmetic in the Splash backend]))
+
AC_ARG_ENABLE(fixedpoint,
-[ --enable-fixedpoint use fixed point (instead of floating point) arithmetic],
-AC_DEFINE(USE_FIXEDPOINT, [1], [Use fixed point arithmetic]))
+[ --enable-fixedpoint use fixed point (instead of double precision) arithmetic in the Splash backend],
+AC_DEFINE(USE_FIXEDPOINT, [1], [Use fixed point arithmetic in the Splash backend]))
+
+dnl Relocation support
+AC_ARG_ENABLE(relocatable,
+ AC_HELP_STRING([--disable-relocatable],
+ [Hardcode the poppler library location (on Windows).]),
+ enable_relocatable=$enableval,
+ [if test x$os_win32 = xyes; then
+ # default to yes on native Windows.
+ enable_relocatable="yes"
+ else
+ # default to no everywhere else.
+ enable_relocatable="no"
+ fi
+ ]
+)
+
+if test x$enable_relocatable = xyes; then
+ if test x$os_win32 = xyes; then
+ AC_DEFINE([ENABLE_RELOCATABLE],
+ [1],[Do not hardcode the library location])
+ else
+ AC_MSG_ERROR(
+ [Invalid setting for relocatable, only supported on windows])
+
+ fi
+fi
AC_DEFINE_DIR(POPPLER_DATADIR, "{datarootdir}/poppler", [Poppler data dir])
dnl ##### Checks for header files.
AC_PATH_XTRA
AC_HEADER_DIRENT
-
-AC_ARG_ENABLE(exceptions,
- [ --enable-exceptions use C++ exceptions],
- AC_DEFINE([USE_EXCEPTIONS], [1], [Throw exceptions to deal with not enough memory and similar problems]))
+AC_CHECK_HEADERS([stdint.h])
dnl ##### Switch over to C++. This will make the checks below a little
dnl ##### bit stricter (requiring function prototypes in include files).
dnl ##### (99% of xpdf is written in C++.)
AC_LANG_CPLUSPLUS
+AC_CHECK_DECL(gettimeofday, [AC_CHECK_FUNC(gettimeofday, AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Defines if gettimeofday is available on your system]))],[],[#include <sys/time.h>])
+AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_r is available on your system]))
+AC_CHECK_FUNC(gmtime_r, AC_DEFINE(HAVE_GMTIME_R, 1, [Defines if gmtime_r is available on your system]))
+
dnl ##### Check for extra libraries needed by X. (LynxOS needs this.)
AC_CHECK_FUNC(gethostbyname)
if test $ac_cv_func_gethostbyname = no; then
@@ -135,6 +174,37 @@ AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$enable_libopenjpeg = xyes)
AH_TEMPLATE([ENABLE_LIBOPENJPEG],
[Use libopenjpeg instead of builtin jpeg2000 decoder.])
+dnl ##### Test for libtiff
+AC_ARG_ENABLE(libtiff,
+ AC_HELP_STRING([--disable-libtiff],
+ [Don't build against libtiff.]),
+ enable_libtiff=$enableval,
+ enable_libtiff="try")
+
+if test x$enable_libtiff = xyes; then
+ AC_CHECK_LIB([tiff], [TIFFOpen],,
+ AC_MSG_ERROR("*** libtiff library not found ***"))
+ AC_CHECK_HEADERS([tiffio.h],,
+ AC_MSG_ERROR("*** libtiff headers not found ***"))
+elif test x$enable_libtiff = xtry; then
+ AC_CHECK_LIB([tiff], [TIFFOpen],
+ [enable_libtiff="yes"],
+ [enable_libtiff="no"])
+ AC_CHECK_HEADERS([tiffio.h],,
+ [enable_libtiff="no"])
+fi
+
+if test x$enable_libtiff = xyes; then
+ LIBTIFF_LIBS="-ltiff"
+ AC_SUBST(LIBTIFF_LIBS)
+ AC_DEFINE(ENABLE_LIBTIFF)
+fi
+
+AM_CONDITIONAL(BUILD_LIBTIFF, test x$enable_libtiff = xyes)
+AH_TEMPLATE([ENABLE_LIBTIFF], [Build against libtiff.])
+if test x$enable_libtiff = xyes; then
+ AC_DEFINE(ENABLE_LIBTIFF, 1, [Build against libtiff.])
+fi
dnl ##### Checks for library functions.
AC_CHECK_FUNCS(popen mkstemp mkstemps)
@@ -179,6 +249,21 @@ AM_CONDITIONAL(BUILD_ZLIB, test x$enable_zlib = xyes)
AH_TEMPLATE([ENABLE_ZLIB],
[Use zlib instead of builtin zlib decoder.])
+dnl Test for libcurl
+AC_ARG_ENABLE(libcurl,
+ AC_HELP_STRING([--enable-libcurl],
+ [Build with libcurl based HTTP support.]),
+ enable_libcurl=$enableval,
+ enable_libcurl="no")
+
+if test x$enable_libcurl = xyes; then
+ PKG_CHECK_MODULES(LIBCURL, libcurl)
+ AC_DEFINE(ENABLE_LIBCURL, 1, [Build against libcurl.])
+ AC_DEFINE(POPPLER_HAS_CURL_SUPPORT, 1,
+ [Support for curl based doc builder is compiled in.])
+fi
+
+AM_CONDITIONAL(BUILD_LIBCURL, test x$enable_libcurl = xyes)
dnl Test for libjpeg
AC_ARG_ENABLE(libjpeg,
@@ -197,16 +282,20 @@ AH_TEMPLATE([ENABLE_LIBJPEG],
dnl Test for libpng
AC_ARG_ENABLE(libpng,
AC_HELP_STRING([--disable-libpng],
- [Don't build against libpng.]),
+ [Do not build against libpng.]),
enable_libpng=$enableval,
enable_libpng="try")
+
if test x$enable_libpng != xno; then
- POPPLER_FIND_PNG
+ PKG_CHECK_MODULES(LIBPNG, libpng, [enable_libpng="yes"],
+ [enable_libpng="no"])
+fi
+
+if test x$enable_libpng = xyes; then
+ AC_DEFINE(ENABLE_LIBPNG, 1, [Build against libpng.])
fi
AM_CONDITIONAL(BUILD_LIBPNG, test x$enable_libpng = xyes)
-AH_TEMPLATE([ENABLE_LIBPNG],
- [Build against libpng.])
dnl Check for freetype headers
FREETYPE_LIBS=
@@ -235,7 +324,42 @@ fi
AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
-PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.0.0)
+AC_MSG_CHECKING([which font configuration to use])
+AC_ARG_WITH([font_configuration],
+ [AS_HELP_STRING([--with-font-configuration=fontconfig|win32],
+ [Select font configuration backend])],
+ [],
+ [if test x$os_win32 = xyes; then
+ # default to win32 on native Windows.
+ with_font_configuration=win32
+ else
+ # default to fontconig everywhere else.
+ with_font_configuration=fontconfig
+ fi
+ ]
+)
+AC_MSG_RESULT([$with_font_configuration])
+
+case $with_font_configuration in
+ win32)
+ AC_DEFINE([WITH_FONTCONFIGURATION_WIN32],
+ [1],[Use win32 font configuration backend])
+ # Set the minimum required Internet Explorer version to 5.0
+ CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x0500"
+ ;;
+ fontconfig)
+ AC_DEFINE([WITH_FONTCONFIGURATION_FONTCONFIG],
+ [1],[Use fontconfig font configuration backend])
+ PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.0.0)
+ ;;
+ *)
+ AC_MSG_ERROR(
+ [Invalid font configuration setting: $with_font_configuration])
+ ;;
+esac
+
+AM_CONDITIONAL(BUILD_WITH_WIN32_FONTCONFIGURATION,
+ test x$with_font_configuration = xwin32)
AC_ARG_ENABLE(splash-output,
AC_HELP_STRING([--disable-splash-output],
@@ -247,7 +371,7 @@ if test x$enable_splash_output = xyes; then
AC_DEFINE(HAVE_SPLASH)
fi
-CAIRO_VERSION="1.8.4"
+CAIRO_VERSION="1.10.0"
AC_SUBST(CAIRO_VERSION)
AC_ARG_ENABLE(cairo-output,
AC_HELP_STRING([--disable-cairo-output],
@@ -272,30 +396,6 @@ if test x$enable_cairo_output = xyes; then
CAIRO_FEATURE="#define POPPLER_HAS_CAIRO 1"
CAIRO_REQ="cairo"
AC_CHECK_HEADERS(fcntl.h sys/mman.h sys/stat.h)
- AC_LANG_PUSH([C])
- _SAVE_CFLAGS=$CFLAGS
- _SAVE_LIBS=$LIBS
- CFLAGS="$CFLAGS $CAIRO_CFLAGS"
- LIBS="$LIBS $CAIRO_LIBS"
- AC_CACHE_CHECK([for cairo blend modes support],
- ac_cv_cairo_has_blend_modes,
- [AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE([[
-#include <cairo.h>
-int main() {
- cairo_t *cr;
- cairo_set_operator(cr, CAIRO_OPERATOR_MULTIPLY);
- return 0;
-}
- ]])],
- [ac_cv_cairo_has_blend_modes="yes"],
- [ac_cv_cairo_has_blend_modes="no"])])
- CFLAGS=$_SAVE_CFLAGS
- LIBS=$_SAVE_LIBS
- AC_LANG_POP([C])
- if test "$ac_cv_cairo_has_blend_modes" = "yes"; then
- AC_DEFINE(CAIRO_HAS_BLEND_MODES, [1], [Whether cairo has blend modes support])
- fi
else
CAIRO_FEATURE="#undef POPPLER_HAS_CAIRO"
CAIRO_REQ=""
@@ -303,93 +403,47 @@ fi
AC_SUBST(CAIRO_FEATURE)
AC_SUBST(CAIRO_REQ)
-POPPLER_GLIB_DISABLE_DEPRECATED=""
-POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
-
-GLIB_REQUIRED=2.6
-AC_ARG_ENABLE(poppler-glib,
- AC_HELP_STRING([--disable-poppler-glib],
- [Don't compile poppler glib wrapper.]),
- enable_poppler_glib=$enableval,
- enable_poppler_glib="try")
-if test x$enable_poppler_glib = xyes; then
- PKG_CHECK_MODULES(POPPLER_GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED)
-elif test x$enable_poppler_glib = xtry; then
- PKG_CHECK_MODULES(POPPLER_GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED,
- [enable_poppler_glib="yes"],
- [enable_poppler_glib="no"])
-fi
-if test x$enable_poppler_glib = xyes; then
- AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
- POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
- POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
-fi
-AM_CONDITIONAL(BUILD_POPPLER_GLIB, test x$enable_poppler_glib = xyes)
-
-GTK_DOC_CHECK([1.0])
-
-dnl
-dnl GDK
-dnl
-AC_ARG_ENABLE(gdk,
- AC_HELP_STRING([--disable-gdk],
- [Compile without gdk.]),
- enable_gdk=$enableval,
- enable_gdk="try")
-
-if test x$enable_poppler_glib = xyes; then
- if test x$enable_gdk = xyes; then
- PKG_CHECK_MODULES(GDK, gdk-2.0)
- elif test x$enable_gdk = xtry; then
- if test x$enable_splash_output = xyes; then
- PKG_CHECK_MODULES(GDK, gdk-2.0,
- [enable_gdk="yes"],
- [enable_gdk="no"])
- elif test x$enable_cairo_output = xyes; then
- PKG_CHECK_MODULES(GDK, gdk-2.0,
- [enable_gdk="yes"],
- [enable_gdk="no"])
- fi
- elif test x$enable_splash_output = xyes; then
- PKG_CHECK_MODULES(GDK, gdk-2.0)
- AC_MSG_WARN("GDK is required by the glib wrapper when splash output device is
- enabled. If you want to comppile popler without GDK use --disable-splash-output too")
- enable_gdk=yes
+found_introspection=no
+if test x$enable_cairo_output = xyes; then
+ POPPLER_GLIB_DISABLE_DEPRECATED=""
+ POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
+
+ GLIB_REQUIRED=2.18
+ AC_ARG_ENABLE(poppler-glib,
+ AC_HELP_STRING([--disable-poppler-glib],
+ [Don't compile poppler glib wrapper.]),
+ enable_poppler_glib=$enableval,
+ enable_poppler_glib="try")
+ if test x$enable_poppler_glib = xyes; then
+ PKG_CHECK_MODULES(POPPLER_GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION)
+ elif test x$enable_poppler_glib = xtry; then
+ PKG_CHECK_MODULES(POPPLER_GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION,
+ [enable_poppler_glib="yes"],
+ [enable_poppler_glib="no"])
fi
- if test x$enable_gdk = xyes; then
- AC_DEFINE(POPPLER_WITH_GDK,[1], [Have GDK])
- GDK_FEATURE="#define POPPLER_WITH_GDK 1"
- POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
- POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
- else
- GDK_FEATURE=""
+ if test x$enable_poppler_glib = xyes; then
+ # Check for introspection
+ GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
+ GLIB_REQ="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION"
+ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
+ POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
+ POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
fi
+else
+ if test x$enable_poppler_glib = xyes; then
+ AC_MSG_ERROR("Cairo output is required to build glib frontend")
+ fi
+ enable_poppler_glib="no"
+ GLIB_REQ=""
fi
-AM_CONDITIONAL(BUILD_WITH_GDK, test x$enable_gdk = xyes)
-AC_SUBST(GDK_CFLAGS)
-AC_SUBST(GDK_LIBS)
-AC_SUBST(GDK_FEATURE)
-
+AM_CONDITIONAL(BUILD_POPPLER_GLIB, test x$enable_poppler_glib = xyes)
+AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+AC_SUBST(GLIB_REQ)
AC_SUBST(POPPLER_GLIB_DISABLE_DEPRECATED)
AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
-AC_ARG_ENABLE(poppler-qt,
- AC_HELP_STRING([--disable-poppler-qt],
- [Don't compile poppler qt wrapper.]),
- enable_poppler_qt=$enableval,
- enable_poppler_qt="try")
-
-if test x$enable_poppler_qt = xyes; then
- POPPLER_FIND_QT(POPPLER_QT,,)
-elif test x$enable_poppler_qt = xtry; then
- POPPLER_FIND_QT(POPPLER_QT,
- [enable_poppler_qt="yes"],
- [enable_poppler_qt="no"])
-fi
-AC_SUBST(POPPLER_QT_CXXFLAGS)
-AC_SUBST(POPPLER_QT_LIBS)
-
-AM_CONDITIONAL(BUILD_POPPLER_QT, test "x$enable_poppler_qt" = "xyes")
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
dnl
dnl Try Qt4
@@ -444,35 +498,39 @@ fi
AM_CONDITIONAL(BUILD_POPPLER_QT4, test "x$enable_poppler_qt4" = "xyes")
+dnl
+dnl CPP frontend
+dnl
+
+AC_ARG_ENABLE(poppler-cpp,
+ AC_HELP_STRING([--disable-poppler-cpp],
+ [Don't compile poppler cpp wrapper.]),
+ enable_poppler_cpp=$enableval,
+ enable_poppler_cpp="yes")
+if test x$enable_poppler_cpp = xyes; then
+ AM_ICONV()
+ if test x$am_func_iconv != xyes; then
+ enable_poppler_cpp=no
+ fi
+fi
+
+AM_CONDITIONAL(BUILD_POPPLER_CPP, test "x$enable_poppler_cpp" = "xyes")
+
+
AC_ARG_ENABLE(gtk-test,
AC_HELP_STRING([--disable-gtk-test],
[Don't compile GTK+ test program.]),
enable_gtk_test=$enableval,
enable_gtk_test="try")
if test x$enable_gtk_test = xyes; then
- PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0)
+ PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0)
elif test x$enable_gtk_test = xtry; then
- PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.12 gdk-pixbuf-2.0 gthread-2.0,
+ PKG_CHECK_MODULES(GTK_TEST, gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0,
[enable_gtk_test="yes"],
[enable_gtk_test="no"])
fi
AM_CONDITIONAL(BUILD_GTK_TEST, test x$enable_gtk_test = xyes -a x$enable_poppler_glib = xyes)
-AC_ARG_ENABLE(abiword-output,
- AC_HELP_STRING([--disable-abiword-output],
- [Don't build the abiword backend.]),
- enable_abiword_output=$enableval,
- enable_abiword_output="try")
-if test x$enable_abiword_output = xyes; then
- PKG_CHECK_MODULES(ABIWORD, libxml-2.0)
-elif test x$enable_abiword_output = xtry; then
- PKG_CHECK_MODULES(ABIWORD, libxml-2.0,
- [enable_abiword_output="yes"],
- [enable_abiword_output="no"])
-fi
-
-AM_CONDITIONAL(BUILD_ABIWORD_OUTPUT, test x$enable_abiword_output = xyes)
-
AC_ARG_ENABLE(utils,
AC_HELP_STRING([--disable-utils],
[Don't compile poppler command line utils.]),
@@ -510,10 +568,10 @@ if test "x$GCC" != xyes; then
fi
case "$enable_compile_warnings" in
no) ;;
- yes) CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual $CXXFLAGS" ;;
- kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef -ansi \
- -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align \
- -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith \
+ yes) CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-check-new -fno-common $CXXFLAGS" ;;
+ kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef \
+ -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
+ -Wconversion -Wall -W -Wpointer-arith \
-Wwrite-strings -O2 -Wformat-security \
-Wmissing-format-attribute -fno-exceptions -fno-check-new \
-fno-common $CXXFLAGS" ;;
@@ -534,6 +592,7 @@ AC_SUBST(PC_REQUIRES_PRIVATE)
AC_SUBST([POPPLER_MAJOR_VERSION],[poppler_version_major])
AC_SUBST([POPPLER_MINOR_VERSION],[poppler_version_minor])
AC_SUBST([POPPLER_MICRO_VERSION],[poppler_version_micro])
+AC_SUBST([POPPLER_VERSION],[poppler_version])
AC_OUTPUT([
Makefile
@@ -545,34 +604,45 @@ utils/Makefile
glib/Makefile
glib/poppler-features.h
glib/reference/Makefile
+glib/reference/version.xml
glib/demo/Makefile
test/Makefile
-qt/Makefile
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
qt4/demos/Makefile
+cpp/Makefile
+cpp/poppler-version.h
+cpp/tests/Makefile
poppler.pc
+poppler-uninstalled.pc
poppler-cairo.pc
+poppler-cairo-uninstalled.pc
poppler-splash.pc
+poppler-splash-uninstalled.pc
poppler-glib.pc
-poppler-qt.pc
-poppler-qt4.pc])
+poppler-glib-uninstalled.pc
+poppler-qt4.pc
+poppler-qt4-uninstalled.pc
+poppler-cpp.pc
+poppler-cpp-uninstalled.pc])
echo ""
echo "Building poppler with support for:"
+echo " font configuration: $with_font_configuration"
echo " splash output: $enable_splash_output"
echo " cairo output: $enable_cairo_output"
-echo " abiword output: $enable_abiword_output"
-echo " qt wrapper: $enable_poppler_qt"
echo " qt4 wrapper: $enable_poppler_qt4"
echo " glib wrapper: $enable_poppler_glib"
-echo " use GDK: $enable_gdk"
+echo " introspection: $found_introspection"
+echo " cpp wrapper: $enable_poppler_cpp"
echo " use gtk-doc: $enable_gtk_doc"
echo " use libjpeg: $enable_libjpeg"
echo " use libpng: $enable_libpng"
+echo " use libtiff: $enable_libtiff"
echo " use zlib: $enable_zlib"
+echo " use libcurl: $enable_libcurl"
echo " use libopenjpeg: $enable_libopenjpeg"
echo " use cms: $enable_cms"
echo " command line utils: $enable_utils"
@@ -582,6 +652,10 @@ if test x$enable_splash_output = xno -a x$enable_cairo_output = xno; then
echo " Warning: There is no rendering backend enabled"
fi
+if test x$enable_single_precision = xyes -a x$enable_fixedpoint = xyes; then
+ echo " Warning: Single precision and fixed point options should not be enabled at the same time"
+fi
+
if test x$enable_libjpeg != xyes; then
echo " Warning: Using libjpeg is recommended"
fi
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiBase.cc
index fe0b92e6546..52808386e76 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiBase.cc
@@ -14,6 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2008 Ed Avis <eda@waniasset.com>
+// Copyright (C) 2011 Jim Meyering <jim@meyering.net>
//
// 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
@@ -62,6 +63,11 @@ char *FoFiBase::readFile(char *fileName, int *fileLen) {
return NULL;
}
n = (int)ftell(f);
+ if (n < 0) {
+ error(-1, "Cannot determine length of '%s'", fileName);
+ fclose(f);
+ return NULL;
+ }
if (fseek(f, 0, SEEK_SET) != 0) {
error(-1, "Cannot seek to start of '%s'", fileName);
fclose(f);
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiBase.h
index e2550017aac..e2550017aac 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiEncodings.cc
index 946b56c19d0..946b56c19d0 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiEncodings.h
index fb4eca86d9f..fb4eca86d9f 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiTrueType.cc
index d716638c7ec..d716638c7ec 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiTrueType.h
index 4213f02b5f4..4ba9b1fe924 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiTrueType.h
@@ -15,6 +15,7 @@
//
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
+// Copyright (C) 2011 Albert Astals Cid <aacid@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -28,6 +29,7 @@
#pragma interface
#endif
+#include "stddef.h"
#include "goo/gtypes.h"
#include "FoFiBase.h"
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1.cc
index 5bfeaedbf37..3fe7f4f7169 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1.cc
@@ -13,8 +13,9 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005, 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2008, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
+// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net>
//
// 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
@@ -30,6 +31,7 @@
#include <stdlib.h>
#include <string.h>
#include "goo/gmem.h"
+#include "goo/GooLikely.h"
#include "FoFiEncodings.h"
#include "FoFiType1.h"
#include "poppler/Error.h"
@@ -192,6 +194,7 @@ void FoFiType1::parse() {
char buf[256];
char c;
int n, code, i, j;
+ char *tokptr;
for (i = 1, line = (char *)file;
i <= 100 && line && (!name || !encoding);
@@ -202,7 +205,7 @@ void FoFiType1::parse() {
strncpy(buf, line, 255);
buf[255] = '\0';
if ((p = strchr(buf+9, '/')) &&
- (p = strtok(p+1, " \t\n\r"))) {
+ (p = strtok_r(p+1, " \t\n\r", &tokptr))) {
name = copyString(p);
}
line = getNextLine(line);
@@ -241,7 +244,7 @@ void FoFiType1::parse() {
code = code * 8 + (*p2 - '0');
}
}
- if (code < 256) {
+ if (likely(code < 256 && code >= 0)) {
for (p = p2; *p == ' ' || *p == '\t'; ++p) ;
if (*p == '/') {
++p;
@@ -270,8 +273,8 @@ void FoFiType1::parse() {
}
}
} else {
- if (strtok(buf, " \t") &&
- (p = strtok(NULL, " \t\n\r")) && !strcmp(p, "def")) {
+ if (strtok_r(buf, " \t", &tokptr) &&
+ (p = strtok_r(NULL, " \t\n\r", &tokptr)) && !strcmp(p, "def")) {
break;
}
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1.h
index 85e67b1c82b..85e67b1c82b 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1C.cc
index 43deb19a2a0..9c5b10cf433 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1C.cc
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2010 Albert Astals Cid <aacid@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -804,10 +804,12 @@ void FoFiType1C::convertToType0(char *psName,
//~ to handle multiple FDs correctly, need to somehow divide the
//~ font up by FD; as a kludge we ignore CID 0, which is .notdef
fd = 0;
- for (j = i==0 ? 1 : 0; j < 256 && i+j < nCIDs; ++j) {
- if (cidMap[i+j] >= 0) {
- fd = fdSelect[cidMap[i+j]];
- break;
+ if (fdSelect != NULL) {
+ for (j = i==0 ? 1 : 0; j < 256 && i+j < nCIDs; ++j) {
+ if (cidMap[i+j] >= 0) {
+ fd = fdSelect[cidMap[i+j]];
+ break;
+ }
}
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1C.h
index 694d5cc7a30..694d5cc7a30 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.18.0/fofi/Makefile.am
index 7a302486505..7a302486505 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.12.4/fofi/Makefile.in b/Build/source/libs/poppler/poppler-0.18.0/fofi/Makefile.in
index 3c7c55fd70c..f5e00e62c1a 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/fofi/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/fofi/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41,10 +41,10 @@ DIST_COMMON = $(am__poppler_fofi_include_HEADERS_DIST) \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
- $(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libpng.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/qt.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
+ $(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -133,8 +133,6 @@ HEADERS = $(poppler_fofi_include_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIWORD_CFLAGS = @ABIWORD_CFLAGS@
-ABIWORD_LIBS = @ABIWORD_LIBS@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -175,12 +173,12 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
FREETYPE_CONFIG = @FREETYPE_CONFIG@
FREETYPE_LIBS = @FREETYPE_LIBS@
-GDK_CFLAGS = @GDK_CFLAGS@
-GDK_FEATURE = @GDK_FEATURE@
-GDK_LIBS = @GDK_LIBS@
GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQ = @GLIB_REQ@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
GTK_TEST_LIBS = @GTK_TEST_LIBS@
HTML_DIR = @HTML_DIR@
@@ -189,20 +187,35 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LCMS_CFLAGS = @LCMS_CFLAGS@
LCMS_LIBS = @LCMS_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
+LIBICONV = @LIBICONV@
LIBJPEG_LIBS = @LIBJPEG_LIBS@
LIBOBJS = @LIBOBJS@
LIBOPENJPEG_LIBS = @LIBOPENJPEG_LIBS@
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBTIFF_LIBS = @LIBTIFF_LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MOCQT4 = @MOCQT4@
NM = @NM@
@@ -222,6 +235,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PC_REQUIRES = @PC_REQUIRES@
PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POPPLER_DATADIR = @POPPLER_DATADIR@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_DISABLE_DEPRECATED = @POPPLER_GLIB_DISABLE_DEPRECATED@
@@ -235,8 +250,7 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
-POPPLER_QT_CXXFLAGS = @POPPLER_QT_CXXFLAGS@
-POPPLER_QT_LIBS = @POPPLER_QT_LIBS@
+POPPLER_VERSION = @POPPLER_VERSION@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -256,6 +270,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -292,7 +307,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/FixedPoint.cc
index 79a6a9ae1f4..79a6a9ae1f4 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.18.0/goo/FixedPoint.h
index 08936bc6f2a..08936bc6f2a 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/GooHash.cc
index 5da9d69f82c..5da9d69f82c 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.18.0/goo/GooHash.h
index bdcf1c43ece..bdcf1c43ece 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.18.0/goo/GooLikely.h
new file mode 100644
index 00000000000..724ccf00870
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/GooLikely.h
@@ -0,0 +1,22 @@
+//========================================================================
+//
+// GooLikely.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2008 Kees Cook <kees@outflux.net>
+//
+//========================================================================
+
+#ifndef GOOLIKELY_H
+#define GOOLIKELY_H
+
+#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
+# define likely(x) __builtin_expect((x), 1)
+# define unlikely(x) __builtin_expect((x), 0)
+#else
+# define likely(x) (x)
+# define unlikely(x) (x)
+#endif
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/GooList.cc
index dc6e4e21e00..dc6e4e21e00 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/GooList.h b/Build/source/libs/poppler/poppler-0.18.0/goo/GooList.h
index 576f3e8142d..576f3e8142d 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.18.0/goo/GooMutex.h
index 3f53a626a67..3f53a626a67 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/GooString.cc
index 0d4cb73fa11..a96b792466f 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/GooString.cc
@@ -18,7 +18,7 @@
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2008, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008-2011 Albert Astals Cid <aacid@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -197,7 +197,7 @@ GooString::GooString(GooString *str, int idx, int lengthA) {
Set(str->getCString() + idx, lengthA);
}
-GooString::GooString(GooString *str) {
+GooString::GooString(const GooString *str) {
s = NULL;
length = 0;
Set(str->getCString(), str->length);
@@ -238,7 +238,7 @@ GooString *GooString::formatv(char *fmt, va_list argList) {
GooString::~GooString() {
if (s != sStatic)
- free(s);
+ gfree(s);
}
GooString *GooString::clear() {
@@ -684,7 +684,7 @@ GooString *GooString::lowerCase() {
return this;
}
-int GooString::cmp(GooString *str) {
+int GooString::cmp(GooString *str) const {
int n1, n2, i, x;
char *p1, *p2;
@@ -699,7 +699,7 @@ int GooString::cmp(GooString *str) {
return n1 - n2;
}
-int GooString::cmpN(GooString *str, int n) {
+int GooString::cmpN(GooString *str, int n) const {
int n1, n2, i, x;
char *p1, *p2;
@@ -719,7 +719,7 @@ int GooString::cmpN(GooString *str, int n) {
return n1 - n2;
}
-int GooString::cmp(const char *sA) {
+int GooString::cmp(const char *sA) const {
int n1, i, x;
const char *p1, *p2;
@@ -739,7 +739,7 @@ int GooString::cmp(const char *sA) {
return 0;
}
-int GooString::cmpN(const char *sA, int n) {
+int GooString::cmpN(const char *sA, int n) const {
int n1, i, x;
const char *p1, *p2;
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/GooString.h b/Build/source/libs/poppler/poppler-0.18.0/goo/GooString.h
index 731f640693b..e77308dcdf9 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/GooString.h
@@ -17,7 +17,7 @@
//
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
-// Copyright (C) 2008, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008-2010 Albert Astals Cid <aacid@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -42,7 +42,7 @@ public:
GooString();
// Create a string from a C string.
- GooString(const char *sA);
+ explicit GooString(const char *sA);
// Create a string from <lengthA> chars at <sA>. This string
// can contain null characters.
@@ -58,8 +58,8 @@ public:
GooString* Set(const char *s1, int s1Len=CALC_STRING_LEN, const char *s2=NULL, int s2Len=CALC_STRING_LEN);
// Copy a string.
- GooString(GooString *str);
- GooString *copy() { return new GooString(this); }
+ explicit GooString(const GooString *str);
+ GooString *copy() const { return new GooString(this); }
// Concatenate two strings.
GooString(GooString *str1, GooString *str2);
@@ -98,7 +98,7 @@ public:
int getLength() { return length; }
// Get C string.
- char *getCString() { return s; }
+ char *getCString() const { return s; }
// Get <i>th character.
char getChar(int i) { return s[i]; }
@@ -131,10 +131,10 @@ public:
GooString *lowerCase();
// Compare two strings: -1:< 0:= +1:>
- int cmp(GooString *str);
- int cmpN(GooString *str, int n);
- int cmp(const char *sA);
- int cmpN(const char *sA, int n);
+ int cmp(GooString *str) const;
+ int cmpN(GooString *str, int n) const;
+ int cmp(const char *sA) const;
+ int cmpN(const char *sA, int n) const;
GBool hasUnicodeMarker(void);
@@ -145,6 +145,9 @@ public:
GooString *sanitizedName(GBool psmode);
private:
+ GooString(const GooString &other);
+ GooString& operator=(const GooString &other);
+
// you can tweak this number for a different speed/memory usage tradeoffs.
// In libc malloc() rounding is 16 so it's best to choose a value that
// results in sizeof(GooString) be a multiple of 16.
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/GooTimer.cc
index 769fd639775..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/GooTimer.cc
@@ -6,6 +6,7 @@
//
// Copyright 2005 Jonathan Blandford <jrb@redhat.com>
// Copyright 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
// Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team
//
//========================================================================
@@ -32,7 +33,7 @@ GooTimer::GooTimer() {
void GooTimer::start() {
#ifdef HAVE_GETTIMEOFDAY
gettimeofday(&start_time, NULL);
-#elif defined(_MSC_VER)
+#elif defined(_WIN32)
QueryPerformanceCounter(&start_time);
#endif
active = true;
@@ -41,7 +42,7 @@ void GooTimer::start() {
void GooTimer::stop() {
#ifdef HAVE_GETTIMEOFDAY
gettimeofday(&end_time, NULL);
-#elif defined(_MSC_VER)
+#elif defined(_WIN32)
QueryPerformanceCounter(&end_time);
#endif
active = false;
@@ -70,7 +71,7 @@ double GooTimer::getElapsed()
return total;
}
-#elif defined(_MSC_VER)
+#elif defined(_WIN32)
double GooTimer::getElapsed()
{
LARGE_INTEGER freq;
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.18.0/goo/GooTimer.h
index f03413c21e6..d700e501c07 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/GooTimer.h
@@ -6,6 +6,8 @@
//
// Copyright 2005 Jonathan Blandford <jrb@redhat.com>
// Copyright 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2011 Albert Astals cid <aacid@kde.org>
// Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team
//
//========================================================================
@@ -17,12 +19,13 @@
#pragma interface
#endif
+#include "poppler/poppler-config.h"
#include "gtypes.h"
#ifdef HAVE_GETTIMEOFDAY
#include <sys/time.h>
#endif
-#ifdef _MSC_VER
+#ifdef _WIN32
#include <windows.h>
#endif
@@ -44,7 +47,7 @@ private:
#ifdef HAVE_GETTIMEOFDAY
struct timeval start_time;
struct timeval end_time;
-#elif defined(_MSC_VER)
+#elif defined(_WIN32)
LARGE_INTEGER start_time;
LARGE_INTEGER end_time;
#endif
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.cc
new file mode 100644
index 00000000000..a30d26d89ad
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.cc
@@ -0,0 +1,15 @@
+//========================================================================
+//
+// ImgWriter.cpp
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#include "ImgWriter.h"
+
+ImgWriter::~ImgWriter()
+{
+}
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.h
new file mode 100644
index 00000000000..185c230ef48
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/ImgWriter.h
@@ -0,0 +1,33 @@
+//========================================================================
+//
+// ImgWriter.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
+// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2010 Brian Cameron <brian.cameron@oracle.com>
+// Copyright (C) 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
+//
+//========================================================================
+
+#ifndef IMGWRITER_H
+#define IMGWRITER_H
+
+#include <stdio.h>
+
+class ImgWriter
+{
+ public:
+ virtual ~ImgWriter();
+ virtual bool init(FILE *f, int width, int height, int hDPI, int vDPI) = 0;
+
+ virtual bool writePointers(unsigned char **rowPointers, int rowCount) = 0;
+ virtual bool writeRow(unsigned char **row) = 0;
+
+ virtual bool close() = 0;
+ virtual bool supportCMYK() { return false; }
+};
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.cc
new file mode 100644
index 00000000000..7ed5d524ce8
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.cc
@@ -0,0 +1,145 @@
+//========================================================================
+//
+// JpegWriter.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
+// Copyright (C) 2010 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2010 Harry Roberts <harry.roberts@midnight-labs.org>
+// Copyright (C) 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
+//
+//========================================================================
+
+#include "JpegWriter.h"
+
+#ifdef ENABLE_LIBJPEG
+
+#include "poppler/Error.h"
+
+void outputMessage(j_common_ptr cinfo)
+{
+ char buffer[JMSG_LENGTH_MAX];
+
+ // Create the message
+ (*cinfo->err->format_message) (cinfo, buffer);
+
+ // Send it to poppler's error handler
+ error(-1, "%s", buffer);
+}
+
+JpegWriter::JpegWriter(int q, bool p, J_COLOR_SPACE cm)
+: progressive(p), quality(q), colorMode(cm)
+{
+}
+
+JpegWriter::JpegWriter(J_COLOR_SPACE cm)
+: progressive(false), quality(-1), colorMode(cm)
+{
+}
+
+JpegWriter::~JpegWriter()
+{
+ // cleanup
+ jpeg_destroy_compress(&cinfo);
+}
+
+bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
+{
+ // Setup error handler
+ cinfo.err = jpeg_std_error(&jerr);
+ jerr.output_message = &outputMessage;
+
+ // Initialize libjpeg
+ jpeg_create_compress(&cinfo);
+
+ // Set destination file
+ jpeg_stdio_dest(&cinfo, f);
+
+ // Set libjpeg configuration
+ cinfo.image_width = width;
+ cinfo.image_height = height;
+ cinfo.density_unit = 1; // dots per inch
+ cinfo.X_density = hDPI;
+ cinfo.Y_density = vDPI;
+ cinfo.in_color_space = colorMode; /* colorspace of input image */
+ /* # of color components per pixel */
+ switch (colorMode) {
+ case JCS_GRAYSCALE:
+ cinfo.input_components = 1;
+ break;
+ case JCS_RGB:
+ cinfo.input_components = 3;
+ break;
+ case JCS_CMYK:
+ cinfo.input_components = 4;
+ break;
+ default:
+ return false;
+ }
+ jpeg_set_defaults(&cinfo);
+ if (cinfo.in_color_space == JCS_CMYK) {
+ jpeg_set_colorspace(&cinfo, JCS_YCCK);
+ cinfo.write_JFIF_header = TRUE;
+ }
+
+ // Set quality
+ if( quality >= 0 && quality <= 100 ) {
+ jpeg_set_quality(&cinfo, quality, true);
+ }
+
+ // Use progressive mode
+ if( progressive) {
+ jpeg_simple_progression(&cinfo);
+ }
+
+ // Get ready for data
+ jpeg_start_compress(&cinfo, TRUE);
+
+ return true;
+}
+
+bool JpegWriter::writePointers(unsigned char **rowPointers, int rowCount)
+{
+ if (colorMode == JCS_CMYK) {
+ for (int y = 0; y < rowCount; y++) {
+ unsigned char *row = rowPointers[y];
+ for (unsigned int x = 0; x < cinfo.image_width; x++) {
+ for (int n = 0; n < 4; n++) {
+ *row = 0xff - *row;
+ row++;
+ }
+ }
+ }
+ }
+ // Write all rows to the file
+ jpeg_write_scanlines(&cinfo, rowPointers, rowCount);
+
+ return true;
+}
+
+bool JpegWriter::writeRow(unsigned char **rowPointer)
+{
+ if (colorMode == JCS_CMYK) {
+ unsigned char *row = rowPointer[0];
+ for (unsigned int x = 0; x < cinfo.image_width; x++) {
+ for (int n = 0; n < 4; n++) {
+ *row = 0xff - *row;
+ row++;
+ }
+ }
+ }
+ // Write the row to the file
+ jpeg_write_scanlines(&cinfo, rowPointer, 1);
+
+ return true;
+}
+
+bool JpegWriter::close()
+{
+ jpeg_finish_compress(&cinfo);
+
+ return true;
+}
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.h
new file mode 100644
index 00000000000..7af6870f6b8
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/JpegWriter.h
@@ -0,0 +1,56 @@
+//========================================================================
+//
+// JpegWriter.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
+// Copyright (C) 2010 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2010 Jürg Billeter <j@bitron.ch>
+// Copyright (C) 2010 Harry Roberts <harry.roberts@midnight-labs.org>
+// Copyright (C) 2010 Brian Cameron <brian.cameron@oracle.com>
+// Copyright (C) 2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
+//
+//========================================================================
+
+#ifndef JPEGWRITER_H
+#define JPEGWRITER_H
+
+#include "poppler/poppler-config.h"
+
+#ifdef ENABLE_LIBJPEG
+
+#include <sys/types.h>
+#include "ImgWriter.h"
+
+extern "C" {
+#include <jpeglib.h>
+}
+
+class JpegWriter : public ImgWriter
+{
+ public:
+ JpegWriter(int quality, bool progressive, J_COLOR_SPACE colorMode = JCS_RGB);
+ JpegWriter(J_COLOR_SPACE colorMode = JCS_RGB);
+ ~JpegWriter();
+
+ bool init(FILE *f, int width, int height, int hDPI, int vDPI);
+
+ bool writePointers(unsigned char **rowPointers, int rowCount);
+ bool writeRow(unsigned char **row);
+
+ bool close();
+ bool supportCMYK() { return colorMode == JCS_CMYK; }
+
+ private:
+ bool progressive;
+ int quality;
+ J_COLOR_SPACE colorMode;
+ struct jpeg_compress_struct cinfo;
+ struct jpeg_error_mgr jerr;
+};
+
+#endif
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.18.0/goo/Makefile.am
index f10fd150458..1921b1ea4ea 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/Makefile.am
@@ -9,18 +9,26 @@ poppler_goo_include_HEADERS = \
GooTimer.h \
GooMutex.h \
GooString.h \
- GooVector.h \
gtypes.h \
gmem.h \
gfile.h \
FixedPoint.h \
PNGWriter.h \
+ JpegWriter.h \
+ TiffWriter.h \
+ ImgWriter.h \
+ GooLikely.h \
gstrtod.h
endif
+if BUILD_LIBPNG
+libpng_includes = $(LIBPNG_CFLAGS)
+endif
+
INCLUDES = \
- -I$(top_srcdir)
+ -I$(top_srcdir) \
+ $(libpng_includes)
libgoo_la_SOURCES = \
gfile.cc \
@@ -32,4 +40,8 @@ libgoo_la_SOURCES = \
gmem.cc \
FixedPoint.cc \
PNGWriter.cc \
+ JpegWriter.cc \
+ TiffWriter.cc \
+ ImgWriter.cc \
+ gtypes_p.h \
gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/Makefile.in b/Build/source/libs/poppler/poppler-0.18.0/goo/Makefile.in
index c4b58fba847..8e5464d79fc 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41,10 +41,10 @@ DIST_COMMON = $(am__poppler_goo_include_HEADERS_DIST) \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
- $(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libpng.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/qt.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
+ $(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -57,7 +57,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
libgoo_la_LIBADD =
am_libgoo_la_OBJECTS = gfile.lo gmempp.lo GooHash.lo GooList.lo \
GooTimer.lo GooString.lo gmem.lo FixedPoint.lo PNGWriter.lo \
- gstrtod.lo
+ JpegWriter.lo TiffWriter.lo ImgWriter.lo gstrtod.lo
libgoo_la_OBJECTS = $(am_libgoo_la_OBJECTS)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -85,14 +85,31 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
AM_V_CXXLD = $(am__v_CXXLD_$(V))
am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
am__v_CXXLD_0 = @echo " CXXLD " $@;
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(libgoo_la_SOURCES)
DIST_SOURCES = $(libgoo_la_SOURCES)
am__poppler_goo_include_HEADERS_DIST = GooHash.h GooList.h GooTimer.h \
- GooMutex.h GooString.h GooVector.h gtypes.h gmem.h gfile.h \
- FixedPoint.h PNGWriter.h gstrtod.h
+ GooMutex.h GooString.h gtypes.h gmem.h gfile.h FixedPoint.h \
+ PNGWriter.h JpegWriter.h TiffWriter.h ImgWriter.h GooLikely.h \
+ gstrtod.h
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -119,8 +136,6 @@ HEADERS = $(poppler_goo_include_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIWORD_CFLAGS = @ABIWORD_CFLAGS@
-ABIWORD_LIBS = @ABIWORD_LIBS@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -161,12 +176,12 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
FREETYPE_CONFIG = @FREETYPE_CONFIG@
FREETYPE_LIBS = @FREETYPE_LIBS@
-GDK_CFLAGS = @GDK_CFLAGS@
-GDK_FEATURE = @GDK_FEATURE@
-GDK_LIBS = @GDK_LIBS@
GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQ = @GLIB_REQ@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
GTK_TEST_LIBS = @GTK_TEST_LIBS@
HTML_DIR = @HTML_DIR@
@@ -175,20 +190,35 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LCMS_CFLAGS = @LCMS_CFLAGS@
LCMS_LIBS = @LCMS_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
+LIBICONV = @LIBICONV@
LIBJPEG_LIBS = @LIBJPEG_LIBS@
LIBOBJS = @LIBOBJS@
LIBOPENJPEG_LIBS = @LIBOPENJPEG_LIBS@
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBTIFF_LIBS = @LIBTIFF_LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MOCQT4 = @MOCQT4@
NM = @NM@
@@ -208,6 +238,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PC_REQUIRES = @PC_REQUIRES@
PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POPPLER_DATADIR = @POPPLER_DATADIR@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_DISABLE_DEPRECATED = @POPPLER_GLIB_DISABLE_DEPRECATED@
@@ -221,8 +253,7 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
-POPPLER_QT_CXXFLAGS = @POPPLER_QT_CXXFLAGS@
-POPPLER_QT_LIBS = @POPPLER_QT_LIBS@
+POPPLER_VERSION = @POPPLER_VERSION@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -242,6 +273,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -278,7 +310,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -303,16 +334,21 @@ noinst_LTLIBRARIES = libgoo.la
@ENABLE_XPDF_HEADERS_TRUE@ GooTimer.h \
@ENABLE_XPDF_HEADERS_TRUE@ GooMutex.h \
@ENABLE_XPDF_HEADERS_TRUE@ GooString.h \
-@ENABLE_XPDF_HEADERS_TRUE@ GooVector.h \
@ENABLE_XPDF_HEADERS_TRUE@ gtypes.h \
@ENABLE_XPDF_HEADERS_TRUE@ gmem.h \
@ENABLE_XPDF_HEADERS_TRUE@ gfile.h \
@ENABLE_XPDF_HEADERS_TRUE@ FixedPoint.h \
@ENABLE_XPDF_HEADERS_TRUE@ PNGWriter.h \
+@ENABLE_XPDF_HEADERS_TRUE@ JpegWriter.h \
+@ENABLE_XPDF_HEADERS_TRUE@ TiffWriter.h \
+@ENABLE_XPDF_HEADERS_TRUE@ ImgWriter.h \
+@ENABLE_XPDF_HEADERS_TRUE@ GooLikely.h \
@ENABLE_XPDF_HEADERS_TRUE@ gstrtod.h
+@BUILD_LIBPNG_TRUE@libpng_includes = $(LIBPNG_CFLAGS)
INCLUDES = \
- -I$(top_srcdir)
+ -I$(top_srcdir) \
+ $(libpng_includes)
libgoo_la_SOURCES = \
gfile.cc \
@@ -324,6 +360,10 @@ libgoo_la_SOURCES = \
gmem.cc \
FixedPoint.cc \
PNGWriter.cc \
+ JpegWriter.cc \
+ TiffWriter.cc \
+ ImgWriter.cc \
+ gtypes_p.h \
gstrtod.cc
all: all-am
@@ -383,7 +423,10 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GooList.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GooString.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GooTimer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ImgWriter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JpegWriter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PNGWriter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TiffWriter.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gfile.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmem.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmempp.Plo@am__quote@
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.cc
index 864c976bc2b..f88c3a77a7b 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.cc
@@ -7,6 +7,9 @@
// Copyright (C) 2009 Warren Toomey <wkt@tuhs.org>
// Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com>
// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
+// Copyright (C) 2010, 2011 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2011 Thomas Klausner <wiz@danbala.tuwien.ac.at>
//
//========================================================================
@@ -14,20 +17,52 @@
#ifdef ENABLE_LIBPNG
+#include <zlib.h>
+#include <stdlib.h>
+
#include "poppler/Error.h"
+#include "goo/gmem.h"
-PNGWriter::PNGWriter()
+PNGWriter::PNGWriter(Format formatA) : format(formatA)
{
+ icc_data = NULL;
+ icc_data_size = 0;
+ icc_name = NULL;
+ sRGB_profile = false;
}
PNGWriter::~PNGWriter()
{
/* cleanup heap allocation */
png_destroy_write_struct(&png_ptr, &info_ptr);
+ if (icc_data) {
+ gfree(icc_data);
+ free(icc_name);
+ }
+}
+
+void PNGWriter::setICCProfile(const char *name, unsigned char *data, int size)
+{
+ icc_data = (unsigned char *)gmalloc(size);
+ memcpy(icc_data, data, size);
+ icc_data_size = size;
+ icc_name = strdup(name);
+}
+
+void PNGWriter::setSRGBProfile()
+{
+ sRGB_profile = true;
}
-bool PNGWriter::init(FILE *f, int width, int height)
+bool PNGWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
{
+ /* libpng changed the png_set_iCCP() prototype in 1.5.0 */
+#if PNG_LIBPNG_VER < 10500
+ png_charp icc_data_ptr = (png_charp)icc_data;
+#else
+ png_const_bytep icc_data_ptr = (png_const_bytep)icc_data;
+#endif
+
/* initialize stuff */
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (!png_ptr) {
@@ -56,22 +91,52 @@ bool PNGWriter::init(FILE *f, int width, int height)
// Set up the type of PNG image and the compression level
png_set_compression_level(png_ptr, Z_BEST_COMPRESSION);
- png_byte bit_depth = 8;
- png_byte color_type = PNG_COLOR_TYPE_RGB;
+ // Silence silly gcc
+ png_byte bit_depth = -1;
+ png_byte color_type = -1;
+ switch (format) {
+ case RGB:
+ bit_depth = 8;
+ color_type = PNG_COLOR_TYPE_RGB;
+ break;
+ case RGBA:
+ bit_depth = 8;
+ color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+ break;
+ case GRAY:
+ bit_depth = 8;
+ color_type = PNG_COLOR_TYPE_GRAY;
+ break;
+ case MONOCHROME:
+ bit_depth = 1;
+ color_type = PNG_COLOR_TYPE_GRAY;
+ break;
+ }
png_byte interlace_type = PNG_INTERLACE_NONE;
png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, color_type, interlace_type, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+ png_set_pHYs(png_ptr, info_ptr, hDPI/0.0254, vDPI/0.0254, PNG_RESOLUTION_METER);
+
+ if (icc_data)
+ png_set_iCCP(png_ptr, info_ptr, icc_name, PNG_COMPRESSION_TYPE_BASE, icc_data_ptr, icc_data_size);
+ else if (sRGB_profile)
+ png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_RELATIVE);
+
png_write_info(png_ptr, info_ptr);
if (setjmp(png_jmpbuf(png_ptr))) {
error(-1, "error during writing png info bytes");
return false;
}
-
+
+ // pack 1 pixel/byte rows into 8 pixels/byte
+ if (format == MONOCHROME)
+ png_set_packing(png_ptr);
+
return true;
}
-bool PNGWriter::writePointers(png_bytep *rowPointers)
+bool PNGWriter::writePointers(unsigned char **rowPointers, int rowCount)
{
png_write_image(png_ptr, rowPointers);
/* write bytes */
@@ -83,7 +148,7 @@ bool PNGWriter::writePointers(png_bytep *rowPointers)
return true;
}
-bool PNGWriter::writeRow(png_bytep *row)
+bool PNGWriter::writeRow(unsigned char **row)
{
// Write the row to the file
png_write_rows(png_ptr, row, 1);
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.h
new file mode 100644
index 00000000000..f22495d0d00
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/PNGWriter.h
@@ -0,0 +1,63 @@
+//========================================================================
+//
+// PNGWriter.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2009 Warren Toomey <wkt@tuhs.org>
+// Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com>
+// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
+// Copyright (C) 2010, 2011 Adrian Johnson <ajohnson@redneon.com>
+//
+//========================================================================
+
+#ifndef PNGWRITER_H
+#define PNGWRITER_H
+
+#include "poppler/poppler-config.h"
+
+#ifdef ENABLE_LIBPNG
+
+#include <cstdio>
+#include <png.h>
+#include "ImgWriter.h"
+
+class PNGWriter : public ImgWriter
+{
+ public:
+
+ /* RGB - 3 bytes/pixel
+ * RGBA - 4 bytes/pixel
+ * GRAY - 1 byte/pixel
+ * MONOCHROME - 1 byte/pixel. PNGWriter will bitpack to 8 pixels/byte
+ */
+ enum Format { RGB, RGBA, GRAY, MONOCHROME };
+
+ PNGWriter(Format format = RGB);
+ ~PNGWriter();
+
+ void setICCProfile(const char *name, unsigned char *data, int size);
+ void setSRGBProfile();
+
+
+ bool init(FILE *f, int width, int height, int hDPI, int vDPI);
+
+ bool writePointers(unsigned char **rowPointers, int rowCount);
+ bool writeRow(unsigned char **row);
+
+ bool close();
+
+ private:
+ Format format;
+ png_structp png_ptr;
+ png_infop info_ptr;
+ unsigned char *icc_data;
+ int icc_data_size;
+ char *icc_name;
+ bool sRGB_profile;
+};
+
+#endif
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.cc
new file mode 100644
index 00000000000..f63b2450029
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.cc
@@ -0,0 +1,202 @@
+//========================================================================
+//
+// TiffWriter.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2010 William Bader <williambader@hotmail.com>
+//
+//========================================================================
+
+#include "TiffWriter.h"
+
+#if ENABLE_LIBTIFF
+
+#include <string.h>
+
+TiffWriter::~TiffWriter()
+{
+ // no cleanup needed
+}
+
+TiffWriter::TiffWriter()
+{
+ f = NULL;
+ numRows = 0;
+ curRow = 0;
+ compressionString = NULL;
+ splashMode = splashModeRGB8;
+}
+
+// Set the compression type
+
+void TiffWriter::setCompressionString(const char *compressionStringArg)
+{
+ compressionString = compressionStringArg;
+}
+
+// Set the bitmap mode
+
+void TiffWriter::setSplashMode(SplashColorMode splashModeArg)
+{
+ splashMode = splashModeArg;
+}
+
+// Write a TIFF file.
+
+bool TiffWriter::init(FILE *openedFile, int width, int height, int hDPI, int vDPI)
+{
+ unsigned int compression;
+ uint16 photometric;
+ uint32 rowsperstrip = (uint32) -1;
+ int bitspersample;
+ uint16 samplesperpixel;
+ const struct compression_name_tag {
+ const char *compressionName; // name of the compression option from the command line
+ unsigned int compressionCode; // internal libtiff code
+ const char *compressionDescription; // descriptive name
+ } compressionList[] = {
+ { "none", COMPRESSION_NONE, "no compression" },
+ { "ccittrle", COMPRESSION_CCITTRLE, "CCITT modified Huffman RLE" },
+ { "ccittfax3", COMPRESSION_CCITTFAX3,"CCITT Group 3 fax encoding" },
+ { "ccittt4", COMPRESSION_CCITT_T4, "CCITT T.4 (TIFF 6 name)" },
+ { "ccittfax4", COMPRESSION_CCITTFAX4, "CCITT Group 4 fax encoding" },
+ { "ccittt6", COMPRESSION_CCITT_T6, "CCITT T.6 (TIFF 6 name)" },
+ { "lzw", COMPRESSION_LZW, "Lempel-Ziv & Welch" },
+ { "ojpeg", COMPRESSION_OJPEG, "!6.0 JPEG" },
+ { "jpeg", COMPRESSION_JPEG, "%JPEG DCT compression" },
+ { "next", COMPRESSION_NEXT, "NeXT 2-bit RLE" },
+ { "packbits", COMPRESSION_PACKBITS, "Macintosh RLE" },
+ { "ccittrlew", COMPRESSION_CCITTRLEW, "CCITT modified Huffman RLE w/ word alignment" },
+ { "deflate", COMPRESSION_DEFLATE, "Deflate compression" },
+ { "adeflate", COMPRESSION_ADOBE_DEFLATE, "Deflate compression, as recognized by Adobe" },
+ { "dcs", COMPRESSION_DCS, "Kodak DCS encoding" },
+ { "jbig", COMPRESSION_JBIG, "ISO JBIG" },
+ { "jp2000", COMPRESSION_JP2000, "Leadtools JPEG2000" },
+ { NULL, 0, NULL }
+ };
+
+ // Initialize
+
+ f = NULL;
+ curRow = 0;
+
+ // Store the number of rows
+
+ numRows = height;
+
+ // Set the compression
+
+ compression = COMPRESSION_NONE;
+
+ if (compressionString == NULL || strcmp(compressionString, "") == 0) {
+ compression = COMPRESSION_NONE;
+ } else {
+ int i;
+ for (i = 0; compressionList[i].compressionName != NULL; i++) {
+ if (strcmp(compressionString, compressionList[i].compressionName) == 0) {
+ compression = compressionList[i].compressionCode;
+ break;
+ }
+ }
+ if (compressionList[i].compressionName == NULL) {
+ fprintf(stderr, "TiffWriter: Unknown compression type '%.10s', using 'none'.\n", compressionString);
+ fprintf(stderr, "Known compression types (the tiff library might not support every type)\n");
+ for (i = 0; compressionList[i].compressionName != NULL; i++) {
+ fprintf(stderr, "%10s %s\n", compressionList[i].compressionName, compressionList[i].compressionDescription);
+ }
+ }
+ }
+
+ // Set bits per sample, samples per pixel, and photometric type from the splash mode
+
+ bitspersample = (splashMode == splashModeMono1? 1: 8);
+
+ switch (splashMode) {
+
+ case splashModeMono1:
+ case splashModeMono8:
+ samplesperpixel = 1;
+ photometric = PHOTOMETRIC_MINISBLACK;
+ break;
+
+ case splashModeRGB8:
+ case splashModeBGR8:
+ samplesperpixel = 3;
+ photometric = PHOTOMETRIC_RGB;
+ break;
+
+ default:
+ fprintf(stderr, "TiffWriter: Mode %d not supported\n", splashMode);
+ return false;
+ }
+
+ // Open the file
+
+ if (openedFile == NULL) {
+ fprintf(stderr, "TiffWriter: No output file given.\n");
+ return false;
+ }
+
+ f = TIFFFdOpen(fileno(openedFile), "-", "w");
+
+ if (!f) {
+ return false;
+ }
+
+ // Set TIFF tags
+
+ TIFFSetField(f, TIFFTAG_IMAGEWIDTH, width);
+ TIFFSetField(f, TIFFTAG_IMAGELENGTH, height);
+ TIFFSetField(f, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+ TIFFSetField(f, TIFFTAG_SAMPLESPERPIXEL, samplesperpixel);
+ TIFFSetField(f, TIFFTAG_BITSPERSAMPLE, bitspersample);
+ TIFFSetField(f, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+ TIFFSetField(f, TIFFTAG_PHOTOMETRIC, photometric);
+ TIFFSetField(f, TIFFTAG_COMPRESSION, (uint16) compression);
+ TIFFSetField(f, TIFFTAG_ROWSPERSTRIP, TIFFDefaultStripSize(f, rowsperstrip));
+ TIFFSetField(f, TIFFTAG_XRESOLUTION, (double) hDPI);
+ TIFFSetField(f, TIFFTAG_YRESOLUTION, (double) vDPI);
+ TIFFSetField(f, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH);
+
+ return true;
+}
+
+bool TiffWriter::writePointers(unsigned char **rowPointers, int rowCount)
+{
+ // Write all rows to the file
+
+ for (int row = 0; row < rowCount; row++) {
+ if (TIFFWriteScanline(f, rowPointers[row], row, 0) < 0) {
+ fprintf(stderr, "TiffWriter: Error writing tiff row %d\n", row);
+ return false;
+ }
+ }
+
+ return true;
+}
+
+bool TiffWriter::writeRow(unsigned char **rowData)
+{
+ // Add a single row
+
+ if (TIFFWriteScanline(f, *rowData, curRow, 0) < 0) {
+ fprintf(stderr, "TiffWriter: Error writing tiff row %d\n", curRow);
+ return false;
+ }
+
+ curRow++;
+
+ return true;
+}
+
+bool TiffWriter::close()
+{
+ // Close the file
+
+ TIFFClose(f);
+
+ return true;
+}
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.h
new file mode 100644
index 00000000000..b2b0ea99cf9
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/TiffWriter.h
@@ -0,0 +1,54 @@
+//========================================================================
+//
+// TiffWriter.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2010 William Bader <williambader@hotmail.com>
+// Copyright (C) 2011 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#ifndef TIFFWRITER_H
+#define TIFFWRITER_H
+
+#include "poppler/poppler-config.h"
+
+#ifdef ENABLE_LIBTIFF
+
+#include <sys/types.h>
+#include "ImgWriter.h"
+#include "splash/SplashTypes.h"
+
+extern "C" {
+#include "tiffio.h"
+}
+
+class TiffWriter : public ImgWriter
+{
+ public:
+ TiffWriter();
+ ~TiffWriter();
+
+ void setCompressionString(const char *compressionStringArg);
+ void setSplashMode(SplashColorMode splashModeArg);
+
+ bool init(FILE *openedFile, int width, int height, int hDPI, int vDPI);
+
+ bool writePointers(unsigned char **rowPointers, int rowCount);
+ bool writeRow(unsigned char **rowData);
+
+ bool close();
+
+ private:
+ TIFF *f; // LibTiff file context
+ int numRows; // number of rows in the image
+ int curRow; // number of rows written
+ const char *compressionString; // compression type
+ SplashColorMode splashMode; // format of image data
+
+};
+
+#endif
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/gfile.cc
index e87563057e1..f48f9f3fbca 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/gfile.cc
@@ -18,7 +18,7 @@
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2008 Adam Batkin <adam@batkin.net>
-// Copyright (C) 2008 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2008, 2010 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
//
@@ -376,11 +376,11 @@ GooString *makePathAbsolute(GooString *path) {
#elif defined(_WIN32)
//---------- Win32 ----------
- char buf[_MAX_PATH];
+ char buf[MAX_PATH];
char *fp;
buf[0] = '\0';
- if (!GetFullPathName(path->getCString(), _MAX_PATH, buf, &fp)) {
+ if (!GetFullPathName(path->getCString(), MAX_PATH, buf, &fp)) {
path->clear();
return path;
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/gfile.h b/Build/source/libs/poppler/poppler-0.18.0/goo/gfile.h
index 17aea024d51..0bc010e7b58 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/gfile.h
@@ -16,7 +16,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
//
// To see a description of the changes please see the Changelog file that
@@ -27,6 +27,7 @@
#ifndef GFILE_H
#define GFILE_H
+#include "poppler/poppler-config.h"
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/gmem.cc
index af3e19ef74b..3e9adb0582c 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/gmem.cc
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
-// Copyright (C) 2007-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2008 Jonathan Kew <jonathan_kew@sil.org>
//
// To see a description of the changes please see the Changelog file that
@@ -63,7 +63,7 @@ static int gMemInUse = 0;
#endif /* DEBUG_MEM */
-inline static void *gmalloc(size_t size, bool checkoverflow) GMEM_EXCEP {
+inline static void *gmalloc(size_t size, bool checkoverflow) {
#ifdef DEBUG_MEM
int size1;
char *mem;
@@ -76,13 +76,9 @@ inline static void *gmalloc(size_t size, bool checkoverflow) GMEM_EXCEP {
}
size1 = gMemDataSize(size);
if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
-#if USE_EXCEPTIONS
- throw GMemException();
-#else
fprintf(stderr, "Out of memory\n");
if (checkoverflow) return NULL;
else exit(1);
-#endif
}
hdr = (GMemHdr *)mem;
data = (void *)(mem + gMemHdrSize);
@@ -112,27 +108,23 @@ inline static void *gmalloc(size_t size, bool checkoverflow) GMEM_EXCEP {
return NULL;
}
if (!(p = malloc(size))) {
-#if USE_EXCEPTIONS
- throw GMemException();
-#else
fprintf(stderr, "Out of memory\n");
if (checkoverflow) return NULL;
else exit(1);
-#endif
}
return p;
#endif
}
-void *gmalloc(size_t size) GMEM_EXCEP {
+void *gmalloc(size_t size) {
return gmalloc(size, false);
}
-void *gmalloc_checkoverflow(size_t size) GMEM_EXCEP {
+void *gmalloc_checkoverflow(size_t size) {
return gmalloc(size, true);
}
-inline static void *grealloc(void *p, size_t size, bool checkoverflow) GMEM_EXCEP {
+inline static void *grealloc(void *p, size_t size, bool checkoverflow) {
#ifdef DEBUG_MEM
GMemHdr *hdr;
void *q;
@@ -169,27 +161,23 @@ inline static void *grealloc(void *p, size_t size, bool checkoverflow) GMEM_EXCE
q = malloc(size);
}
if (!q) {
-#if USE_EXCEPTIONS
- throw GMemException();
-#else
fprintf(stderr, "Out of memory\n");
if (checkoverflow) return NULL;
else exit(1);
-#endif
}
return q;
#endif
}
-void *grealloc(void *p, size_t size) GMEM_EXCEP {
+void *grealloc(void *p, size_t size) {
return grealloc(p, size, false);
}
-void *grealloc_checkoverflow(void *p, size_t size) GMEM_EXCEP {
+void *grealloc_checkoverflow(void *p, size_t size) {
return grealloc(p, size, true);
}
-inline static void *gmallocn(int nObjs, int objSize, bool checkoverflow) GMEM_EXCEP {
+inline static void *gmallocn(int nObjs, int objSize, bool checkoverflow) {
int n;
if (nObjs == 0) {
@@ -197,48 +185,40 @@ inline static void *gmallocn(int nObjs, int objSize, bool checkoverflow) GMEM_EX
}
n = nObjs * objSize;
if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-#if USE_EXCEPTIONS
- throw GMemException();
-#else
fprintf(stderr, "Bogus memory allocation size\n");
if (checkoverflow) return NULL;
else exit(1);
-#endif
}
return gmalloc(n, checkoverflow);
}
-void *gmallocn(int nObjs, int objSize) GMEM_EXCEP {
+void *gmallocn(int nObjs, int objSize) {
return gmallocn(nObjs, objSize, false);
}
-void *gmallocn_checkoverflow(int nObjs, int objSize) GMEM_EXCEP {
+void *gmallocn_checkoverflow(int nObjs, int objSize) {
return gmallocn(nObjs, objSize, true);
}
-inline static void *gmallocn3(int a, int b, int c, bool checkoverflow) GMEM_EXCEP {
+inline static void *gmallocn3(int a, int b, int c, bool checkoverflow) {
int n = a * b;
if (b <= 0 || a < 0 || a >= INT_MAX / b) {
-#if USE_EXCEPTIONS
- throw GMemException();
-#else
fprintf(stderr, "Bogus memory allocation size\n");
if (checkoverflow) return NULL;
else exit(1);
-#endif
}
return gmallocn(n, c, checkoverflow);
}
-void *gmallocn3(int a, int b, int c) GMEM_EXCEP {
+void *gmallocn3(int a, int b, int c) {
return gmallocn3(a, b, c, false);
}
-void *gmallocn3_checkoverflow(int a, int b, int c) GMEM_EXCEP {
+void *gmallocn3_checkoverflow(int a, int b, int c) {
return gmallocn3(a, b, c, true);
}
-inline static void *greallocn(void *p, int nObjs, int objSize, bool checkoverflow) GMEM_EXCEP {
+inline static void *greallocn(void *p, int nObjs, int objSize, bool checkoverflow) {
int n;
if (nObjs == 0) {
@@ -249,22 +229,22 @@ inline static void *greallocn(void *p, int nObjs, int objSize, bool checkoverflo
}
n = nObjs * objSize;
if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-#if USE_EXCEPTIONS
- throw GMemException();
-#else
fprintf(stderr, "Bogus memory allocation size\n");
- if (checkoverflow) return NULL;
- else exit(1);
-#endif
+ if (checkoverflow) {
+ gfree(p);
+ return NULL;
+ } else {
+ exit(1);
+ }
}
return grealloc(p, n, checkoverflow);
}
-void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP {
+void *greallocn(void *p, int nObjs, int objSize) {
return greallocn(p, nObjs, objSize, false);
}
-void *greallocn_checkoverflow(void *p, int nObjs, int objSize) GMEM_EXCEP {
+void *greallocn_checkoverflow(void *p, int nObjs, int objSize) {
return greallocn(p, nObjs, objSize, true);
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/gmem.h b/Build/source/libs/poppler/poppler-0.18.0/goo/gmem.h
index ea75fb946f1..405c8291fd4 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/gmem.h
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
-// Copyright (C) 2007-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2008 Jonathan Kew <jonathan_kew@sil.org>
//
// To see a description of the changes please see the Changelog file that
@@ -28,22 +28,6 @@
#include <stdio.h>
#include "poppler/poppler-config.h"
-#if USE_EXCEPTIONS
-
-class GMemException {
-public:
- GMemException() {}
- ~GMemException() {}
-};
-
-#define GMEM_EXCEP throw(GMemException)
-
-#else // USE_EXCEPTIONS
-
-#define GMEM_EXCEP
-
-#endif // USE_EXCEPTIONS
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -52,15 +36,15 @@ extern "C" {
* Same as malloc, but prints error message and exits if malloc()
* returns NULL.
*/
-extern void *gmalloc(size_t size) GMEM_EXCEP;
-extern void *gmalloc_checkoverflow(size_t size) GMEM_EXCEP;
+extern void *gmalloc(size_t size);
+extern void *gmalloc_checkoverflow(size_t size);
/*
* Same as realloc, but prints error message and exits if realloc()
* returns NULL. If <p> is NULL, calls malloc instead of realloc().
*/
-extern void *grealloc(void *p, size_t size) GMEM_EXCEP;
-extern void *grealloc_checkoverflow(size_t size) GMEM_EXCEP;
+extern void *grealloc(void *p, size_t size);
+extern void *grealloc_checkoverflow(size_t size);
/*
* These are similar to gmalloc and grealloc, but take an object count
@@ -70,12 +54,12 @@ extern void *grealloc_checkoverflow(size_t size) GMEM_EXCEP;
* The gmallocn_checkoverflow variant returns NULL instead of exiting
* the application if a overflow is detected
*/
-extern void *gmallocn(int nObjs, int objSize) GMEM_EXCEP;
-extern void *gmallocn_checkoverflow(int nObjs, int objSize) GMEM_EXCEP;
-extern void *gmallocn3(int a, int b, int c) GMEM_EXCEP;
-extern void *gmallocn3_checkoverflow(int a, int b, int c) GMEM_EXCEP;
-extern void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP;
-extern void *greallocn_checkoverflow(void *p, int nObjs, int objSize) GMEM_EXCEP;
+extern void *gmallocn(int nObjs, int objSize);
+extern void *gmallocn_checkoverflow(int nObjs, int objSize);
+extern void *gmallocn3(int a, int b, int c);
+extern void *gmallocn3_checkoverflow(int a, int b, int c);
+extern void *greallocn(void *p, int nObjs, int objSize);
+extern void *greallocn_checkoverflow(void *p, int nObjs, int objSize);
/*
* Same as free, but checks for and ignores NULL pointers.
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.18.0/goo/gstrtod.cc
index e6c3a00741f..e6c3a00741f 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.18.0/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.18.0/goo/gtypes.h
new file mode 100644
index 00000000000..b7a2dd2d268
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/gtypes.h
@@ -0,0 +1,48 @@
+/*
+ * gtypes.h
+ *
+ * Some useful simple types.
+ *
+ * Copyright 1996-2003 Glyph & Cog, LLC
+ */
+
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
+// Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
+#ifndef GTYPES_H
+#define GTYPES_H
+
+/*
+ * These have stupid names to avoid conflicts with some (but not all)
+ * C++ compilers which define them.
+ */
+typedef bool GBool;
+#define gTrue true
+#define gFalse false
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4800) /* 'type' : forcing value to bool 'true' or 'false' (performance warning) */
+#endif
+
+/*
+ * These have stupid names to avoid conflicts with <sys/types.h>,
+ * which on various systems defines some random subset of these.
+ */
+typedef unsigned char Guchar;
+typedef unsigned short Gushort;
+typedef unsigned int Guint;
+typedef unsigned long Gulong;
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.18.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.18.0/goo/gtypes_p.h
new file mode 100644
index 00000000000..cc4866e1389
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/goo/gtypes_p.h
@@ -0,0 +1,30 @@
+/*
+ * gtypes_p.h
+ *
+ * Some useful simple types.
+ *
+ * Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
+ */
+
+#ifndef GTYPES_P_H
+#define GTYPES_P_H
+
+#include "config.h"
+
+/*
+ * Define precise integer types.
+ */
+#if HAVE_STDINT_H
+#include <stdint.h>
+#elif _MSC_VER
+typedef signed __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef signed __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef signed __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#endif
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.18.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.18.0/gtk-doc.make
new file mode 100644
index 00000000000..4450835f085
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/gtk-doc.make
@@ -0,0 +1,240 @@
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN = $(LIBTOOL) --mode=execute
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN =
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+SETUP_FILES = \
+ $(content_files) \
+ $(DOC_MAIN_SGML_FILE) \
+ $(DOC_MODULE)-sections.txt \
+ $(DOC_MODULE)-overrides.txt
+
+EXTRA_DIST = \
+ $(SETUP_FILES)
+
+DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
+ html-build.stamp pdf-build.stamp \
+ setup.stamp sgml.stamp html.stamp pdf.stamp
+
+SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+ $(DOC_MODULE).hierarchy \
+ $(DOC_MODULE).interfaces \
+ $(DOC_MODULE).prerequisites \
+ $(DOC_MODULE).signals
+
+REPORT_FILES = \
+ $(DOC_MODULE)-undocumented.txt \
+ $(DOC_MODULE)-undeclared.txt \
+ $(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+if GTK_DOC_BUILD_HTML
+HTML_BUILD_STAMP=html-build.stamp
+else
+HTML_BUILD_STAMP=
+endif
+if GTK_DOC_BUILD_PDF
+PDF_BUILD_STAMP=pdf-build.stamp
+else
+PDF_BUILD_STAMP=
+endif
+
+all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+else
+all-local:
+endif
+
+docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+$(REPORT_FILES): sgml-build.stamp
+
+#### setup ####
+
+setup-build.stamp:
+ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ echo 'gtk-doc: Preparing build'; \
+ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+ if test "x$$files" != "x" ; then \
+ for file in $$files ; do \
+ test -f $(abs_srcdir)/$$file && \
+ cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+ done \
+ fi \
+ fi
+ @touch setup-build.stamp
+
+
+setup.stamp: setup-build.stamp
+ @true
+
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+ @_source_dir='' ; \
+ for i in $(DOC_SOURCE_DIR) ; do \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ done ; \
+ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
+ else \
+ for i in $(SCANOBJ_FILES) ; do \
+ test -f $$i || touch $$i ; \
+ done \
+ fi
+ @touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ @true
+
+#### xml ####
+
+sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
+ @_source_dir='' ; \
+ for i in $(DOC_SOURCE_DIR) ; do \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ done ; \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+ @touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+ @true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building HTML'
+ @rm -rf html
+ @mkdir html
+ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(abs_srcdir)"; \
+ fi; \
+ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ -@test "x$(HTML_IMAGES)" = "x" || \
+ for file in $(HTML_IMAGES) ; do \
+ if test -f $(abs_srcdir)/$$file ; then \
+ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+ fi; \
+ if test -f $(abs_builddir)/$$file ; then \
+ cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+ fi; \
+ done;
+ @echo 'gtk-doc: Fixing cross-references'
+ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ @touch html-build.stamp
+
+#### pdf ####
+
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building PDF'
+ @rm -rf $(DOC_MODULE).pdf
+ @mkpdf_imgdirs=""; \
+ if test "x$(HTML_IMAGES)" != "x"; then \
+ for img in $(HTML_IMAGES); do \
+ part=`dirname $$img`; \
+ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+ if test $$? != 0; then \
+ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+ fi; \
+ done; \
+ fi; \
+ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+ @touch pdf-build.stamp
+
+##############
+
+clean-local:
+ rm -f *~ *.bak
+ rm -rf .libs
+
+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; \
+ fi
+
+maintainer-clean-local: clean
+ rm -rf xml html
+
+install-data-local:
+ @installfiles=`echo $(builddir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; \
+ then echo '-- Nothing to install' ; \
+ else \
+ if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+ fi; \
+ $(mkinstalldirs) $${installdir} ; \
+ for i in $$installfiles; do \
+ echo '-- Installing '$$i ; \
+ $(INSTALL_DATA) $$i $${installdir}; \
+ done; \
+ if test -n "$(DOC_MODULE_VERSION)"; then \
+ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+ fi
+
+uninstall-local:
+ @if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+ fi; \
+ rm -rf $${installdir}
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+ @echo "*** gtk-doc must be installed and enabled in order to make dist"
+ @false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/html
+ cp $(builddir)/html/* $(distdir)/html
+ -cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+ -cp $(builddir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(builddir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo-uninstalled.pc.in
new file mode 100644
index 00000000000..2458eb20df8
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo-uninstalled.pc.in
@@ -0,0 +1,6 @@
+Name: poppler-cairo
+Description: Cairo backend for Poppler PDF rendering library - uninstalled
+Version: @VERSION@
+Requires: poppler = @VERSION@ cairo >= @CAIRO_VERSION@
+
+Libs: ${pc_top_builddir}/${pcfiledir}/poppler/libpoppler-cairo.la
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp-uninstalled.pc.in
new file mode 100644
index 00000000000..af3640eb2c1
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: poppler-cpp
+Description: cpp backend for Poppler PDF rendering library - uninstalled
+Version: @VERSION@
+Requires: poppler = @VERSION@
+
+Libs: ${pc_top_builddir}/${pcfiledir}/cpp/libpoppler-cpp.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/cpp
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-qt.pc.cmake b/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp.pc.cmake
index a01c03ee52b..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-qt.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp.pc.cmake
@@ -3,11 +3,11 @@ exec_prefix=${prefix}
libdir=${exec_prefix}/lib@LIB_SUFFIX@
includedir=${prefix}/include
-Name: poppler-qt
-Description: Qt bindings for poppler
+Name: poppler-cpp
+Description: cpp backend for Poppler PDF rendering library
Version: @POPPLER_VERSION@
Requires: @PC_REQUIRES@
@PC_REQUIRES_PRIVATE@
-Libs: -L${libdir} -lpoppler-qt
-Cflags: -I${includedir}/poppler/qt3
+Libs: -L${libdir} -lpoppler-cpp
+Cflags: -I${includedir}/poppler/cpp
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-qt.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp.pc.in
index 3bab805dc83..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-qt.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-cpp.pc.in
@@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: poppler-qt
-Description: Qt bindings for poppler
+Name: poppler-cpp
+Description: cpp backend for Poppler PDF rendering library
Version: @VERSION@
Requires: @PC_REQUIRES@
@PC_REQUIRES_PRIVATE@
-Libs: -L${libdir} -lpoppler-qt
-Cflags: -I${includedir}/poppler/qt3
+Libs: -L${libdir} -lpoppler-cpp
+Cflags: -I${includedir}/poppler/cpp
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-glib-uninstalled.pc.in
new file mode 100644
index 00000000000..d0d63f4ae6f
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-glib-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: poppler-glib
+Description: GLib wrapper for poppler - uninstalled
+Version: @VERSION@
+Requires: poppler-cairo = @VERSION@ @GLIB_REQ@
+
+Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.18.0/poppler-glib.pc.cmake
index 5d06bab6c15..5e940155c2d 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-glib.pc.cmake
@@ -6,7 +6,7 @@ includedir=${prefix}/include
Name: poppler-glib
Description: GLib wrapper for poppler
Version: @POPPLER_VERSION@
-Requires: @PC_REQUIRES@ gobject-2.0 gdk-2.0 gdk-pixbuf-2.0 @CAIRO_REQ@
+Requires: poppler-cairo = @POPPLER_VERSION@ @GLIB_REQ@
@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-glib
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-glib.pc.in
index 2b79945d9dc..05b9a771914 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-glib.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: poppler-glib
Description: GLib wrapper for poppler
Version: @VERSION@
-Requires: @PC_REQUIRES@ gobject-2.0 gdk-2.0 gdk-pixbuf-2.0 @CAIRO_REQ@
+Requires: poppler-cairo = @VERSION@ @GLIB_REQ@
@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-glib
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4-uninstalled.pc.in
new file mode 100644
index 00000000000..3a336c6c294
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: poppler-qt4
+Description: Qt4 bindings for poppler - uninstalled
+Version: @VERSION@
+Requires: poppler = @VERSION@
+
+Libs: ${pc_top_builddir}/${pcfiledir}/qt4/src/libpoppler-qt4.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/qt4/src
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-splash-uninstalled.pc.in
new file mode 100644
index 00000000000..436ecdb8f1b
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-splash-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: poppler-splash
+Description: Splash backend for Poppler PDF rendering library - uninstalled
+Version: @VERSION@
+Requires: poppler = @VERSION@
+
+Libs: ${pc_top_builddir}/${pcfiledir}/splash/libsplash.la
+
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.18.0/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler-uninstalled.pc.in
new file mode 100644
index 00000000000..6076e80c5b3
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler-uninstalled.pc.in
@@ -0,0 +1,6 @@
+Name: poppler
+Description: PDF rendering library - uninstalled
+Version: @VERSION@
+
+Libs: ${pc_top_builddir}/${pcfiledir}/poppler/libpoppler.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/poppler
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.18.0/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler.pc.in b/Build/source/libs/poppler/poppler-0.18.0/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Annot.cc
index cb6a3811b0e..664a6c16fd5 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Annot.cc
@@ -15,14 +15,15 @@
//
// Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
// Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2007-2009 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2007-2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007-2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2011 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>
-// Copyright (C) 2008 Pino Toscano <pino@kde.org>
+// Copyright (C) 2008, 2011 Pino Toscano <pino@kde.org>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
// Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
+// Copyright (C) 2011 José Aliste <jaliste@src.gnome.org>
//
// 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
@@ -46,25 +47,22 @@
#include "Catalog.h"
#include "Gfx.h"
#include "Lexer.h"
+#include "Page.h"
#include "Annot.h"
#include "GfxFont.h"
#include "CharCodeToUnicode.h"
#include "PDFDocEncoding.h"
#include "Form.h"
#include "Error.h"
-#include "Page.h"
#include "XRef.h"
#include "Movie.h"
#include "OptionalContent.h"
#include "Sound.h"
#include "FileSpec.h"
#include "DateInfo.h"
+#include "Link.h"
#include <string.h>
-#define annotFlagHidden 0x0002
-#define annotFlagPrint 0x0004
-#define annotFlagNoView 0x0020
-
#define fieldFlagReadOnly 0x00000001
#define fieldFlagRequired 0x00000002
#define fieldFlagNoExport 0x00000004
@@ -93,6 +91,10 @@
// = (4 * (sqrt(2) - 1) / 3) * r
#define bezierCircle 0.55228475
+// Ensures that x is between the limits set by low and high.
+// If low is greater than high the result is undefined.
+#define CLAMP(x, low, high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
+
AnnotLineEndingStyle parseAnnotLineEndingStyle(GooString *string) {
if (string != NULL) {
if (!string->cmp("Square")) {
@@ -126,14 +128,13 @@ static AnnotExternalDataType parseAnnotExternalData(Dict* dict) {
AnnotExternalDataType type;
if (dict->lookup("Subtype", &obj1)->isName()) {
- GooString *typeName = new GooString(obj1.getName());
+ const char *typeName = obj1.getName();
- if (!typeName->cmp("Markup3D")) {
+ if (!strcmp(typeName, "Markup3D")) {
type = annotExternalDataMarkup3D;
} else {
type = annotExternalDataMarkupUnknown;
}
- delete typeName;
} else {
type = annotExternalDataMarkupUnknown;
}
@@ -179,13 +180,12 @@ AnnotBorderEffect::AnnotBorderEffect(Dict *dict) {
Object obj1;
if (dict->lookup("S", &obj1)->isName()) {
- GooString *effectName = new GooString(obj1.getName());
+ const char *effectName = obj1.getName();
- if (!effectName->cmp("C"))
+ if (!strcmp(effectName, "C"))
effectType = borderEffectCloudy;
else
effectType = borderEffectNoEffect;
- delete effectName;
} else {
effectType = borderEffectNoEffect;
}
@@ -323,37 +323,37 @@ AnnotQuadrilaterals::AnnotQuadrilaterals(Array *array, PDFRectangle *rect) {
quadrilateralsLength = 0;
if ((arrayLength % 8) == 0) {
- int i = 0;
+ int i;
quadsLength = arrayLength / 8;
quads = (AnnotQuadrilateral **) gmallocn
((quadsLength), sizeof(AnnotQuadrilateral *));
memset(quads, 0, quadsLength * sizeof(AnnotQuadrilateral *));
- while (i < (quadsLength) && correct) {
- for (int j = 0; j < 8 && correct; j++) {
+ for (i = 0; i < quadsLength; i++) {
+ for (int j = 0; j < 8; j++) {
Object obj;
if (array->get(i * 8 + j, &obj)->isNum()) {
- quadArray[j] = obj.getNum();
- if (j % 2 == 1) {
- if (quadArray[j] < rect->y1 || quadArray[j] > rect->y2)
- correct = gFalse;
- } else {
- if (quadArray[j] < rect->x1 || quadArray[j] > rect->x2)
- correct = gFalse;
- }
+ if (j % 2 == 1)
+ quadArray[j] = CLAMP (obj.getNum(), rect->y1, rect->y2);
+ else
+ quadArray[j] = CLAMP (obj.getNum(), rect->x1, rect->x2);
} else {
correct = gFalse;
+ obj.free();
+ error (-1, "Invalid QuadPoint in annot");
+ break;
}
obj.free();
}
- if (correct)
- quads[i] = new AnnotQuadrilateral(quadArray[0], quadArray[1],
- quadArray[2], quadArray[3],
- quadArray[4], quadArray[5],
- quadArray[6], quadArray[7]);
- i++;
+ if (!correct)
+ break;
+
+ quads[i] = new AnnotQuadrilateral(quadArray[0], quadArray[1],
+ quadArray[2], quadArray[3],
+ quadArray[4], quadArray[5],
+ quadArray[6], quadArray[7]);
}
if (correct) {
@@ -440,6 +440,34 @@ AnnotBorder::AnnotBorder() {
style = borderSolid;
}
+GBool AnnotBorder::parseDashArray(Object *dashObj) {
+ GBool correct = gTrue;
+ int tempLength = dashObj->arrayGetLength();
+ double *tempDash = (double *) gmallocn (tempLength, sizeof (double));
+
+ // TODO: check not all zero (Line Dash Pattern Page 217 PDF 8.1)
+ for (int i = 0; i < tempLength && i < DASH_LIMIT && correct; i++) {
+ Object obj1;
+
+ if (dashObj->arrayGet(i, &obj1)->isNum()) {
+ tempDash[i] = obj1.getNum();
+
+ correct = tempDash[i] >= 0;
+ obj1.free();
+ }
+ }
+
+ if (correct) {
+ dashLength = tempLength;
+ dash = tempDash;
+ style = borderDashed;
+ } else {
+ gfree (tempDash);
+ }
+
+ return correct;
+}
+
AnnotBorder::~AnnotBorder() {
if (dash)
gfree (dash);
@@ -481,37 +509,11 @@ AnnotBorderArray::AnnotBorderArray(Array *array) {
correct = gFalse;
obj1.free();
- // TODO: check not all zero ? (Line Dash Pattern Page 217 PDF 8.1)
if (arrayLength == 4) {
- if (array->get(3, &obj1)->isArray()) {
- Array *dashPattern = obj1.getArray();
- int tempLength = dashPattern->getLength();
- double *tempDash = (double *) gmallocn (tempLength, sizeof (double));
-
- for(int i = 0; i < tempLength && i < DASH_LIMIT && correct; i++) {
-
- if (dashPattern->get(i, &obj1)->isNum()) {
- tempDash[i] = obj1.getNum();
-
- if (tempDash[i] < 0)
- correct = gFalse;
-
- } else {
- correct = gFalse;
- }
- obj1.free();
- }
-
- if (correct) {
- dashLength = tempLength;
- dash = tempDash;
- style = borderDashed;
- } else {
- gfree (tempDash);
- }
- } else {
+ if (array->get(3, &obj1)->isArray())
+ correct = parseDashArray(&obj1);
+ else
correct = gFalse;
- }
obj1.free();
}
} else {
@@ -543,66 +545,40 @@ AnnotBorderBS::AnnotBorderBS(Dict *dict) {
dict->lookup("W", &obj1);
dict->lookup("S", &obj2);
if (obj1.isNum() && obj2.isName()) {
- GooString *styleName = new GooString(obj2.getName());
+ const char *styleName = obj2.getName();
width = obj1.getNum();
- if (!styleName->cmp("S")) {
+ if (!strcmp(styleName, "S")) {
style = borderSolid;
- } else if (!styleName->cmp("D")) {
+ } else if (!strcmp(styleName, "D")) {
style = borderDashed;
- } else if (!styleName->cmp("B")) {
+ } else if (!strcmp(styleName, "B")) {
style = borderBeveled;
- } else if (!styleName->cmp("I")) {
+ } else if (!strcmp(styleName, "I")) {
style = borderInset;
- } else if (!styleName->cmp("U")) {
+ } else if (!strcmp(styleName, "U")) {
style = borderUnderlined;
} else {
style = borderSolid;
}
- delete styleName;
} else {
width = 0;
}
obj2.free();
obj1.free();
- // TODO: check not all zero (Line Dash Pattern Page 217 PDF 8.1)
- if (dict->lookup("D", &obj1)->isArray()) {
- GBool correct = gTrue;
- int tempLength = obj1.arrayGetLength();
- double *tempDash = (double *) gmallocn (tempLength, sizeof (double));
-
- for(int i = 0; i < tempLength && correct; i++) {
- Object obj2;
-
- if (obj1.arrayGet(i, &obj2)->isNum()) {
- tempDash[i] = obj2.getNum();
-
- if (tempDash[i] < 0)
- correct = gFalse;
- } else {
- correct = gFalse;
- }
- obj2.free();
- }
+ if (style == borderDashed) {
+ if (dict->lookup("D", &obj1)->isArray())
+ parseDashArray(&obj1);
+ obj1.free();
- if (correct) {
- dashLength = tempLength;
- dash = tempDash;
- style = borderDashed;
- } else {
- gfree (tempDash);
+ if (!dash) {
+ dashLength = 1;
+ dash = (double *) gmallocn (dashLength, sizeof (double));
+ dash[0] = 3;
}
-
}
-
- if (!dash) {
- dashLength = 1;
- dash = (double *) gmallocn (dashLength, sizeof (double));
- dash[0] = 3;
- }
- obj1.free();
}
//------------------------------------------------------------------------
@@ -611,19 +587,16 @@ AnnotBorderBS::AnnotBorderBS(Dict *dict) {
AnnotColor::AnnotColor() {
length = 0;
- values = NULL;
}
AnnotColor::AnnotColor(double gray) {
length = 1;
- values = (double *) gmallocn (length, sizeof(double));
values[0] = gray;
}
AnnotColor::AnnotColor(double r, double g, double b) {
length = 3;
- values = (double *) gmallocn (length, sizeof(double));
values[0] = r;
values[1] = g;
@@ -632,7 +605,6 @@ AnnotColor::AnnotColor(double r, double g, double b) {
AnnotColor::AnnotColor(double c, double m, double y, double k) {
length = 4;
- values = (double *) gmallocn (length, sizeof(double));
values[0] = c;
values[1] = m;
@@ -640,55 +612,48 @@ AnnotColor::AnnotColor(double c, double m, double y, double k) {
values[3] = k;
}
-AnnotColor::AnnotColor(Array *array) {
- // TODO: check what Acrobat does in the case of having more than 5 numbers.
- if (array->getLength() < 5) {
- length = array->getLength();
- values = (double *) gmallocn (length, sizeof(double));
+// If <adjust> is +1, color is brightened;
+// if <adjust> is -1, color is darkened;
+// otherwise color is not modified.
+AnnotColor::AnnotColor(Array *array, int adjust) {
+ int i;
+
+ length = array->getLength();
+ if (length > 4)
+ length = 4;
- for(int i = 0; i < length; i++) {
- Object obj1;
+ for (i = 0; i < length; i++) {
+ Object obj1;
- if (array->get(i, &obj1)->isNum()) {
- values[i] = obj1.getNum();
+ if (array->get(i, &obj1)->isNum()) {
+ values[i] = obj1.getNum();
- if (values[i] < 0 || values[i] > 1)
- values[i] = 0;
- } else {
+ if (values[i] < 0 || values[i] > 1)
values[i] = 0;
- }
- obj1.free();
+ } else {
+ values[i] = 0;
}
- } else {
- values = NULL;
- length = 0;
+ obj1.free();
}
-}
-AnnotColor::~AnnotColor() {
- if (values)
- gfree (values);
+ if (adjust != 0)
+ adjustColor(adjust);
}
-//------------------------------------------------------------------------
-// AnnotBorderStyle
-//------------------------------------------------------------------------
-
-AnnotBorderStyle::AnnotBorderStyle(AnnotBorderType typeA, double widthA,
- double *dashA, int dashLengthA,
- double rA, double gA, double bA) {
- type = typeA;
- width = widthA;
- dash = dashA;
- dashLength = dashLengthA;
- r = rA;
- g = gA;
- b = bA;
-}
+void AnnotColor::adjustColor(int adjust) {
+ int i;
-AnnotBorderStyle::~AnnotBorderStyle() {
- if (dash) {
- gfree(dash);
+ if (length == 4) {
+ adjust = -adjust;
+ }
+ if (adjust > 0) {
+ for (i = 0; i < length; ++i) {
+ values[i] = 0.5 * values[i] + 0.5;
+ }
+ } else if (adjust < 0) {
+ for (i = 0; i < length; ++i) {
+ values[i] = 0.5 * values[i];
+ }
}
}
@@ -700,32 +665,30 @@ AnnotIconFit::AnnotIconFit(Dict* dict) {
Object obj1;
if (dict->lookup("SW", &obj1)->isName()) {
- GooString *scaleName = new GooString(obj1.getName());
+ const char *scaleName = obj1.getName();
- if(!scaleName->cmp("B")) {
+ if(!strcmp(scaleName, "B")) {
scaleWhen = scaleBigger;
- } else if(!scaleName->cmp("S")) {
+ } else if(!strcmp(scaleName, "S")) {
scaleWhen = scaleSmaller;
- } else if(!scaleName->cmp("N")) {
+ } else if(!strcmp(scaleName, "N")) {
scaleWhen = scaleNever;
} else {
scaleWhen = scaleAlways;
}
- delete scaleName;
} else {
scaleWhen = scaleAlways;
}
obj1.free();
if (dict->lookup("S", &obj1)->isName()) {
- GooString *scaleName = new GooString(obj1.getName());
+ const char *scaleName = obj1.getName();
- if(!scaleName->cmp("A")) {
+ if(!strcmp(scaleName, "A")) {
scale = scaleAnamorphic;
} else {
scale = scaleProportional;
}
- delete scaleName;
} else {
scale = scaleProportional;
}
@@ -785,22 +748,22 @@ AnnotAppearanceCharacs::AnnotAppearanceCharacs(Dict *dict) {
}
obj1.free();
- if (dict->lookup("CA", &obj1)->isName()) {
- normalCaption = new GooString(obj1.getName());
+ if (dict->lookup("CA", &obj1)->isString()) {
+ normalCaption = new GooString(obj1.getString());
} else {
normalCaption = NULL;
}
obj1.free();
- if (dict->lookup("RC", &obj1)->isName()) {
- rolloverCaption = new GooString(obj1.getName());
+ if (dict->lookup("RC", &obj1)->isString()) {
+ rolloverCaption = new GooString(obj1.getString());
} else {
rolloverCaption = NULL;
}
obj1.free();
- if (dict->lookup("AC", &obj1)->isName()) {
- alternateCaption = new GooString(obj1.getName());
+ if (dict->lookup("AC", &obj1)->isString()) {
+ alternateCaption = new GooString(obj1.getString());
} else {
alternateCaption = NULL;
}
@@ -848,6 +811,7 @@ AnnotAppearanceCharacs::~AnnotAppearanceCharacs() {
Annot::Annot(XRef *xrefA, PDFRectangle *rectA, Catalog *catalog) {
Object obj1;
+ refCnt = 1;
flags = flagUnknown;
type = typeUnknown;
@@ -870,6 +834,7 @@ Annot::Annot(XRef *xrefA, PDFRectangle *rectA, Catalog *catalog) {
}
Annot::Annot(XRef *xrefA, Dict *dict, Catalog* catalog) {
+ refCnt = 1;
hasRef = false;
flags = flagUnknown;
type = typeUnknown;
@@ -878,6 +843,7 @@ Annot::Annot(XRef *xrefA, Dict *dict, Catalog* catalog) {
}
Annot::Annot(XRef *xrefA, Dict *dict, Catalog* catalog, Object *obj) {
+ refCnt = 1;
if (obj->isRef()) {
hasRef = gTrue;
ref = obj->getRef();
@@ -900,6 +866,8 @@ void Annot::initialize(XRef *xrefA, Dict *dict, Catalog *catalog) {
appearBuf = NULL;
fontSize = 0;
+ appearance.initNull();
+
//----- parse the rectangle
rect = new PDFRectangle();
if (dict->lookup("Rect", &obj1)->isArray() && obj1.arrayGetLength() == 4) {
@@ -939,15 +907,14 @@ void Annot::initialize(XRef *xrefA, Dict *dict, Catalog *catalog) {
}
obj1.free();
- /* TODO: Page Object indirect reference (should be parsed ?) */
- pageDict = NULL;
- /*if (dict->lookup("P", &obj1)->isDict()) {
- pageDict = NULL;
+ if (dict->lookupNF("P", &obj1)->isRef()) {
+ Ref ref = obj1.getRef();
+
+ page = catalog ? catalog->findPage (ref.num, ref.gen) : -1;
} else {
- pageDict = NULL;
+ page = 0;
}
obj1.free();
- */
if (dict->lookup("NM", &obj1)->isString()) {
name = obj1.getString()->copy();
@@ -1042,6 +1009,17 @@ void Annot::initialize(XRef *xrefA, Dict *dict, Catalog *catalog) {
}
}
+void Annot::getRect(double *x1, double *y1, double *x2, double *y2) const {
+ *x1 = rect->x1;
+ *y1 = rect->y1;
+ *x2 = rect->x2;
+ *y2 = rect->y2;
+}
+
+GBool Annot::inRect(double x, double y) const {
+ return rect->contains(x, y);
+}
+
void Annot::update(const char *key, Object *value) {
/* Set M to current time */
delete modified;
@@ -1080,7 +1058,7 @@ void Annot::setColor(AnnotColor *new_color) {
if (new_color) {
Object obj1, obj2;
- double *values = new_color->getValues();
+ const double *values = new_color->getValues();
obj1.initArray(xref);
for (int i = 0; i < (int)new_color->getSpace(); i++)
@@ -1092,6 +1070,49 @@ void Annot::setColor(AnnotColor *new_color) {
}
}
+void Annot::setPage(Ref *pageRef, int pageIndex)
+{
+ Object obj1;
+
+ obj1.initRef(pageRef->num, pageRef->gen);
+ update("P", &obj1);
+ page = pageIndex;
+}
+
+void Annot::setAppearanceState(char *state) {
+ if (!state)
+ return;
+
+ if (appearState && appearState->cmp(state) == 0)
+ return;
+
+ delete appearState;
+ appearState = new GooString(state);
+
+ Object obj1;
+ obj1.initName(state);
+ update ("AS", &obj1);
+
+ // The appearance state determines the current appearance stream
+ Object obj2;
+ if (annotObj.dictLookup("AP", &obj2)->isDict()) {
+ Object obj3;
+
+ if (obj2.dictLookup("N", &obj3)->isDict()) {
+ Object obj4;
+
+ appearance.free();
+ if (obj3.dictLookupNF(state, &obj4)->isRef())
+ obj4.copy(&appearance);
+ else
+ appearance.initNull();
+ obj4.free();
+ }
+ obj3.free();
+ }
+ obj2.free();
+}
+
double Annot::getXMin() {
return rect->x1;
}
@@ -1113,6 +1134,15 @@ void Annot::readArrayNum(Object *pdfArray, int key, double *value) {
valueObject.free();
}
+void Annot::incRefCnt() {
+ refCnt++;
+}
+
+void Annot::decRefCnt() {
+ if (--refCnt == 0)
+ delete this;
+}
+
Annot::~Annot() {
annotObj.free();
@@ -1121,9 +1151,6 @@ Annot::~Annot() {
if (contents)
delete contents;
- if (pageDict)
- delete pageDict;
-
if (name)
delete name;
@@ -1144,51 +1171,28 @@ Annot::~Annot() {
oc.free();
}
-// Set the current fill or stroke color, based on <a> (which should
-// have 1, 3, or 4 elements). If <adjust> is +1, color is brightened;
-// if <adjust> is -1, color is darkened; otherwise color is not
-// modified.
-void Annot::setColor(Array *a, GBool fill, int adjust) {
- Object obj1;
- double color[4];
- int nComps, i;
+void Annot::setColor(AnnotColor *color, GBool fill) {
+ const double *values = color->getValues();
- nComps = a->getLength();
- if (nComps > 4) {
- nComps = 4;
- }
- for (i = 0; i < nComps && i < 4; ++i) {
- if (a->get(i, &obj1)->isNum()) {
- color[i] = obj1.getNum();
- } else {
- color[i] = 0;
- }
- obj1.free();
- }
- if (nComps == 4) {
- adjust = -adjust;
- }
- if (adjust > 0) {
- for (i = 0; i < nComps; ++i) {
- color[i] = 0.5 * color[i] + 0.5;
- }
- } else if (adjust < 0) {
- for (i = 0; i < nComps; ++i) {
- color[i] = 0.5 * color[i];
- }
- }
- if (nComps == 4) {
+ switch (color->getSpace()) {
+ case AnnotColor::colorCMYK:
appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:c}\n",
- color[0], color[1], color[2], color[3],
- fill ? 'k' : 'K');
- } else if (nComps == 3) {
+ values[0], values[1], values[2], values[3],
+ fill ? 'k' : 'K');
+ break;
+ case AnnotColor::colorRGB:
appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:s}\n",
- color[0], color[1], color[2],
- fill ? "rg" : "RG");
- } else {
+ values[0], values[1], values[2],
+ fill ? "rg" : "RG");
+ break;
+ case AnnotColor::colorGray:
appearBuf->appendf("{0:.2f} {1:c}\n",
- color[0],
- fill ? 'g' : 'G');
+ values[0],
+ fill ? 'g' : 'G');
+ break;
+ case AnnotColor::colorTransparent:
+ default:
+ break;
}
}
@@ -1266,25 +1270,83 @@ void Annot::drawCircleBottomRight(double cx, double cy, double r) {
appearBuf->append("S\n");
}
-void Annot::draw(Gfx *gfx, GBool printing) {
- Object obj;
+void Annot::createForm(double *bbox, GBool transparencyGroup, Object *resDict, Object *aStream) {
+ Object obj1, obj2;
+ Object appearDict;
+ appearDict.initDict(xref);
+ appearDict.dictSet("Length", obj1.initInt(appearBuf->getLength()));
+ appearDict.dictSet("Subtype", obj1.initName("Form"));
+ obj1.initArray(xref);
+ obj1.arrayAdd(obj2.initReal(bbox[0]));
+ obj1.arrayAdd(obj2.initReal(bbox[1]));
+ obj1.arrayAdd(obj2.initReal(bbox[2]));
+ obj1.arrayAdd(obj2.initReal(bbox[3]));
+ appearDict.dictSet("BBox", &obj1);
+ if (transparencyGroup) {
+ Object transDict;
+ transDict.initDict(xref);
+ transDict.dictSet("S", obj1.initName("Transparency"));
+ appearDict.dictSet("Group", &transDict);
+ }
+ if (resDict)
+ appearDict.dictSet("Resources", resDict);
+
+ MemStream *mStream = new MemStream(copyString(appearBuf->getCString()), 0,
+ appearBuf->getLength(), &appearDict);
+ mStream->setNeedFree(gTrue);
+ aStream->initStream(mStream);
+}
+
+void Annot::createResourcesDict(char *formName, Object *formStream,
+ char *stateName,
+ double opacity, char *blendMode,
+ Object *resDict) {
+ Object gsDict, stateDict, formDict, obj1;
+
+ gsDict.initDict(xref);
+ if (opacity != 1) {
+ gsDict.dictSet("CA", obj1.initReal(opacity));
+ gsDict.dictSet("ca", obj1.initReal(opacity));
+ }
+ if (blendMode)
+ gsDict.dictSet("BM", obj1.initName(blendMode));
+ stateDict.initDict(xref);
+ stateDict.dictSet(stateName, &gsDict);
+ formDict.initDict(xref);
+ formDict.dictSet(formName, formStream);
+
+ resDict->initDict(xref);
+ resDict->dictSet("ExtGState", &stateDict);
+ resDict->dictSet("XObject", &formDict);
+}
+
+GBool Annot::isVisible(GBool printing) {
// check the flags
- if ((flags & annotFlagHidden) ||
- (printing && !(flags & annotFlagPrint)) ||
- (!printing && (flags & annotFlagNoView))) {
- return;
+ if ((flags & flagHidden) ||
+ (printing && !(flags & flagPrint)) ||
+ (!printing && (flags & flagNoView))) {
+ return gFalse;
}
// check the OC
if (optContentConfig && oc.isRef()) {
if (! optContentConfig->optContentIsVisible(&oc))
- return;
+ return gFalse;
}
+ return gTrue;
+}
+
+void Annot::draw(Gfx *gfx, GBool printing) {
+ Object obj;
+
+ if (!isVisible (printing))
+ return;
+
// draw the appearance stream
appearance.fetch(xref, &obj);
- gfx->drawAnnot(&obj, (type == typeLink) ? border : (AnnotBorder *)NULL, color,
+ gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
rect->x1, rect->y1, rect->x2, rect->y2);
obj.free();
}
@@ -1421,16 +1483,15 @@ void AnnotMarkup::initialize(XRef *xrefA, Dict *dict, Catalog *catalog, Object *
obj1.free();
if (dict->lookup("RT", &obj1)->isName()) {
- GooString *replyName = new GooString(obj1.getName());
+ const char *replyName = obj1.getName();
- if (!replyName->cmp("R")) {
+ if (!strcmp(replyName, "R")) {
replyTo = replyTypeR;
- } else if (!replyName->cmp("Group")) {
+ } else if (!strcmp(replyName, "Group")) {
replyTo = replyTypeGroup;
} else {
replyTo = replyTypeR;
}
- delete replyName;
} else {
replyTo = replyTypeR;
}
@@ -1480,6 +1541,14 @@ void AnnotMarkup::setPopup(AnnotPopup *new_popup) {
}
}
+void AnnotMarkup::setOpacity(double opacityA) {
+ Object obj1;
+
+ opacity = opacityA;
+ obj1.initReal(opacity);
+ update ("CA", &obj1);
+}
+
//------------------------------------------------------------------------
// AnnotText
//------------------------------------------------------------------------
@@ -1613,6 +1682,317 @@ void AnnotText::setIcon(GooString *new_icon) {
update("Name", &obj1);
}
+#define ANNOT_TEXT_AP_NOTE \
+ "3.602 24 m 20.398 24 l 22.387 24 24 22.387 24 20.398 c 24 3.602 l 24\n" \
+ "1.613 22.387 0 20.398 0 c 3.602 0 l 1.613 0 0 1.613 0 3.602 c 0 20.398\n" \
+ "l 0 22.387 1.613 24 3.602 24 c h\n" \
+ "3.602 24 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2 w\n" \
+ "1 J\n" \
+ "1 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 9 18 m 4 18 l 4 7 4 4 6 3 c 20 3 l 18 4 18 7 18 18 c 17 18 l S\n" \
+ "1.5 w\n" \
+ "0 j\n" \
+ "10 16 m 14 21 l S\n" \
+ "1.85625 w\n" \
+ "1 j\n" \
+ "15.07 20.523 m 15.07 19.672 14.379 18.977 13.523 18.977 c 12.672 18.977\n" \
+ "11.977 19.672 11.977 20.523 c 11.977 21.379 12.672 22.07 13.523 22.07 c\n" \
+ "14.379 22.07 15.07 21.379 15.07 20.523 c h\n" \
+ "15.07 20.523 m S\n" \
+ "1 w\n" \
+ "0 j\n" \
+ "6.5 13.5 m 15.5 13.5 l S\n" \
+ "6.5 10.5 m 13.5 10.5 l S\n" \
+ "6.801 7.5 m 15.5 7.5 l S\n" \
+ "0.729412 0.741176 0.713725 RG 2 w\n" \
+ "1 j\n" \
+ "9 19 m 4 19 l 4 8 4 5 6 4 c 20 4 l 18 5 18 8 18 19 c 17 19 l S\n" \
+ "1.5 w\n" \
+ "0 j\n" \
+ "10 17 m 14 22 l S\n" \
+ "1.85625 w\n" \
+ "1 j\n" \
+ "15.07 21.523 m 15.07 20.672 14.379 19.977 13.523 19.977 c 12.672 19.977\n" \
+ "11.977 20.672 11.977 21.523 c 11.977 22.379 12.672 23.07 13.523 23.07 c\n" \
+ "14.379 23.07 15.07 22.379 15.07 21.523 c h\n" \
+ "15.07 21.523 m S\n" \
+ "1 w\n" \
+ "0 j\n" \
+ "6.5 14.5 m 15.5 14.5 l S\n" \
+ "6.5 11.5 m 13.5 11.5 l S\n" \
+ "6.801 8.5 m 15.5 8.5 l S\n"
+
+#define ANNOT_TEXT_AP_COMMENT \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2 w\n" \
+ "0 J\n" \
+ "1 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 8 20 m 16 20 l 18.363 20 20 18.215 20 16 c 20 13 l 20 10.785 18.363 9\n" \
+ "16 9 c 13 9 l 8 3 l 8 9 l 8 9 l 5.637 9 4 10.785 4 13 c 4 16 l 4 18.215\n" \
+ "5.637 20 8 20 c h\n" \
+ "8 20 m S\n" \
+ "0.729412 0.741176 0.713725 RG 8 21 m 16 21 l 18.363 21 20 19.215 20 17\n" \
+ "c 20 14 l 20 11.785 18.363 10\n" \
+ "16 10 c 13 10 l 8 4 l 8 10 l 8 10 l 5.637 10 4 11.785 4 14 c 4 17 l 4\n" \
+ "19.215 5.637 21 8 21 c h\n" \
+ "8 21 m S\n"
+
+#define ANNOT_TEXT_AP_KEY \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2 w\n" \
+ "1 J\n" \
+ "0 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 11.895 18.754 m 13.926 20.625 17.09 20.496 18.961 18.465 c 20.832\n" \
+ "16.434 20.699 13.27 18.668 11.398 c 17.164 10.016 15.043 9.746 13.281\n" \
+ "10.516 c 12.473 9.324 l 11.281 10.078 l 9.547 8.664 l 9.008 6.496 l\n" \
+ "7.059 6.059 l 6.34 4.121 l 5.543 3.668 l 3.375 4.207 l 2.938 6.156 l\n" \
+ "10.57 13.457 l 9.949 15.277 10.391 17.367 11.895 18.754 c h\n" \
+ "11.895 18.754 m S\n" \
+ "1.5 w\n" \
+ "16.059 15.586 m 16.523 15.078 17.316 15.043 17.824 15.512 c 18.332\n" \
+ "15.98 18.363 16.77 17.895 17.277 c 17.43 17.785 16.637 17.816 16.129\n" \
+ "17.352 c 15.621 16.883 15.59 16.094 16.059 15.586 c h\n" \
+ "16.059 15.586 m S\n" \
+ "0.729412 0.741176 0.713725 RG 2 w\n" \
+ "11.895 19.754 m 13.926 21.625 17.09 21.496 18.961 19.465 c 20.832\n" \
+ "17.434 20.699 14.27 18.668 12.398 c 17.164 11.016 15.043 10.746 13.281\n" \
+ "11.516 c 12.473 10.324 l 11.281 11.078 l 9.547 9.664 l 9.008 7.496 l\n" \
+ "7.059 7.059 l 6.34 5.121 l 5.543 4.668 l 3.375 5.207 l 2.938 7.156 l\n" \
+ "10.57 14.457 l 9.949 16.277 10.391 18.367 11.895 19.754 c h\n" \
+ "11.895 19.754 m S\n" \
+ "1.5 w\n" \
+ "16.059 16.586 m 16.523 16.078 17.316 16.043 17.824 16.512 c 18.332\n" \
+ "16.98 18.363 17.77 17.895 18.277 c 17.43 18.785 16.637 18.816 16.129\n" \
+ "18.352 c 15.621 17.883 15.59 17.094 16.059 16.586 c h\n" \
+ "16.059 16.586 m S\n"
+
+#define ANNOT_TEXT_AP_HELP \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2.5 w\n" \
+ "1 J\n" \
+ "1 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 8.289 16.488 m 8.824 17.828 10.043 18.773 11.473 18.965 c 12.902 19.156\n" \
+ "14.328 18.559 15.195 17.406 c 16.062 16.254 16.242 14.723 15.664 13.398\n" \
+ "c S\n" \
+ "0 j\n" \
+ "12 8 m 12 12 16 11 16 15 c S\n" \
+ "1.539286 w\n" \
+ "1 j\n" \
+ "q 1 0 0 -0.999991 0 24 cm\n" \
+ "12.684 20.891 m 12.473 21.258 12.004 21.395 11.629 21.196 c 11.254\n" \
+ "20.992 11.105 20.531 11.297 20.149 c 11.488 19.77 11.945 19.61 12.332\n" \
+ "19.789 c 12.719 19.969 12.891 20.426 12.719 20.817 c S Q\n" \
+ "0.729412 0.741176 0.713725 RG 2.5 w\n" \
+ "8.289 17.488 m 9.109 19.539 11.438 20.535 13.488 19.711 c 15.539 18.891\n" \
+ "16.535 16.562 15.711 14.512 c 15.699 14.473 15.684 14.438 15.664 14.398\n" \
+ "c S\n" \
+ "0 j\n" \
+ "12 9 m 12 13 16 12 16 16 c S\n" \
+ "1.539286 w\n" \
+ "1 j\n" \
+ "q 1 0 0 -0.999991 0 24 cm\n" \
+ "12.684 19.891 m 12.473 20.258 12.004 20.395 11.629 20.195 c 11.254\n" \
+ "19.992 11.105 19.531 11.297 19.149 c 11.488 18.77 11.945 18.61 12.332\n" \
+ "18.789 c 12.719 18.969 12.891 19.426 12.719 19.817 c S Q\n"
+
+#define ANNOT_TEXT_AP_NEW_PARAGRAPH \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 4 w\n" \
+ "0 J\n" \
+ "2 j\n" \
+ "[] 0.0 d\n" \
+ "4 M q 1 0 0 -1 0 24 cm\n" \
+ "9.211 11.988 m 8.449 12.07 7.711 11.707 7.305 11.059 c 6.898 10.41\n" \
+ "6.898 9.59 7.305 8.941 c 7.711 8.293 8.449 7.93 9.211 8.012 c S Q\n" \
+ "1.004413 w\n" \
+ "1 J\n" \
+ "1 j\n" \
+ "q 1 0 0 -0.991232 0 24 cm\n" \
+ "18.07 11.511 m 15.113 10.014 l 12.199 11.602 l 12.711 8.323 l 10.301\n" \
+ "6.045 l 13.574 5.517 l 14.996 2.522 l 16.512 5.474 l 19.801 5.899 l\n" \
+ "17.461 8.252 l 18.07 11.511 l h\n" \
+ "18.07 11.511 m S Q\n" \
+ "2 w\n" \
+ "0 j\n" \
+ "11 17 m 10 17 l 10 3 l S\n" \
+ "14 3 m 14 13 l S\n" \
+ "0.729412 0.741176 0.713725 RG 4 w\n" \
+ "0 J\n" \
+ "2 j\n" \
+ "q 1 0 0 -1 0 24 cm\n" \
+ "9.211 10.988 m 8.109 11.105 7.125 10.309 7.012 9.211 c 6.895 8.109\n" \
+ "7.691 7.125 8.789 7.012 c 8.93 6.996 9.07 6.996 9.211 7.012 c S Q\n" \
+ "1.004413 w\n" \
+ "1 J\n" \
+ "1 j\n" \
+ "q 1 0 0 -0.991232 0 24 cm\n" \
+ "18.07 10.502 m 15.113 9.005 l 12.199 10.593 l 12.711 7.314 l 10.301\n" \
+ "5.036 l 13.574 4.508 l 14.996 1.513 l 16.512 4.465 l 19.801 4.891 l\n" \
+ "17.461 7.243 l 18.07 10.502 l h\n" \
+ "18.07 10.502 m S Q\n" \
+ "2 w\n" \
+ "0 j\n" \
+ "11 18 m 10 18 l 10 4 l S\n" \
+ "14 4 m 14 14 l S\n"
+
+#define ANNOT_TEXT_AP_PARAGRAPH \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2 w\n" \
+ "1 J\n" \
+ "1 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 15 3 m 15 18 l 11 18 l 11 3 l S\n" \
+ "4 w\n" \
+ "q 1 0 0 -1 0 24 cm\n" \
+ "9.777 10.988 m 8.746 10.871 7.973 9.988 8 8.949 c 8.027 7.91 8.844\n" \
+ "7.066 9.879 7.004 c S Q\n" \
+ "0.729412 0.741176 0.713725 RG 2 w\n" \
+ "15 4 m 15 19 l 11 19 l 11 4 l S\n" \
+ "4 w\n" \
+ "q 1 0 0 -1 0 24 cm\n" \
+ "9.777 9.988 m 8.746 9.871 7.973 8.988 8 7.949 c 8.027 6.91 8.844 6.066\n" \
+ "9.879 6.004 c S Q\n"
+
+#define ANNOT_TEXT_AP_INSERT \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2 w\n" \
+ "1 J\n" \
+ "0 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 12 18.012 m 20 18 l S\n" \
+ "9 10 m 17 10 l S\n" \
+ "12 14.012 m 20 14 l S\n" \
+ "12 6.012 m 20 6.012 l S\n" \
+ "4 12 m 6 10 l 4 8 l S\n" \
+ "4 12 m 4 8 l S\n" \
+ "0.729412 0.741176 0.713725 RG 12 19.012 m 20 19 l S\n" \
+ "9 11 m 17 11 l S\n" \
+ "12 15.012 m 20 15 l S\n" \
+ "12 7.012 m 20 7.012 l S\n" \
+ "4 13 m 6 11 l 4 9 l S\n" \
+ "4 13 m 4 9 l S\n"
+
+#define ANNOT_TEXT_AP_CROSS \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2.5 w\n" \
+ "1 J\n" \
+ "0 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 18 5 m 6 17 l S\n" \
+ "6 5 m 18 17 l S\n" \
+ "0.729412 0.741176 0.713725 RG 18 6 m 6 18 l S\n" \
+ "6 6 m 18 18 l S\n"
+
+#define ANNOT_TEXT_AP_CIRCLE \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2.5 w\n" \
+ "1 J\n" \
+ "1 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 19.5 11.5 m 19.5 7.359 16.141 4 12 4 c 7.859 4 4.5 7.359 4.5 11.5 c 4.5\n" \
+ "15.641 7.859 19 12 19 c 16.141 19 19.5 15.641 19.5 11.5 c h\n" \
+ "19.5 11.5 m S\n" \
+ "0.729412 0.741176 0.713725 RG 19.5 12.5 m 19.5 8.359 16.141 5 12 5 c\n" \
+ "7.859 5 4.5 8.359 4.5 12.5 c 4.5\n" \
+ "16.641 7.859 20 12 20 c 16.141 20 19.5 16.641 19.5 12.5 c h\n" \
+ "19.5 12.5 m S\n"
+
+void AnnotText::draw(Gfx *gfx, GBool printing) {
+ Object obj;
+ double ca = 1;
+
+ if (!isVisible (printing))
+ return;
+
+ double rectx2 = rect->x2;
+ double recty2 = rect->y2;
+ if (appearance.isNull()) {
+ ca = opacity;
+
+ appearBuf = new GooString ();
+
+ appearBuf->append ("q\n");
+ if (color)
+ setColor(color, gTrue);
+ else
+ appearBuf->append ("1 1 1 rg\n");
+ if (!icon->cmp("Note"))
+ appearBuf->append (ANNOT_TEXT_AP_NOTE);
+ else if (!icon->cmp("Comment"))
+ appearBuf->append (ANNOT_TEXT_AP_COMMENT);
+ else if (!icon->cmp("Key"))
+ appearBuf->append (ANNOT_TEXT_AP_KEY);
+ else if (!icon->cmp("Help"))
+ appearBuf->append (ANNOT_TEXT_AP_HELP);
+ else if (!icon->cmp("NewParagraph"))
+ appearBuf->append (ANNOT_TEXT_AP_NEW_PARAGRAPH);
+ else if (!icon->cmp("Paragraph"))
+ appearBuf->append (ANNOT_TEXT_AP_PARAGRAPH);
+ else if (!icon->cmp("Insert"))
+ appearBuf->append (ANNOT_TEXT_AP_INSERT);
+ else if (!icon->cmp("Cross"))
+ appearBuf->append (ANNOT_TEXT_AP_CROSS);
+ else if (!icon->cmp("Circle"))
+ appearBuf->append (ANNOT_TEXT_AP_CIRCLE);
+ appearBuf->append ("Q\n");
+
+ double bbox[4];
+ bbox[0] = bbox[1] = 0;
+ bbox[2] = bbox[3] = 24;
+ if (ca == 1) {
+ createForm(bbox, gFalse, NULL, &appearance);
+ } else {
+ Object aStream, resDict;
+
+ createForm(bbox, gTrue, NULL, &aStream);
+ delete appearBuf;
+
+ appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ createResourcesDict("Fm0", &aStream, "GS0", ca, NULL, &resDict);
+ createForm(bbox, gFalse, &resDict, &appearance);
+ }
+ delete appearBuf;
+
+ rectx2 = rect->x1 + 24;
+ recty2 = rect->y1 + 24;
+ }
+
+ // draw the appearance stream
+ appearance.fetch(xref, &obj);
+ gfx->drawAnnot(&obj, border, color,
+ rect->x1, rect->y1, rectx2, recty2);
+ obj.free();
+}
+
//------------------------------------------------------------------------
// AnnotLink
//------------------------------------------------------------------------
@@ -1633,11 +2013,7 @@ AnnotLink::AnnotLink(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) :
}
AnnotLink::~AnnotLink() {
- /*
- if (actionDict)
- delete actionDict;
- */
- dest.free();
+ delete action;
/*
if (uriAction)
delete uriAction;
@@ -1648,30 +2024,35 @@ AnnotLink::~AnnotLink() {
void AnnotLink::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
Object obj1;
- /*
- if (dict->lookup("A", &obj1)->isDict()) {
- actionDict = NULL;
+
+ action = NULL;
+
+ // look for destination
+ if (!dict->lookup("Dest", &obj1)->isNull()) {
+ action = LinkAction::parseDest(&obj1);
+ // look for action
} else {
- actionDict = NULL;
+ obj1.free();
+ if (dict->lookup("A", &obj1)->isDict()) {
+ action = LinkAction::parseAction(&obj1, catalog->getBaseURI());
+ }
}
obj1.free();
- */
- dict->lookup("Dest", &dest);
+
if (dict->lookup("H", &obj1)->isName()) {
- GooString *effect = new GooString(obj1.getName());
+ const char *effect = obj1.getName();
- if (!effect->cmp("N")) {
+ if (!strcmp(effect, "N")) {
linkEffect = effectNone;
- } else if (!effect->cmp("I")) {
+ } else if (!strcmp(effect, "I")) {
linkEffect = effectInvert;
- } else if (!effect->cmp("O")) {
+ } else if (!strcmp(effect, "O")) {
linkEffect = effectOutline;
- } else if (!effect->cmp("P")) {
+ } else if (!strcmp(effect, "P")) {
linkEffect = effectPush;
} else {
linkEffect = effectInvert;
}
- delete effect;
} else {
linkEffect = effectInvert;
}
@@ -1695,12 +2076,8 @@ void AnnotLink::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
void AnnotLink::draw(Gfx *gfx, GBool printing) {
Object obj;
- // check the flags
- if ((flags & annotFlagHidden) ||
- (printing && !(flags & annotFlagPrint)) ||
- (!printing && (flags & annotFlagNoView))) {
+ if (!isVisible (printing))
return;
- }
// draw the appearance stream
appearance.fetch(xref, &obj);
@@ -1804,18 +2181,17 @@ void AnnotFreeText::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
obj1.free();
if (dict->lookup("IT", &obj1)->isName()) {
- GooString *intentName = new GooString(obj1.getName());
+ const char *intentName = obj1.getName();
- if (!intentName->cmp("FreeText")) {
+ if (!strcmp(intentName, "FreeText")) {
intent = intentFreeText;
- } else if (!intentName->cmp("FreeTextCallout")) {
+ } else if (!strcmp(intentName, "FreeTextCallout")) {
intent = intentFreeTextCallout;
- } else if (!intentName->cmp("FreeTextTypeWriter")) {
+ } else if (!strcmp(intentName, "FreeTextTypeWriter")) {
intent = intentFreeTextTypeWriter;
} else {
intent = intentFreeText;
}
- delete intentName;
} else {
intent = intentFreeText;
}
@@ -1836,9 +2212,8 @@ void AnnotFreeText::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
obj1.free();
if (dict->lookup("LE", &obj1)->isName()) {
- GooString *styleName = new GooString(obj1.getName());
- endStyle = parseAnnotLineEndingStyle(styleName);
- delete styleName;
+ GooString styleName(obj1.getName());
+ endStyle = parseAnnotLineEndingStyle(&styleName);
} else {
endStyle = annotLineEndingNone;
}
@@ -1960,16 +2335,15 @@ void AnnotLine::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
obj1.free();
if (dict->lookup("IT", &obj1)->isName()) {
- GooString *intentName = new GooString(obj1.getName());
+ const char *intentName = obj1.getName();
- if(!intentName->cmp("LineArrow")) {
+ if(!strcmp(intentName, "LineArrow")) {
intent = intentLineArrow;
- } else if(!intentName->cmp("LineDimension")) {
+ } else if(!strcmp(intentName, "LineDimension")) {
intent = intentLineDimension;
} else {
intent = intentLineArrow;
}
- delete intentName;
} else {
intent = intentLineArrow;
}
@@ -1986,16 +2360,15 @@ void AnnotLine::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
obj1.free();
if (dict->lookup("CP", &obj1)->isName()) {
- GooString *captionName = new GooString(obj1.getName());
+ const char *captionName = obj1.getName();
- if(!captionName->cmp("Inline")) {
+ if(!strcmp(captionName, "Inline")) {
captionPos = captionPosInline;
- } else if(!captionName->cmp("Top")) {
+ } else if(!strcmp(captionName, "Top")) {
captionPos = captionPosTop;
} else {
captionPos = captionPosInline;
}
- delete captionName;
} else {
captionPos = captionPosInline;
}
@@ -2023,6 +2396,82 @@ void AnnotLine::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
obj1.free();
}
+void AnnotLine::draw(Gfx *gfx, GBool printing) {
+ Object obj;
+ double ca = 1;
+
+ if (!isVisible (printing))
+ return;
+
+ /* Some documents like pdf_commenting_new.pdf,
+ * have y1 = y2 but line_width > 0, acroread
+ * renders the lines in such cases even though
+ * the annot bbox is empty. We adjust the bbox here
+ * to avoid having an empty bbox so that lines
+ * are rendered
+ */
+ if (rect->y1 == rect->y2)
+ rect->y2 += border ? border->getWidth() : 1;
+
+ if (appearance.isNull()) {
+ ca = opacity;
+
+ appearBuf = new GooString ();
+ appearBuf->append ("q\n");
+ if (color)
+ setColor(color, gFalse);
+
+ if (border) {
+ int i, dashLength;
+ double *dash;
+
+ switch (border->getStyle()) {
+ case AnnotBorder::borderDashed:
+ appearBuf->append("[");
+ dashLength = border->getDashLength();
+ dash = border->getDash();
+ for (i = 0; i < dashLength; ++i)
+ appearBuf->appendf(" {0:.2f}", dash[i]);
+ appearBuf->append(" ] 0 d\n");
+ break;
+ default:
+ appearBuf->append("[] 0 d\n");
+ break;
+ }
+ appearBuf->appendf("{0:.2f} w\n", border->getWidth());
+ }
+ appearBuf->appendf ("{0:.2f} {1:.2f} m\n", coord1->getX() - rect->x1, coord1->getY() - rect->y1);
+ appearBuf->appendf ("{0:.2f} {1:.2f} l\n", coord2->getX() - rect->x1, coord2->getY() - rect->y1);
+ // TODO: Line ending, caption, leader lines
+ appearBuf->append ("S\n");
+ appearBuf->append ("Q\n");
+
+ double bbox[4];
+ bbox[0] = bbox[1] = 0;
+ bbox[2] = rect->x2 - rect->x1;
+ bbox[3] = rect->y2 - rect->y1;
+ if (ca == 1) {
+ createForm(bbox, gFalse, NULL, &appearance);
+ } else {
+ Object aStream, resDict;
+
+ createForm(bbox, gTrue, NULL, &aStream);
+ delete appearBuf;
+
+ appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ createResourcesDict("Fm0", &aStream, "GS0", ca, NULL, &resDict);
+ createForm(bbox, gFalse, &resDict, &appearance);
+ }
+ delete appearBuf;
+ }
+
+ // draw the appearance stream
+ appearance.fetch(xref, &obj);
+ gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
+ rect->x1, rect->y1, rect->x2, rect->y2);
+ obj.free();
+}
+
//------------------------------------------------------------------------
// AnnotTextMarkup
//------------------------------------------------------------------------
@@ -2096,7 +2545,9 @@ void AnnotTextMarkup::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
if(dict->lookup("QuadPoints", &obj1)->isArray()) {
quadrilaterals = new AnnotQuadrilaterals(obj1.getArray(), rect);
} else {
+ error(-1, "Bad Annot Text Markup QuadPoints");
quadrilaterals = NULL;
+ ok = gFalse;
}
obj1.free();
}
@@ -2107,6 +2558,135 @@ AnnotTextMarkup::~AnnotTextMarkup() {
}
}
+
+
+void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) {
+ Object obj;
+ double ca = 1;
+ int i;
+ Object obj1, obj2;
+
+ if (!isVisible (printing))
+ return;
+
+ if (appearance.isNull() || type == typeHighlight) {
+ ca = opacity;
+
+ appearBuf = new GooString ();
+
+ switch (type) {
+ case typeUnderline:
+ if (color) {
+ setColor(color, gFalse);
+ setColor(color, gTrue);
+ }
+
+ for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
+ double x1, x2, y3;
+ double x, y;
+
+ x1 = quadrilaterals->getX1(i);
+ x2 = quadrilaterals->getX2(i);
+ y3 = quadrilaterals->getY3(i);
+
+ x = x1 - rect->x1;
+ y = y3 - rect->y1;
+ appearBuf->append ("[]0 d 2 w\n");
+ appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x, y);
+ appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x + (x2 - x1), y);
+ appearBuf->append ("S\n");
+ }
+ break;
+ case typeStrikeOut:
+ if (color) {
+ setColor(color, gFalse);
+ setColor(color, gTrue);
+ }
+
+ for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
+ double x1, y1, x2, y3;
+ double x, y;
+ double h2;
+
+ x1 = quadrilaterals->getX1(i);
+ y1 = quadrilaterals->getY1(i);
+ x2 = quadrilaterals->getX2(i);
+ y3 = quadrilaterals->getY3(i);
+ h2 = (y1 - y3) / 2.0;
+
+ x = x1 - rect->x1;
+ y = (y3 - rect->y1) + h2;
+ appearBuf->append ("[]0 d 2 w\n");
+ appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x, y);
+ appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x + (x2 - x1), y);
+ appearBuf->append ("S\n");
+ }
+ break;
+ case typeSquiggly:
+ // TODO
+ default:
+ case typeHighlight:
+ appearance.free();
+
+ if (color)
+ setColor(color, gTrue);
+
+ for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
+ double x1, y1, x2, y2, x3, y3, x4, y4;
+ double h4;
+
+ x1 = quadrilaterals->getX1(i);
+ y1 = quadrilaterals->getY1(i);
+ x2 = quadrilaterals->getX2(i);
+ y2 = quadrilaterals->getY2(i);
+ x3 = quadrilaterals->getX3(i);
+ y3 = quadrilaterals->getY3(i);
+ x4 = quadrilaterals->getX4(i);
+ y4 = quadrilaterals->getY4(i);
+ h4 = fabs(y1 - y3) / 4.0;
+
+ appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x3, y3);
+ appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ x3 - h4, y3 + h4, x1 - h4, y1 - h4, x1, y1);
+ appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x2, y2);
+ appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ x2 + h4, y2 - h4, x4 + h4, y4 + h4, x4, y4);
+ appearBuf->append ("f\n");
+ }
+
+ Object aStream, resDict;
+ double bbox[4];
+ bbox[0] = rect->x1;
+ bbox[1] = rect->y1;
+ bbox[2] = rect->x2;
+ bbox[3] = rect->y2;
+ createForm(bbox, gTrue, NULL, &aStream);
+ delete appearBuf;
+
+ appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ createResourcesDict("Fm0", &aStream, "GS0", 1, "Multiply", &resDict);
+ if (ca == 1) {
+ createForm(bbox, gFalse, &resDict, &appearance);
+ } else {
+ createForm(bbox, gTrue, &resDict, &aStream);
+ delete appearBuf;
+
+ appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ createResourcesDict("Fm0", &aStream, "GS0", ca, NULL, &resDict);
+ createForm(bbox, gFalse, &resDict, &appearance);
+ }
+ delete appearBuf;
+ break;
+ }
+ }
+
+ // draw the appearance stream
+ appearance.fetch(xref, &obj);
+ gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
+ rect->x1, rect->y1, rect->x2, rect->y2);
+ obj.free();
+}
+
//------------------------------------------------------------------------
// AnnotWidget
//------------------------------------------------------------------------
@@ -2114,7 +2694,14 @@ AnnotTextMarkup::~AnnotTextMarkup() {
AnnotWidget::AnnotWidget(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) :
Annot(xrefA, dict, catalog, obj) {
type = typeWidget;
- widget = NULL;
+ field = NULL;
+ initialize(xrefA, catalog, dict);
+}
+
+AnnotWidget::AnnotWidget(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj, FormField *fieldA) :
+ Annot(xrefA, dict, catalog, obj) {
+ type = typeWidget;
+ field = fieldA;
initialize(xrefA, catalog, dict);
}
@@ -2135,35 +2722,20 @@ AnnotWidget::~AnnotWidget() {
void AnnotWidget::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
Object obj1;
- if ((form = catalog->getForm ())) {
- widget = form->findWidgetByRef (ref);
-
- // check if field apperances need to be regenerated
- // Only text or choice fields needs to have appearance regenerated
- // see section 8.6.2 "Variable Text" of PDFReference
- regen = gFalse;
- if (widget != NULL && (widget->getType () == formText || widget->getType () == formChoice)) {
- regen = form->getNeedAppearances ();
- }
- }
-
- // If field doesn't have an AP we'll have to generate it
- if (appearance.isNone () || appearance.isNull ())
- regen = gTrue;
+ form = catalog->getForm();
if(dict->lookup("H", &obj1)->isName()) {
- GooString *modeName = new GooString(obj1.getName());
+ const char *modeName = obj1.getName();
- if(!modeName->cmp("N")) {
+ if(!strcmp(modeName, "N")) {
mode = highlightModeNone;
- } else if(!modeName->cmp("O")) {
+ } else if(!strcmp(modeName, "O")) {
mode = highlightModeOutline;
- } else if(!modeName->cmp("P") || !modeName->cmp("T")) {
+ } else if(!strcmp(modeName, "P") || !strcmp(modeName, "T")) {
mode = highlightModePush;
} else {
mode = highlightModeInvert;
}
- delete modeName;
} else {
mode = highlightModeInvert;
}
@@ -2176,10 +2748,9 @@ void AnnotWidget::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
}
obj1.free();
+ action = NULL;
if(dict->lookup("A", &obj1)->isDict()) {
- action = NULL;
- } else {
- action = NULL;
+ action = LinkAction::parseAction(&obj1, catalog->getBaseURI());
}
obj1.free();
@@ -2439,7 +3010,7 @@ void AnnotWidget::writeString(GooString *str, GooString *appearBuf)
}
// Draw the variable text or caption for a field.
-void AnnotWidget::drawText(GooString *text, GooString *da, GfxFontDict *fontDict,
+void AnnotWidget::drawText(GooString *text, GooString *da, GfxResources *resources,
GBool multiline, int comb, int quadding,
GBool txField, GBool forceZapfDingbats,
GBool password) {
@@ -2499,7 +3070,7 @@ void AnnotWidget::drawText(GooString *text, GooString *da, GfxFontDict *fontDict
if (tfPos >= 0) {
tok = (GooString *)daToks->get(tfPos);
if (tok->getLength() >= 1 && tok->getChar(0) == '/') {
- if (!fontDict || !(font = fontDict->lookup(tok->getCString() + 1))) {
+ if (!resources || !(font = resources->lookupFont(tok->getCString() + 1))) {
if (forceZapfDingbats) {
// We are forcing ZaDb but the font does not exist
// so create a fake one
@@ -2620,16 +3191,16 @@ void AnnotWidget::drawText(GooString *text, GooString *da, GfxFontDict *fontDict
// compute text start position
switch (quadding) {
- case fieldQuadLeft:
- default:
- x = borderWidth + 2;
- break;
- case fieldQuadCenter:
- x = (rect->x2 - rect->x1 - w) / 2;
- break;
- case fieldQuadRight:
- x = rect->x2 - rect->x1 - borderWidth - 2 - w;
- break;
+ case quaddingLeftJustified:
+ default:
+ x = borderWidth + 2;
+ break;
+ case quaddingCentered:
+ x = (rect->x2 - rect->x1 - w) / 2;
+ break;
+ case quaddingRightJustified:
+ x = rect->x2 - rect->x1 - borderWidth - 2 - w;
+ break;
}
// draw the line
@@ -2674,16 +3245,16 @@ void AnnotWidget::drawText(GooString *text, GooString *da, GfxFontDict *fontDict
// compute starting text cell
switch (quadding) {
- case fieldQuadLeft:
- default:
+ case quaddingLeftJustified:
+ default:
x = borderWidth;
- break;
- case fieldQuadCenter:
- x = borderWidth + (comb - charCount) / 2 * w;
- break;
- case fieldQuadRight:
- x = borderWidth + (comb - charCount) * w;
- break;
+ break;
+ case quaddingCentered:
+ x = borderWidth + (comb - charCount) / 2 * w;
+ break;
+ case quaddingRightJustified:
+ x = borderWidth + (comb - charCount) * w;
+ break;
}
y = 0.5 * (rect->y2 - rect->y1) - 0.4 * fontSize;
@@ -2765,16 +3336,16 @@ void AnnotWidget::drawText(GooString *text, GooString *da, GfxFontDict *fontDict
// compute text start position
w *= fontSize;
switch (quadding) {
- case fieldQuadLeft:
- default:
- x = borderWidth + 2;
- break;
- case fieldQuadCenter:
- x = (rect->x2 - rect->x1 - w) / 2;
- break;
- case fieldQuadRight:
- x = rect->x2 - rect->x1 - borderWidth - 2 - w;
- break;
+ case quaddingLeftJustified:
+ default:
+ x = borderWidth + 2;
+ break;
+ case quaddingCentered:
+ x = (rect->x2 - rect->x1 - w) / 2;
+ break;
+ case quaddingRightJustified:
+ x = rect->x2 - rect->x1 - borderWidth - 2 - w;
+ break;
}
y = 0.5 * (rect->y2 - rect->y1) - 0.4 * fontSize;
@@ -2824,9 +3395,8 @@ void AnnotWidget::drawText(GooString *text, GooString *da, GfxFontDict *fontDict
}
// Draw the variable text or caption for a field.
-void AnnotWidget::drawListBox(GooString **text, GBool *selection,
- int nOptions, int topIdx,
- GooString *da, GfxFontDict *fontDict, GBool quadding) {
+void AnnotWidget::drawListBox(FormFieldChoice *fieldChoice,
+ GooString *da, GfxResources *resources, int quadding) {
GooList *daToks;
GooString *tok, *convertedText;
GfxFont *font;
@@ -2871,7 +3441,7 @@ void AnnotWidget::drawListBox(GooString **text, GBool *selection,
if (tfPos >= 0) {
tok = (GooString *)daToks->get(tfPos);
if (tok->getLength() >= 1 && tok->getChar(0) == '/') {
- if (!fontDict || !(font = fontDict->lookup(tok->getCString() + 1))) {
+ if (!resources || !(font = resources->lookupFont(tok->getCString() + 1))) {
error(-1, "Unknown font in field's DA string");
}
} else {
@@ -2897,9 +3467,9 @@ void AnnotWidget::drawListBox(GooString **text, GBool *selection,
// compute font autosize
if (fontSize == 0) {
wMax = 0;
- for (i = 0; i < nOptions; ++i) {
+ for (i = 0; i < fieldChoice->getNumChoices(); ++i) {
j = 0;
- layoutText(text[i], convertedText, &j, font, &w, 0.0, NULL, gFalse);
+ layoutText(fieldChoice->getChoice(i), convertedText, &j, font, &w, 0.0, NULL, gFalse);
if (w > wMax) {
wMax = w;
}
@@ -2918,12 +3488,12 @@ void AnnotWidget::drawListBox(GooString **text, GBool *selection,
}
// draw the text
y = rect->y2 - rect->y1 - 1.1 * fontSize;
- for (i = topIdx; i < nOptions; ++i) {
+ for (i = fieldChoice->getTopIndex(); i < fieldChoice->getNumChoices(); ++i) {
// setup
appearBuf->append("q\n");
// draw the background if selected
- if (selection[i]) {
+ if (fieldChoice->isSelected(i)) {
appearBuf->append("0 g f\n");
appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} re f\n",
borderWidth,
@@ -2937,19 +3507,19 @@ void AnnotWidget::drawListBox(GooString **text, GBool *selection,
// compute text width and start position
j = 0;
- layoutText(text[i], convertedText, &j, font, &w, 0.0, NULL, gFalse);
+ layoutText(fieldChoice->getChoice(i), convertedText, &j, font, &w, 0.0, NULL, gFalse);
w *= fontSize;
switch (quadding) {
- case fieldQuadLeft:
- default:
- x = borderWidth + 2;
- break;
- case fieldQuadCenter:
- x = (rect->x2 - rect->x1 - w) / 2;
- break;
- case fieldQuadRight:
- x = rect->x2 - rect->x1 - borderWidth - 2 - w;
- break;
+ case quaddingLeftJustified:
+ default:
+ x = borderWidth + 2;
+ break;
+ case quaddingCentered:
+ x = (rect->x2 - rect->x1 - w) / 2;
+ break;
+ case quaddingRightJustified:
+ x = rect->x2 - rect->x1 - borderWidth - 2 - w;
+ break;
}
// set the font matrix
@@ -2975,7 +3545,7 @@ void AnnotWidget::drawListBox(GooString **text, GBool *selection,
}
// change the text color if selected
- if (selection[i]) {
+ if (fieldChoice->isSelected(i)) {
appearBuf->append("1 g\n");
}
@@ -2998,354 +3568,235 @@ void AnnotWidget::drawListBox(GooString **text, GBool *selection,
delete convertedText;
}
-void AnnotWidget::generateFieldAppearance() {
- Object mkObj, ftObj, appearDict, drObj, obj1, obj2, obj3;
- Dict *field;
- Dict *annot;
- Dict *acroForm;
- Dict *mkDict;
- MemStream *appearStream;
- GfxFontDict *fontDict;
- GBool hasCaption;
- double w, dx, dy, r;
+void AnnotWidget::drawBorder() {
+ int dashLength;
double *dash;
- GooString *caption, *da;
- GooString **text;
- GBool *selection;
- int dashLength, ff, quadding, comb, nOptions, topIdx, i, j;
- GBool modified;
+ AnnotColor adjustedColor;
+ double w = border->getWidth();
- if (widget == NULL || !widget->getField () || !widget->getField ()->getObj ()->isDict ())
+ AnnotColor *aColor = appearCharacs->getBorderColor();
+ if (!aColor)
+ aColor = appearCharacs->getBackColor();
+ if (!aColor)
return;
- field = widget->getField ()->getObj ()->getDict ();
- annot = widget->getObj ()->getDict ();
- acroForm = form->getObj ()->getDict ();
-
- // do not regenerate appearence if widget has not changed
- modified = widget->isModified ();
+ double dx = rect->x2 - rect->x1;
+ double dy = rect->y2 - rect->y1;
+
+ // radio buttons with no caption have a round border
+ GBool hasCaption = appearCharacs->getNormalCaption() != NULL;
+ if (field->getType() == formButton &&
+ static_cast<FormFieldButton*>(field)->getButtonType() == formButtonRadio && !hasCaption) {
+ double r = 0.5 * (dx < dy ? dx : dy);
+ switch (border->getStyle()) {
+ case AnnotBorder::borderDashed:
+ appearBuf->append("[");
+ dashLength = border->getDashLength();
+ dash = border->getDash();
+ for (int i = 0; i < dashLength; ++i) {
+ appearBuf->appendf(" {0:.2f}", dash[i]);
+ }
+ appearBuf->append("] 0 d\n");
+ // fall through to the solid case
+ case AnnotBorder::borderSolid:
+ case AnnotBorder::borderUnderlined:
+ appearBuf->appendf("{0:.2f} w\n", w);
+ setColor(aColor, gFalse);
+ drawCircle(0.5 * dx, 0.5 * dy, r - 0.5 * w, gFalse);
+ break;
+ case AnnotBorder::borderBeveled:
+ case AnnotBorder::borderInset:
+ appearBuf->appendf("{0:.2f} w\n", 0.5 * w);
+ setColor(aColor, gFalse);
+ drawCircle(0.5 * dx, 0.5 * dy, r - 0.25 * w, gFalse);
+ adjustedColor = AnnotColor(*aColor);
+ adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? 1 : -1);
+ setColor(&adjustedColor, gFalse);
+ drawCircleTopLeft(0.5 * dx, 0.5 * dy, r - 0.75 * w);
+ adjustedColor = AnnotColor(*aColor);
+ adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? -1 : 1);
+ setColor(&adjustedColor, gFalse);
+ drawCircleBottomRight(0.5 * dx, 0.5 * dy, r - 0.75 * w);
+ break;
+ }
+ } else {
+ switch (border->getStyle()) {
+ case AnnotBorder::borderDashed:
+ appearBuf->append("[");
+ dashLength = border->getDashLength();
+ dash = border->getDash();
+ for (int i = 0; i < dashLength; ++i) {
+ appearBuf->appendf(" {0:.2f}", dash[i]);
+ }
+ appearBuf->append("] 0 d\n");
+ // fall through to the solid case
+ case AnnotBorder::borderSolid:
+ appearBuf->appendf("{0:.2f} w\n", w);
+ setColor(aColor, gFalse);
+ appearBuf->appendf("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re s\n",
+ 0.5 * w, dx - w, dy - w);
+ break;
+ case AnnotBorder::borderBeveled:
+ case AnnotBorder::borderInset:
+ adjustedColor = AnnotColor(*aColor);
+ adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? 1 : -1);
+ setColor(&adjustedColor, gTrue);
+ appearBuf->append("0 0 m\n");
+ appearBuf->appendf("0 {0:.2f} l\n", dy);
+ appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx, dy);
+ appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx - w, dy - w);
+ appearBuf->appendf("{0:.2f} {1:.2f} l\n", w, dy - w);
+ appearBuf->appendf("{0:.2f} {0:.2f} l\n", w);
+ appearBuf->append("f\n");
+ adjustedColor = AnnotColor(*aColor);
+ adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? -1 : 1);
+ setColor(&adjustedColor, gTrue);
+ appearBuf->append("0 0 m\n");
+ appearBuf->appendf("{0:.2f} 0 l\n", dx);
+ appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx, dy);
+ appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx - w, dy - w);
+ appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx - w, w);
+ appearBuf->appendf("{0:.2f} {0:.2f} l\n", w);
+ appearBuf->append("f\n");
+ break;
+ case AnnotBorder::borderUnderlined:
+ appearBuf->appendf("{0:.2f} w\n", w);
+ setColor(aColor, gFalse);
+ appearBuf->appendf("0 0 m {0:.2f} 0 l s\n", dx);
+ break;
+ }
- // only regenerate when it doesn't have an AP or
- // it already has an AP but widget has been modified
- if (!regen && !modified) {
- return;
+ // clip to the inside of the border
+ appearBuf->appendf("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re W n\n",
+ w, dx - 2 * w, dy - 2 * w);
}
+}
- appearBuf = new GooString ();
- // get the appearance characteristics (MK) dictionary
- if (annot->lookup("MK", &mkObj)->isDict()) {
- mkDict = mkObj.getDict();
- } else {
- mkDict = NULL;
+void AnnotWidget::drawFormFieldButton(GfxResources *resources, GooString *da) {
+ GooString *caption = NULL;
+ if (appearCharacs)
+ caption = appearCharacs->getNormalCaption();
+
+ switch (static_cast<FormFieldButton *>(field)->getButtonType()) {
+ case formButtonRadio: {
+ //~ Acrobat doesn't draw a caption if there is no AP dict (?)
+ if (appearState && appearState->cmp("Off") != 0) {
+ if (caption) {
+ drawText(caption, da, resources, gFalse, 0, fieldQuadCenter,
+ gFalse, gTrue);
+ } else if (appearCharacs) {
+ AnnotColor *aColor = appearCharacs->getBorderColor();
+ if (aColor) {
+ double dx = rect->x2 - rect->x1;
+ double dy = rect->y2 - rect->y1;
+ setColor(aColor, gTrue);
+ drawCircle(0.5 * dx, 0.5 * dy, 0.2 * (dx < dy ? dx : dy), gTrue);
+ }
+ }
+ }
}
- // draw the background
- if (mkDict) {
- if (mkDict->lookup("BG", &obj1)->isArray() &&
- obj1.arrayGetLength() > 0) {
- setColor(obj1.getArray(), gTrue, 0);
- appearBuf->appendf("0 0 {0:.2f} {1:.2f} re f\n",
- rect->x2 - rect->x1, rect->y2 - rect->y1);
+ break;
+ case formButtonPush:
+ if (caption)
+ drawText(caption, da, resources, gFalse, 0, fieldQuadCenter, gFalse, gFalse);
+ break;
+ case formButtonCheck:
+ if (appearState && appearState->cmp("Off") != 0) {
+ if (!caption) {
+ GooString checkMark("3");
+ drawText(&checkMark, da, resources, gFalse, 0, fieldQuadCenter, gFalse, gTrue);
+ } else {
+ drawText(caption, da, resources, gFalse, 0, fieldQuadCenter, gFalse, gTrue);
+ }
}
- obj1.free();
+ break;
}
+}
- // get the field type
- Form::fieldLookup(field, "FT", &ftObj);
+void AnnotWidget::drawFormFieldText(GfxResources *resources, GooString *da) {
+ VariableTextQuadding quadding;
+ GooString *contents;
+ FormFieldText *fieldText = static_cast<FormFieldText *>(field);
- // get the field flags (Ff) value
- if (Form::fieldLookup(field, "Ff", &obj1)->isInt()) {
- ff = obj1.getInt();
- } else {
- ff = 0;
+ contents = fieldText->getContent();
+ if (contents) {
+ quadding = field->hasTextQuadding() ? field->getTextQuadding() : form->getTextQuadding();
+
+ int comb = 0;
+ if (fieldText->isComb())
+ comb = fieldText->getMaxLen();
+
+ drawText(contents, da, resources,
+ fieldText->isMultiline(), comb, quadding, gTrue, gFalse, fieldText->isPassword());
}
- obj1.free();
+}
- // draw the border
- if (mkDict && border) {
- w = border->getWidth();
- if (w > 0) {
- mkDict->lookup("BC", &obj1);
- if (!(obj1.isArray() && obj1.arrayGetLength() > 0)) {
- mkDict->lookup("BG", &obj1);
- }
- if (obj1.isArray() && obj1.arrayGetLength() > 0) {
- dx = rect->x2 - rect->x1;
- dy = rect->y2 - rect->y1;
-
- // radio buttons with no caption have a round border
- hasCaption = mkDict->lookup("CA", &obj2)->isString();
- obj2.free();
- if (ftObj.isName("Btn") && (ff & fieldFlagRadio) && !hasCaption) {
- r = 0.5 * (dx < dy ? dx : dy);
- switch (border->getStyle()) {
- case AnnotBorder::borderDashed:
- appearBuf->append("[");
- dashLength = border->getDashLength();
- dash = border->getDash();
- for (i = 0; i < dashLength; ++i) {
- appearBuf->appendf(" {0:.2f}", dash[i]);
- }
- appearBuf->append("] 0 d\n");
- // fall through to the solid case
- case AnnotBorder::borderSolid:
- case AnnotBorder::borderUnderlined:
- appearBuf->appendf("{0:.2f} w\n", w);
- setColor(obj1.getArray(), gFalse, 0);
- drawCircle(0.5 * dx, 0.5 * dy, r - 0.5 * w, gFalse);
- break;
- case AnnotBorder::borderBeveled:
- case AnnotBorder::borderInset:
- appearBuf->appendf("{0:.2f} w\n", 0.5 * w);
- setColor(obj1.getArray(), gFalse, 0);
- drawCircle(0.5 * dx, 0.5 * dy, r - 0.25 * w, gFalse);
- setColor(obj1.getArray(), gFalse,
- border->getStyle() == AnnotBorder::borderBeveled ? 1 : -1);
- drawCircleTopLeft(0.5 * dx, 0.5 * dy, r - 0.75 * w);
- setColor(obj1.getArray(), gFalse,
- border->getStyle() == AnnotBorder::borderBeveled ? -1 : 1);
- drawCircleBottomRight(0.5 * dx, 0.5 * dy, r - 0.75 * w);
- break;
- }
+void AnnotWidget::drawFormFieldChoice(GfxResources *resources, GooString *da) {
+ GooString *selected;
+ VariableTextQuadding quadding;
+ FormFieldChoice *fieldChoice = static_cast<FormFieldChoice *>(field);
- } else {
- switch (border->getStyle()) {
- case AnnotBorder::borderDashed:
- appearBuf->append("[");
- dashLength = border->getDashLength();
- dash = border->getDash();
- for (i = 0; i < dashLength; ++i) {
- appearBuf->appendf(" {0:.2f}", dash[i]);
- }
- appearBuf->append("] 0 d\n");
- // fall through to the solid case
- case AnnotBorder::borderSolid:
- appearBuf->appendf("{0:.2f} w\n", w);
- setColor(obj1.getArray(), gFalse, 0);
- appearBuf->appendf("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re s\n",
- 0.5 * w, dx - w, dy - w);
- break;
- case AnnotBorder::borderBeveled:
- case AnnotBorder::borderInset:
- setColor(obj1.getArray(), gTrue,
- border->getStyle() == AnnotBorder::borderBeveled ? 1 : -1);
- appearBuf->append("0 0 m\n");
- appearBuf->appendf("0 {0:.2f} l\n", dy);
- appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx, dy);
- appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx - w, dy - w);
- appearBuf->appendf("{0:.2f} {1:.2f} l\n", w, dy - w);
- appearBuf->appendf("{0:.2f} {0:.2f} l\n", w);
- appearBuf->append("f\n");
- setColor(obj1.getArray(), gTrue,
- border->getStyle() == AnnotBorder::borderBeveled ? -1 : 1);
- appearBuf->append("0 0 m\n");
- appearBuf->appendf("{0:.2f} 0 l\n", dx);
- appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx, dy);
- appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx - w, dy - w);
- appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx - w, w);
- appearBuf->appendf("{0:.2f} {0:.2f} l\n", w);
- appearBuf->append("f\n");
- break;
- case AnnotBorder::borderUnderlined:
- appearBuf->appendf("{0:.2f} w\n", w);
- setColor(obj1.getArray(), gFalse, 0);
- appearBuf->appendf("0 0 m {0:.2f} 0 l s\n", dx);
- break;
- }
+ quadding = field->hasTextQuadding() ? field->getTextQuadding() : form->getTextQuadding();
- // clip to the inside of the border
- appearBuf->appendf("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re W n\n",
- w, dx - 2 * w, dy - 2 * w);
- }
- }
- obj1.free();
+ if (fieldChoice->isCombo()) {
+ selected = fieldChoice->getSelectedChoice();
+ if (selected) {
+ drawText(selected, da, resources, gFalse, 0, quadding, gTrue, gFalse);
+ //~ Acrobat draws a popup icon on the right side
}
+ // list box
+ } else {
+ drawListBox(fieldChoice, da, resources, quadding);
}
+}
- // get the resource dictionary
- acroForm->lookup("DR", &drObj);
+void AnnotWidget::generateFieldAppearance() {
+ Object appearDict, obj1, obj2;
+ GfxResources *resources;
+ MemStream *appearStream;
+ GooString *da;
- // build the font dictionary
- if (drObj.isDict() && drObj.dictLookup("Font", &obj1)->isDict()) {
- fontDict = new GfxFontDict(xref, NULL, obj1.getDict());
- } else {
- fontDict = NULL;
- }
- obj1.free();
+ appearBuf = new GooString ();
- // get the default appearance string
- if (Form::fieldLookup(field, "DA", &obj1)->isNull()) {
- obj1.free();
- acroForm->lookup("DA", &obj1);
- }
- if (obj1.isString()) {
- da = obj1.getString()->copy();
- //TODO: look for a font size / name HERE
- // => create a function
- } else {
- da = NULL;
+ // draw the background
+ if (appearCharacs) {
+ AnnotColor *aColor = appearCharacs->getBackColor();
+ if (aColor) {
+ setColor(aColor, gTrue);
+ appearBuf->appendf("0 0 {0:.2f} {1:.2f} re f\n",
+ rect->x2 - rect->x1, rect->y2 - rect->y1);
+ }
}
- obj1.free();
+
+ // draw the border
+ if (appearCharacs && border && border->getWidth() > 0)
+ drawBorder();
+
+ da = field->getDefaultAppearance();
+ if (!da)
+ da = form->getDefaultAppearance();
+
+ resources = form->getDefaultResources();
// draw the field contents
- if (ftObj.isName("Btn")) {
- caption = NULL;
- if (mkDict) {
- if (mkDict->lookup("CA", &obj1)->isString()) {
- caption = obj1.getString()->copy();
- }
- obj1.free();
- }
- // radio button
- if (ff & fieldFlagRadio) {
- //~ Acrobat doesn't draw a caption if there is no AP dict (?)
- if (Form::fieldLookup(field, "V", &obj1)->isName()) {
- if (annot->lookup("AS", &obj2)->isName(obj1.getName()) &&
- strcmp (obj1.getName(), "Off") != 0) {
- if (caption) {
- drawText(caption, da, fontDict, gFalse, 0, fieldQuadCenter,
- gFalse, gTrue);
- } else {
- if (mkDict) {
- if (mkDict->lookup("BC", &obj3)->isArray() &&
- obj3.arrayGetLength() > 0) {
- dx = rect->x2 - rect->x1;
- dy = rect->y2 - rect->y1;
- setColor(obj3.getArray(), gTrue, 0);
- drawCircle(0.5 * dx, 0.5 * dy, 0.2 * (dx < dy ? dx : dy),
- gTrue);
- }
- obj3.free();
- }
- }
- }
- obj2.free();
- }
- obj1.free();
- // pushbutton
- } else if (ff & fieldFlagPushbutton) {
- if (caption) {
- drawText(caption, da, fontDict, gFalse, 0, fieldQuadCenter,
- gFalse, gFalse);
- }
- // checkbox
- } else {
- if (annot->lookup("AS", &obj1)->isName() &&
- strcmp(obj1.getName(), "Off") != 0) {
- if (!caption) {
- caption = new GooString("3"); // ZapfDingbats checkmark
- }
- drawText(caption, da, fontDict, gFalse, 0, fieldQuadCenter,
- gFalse, gTrue);
- }
- obj1.free();
- }
- if (caption) {
- delete caption;
- }
- } else if (ftObj.isName("Tx")) {
- if (Form::fieldLookup(field, "V", &obj1)->isString()) {
- if (Form::fieldLookup(field, "Q", &obj2)->isInt()) {
- quadding = obj2.getInt();
- } else {
- quadding = fieldQuadLeft;
- }
- obj2.free();
- comb = 0;
- if (ff & fieldFlagComb) {
- if (Form::fieldLookup(field, "MaxLen", &obj2)->isInt()) {
- comb = obj2.getInt();
- }
- obj2.free();
- }
- drawText(obj1.getString(), da, fontDict,
- ff & fieldFlagMultiline, comb, quadding, gTrue, gFalse, ff & fieldFlagPassword);
- }
- obj1.free();
- } else if (ftObj.isName("Ch")) {
- if (Form::fieldLookup(field, "Q", &obj1)->isInt()) {
- quadding = obj1.getInt();
- } else {
- quadding = fieldQuadLeft;
- }
- obj1.free();
- // combo box
- if (ff & fieldFlagCombo) {
- if (Form::fieldLookup(field, "V", &obj1)->isString()) {
- drawText(obj1.getString(), da, fontDict,
- gFalse, 0, quadding, gTrue, gFalse);
- //~ Acrobat draws a popup icon on the right side
- }
- obj1.free();
- // list box
- } else {
- if (field->lookup("Opt", &obj1)->isArray()) {
- nOptions = obj1.arrayGetLength();
- // get the option text
- text = (GooString **)gmallocn(nOptions, sizeof(GooString *));
- for (i = 0; i < nOptions; ++i) {
- text[i] = NULL;
- obj1.arrayGet(i, &obj2);
- if (obj2.isString()) {
- text[i] = obj2.getString()->copy();
- } else if (obj2.isArray() && obj2.arrayGetLength() == 2) {
- if (obj2.arrayGet(1, &obj3)->isString()) {
- text[i] = obj3.getString()->copy();
- }
- obj3.free();
- }
- obj2.free();
- if (!text[i]) {
- text[i] = new GooString();
- }
- }
- // get the selected option(s)
- selection = (GBool *)gmallocn(nOptions, sizeof(GBool));
- //~ need to use the I field in addition to the V field
- Form::fieldLookup(field, "V", &obj2);
- for (i = 0; i < nOptions; ++i) {
- selection[i] = gFalse;
- if (obj2.isString()) {
- if (!obj2.getString()->cmp(text[i])) {
- selection[i] = gTrue;
- }
- } else if (obj2.isArray()) {
- for (j = 0; j < obj2.arrayGetLength(); ++j) {
- if (obj2.arrayGet(j, &obj3)->isString() &&
- !obj3.getString()->cmp(text[i])) {
- selection[i] = gTrue;
- }
- obj3.free();
- }
- }
- }
- obj2.free();
- // get the top index
- if (field->lookup("TI", &obj2)->isInt()) {
- topIdx = obj2.getInt();
- } else {
- topIdx = 0;
- }
- obj2.free();
- // draw the text
- drawListBox(text, selection, nOptions, topIdx, da, fontDict, quadding);
- for (i = 0; i < nOptions; ++i) {
- delete text[i];
- }
- gfree(text);
- gfree(selection);
- }
- obj1.free();
- }
- } else if (ftObj.isName("Sig")) {
+ switch (field->getType()) {
+ case formButton:
+ drawFormFieldButton(resources, da);
+ break;
+ case formText:
+ drawFormFieldText(resources, da);
+ break;
+ case formChoice:
+ drawFormFieldChoice(resources, da);
+ break;
+ case formSignature:
//~unimp
- } else {
+ break;
+ case formUndef:
+ default:
error(-1, "Unknown field type");
}
- if (da) {
- delete da;
- }
-
// build the appearance stream dictionary
appearDict.initDict(xref);
appearDict.dictAdd(copyString("Length"),
@@ -3359,10 +3810,10 @@ void AnnotWidget::generateFieldAppearance() {
appearDict.dictAdd(copyString("BBox"), &obj1);
// set the resource dictionary
- if (drObj.isDict()) {
- appearDict.dictAdd(copyString("Resources"), drObj.copy(&obj1));
+ Object *resDict = form->getDefaultResourcesObj();
+ if (resDict->isDict()) {
+ appearDict.dictAdd(copyString("Resources"), resDict->copy(&obj1));
}
- drObj.free();
// build the appearance stream
appearStream = new MemStream(strdup(appearBuf->getCString()), 0,
@@ -3372,63 +3823,28 @@ void AnnotWidget::generateFieldAppearance() {
delete appearBuf;
appearStream->setNeedFree(gTrue);
-
- if (widget->isModified()) {
- //create a new object that will contains the new appearance
-
- //if we already have a N entry in our AP dict, reuse it
- if (annot->lookup("AP", &obj1)->isDict() &&
- obj1.dictLookupNF("N", &obj2)->isRef()) {
- appRef = obj2.getRef();
- }
-
- obj2.free();
- obj1.free();
-
- // this annot doesn't have an AP yet, create one
- if (appRef.num == 0)
- appRef = xref->addIndirectObject(&appearance);
- else // since we reuse the already existing AP, we have to notify the xref about this update
- xref->setModifiedObject(&appearance, appRef);
-
- // update object's AP and AS
- Object apObj;
- apObj.initDict(xref);
-
- Object oaRef;
- oaRef.initRef(appRef.num, appRef.gen);
-
- apObj.dictSet("N", &oaRef);
- annot->set("AP", &apObj);
- Dict* d = new Dict(annot);
- d->decRef();
- Object dictObj;
- dictObj.initDict(d);
-
- xref->setModifiedObject(&dictObj, ref);
- dictObj.free();
- }
-
- if (fontDict) {
- delete fontDict;
- }
- ftObj.free();
- mkObj.free();
}
void AnnotWidget::draw(Gfx *gfx, GBool printing) {
Object obj;
- // check the flags
- if ((flags & annotFlagHidden) ||
- (printing && !(flags & annotFlagPrint)) ||
- (!printing && (flags & annotFlagNoView))) {
+ if (!isVisible (printing))
return;
- }
addDingbatsResource = gFalse;
- generateFieldAppearance ();
+
+ // Only construct the appearance stream when
+ // - annot doesn't have an AP or
+ // - it's a field containing text (text and choices) and
+ // - NeedAppearances is true or
+ // - widget has been modified or
+ if (field) {
+ if (appearance.isNull() || (form && form->getNeedAppearances()) ||
+ ((field->getType() == formText || field->getType() == formChoice) &&
+ field->isModified()))
+ generateFieldAppearance();
+ }
// draw the appearance stream
appearance.fetch(xref, &obj);
@@ -3486,21 +3902,12 @@ AnnotMovie::AnnotMovie(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) :
Annot(xrefA, dict, catalog, obj) {
type = typeMovie;
initialize(xrefA, catalog, dict);
-
- movie = new Movie();
- movie->parseAnnotMovie(this);
}
AnnotMovie::~AnnotMovie() {
if (title)
delete title;
- if (fileName)
- delete fileName;
delete movie;
-
- if (posterStream && (!posterStream->decRef())) {
- delete posterStream;
- }
}
void AnnotMovie::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) {
@@ -3514,240 +3921,118 @@ void AnnotMovie::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) {
obj1.free();
Object movieDict;
- Object aDict;
-
- // default values
- fileName = NULL;
- width = 0;
- height = 0;
- rotationAngle = 0;
- rate = 1.0;
- volume = 1.0;
- showControls = false;
- repeatMode = repeatModeOnce;
- synchronousPlay = false;
-
- hasFloatingWindow = false;
- isFullscreen = false;
- FWScaleNum = 1;
- FWScaleDenum = 1;
- FWPosX = 0.5;
- FWPosY = 0.5;
-
if (dict->lookup("Movie", &movieDict)->isDict()) {
Object obj2;
- if (getFileSpecNameForPlatform(movieDict.dictLookup("F", &obj1), &obj2)) {
- fileName = obj2.getString()->copy();
- obj2.free();
- }
- obj1.free();
-
- if (movieDict.dictLookup("Aspect", &obj1)->isArray()) {
- Array* aspect = obj1.getArray();
- if (aspect->getLength() >= 2) {
- Object tmp;
- if( aspect->get(0, &tmp)->isNum() ) {
- width = (int)floor( aspect->get(0, &tmp)->getNum() + 0.5 );
- }
- tmp.free();
- if( aspect->get(1, &tmp)->isNum() ) {
- height = (int)floor( aspect->get(1, &tmp)->getNum() + 0.5 );
- }
- tmp.free();
- }
- }
- obj1.free();
-
- if (movieDict.dictLookup("Rotate", &obj1)->isInt()) {
- // round up to 90°
- rotationAngle = (((obj1.getInt() + 360) % 360) % 90) * 90;
- }
- obj1.free();
-
- //
- // movie poster
- //
- posterType = posterTypeNone;
- posterStream = NULL;
- if (!movieDict.dictLookup("Poster", &obj1)->isNone()) {
- if (obj1.isBool()) {
- GBool v = obj1.getBool();
- if (v)
- posterType = posterTypeFromMovie;
- }
-
- if (obj1.isStream()) {
- posterType = posterTypeStream;
-
- // "copy" stream
- posterStream = obj1.getStream();
- posterStream->incRef();
- }
-
- obj1.free();
+ dict->lookup("A", &obj2);
+ if (obj2.isDict())
+ movie = new Movie (&movieDict, &obj2);
+ else
+ movie = new Movie (&movieDict);
+ if (!movie->isOk()) {
+ delete movie;
+ movie = NULL;
+ ok = gFalse;
}
-
+ obj2.free();
+ } else {
+ error(-1, "Bad Annot Movie");
+ movie = NULL;
+ ok = gFalse;
}
movieDict.free();
+}
+void AnnotMovie::draw(Gfx *gfx, GBool printing) {
+ Object obj;
- // activation dictionary parsing ...
-
- if (dict->lookup("A", &aDict)->isDict()) {
- if (!aDict.dictLookup("Start", &obj1)->isNone()) {
- if (obj1.isInt()) {
- // If it is representable as an integer (subject to the implementation limit for
- // integers, as described in Appendix C), it should be specified as such.
-
- start.units = obj1.getInt();
- }
- if (obj1.isString()) {
- // If it is not representable as an integer, it should be specified as an 8-byte
- // string representing a 64-bit twos-complement integer, most significant
- // byte first.
-
- // UNSUPPORTED
- }
-
- if (obj1.isArray()) {
- Array* a = obj1.getArray();
-
- Object tmp;
- a->get(0, &tmp);
- if (tmp.isInt()) {
- start.units = tmp.getInt();
- }
- if (tmp.isString()) {
- // UNSUPPORTED
- }
- tmp.free();
-
- a->get(1, &tmp);
- if (tmp.isInt()) {
- start.units_per_second = tmp.getInt();
- }
- tmp.free();
- }
- }
- obj1.free();
-
- if (!aDict.dictLookup("Duration", &obj1)->isNone()) {
- if (obj1.isInt()) {
- duration.units = obj1.getInt();
- }
- if (obj1.isString()) {
- // UNSUPPORTED
- }
-
- if (obj1.isArray()) {
- Array* a = obj1.getArray();
-
- Object tmp;
- a->get(0, &tmp);
- if (tmp.isInt()) {
- duration.units = tmp.getInt();
- }
- if (tmp.isString()) {
- // UNSUPPORTED
- }
- tmp.free();
-
- a->get(1, &tmp);
- if (tmp.isInt()) {
- duration.units_per_second = tmp.getInt();
- }
- tmp.free();
- }
- }
- obj1.free();
-
- if (aDict.dictLookup("Rate", &obj1)->isNum()) {
- rate = obj1.getNum();
- }
- obj1.free();
-
- if (aDict.dictLookup("Volume", &obj1)->isNum()) {
- volume = obj1.getNum();
- }
- obj1.free();
-
- if (aDict.dictLookup("ShowControls", &obj1)->isBool()) {
- showControls = obj1.getBool();
- }
- obj1.free();
-
- if (aDict.dictLookup("Synchronous", &obj1)->isBool()) {
- synchronousPlay = obj1.getBool();
- }
- obj1.free();
-
- if (aDict.dictLookup("Mode", &obj1)->isName()) {
- char* name = obj1.getName();
- if (!strcmp(name, "Once"))
- repeatMode = repeatModeOnce;
- if (!strcmp(name, "Open"))
- repeatMode = repeatModeOpen;
- if (!strcmp(name, "Repeat"))
- repeatMode = repeatModeRepeat;
- if (!strcmp(name,"Palindrome"))
- repeatMode = repeatModePalindrome;
- }
- obj1.free();
-
- if (aDict.dictLookup("FWScale", &obj1)->isArray()) {
- // the presence of that entry implies that the movie is to be played
- // in a floating window
- hasFloatingWindow = true;
-
- Array* scale = obj1.getArray();
- if (scale->getLength() >= 2) {
- Object tmp;
- if (scale->get(0, &tmp)->isInt()) {
- FWScaleNum = tmp.getInt();
- }
- tmp.free();
- if (scale->get(1, &tmp)->isInt()) {
- FWScaleDenum = tmp.getInt();
- }
- tmp.free();
- }
-
- // detect fullscreen mode
- if ((FWScaleNum == 999) && (FWScaleDenum == 1)) {
- isFullscreen = true;
- }
- }
- obj1.free();
+ if (!isVisible (printing))
+ return;
- if (aDict.dictLookup("FWPosition", &obj1)->isArray()) {
- Array* pos = obj1.getArray();
- if (pos->getLength() >= 2) {
- Object tmp;
- if (pos->get(0, &tmp)->isNum()) {
- FWPosX = tmp.getNum();
- }
- tmp.free();
- if (pos->get(1, &tmp)->isNum()) {
- FWPosY = tmp.getNum();
- }
- tmp.free();
- }
+ if (appearance.isNull() && movie->getShowPoster()) {
+ int width, height;
+ Object poster;
+ movie->getPoster(&poster);
+ movie->getAspect(&width, &height);
+
+ if (width != -1 && height != -1 && !poster.isNone()) {
+ MemStream *mStream;
+
+ appearBuf = new GooString ();
+ appearBuf->append ("q\n");
+ appearBuf->appendf ("{0:d} 0 0 {1:d} 0 0 cm\n", width, height);
+ appearBuf->append ("/MImg Do\n");
+ appearBuf->append ("Q\n");
+
+ Object imgDict;
+ imgDict.initDict(xref);
+ imgDict.dictSet ("MImg", &poster);
+
+ Object resDict;
+ resDict.initDict(xref);
+ resDict.dictSet ("XObject", &imgDict);
+
+ Object formDict, obj1, obj2;
+ formDict.initDict(xref);
+ formDict.dictSet("Length", obj1.initInt(appearBuf->getLength()));
+ formDict.dictSet("Subtype", obj1.initName("Form"));
+ formDict.dictSet("Name", obj1.initName("FRM"));
+ obj1.initArray(xref);
+ obj1.arrayAdd(obj2.initInt(0));
+ obj1.arrayAdd(obj2.initInt(0));
+ obj1.arrayAdd(obj2.initInt(width));
+ obj1.arrayAdd(obj2.initInt(height));
+ formDict.dictSet("BBox", &obj1);
+ obj1.initArray(xref);
+ obj1.arrayAdd(obj2.initInt(1));
+ obj1.arrayAdd(obj2.initInt(0));
+ obj1.arrayAdd(obj2.initInt(0));
+ obj1.arrayAdd(obj2.initInt(1));
+ obj1.arrayAdd(obj2.initInt(-width / 2));
+ obj1.arrayAdd(obj2.initInt(-height / 2));
+ formDict.dictSet("Matrix", &obj1);
+ formDict.dictSet("Resources", &resDict);
+
+ Object aStream;
+ mStream = new MemStream(copyString(appearBuf->getCString()), 0,
+ appearBuf->getLength(), &formDict);
+ mStream->setNeedFree(gTrue);
+ aStream.initStream(mStream);
+ delete appearBuf;
+
+ Object objDict;
+ objDict.initDict(xref);
+ objDict.dictSet ("FRM", &aStream);
+
+ resDict.initDict(xref);
+ resDict.dictSet ("XObject", &objDict);
+
+ appearBuf = new GooString ();
+ appearBuf->append ("q\n");
+ appearBuf->appendf ("0 0 {0:d} {1:d} re W n\n", width, height);
+ appearBuf->append ("q\n");
+ appearBuf->appendf ("0 0 {0:d} {1:d} re W n\n", width, height);
+ appearBuf->appendf ("1 0 0 1 {0:d} {1:d} cm\n", width / 2, height / 2);
+ appearBuf->append ("/FRM Do\n");
+ appearBuf->append ("Q\n");
+ appearBuf->append ("Q\n");
+
+ double bbox[4];
+ bbox[0] = bbox[1] = 0;
+ bbox[2] = width;
+ bbox[3] = height;
+ createForm(bbox, gFalse, &resDict, &appearance);
+ delete appearBuf;
}
+ poster.free();
}
- aDict.free();
-}
-void AnnotMovie::getMovieSize(int& width, int& height) {
- width = this->width;
- height = this->height;
-}
-
-void AnnotMovie::getZoomFactor(int& num, int& denum) {
- num = FWScaleNum;
- denum = FWScaleDenum;
+ // draw the appearance stream
+ appearance.fetch(xref, &obj);
+ gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
+ rect->x1, rect->y1, rect->x2, rect->y2);
+ obj.free();
}
-
//------------------------------------------------------------------------
// AnnotScreen
//------------------------------------------------------------------------
@@ -3772,8 +4057,9 @@ AnnotScreen::~AnnotScreen() {
delete title;
if (appearCharacs)
delete appearCharacs;
+ if (action)
+ delete action;
- action.free();
additionAction.free();
}
@@ -3786,7 +4072,17 @@ void AnnotScreen::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) {
}
obj1.free();
- dict->lookup("A", &action);
+ action = NULL;
+ if (dict->lookup("A", &obj1)->isDict()) {
+ action = LinkAction::parseAction(&obj1, catalog->getBaseURI());
+ if (action->getKind() == actionRendition && page == 0) {
+ error (-1, "Invalid Rendition action: associated screen annotation without P");
+ delete action;
+ action = NULL;
+ ok = gFalse;
+ }
+ }
+ obj1.free();
dict->lookup("AA", &additionAction);
@@ -3901,6 +4197,132 @@ void AnnotGeometry::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) {
}
+void AnnotGeometry::draw(Gfx *gfx, GBool printing) {
+ Object obj;
+ double ca = 1;
+
+ if (!isVisible (printing))
+ return;
+
+ if (appearance.isNull()) {
+ ca = opacity;
+
+ appearBuf = new GooString ();
+ appearBuf->append ("q\n");
+ if (color)
+ setColor(color, gFalse);
+
+ if (border) {
+ int i, dashLength;
+ double *dash;
+ double borderWidth = border->getWidth();
+
+ switch (border->getStyle()) {
+ case AnnotBorder::borderDashed:
+ appearBuf->append("[");
+ dashLength = border->getDashLength();
+ dash = border->getDash();
+ for (i = 0; i < dashLength; ++i)
+ appearBuf->appendf(" {0:.2f}", dash[i]);
+ appearBuf->append(" ] 0 d\n");
+ break;
+ default:
+ appearBuf->append("[] 0 d\n");
+ break;
+ }
+ appearBuf->appendf("{0:.2f} w\n", borderWidth);
+
+ if (interiorColor)
+ setColor(interiorColor, gTrue);
+
+ if (type == typeSquare) {
+ appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} re\n",
+ borderWidth / 2.0, borderWidth / 2.0,
+ (rect->x2 - rect->x1) - borderWidth,
+ (rect->y2 - rect->y1) - borderWidth);
+ } else {
+ double width, height;
+ double b;
+ double x1, y1, x2, y2, x3, y3;
+
+ width = rect->x2 - rect->x1;
+ height = rect->y2 - rect->y1;
+ b = borderWidth / 2.0;
+
+ x1 = b;
+ y1 = height / 2.0;
+ appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y1);
+
+ y1 += height / 4.0;
+ x2 = width / 4.0;
+ y2 = height - b;
+ x3 = width / 2.0;
+ y3 = y2;
+ appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ x1, y1, x2, y2, x3, y3);
+ x2 = width - b;
+ y2 = y1;
+ x1 = x3 + (width / 4.0);
+ y1 = y3;
+ x3 = x2;
+ y3 = height / 2.0;
+ appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ x1, y1, x2, y2, x3, y3);
+
+ x2 = x1;
+ y2 = b;
+ x1 = x3;
+ y1 = height / 4.0;
+ x3 = width / 2.0;
+ y3 = b;
+ appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ x1, y1, x2, y2, x3, y3);
+
+ x2 = b;
+ y2 = y1;
+ x1 = width / 4.0;
+ y1 = b;
+ x3 = b;
+ y3 = height / 2.0;
+ appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+ x1, y1, x2, y2, x3, y3);
+
+ }
+
+ if (interiorColor)
+ appearBuf->append ("b\n");
+ else
+ appearBuf->append ("S\n");
+ }
+ appearBuf->append ("Q\n");
+
+ double bbox[4];
+ bbox[0] = bbox[1] = 0;
+ bbox[2] = rect->x2 - rect->x1;
+ bbox[3] = rect->y2 - rect->y1;
+ if (ca == 1) {
+ createForm(bbox, gFalse, NULL, &appearance);
+ } else {
+ Object aStream;
+
+ createForm(bbox, gTrue, NULL, &aStream);
+ delete appearBuf;
+
+ Object resDict;
+ appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ createResourcesDict("Fm0", &aStream, "GS0", ca, NULL, &resDict);
+ createForm(bbox, gFalse, &resDict, &appearance);
+ }
+ delete appearBuf;
+ }
+
+ // draw the appearance stream
+ appearance.fetch(xref, &obj);
+ gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
+ rect->x1, rect->y1, rect->x2, rect->y2);
+ obj.free();
+}
+
//------------------------------------------------------------------------
// AnnotPolygon
//------------------------------------------------------------------------
@@ -4009,16 +4431,15 @@ void AnnotPolygon::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) {
obj1.free();
if (dict->lookup("IT", &obj1)->isName()) {
- GooString *intentName = new GooString(obj1.getName());
+ const char *intentName = obj1.getName();
- if(!intentName->cmp("PolygonCloud")) {
+ if(!strcmp(intentName, "PolygonCloud")) {
intent = polygonCloud;
- } else if(!intentName->cmp("PolyLineDimension")) {
+ } else if(!strcmp(intentName, "PolyLineDimension")) {
intent = polylineDimension;
} else {
intent = polygonDimension;
}
- delete intentName;
} else {
intent = polygonCloud;
}
@@ -4192,6 +4613,171 @@ void AnnotFileAttachment::initialize(XRef *xrefA, Catalog *catalog, Dict* dict)
obj1.free();
}
+#define ANNOT_FILE_ATTACHMENT_AP_PUSHPIN \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2 w\n" \
+ "1 J\n" \
+ "1 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 5 4 m 6 5 l S\n" \
+ "2 w\n" \
+ "11 14 m 9 12 l 6 12 l 13 5 l 13 8 l 15 10 l 18 11 l 20 11 l 12 19 l 12\n" \
+ "17 l 11 14 l h\n" \
+ "11 14 m S\n" \
+ "3 w\n" \
+ "6 5 m 9 8 l S\n" \
+ "0.729412 0.741176 0.713725 RG 2 w\n" \
+ "5 5 m 6 6 l S\n" \
+ "2 w\n" \
+ "11 15 m 9 13 l 6 13 l 13 6 l 13 9 l 15 11 l 18 12 l 20 12 l 12 20 l 12\n" \
+ "18 l 11 15 l h\n" \
+ "11 15 m S\n" \
+ "3 w\n" \
+ "6 6 m 9 9 l S\n"
+
+#define ANNOT_FILE_ATTACHMENT_AP_PAPERCLIP \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2 w\n" \
+ "1 J\n" \
+ "1 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 16.645 12.035 m 12.418 7.707 l 10.902 6.559 6.402 11.203 8.09 12.562 c\n" \
+ "14.133 18.578 l 14.949 19.387 16.867 19.184 17.539 18.465 c 20.551\n" \
+ "15.23 l 21.191 14.66 21.336 12.887 20.426 12.102 c 13.18 4.824 l 12.18\n" \
+ "3.82 6.25 2.566 4.324 4.461 c 3 6.395 3.383 11.438 4.711 12.801 c 9.648\n" \
+ "17.887 l S\n" \
+ "0.729412 0.741176 0.713725 RG 16.645 13.035 m 12.418 8.707 l\n" \
+ "10.902 7.559 6.402 12.203 8.09 13.562 c\n" \
+ "14.133 19.578 l 14.949 20.387 16.867 20.184 17.539 19.465 c 20.551\n" \
+ "16.23 l 21.191 15.66 21.336 13.887 20.426 13.102 c 13.18 5.824 l 12.18\n" \
+ "4.82 6.25 3.566 4.324 5.461 c 3 7.395 3.383 12.438 4.711 13.801 c 9.648\n" \
+ "18.887 l S\n"
+
+#define ANNOT_FILE_ATTACHMENT_AP_GRAPH \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 1 w\n" \
+ "1 J\n" \
+ "0 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 18.5 15.5 m 18.5 13.086 l 16.086 15.5 l 18.5 15.5 l h\n" \
+ "18.5 15.5 m S\n" \
+ "7 7 m 10 11 l 13 9 l 18 15 l S\n" \
+ "0.729412 0.741176 0.713725 RG 7 8 m 10 12 l 13 10 l 18 16 l S\n" \
+ "18.5 16.5 m 18.5 14.086 l 16.086 16.5 l 18.5 16.5 l h\n" \
+ "18.5 16.5 m S\n" \
+ "0.533333 0.541176 0.521569 RG 2 w\n" \
+ "1 j\n" \
+ "3 19 m 3 3 l 21 3 l S\n" \
+ "0.729412 0.741176 0.713725 RG 3 20 m 3 4 l 21 4 l S\n"
+
+#define ANNOT_FILE_ATTACHMENT_AP_TAG \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 0.999781 w\n" \
+ "1 J\n" \
+ "1 j\n" \
+ "[] 0.0 d\n" \
+ "4 M q 1 0 0 -1 0 24 cm\n" \
+ "8.492 8.707 m 8.492 9.535 7.82 10.207 6.992 10.207 c 6.164 10.207 5.492\n" \
+ "9.535 5.492 8.707 c 5.492 7.879 6.164 7.207 6.992 7.207 c 7.82 7.207\n" \
+ "8.492 7.879 8.492 8.707 c h\n" \
+ "8.492 8.707 m S Q\n" \
+ "2 w\n" \
+ "20.078 11.414 m 20.891 10.602 20.785 9.293 20.078 8.586 c 14.422 2.93 l\n" \
+ "13.715 2.223 12.301 2.223 11.594 2.93 c 3.816 10.707 l 3.109 11.414\n" \
+ "2.402 17.781 3.816 19.195 c 5.23 20.609 11.594 19.902 12.301 19.195 c\n" \
+ "20.078 11.414 l h\n" \
+ "20.078 11.414 m S\n" \
+ "0.729412 0.741176 0.713725 RG 20.078 12.414 m\n" \
+ "20.891 11.605 20.785 10.293 20.078 9.586 c 14.422 3.93 l\n" \
+ "13.715 3.223 12.301 3.223 11.594 3.93 c 3.816 11.707 l 3.109 12.414\n" \
+ "2.402 18.781 3.816 20.195 c 5.23 21.609 11.594 20.902 12.301 20.195 c\n" \
+ "20.078 12.414 l h\n" \
+ "20.078 12.414 m S\n" \
+ "0.533333 0.541176 0.521569 RG 1 w\n" \
+ "0 j\n" \
+ "11.949 13.184 m 16.191 8.941 l S\n" \
+ "0.729412 0.741176 0.713725 RG 11.949 14.184 m 16.191 9.941 l S\n" \
+ "0.533333 0.541176 0.521569 RG 14.07 6.82 m 9.828 11.062 l S\n" \
+ "0.729412 0.741176 0.713725 RG 14.07 7.82 m 9.828 12.062 l S\n" \
+ "0.533333 0.541176 0.521569 RG 6.93 15.141 m 8 20 14.27 20.5 16 20.5 c\n" \
+ "18.094 20.504 19.5 20 19.5 18 c 19.5 16.699 20.91 16.418 22.5 16.5 c S\n" \
+ "0.729412 0.741176 0.713725 RG 0.999781 w\n" \
+ "1 j\n" \
+ "q 1 0 0 -1 0 24 cm\n" \
+ "8.492 7.707 m 8.492 8.535 7.82 9.207 6.992 9.207 c 6.164 9.207 5.492\n" \
+ "8.535 5.492 7.707 c 5.492 6.879 6.164 6.207 6.992 6.207 c 7.82 6.207\n" \
+ "8.492 6.879 8.492 7.707 c h\n" \
+ "8.492 7.707 m S Q\n" \
+ "1 w\n" \
+ "0 j\n" \
+ "6.93 16.141 m 8 21 14.27 21.5 16 21.5 c 18.094 21.504 19.5 21 19.5 19 c\n" \
+ "19.5 17.699 20.91 17.418 22.5 17.5 c S\n"
+
+void AnnotFileAttachment::draw(Gfx *gfx, GBool printing) {
+ Object obj;
+ double ca = 1;
+
+ if (!isVisible (printing))
+ return;
+
+ if (appearance.isNull()) {
+ ca = opacity;
+
+ appearBuf = new GooString ();
+
+ appearBuf->append ("q\n");
+ if (color)
+ setColor(color, gTrue);
+ else
+ appearBuf->append ("1 1 1 rg\n");
+ if (!name->cmp("PushPin"))
+ appearBuf->append (ANNOT_FILE_ATTACHMENT_AP_PUSHPIN);
+ else if (!name->cmp("Paperclip"))
+ appearBuf->append (ANNOT_FILE_ATTACHMENT_AP_PAPERCLIP);
+ else if (!name->cmp("Graph"))
+ appearBuf->append (ANNOT_FILE_ATTACHMENT_AP_GRAPH);
+ else if (!name->cmp("Tag"))
+ appearBuf->append (ANNOT_FILE_ATTACHMENT_AP_TAG);
+ appearBuf->append ("Q\n");
+
+ double bbox[4];
+ bbox[0] = bbox[1] = 0;
+ bbox[2] = bbox[3] = 24;
+ if (ca == 1) {
+ createForm (bbox, gFalse, NULL, &appearance);
+ } else {
+ Object aStream;
+
+ createForm (bbox, gTrue, NULL, &aStream);
+ delete appearBuf;
+
+ Object resDict;
+ appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ createResourcesDict("Fm0", &aStream, "GS0", ca, NULL, &resDict);
+ createForm(bbox, gFalse, &resDict, &appearance);
+ }
+ delete appearBuf;
+ }
+
+ // draw the appearance stream
+ appearance.fetch(xref, &obj);
+ gfx->drawAnnot(&obj, border, color,
+ rect->x1, rect->y1, rect->x2, rect->y2);
+ obj.free();
+}
+
//------------------------------------------------------------------------
// AnnotSound
//------------------------------------------------------------------------
@@ -4242,6 +4828,117 @@ void AnnotSound::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) {
obj1.free();
}
+#define ANNOT_SOUND_AP_SPEAKER \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2 w\n" \
+ "0 J\n" \
+ "1 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 4 14 m 4.086 8.043 l 7 8 l 11 4 l 11 18 l 7 14 l 4 14 l h\n" \
+ "4 14 m S\n" \
+ "1 w\n" \
+ "1 J\n" \
+ "0 j\n" \
+ "13.699 15.398 m 14.699 13.398 14.699 9.398 13.699 7.398 c S\n" \
+ "18.199 19.398 m 21.199 17.398 21.199 5.398 18.199 3.398 c S\n" \
+ "16 17.398 m 18 16.398 18 7.398 16 5.398 c S\n" \
+ "0.729412 0.741176 0.713725 RG 2 w\n" \
+ "0 J\n" \
+ "1 j\n" \
+ "4 15 m 4.086 9.043 l 7 9 l 11 5 l 11 19 l 7 15 l 4 15 l h\n" \
+ "4 15 m S\n" \
+ "1 w\n" \
+ "1 J\n" \
+ "0 j\n" \
+ "13.699 16 m 14.699 14 14.699 10 13.699 8 c S\n" \
+ "18.199 20 m 21.199 18 21.199 6 18.199 4 c S\n" \
+ "16 18 m 18 17 18 8 16 6 c S\n"
+
+#define ANNOT_SOUND_AP_MIC \
+ "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \
+ "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \
+ "l 1 21.523 2.477 23 4.301 23 c h\n" \
+ "4.301 23 m f\n" \
+ "0.533333 0.541176 0.521569 RG 2 w\n" \
+ "1 J\n" \
+ "0 j\n" \
+ "[] 0.0 d\n" \
+ "4 M 12 20 m 12 20 l 13.656 20 15 18.656 15 17 c 15 13 l 15 11.344 13.656 10\n" \
+ "12 10 c 12 10 l 10.344 10 9 11.344 9 13 c 9 17 l 9 18.656 10.344 20 12\n" \
+ "20 c h\n" \
+ "12 20 m S\n" \
+ "1 w\n" \
+ "17.5 14.5 m 17.5 11.973 l 17.5 8.941 15.047 6.5 12 6.5 c 8.953 6.5 6.5\n" \
+ "8.941 6.5 11.973 c 6.5 14.5 l S\n" \
+ "2 w\n" \
+ "0 J\n" \
+ "12 6.52 m 12 3 l S\n" \
+ "1 J\n" \
+ "8 3 m 16 3 l S\n" \
+ "0.729412 0.741176 0.713725 RG 12 21 m 12 21 l 13.656 21 15 19.656 15 18 c\n" \
+ "15 14 l 15 12.344 13.656 11 12 11 c 12 11 l 10.344 11 9 12.344 9 14 c\n" \
+ "9 18 l 9 19.656 10.344 21 12 21 c h\n" \
+ "12 21 m S\n" \
+ "1 w\n" \
+ "17.5 15.5 m 17.5 12.973 l 17.5 9.941 15.047 7.5 12 7.5 c 8.953 7.5 6.5\n" \
+ "9.941 6.5 12.973 c 6.5 15.5 l S\n" \
+ "2 w\n" \
+ "0 J\n" \
+ "12 7.52 m 12 4 l S\n" \
+ "1 J\n" \
+ "8 4 m 16 4 l S\n"
+
+void AnnotSound::draw(Gfx *gfx, GBool printing) {
+ Object obj;
+ double ca = 1;
+
+ if (!isVisible (printing))
+ return;
+
+ if (appearance.isNull()) {
+ ca = opacity;
+
+ appearBuf = new GooString ();
+
+ appearBuf->append ("q\n");
+ if (color)
+ setColor(color, gTrue);
+ else
+ appearBuf->append ("1 1 1 rg\n");
+ if (!name->cmp("Speaker"))
+ appearBuf->append (ANNOT_SOUND_AP_SPEAKER);
+ else if (!name->cmp("Mic"))
+ appearBuf->append (ANNOT_SOUND_AP_MIC);
+ appearBuf->append ("Q\n");
+
+ double bbox[4];
+ bbox[0] = bbox[1] = 0;
+ bbox[2] = bbox[3] = 24;
+ if (ca == 1) {
+ createForm(bbox, gFalse, NULL, &appearance);
+ } else {
+ Object aStream, resDict;
+
+ createForm(bbox, gTrue, NULL, &aStream);
+ delete appearBuf;
+
+ appearBuf = new GooString ("/GS0 gs\n/Fm0 Do");
+ createResourcesDict("Fm0", &aStream, "GS0", ca, NULL, &resDict);
+ createForm(bbox, gFalse, &resDict, &appearance);
+ }
+ delete appearBuf;
+ }
+
+ // draw the appearance stream
+ appearance.fetch(xref, &obj);
+ gfx->drawAnnot(&obj, border, color,
+ rect->x1, rect->y1, rect->x2, rect->y2);
+ obj.free();
+}
+
//------------------------------------------------------------------------
// Annot3D
//------------------------------------------------------------------------
@@ -4282,70 +4979,66 @@ Annot3D::Activation::Activation(Dict *dict) {
Object obj1;
if (dict->lookup("A", &obj1)->isName()) {
- GooString *name = new GooString(obj1.getName());
+ const char *name = obj1.getName();
- if(!name->cmp("PO")) {
+ if(!strcmp(name, "PO")) {
aTrigger = aTriggerPageOpened;
- } else if(!name->cmp("PV")) {
+ } else if(!strcmp(name, "PV")) {
aTrigger = aTriggerPageVisible;
- } else if(!name->cmp("XA")) {
+ } else if(!strcmp(name, "XA")) {
aTrigger = aTriggerUserAction;
} else {
aTrigger = aTriggerUnknown;
}
- delete name;
} else {
aTrigger = aTriggerUnknown;
}
obj1.free();
if(dict->lookup("AIS", &obj1)->isName()) {
- GooString *name = new GooString(obj1.getName());
+ const char *name = obj1.getName();
- if(!name->cmp("I")) {
+ if(!strcmp(name, "I")) {
aState = aStateEnabled;
- } else if(!name->cmp("L")) {
+ } else if(!strcmp(name, "L")) {
aState = aStateDisabled;
} else {
aState = aStateUnknown;
}
- delete name;
} else {
aState = aStateUnknown;
}
obj1.free();
if(dict->lookup("D", &obj1)->isName()) {
- GooString *name = new GooString(obj1.getName());
+ const char *name = obj1.getName();
- if(!name->cmp("PC")) {
+ if(!strcmp(name, "PC")) {
dTrigger = dTriggerPageClosed;
- } else if(!name->cmp("PI")) {
+ } else if(!strcmp(name, "PI")) {
dTrigger = dTriggerPageInvisible;
- } else if(!name->cmp("XD")) {
+ } else if(!strcmp(name, "XD")) {
dTrigger = dTriggerUserAction;
} else {
dTrigger = dTriggerUnknown;
}
- delete name;
} else {
dTrigger = dTriggerUnknown;
}
obj1.free();
if(dict->lookup("DIS", &obj1)->isName()) {
- GooString *name = new GooString(obj1.getName());
+ const char *name = obj1.getName();
- if(!name->cmp("U")) {
+ if(!strcmp(name, "U")) {
dState = dStateUninstantiaded;
- } else if(!name->cmp("I")) {
+ } else if(!strcmp(name, "I")) {
dState = dStateInstantiated;
- } else if(!name->cmp("L")) {
+ } else if(!strcmp(name, "L")) {
dState = dStateLive;
} else {
dState = dStateUnknown;
}
- delete name;
} else {
dState = dStateUnknown;
}
@@ -4373,7 +5066,6 @@ Annot3D::Activation::Activation(Dict *dict) {
Annots::Annots(XRef *xref, Catalog *catalog, Object *annotsObj) {
Annot *annot;
Object obj1;
- int size;
int i;
annots = NULL;
@@ -4389,14 +5081,11 @@ Annots::Annots(XRef *xref, Catalog *catalog, Object *annotsObj) {
if (annotsObj->arrayGet(i, &obj1)->isDict()) {
annotsObj->arrayGetNF(i, &obj2);
annot = createAnnot (xref, obj1.getDict(), catalog, &obj2);
- if (annot && annot->isOk()) {
- if (nAnnots >= size) {
- size += 16;
- annots = (Annot **)greallocn(annots, size, sizeof(Annot *));
+ if (annot) {
+ if (annot->isOk()) {
+ appendAnnot(annot);
}
- annots[nAnnots++] = annot;
- } else {
- delete annot;
+ annot->decRefCnt();
}
}
obj2.free();
@@ -4405,62 +5094,85 @@ Annots::Annots(XRef *xref, Catalog *catalog, Object *annotsObj) {
}
}
+void Annots::appendAnnot(Annot *annot) {
+ if (annot && annot->isOk()) {
+ if (nAnnots >= size) {
+ size += 16;
+ annots = (Annot **)greallocn(annots, size, sizeof(Annot *));
+ }
+ annots[nAnnots++] = annot;
+ annot->incRefCnt();
+ }
+}
+
Annot *Annots::createAnnot(XRef *xref, Dict* dict, Catalog *catalog, Object *obj) {
- Annot *annot;
+ Annot *annot = NULL;
Object obj1;
if (dict->lookup("Subtype", &obj1)->isName()) {
- GooString *typeName = new GooString(obj1.getName());
+ const char *typeName = obj1.getName();
- if (!typeName->cmp("Text")) {
+ if (!strcmp(typeName, "Text")) {
annot = new AnnotText(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Link")) {
+ } else if (!strcmp(typeName, "Link")) {
annot = new AnnotLink(xref, dict, catalog, obj);
- } else if (!typeName->cmp("FreeText")) {
+ } else if (!strcmp(typeName, "FreeText")) {
annot = new AnnotFreeText(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Line")) {
+ } else if (!strcmp(typeName, "Line")) {
annot = new AnnotLine(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Square")) {
+ } else if (!strcmp(typeName, "Square")) {
annot = new AnnotGeometry(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Circle")) {
+ } else if (!strcmp(typeName, "Circle")) {
annot = new AnnotGeometry(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Polygon")) {
+ } else if (!strcmp(typeName, "Polygon")) {
annot = new AnnotPolygon(xref, dict, catalog, obj);
- } else if (!typeName->cmp("PolyLine")) {
+ } else if (!strcmp(typeName, "PolyLine")) {
annot = new AnnotPolygon(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Highlight")) {
+ } else if (!strcmp(typeName, "Highlight")) {
annot = new AnnotTextMarkup(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Underline")) {
+ } else if (!strcmp(typeName, "Underline")) {
annot = new AnnotTextMarkup(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Squiggly")) {
+ } else if (!strcmp(typeName, "Squiggly")) {
annot = new AnnotTextMarkup(xref, dict, catalog, obj);
- } else if (!typeName->cmp("StrikeOut")) {
+ } else if (!strcmp(typeName, "StrikeOut")) {
annot = new AnnotTextMarkup(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Stamp")) {
+ } else if (!strcmp(typeName, "Stamp")) {
annot = new AnnotStamp(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Caret")) {
+ } else if (!strcmp(typeName, "Caret")) {
annot = new AnnotCaret(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Ink")) {
+ } else if (!strcmp(typeName, "Ink")) {
annot = new AnnotInk(xref, dict, catalog, obj);
- } else if (!typeName->cmp("FileAttachment")) {
+ } else if (!strcmp(typeName, "FileAttachment")) {
annot = new AnnotFileAttachment(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Sound")) {
+ } else if (!strcmp(typeName, "Sound")) {
annot = new AnnotSound(xref, dict, catalog, obj);
- } else if(!typeName->cmp("Movie")) {
+ } else if(!strcmp(typeName, "Movie")) {
annot = new AnnotMovie(xref, dict, catalog, obj);
- } else if(!typeName->cmp("Widget")) {
- annot = new AnnotWidget(xref, dict, catalog, obj);
- } else if(!typeName->cmp("Screen")) {
+ } else if(!strcmp(typeName, "Widget")) {
+ // Find the annot in forms
+ if (obj->isRef()) {
+ Form *form = catalog->getForm();
+ if (form) {
+ FormWidget *widget = form->findWidgetByRef(obj->getRef());
+ if (widget) {
+ annot = widget->getWidgetAnnotation();
+ annot->incRefCnt();
+ }
+ }
+ }
+ if (!annot)
+ annot = new AnnotWidget(xref, dict, catalog, obj);
+ } else if(!strcmp(typeName, "Screen")) {
annot = new AnnotScreen(xref, dict, catalog, obj);
- } else if(!typeName->cmp("PrinterMark")) {
+ } else if(!strcmp(typeName, "PrinterMark")) {
annot = new Annot(xref, dict, catalog, obj);
- } else if (!typeName->cmp("TrapNet")) {
+ } else if (!strcmp(typeName, "TrapNet")) {
annot = new Annot(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Watermark")) {
+ } else if (!strcmp(typeName, "Watermark")) {
annot = new Annot(xref, dict, catalog, obj);
- } else if (!typeName->cmp("3D")) {
+ } else if (!strcmp(typeName, "3D")) {
annot = new Annot3D(xref, dict, catalog, obj);
- } else if (!typeName->cmp("Popup")) {
+ } else if (!strcmp(typeName, "Popup")) {
/* Popup annots are already handled by markup annots
* Here we only care about popup annots without a
* markup annotation associated
@@ -4476,10 +5188,6 @@ Annot *Annots::createAnnot(XRef *xref, Dict* dict, Catalog *catalog, Object *obj
} else {
annot = new Annot(xref, dict, catalog, obj);
}
-
- delete typeName;
- } else {
- annot = NULL;
}
obj1.free();
@@ -4502,7 +5210,7 @@ Annots::~Annots() {
int i;
for (i = 0; i < nAnnots; ++i) {
- delete annots[i];
+ annots[i]->decRefCnt();
}
gfree(annots);
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Annot.h
index b83c1dbb8c5..59d610ba40b 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Annot.h
@@ -15,13 +15,13 @@
//
// Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
// Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2007-2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007-2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
// Copyright (C) 2008 Pino Toscano <pino@kde.org>
// Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com>
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009-2011 Albert Astals Cid <aacid@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -35,16 +35,21 @@
#pragma interface
#endif
+#include "Object.h"
+
class XRef;
class Gfx;
class Catalog;
class CharCodeToUnicode;
class GfxFont;
-class GfxFontDict;
+class GfxResources;
class Form;
class FormWidget;
+class FormField;
+class FormFieldChoice;
class PDFRectangle;
class Movie;
+class LinkAction;
class OCGs;
class Sound;
@@ -230,8 +235,11 @@ public:
virtual AnnotBorderStyle getStyle() const { return style; }
protected:
+ GBool parseDashArray(Object *dashObj);
+
AnnotBorderType type;
double width;
+ static const int DASH_LIMIT = 10; // implementation note 82 in Appendix H.
int dashLength;
double *dash;
AnnotBorderStyle style;
@@ -250,7 +258,6 @@ public:
double getVerticalCorner() const { return verticalCorner; }
protected:
- static const int DASH_LIMIT = 10; // implementation note 82 in Appendix H.
double horizontalCorner; // (Default 0)
double verticalCorner; // (Default 0)
// double width; // (Default 1) (inherited from AnnotBorder)
@@ -290,55 +297,20 @@ public:
AnnotColor(double gray);
AnnotColor(double r, double g, double b);
AnnotColor(double c, double m, double y, double k);
- AnnotColor(Array *array);
- ~AnnotColor();
+ AnnotColor(Array *array, int adjust = 0);
+
+ void adjustColor(int adjust);
AnnotColorSpace getSpace() const { return (AnnotColorSpace) length; }
- double *getValues() const { return values; }
+ const double *getValues() const { return values; }
private:
- double *values;
+ double values[4];
int length;
};
//------------------------------------------------------------------------
-// AnnotBorderStyle
-//------------------------------------------------------------------------
-
-enum AnnotBorderType {
- annotBorderSolid,
- annotBorderDashed,
- annotBorderBeveled,
- annotBorderInset,
- annotBorderUnderlined
-};
-
-class AnnotBorderStyle {
-public:
-
- AnnotBorderStyle(AnnotBorderType typeA, double widthA,
- double *dashA, int dashLengthA,
- double rA, double gA, double bA);
- ~AnnotBorderStyle();
-
- AnnotBorderType getType() { return type; }
- double getWidth() { return width; }
- void getDash(double **dashA, int *dashLengthA)
- { *dashA = dash; *dashLengthA = dashLength; }
- void getColor(double *rA, double *gA, double *bA)
- { *rA = r; *gA = g; *bA = b; }
-
-private:
-
- AnnotBorderType type;
- double width;
- double *dash;
- int dashLength;
- double r, g, b;
-};
-
-//------------------------------------------------------------------------
// AnnotIconFit
//------------------------------------------------------------------------
@@ -486,9 +458,11 @@ public:
Annot(XRef *xrefA, PDFRectangle *rectA, Catalog *catalog);
Annot(XRef *xrefA, Dict *dict, Catalog *catalog);
Annot(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
- virtual ~Annot();
GBool isOk() { return ok; }
+ void incRefCnt();
+ void decRefCnt();
+
virtual void draw(Gfx *gfx, GBool printing);
// Get appearance object.
Object *getAppearance(Object *obj) { return appearance.fetch(xref, obj); }
@@ -509,12 +483,19 @@ public:
// new_color.
void setColor(AnnotColor *new_color);
+ void setPage(Ref *pageRef, int pageIndex);
+
+ void setAppearanceState(char *state);
+
// getters
+ XRef *getXRef() const { return xref; }
+ GBool getHasRef() const { return hasRef; }
Ref getRef() const { return ref; }
AnnotSubtype getType() const { return type; }
PDFRectangle *getRect() const { return rect; }
+ void getRect(double *x1, double *y1, double *x2, double *y2) const;
GooString *getContents() const { return contents; }
- Dict *getPageDict() const { return pageDict; }
+ int getPageNum() const { return page; }
GooString *getName() const { return name; }
GooString *getModified() const { return modified; }
Guint getFlags() const { return flags; }
@@ -526,6 +507,9 @@ public:
int getId() { return ref.num; }
+ // Check if point is inside the annot rectangle.
+ GBool inRect(double x, double y) const;
+
private:
void readArrayNum(Object *pdfArray, int key, double *value);
// write vStr[i:j[ in appearBuf
@@ -534,15 +518,22 @@ private:
protected:
- void setColor(Array *a, GBool fill, int adjust);
+ virtual ~Annot();
+ void setColor(AnnotColor *color, GBool fill);
void drawCircle(double cx, double cy, double r, GBool fill);
void drawCircleTopLeft(double cx, double cy, double r);
void drawCircleBottomRight(double cx, double cy, double r);
+ void createForm(double *bbox, GBool transparencyGroup, Object *resDict, Object *aStream);
+ void createResourcesDict(char *formName, Object *formStream, char *stateName,
+ double opacity, char *blendMode, Object *resDict);
+ GBool isVisible(GBool printing);
// Updates the field key of the annotation dictionary
// and sets M to the current time
void update(const char *key, Object *value);
+ int refCnt;
+
Object annotObj;
// required data
@@ -551,7 +542,7 @@ protected:
// optional data
GooString *contents; // Contents
- Dict *pageDict; // P
+ int page; // P
GooString *name; // NM
GooString *modified; // M
Guint flags; // F (must be a 32 bit unsigned int)
@@ -628,6 +619,7 @@ public:
// The annotation takes the ownership of new_popup
void setPopup(AnnotPopup *new_popup);
void setLabel(GooString *new_label);
+ void setOpacity(double opacityA);
protected:
GooString *label; // T (Default autor)
@@ -670,6 +662,8 @@ public:
AnnotText(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
~AnnotText();
+ virtual void draw(Gfx *gfx, GBool printing);
+
// getters
GBool getOpen() const { return open; }
GooString *getIcon() const { return icon; }
@@ -697,89 +691,20 @@ private:
class AnnotMovie: public Annot {
public:
- enum PosterType {
- posterTypeNone,
- posterTypeStream,
- posterTypeFromMovie
- };
-
- enum RepeatMode {
- repeatModeOnce,
- repeatModeOpen,
- repeatModeRepeat,
- repeatModePalindrome
- };
-
- struct Time {
- Time() { units_per_second = 0; }
- Gulong units;
- int units_per_second; // 0 : defined by movie
- };
-
AnnotMovie(XRef *xrefA, PDFRectangle *rect, Movie *movieA, Catalog *catalog);
AnnotMovie(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
~AnnotMovie();
- GooString* getTitle() { return title; }
- GooString* getFileName() { return fileName; }
- int getRotationAngle() { return rotationAngle; }
-
- PosterType getPosterType() { return posterType; }
- Stream* getPosterStream() { return posterStream; }
-
- Time getStart() { return start; }
- Time getDuration() { return duration; }
- double getRate() { return rate; }
- double getVolume() { return volume; }
-
- GBool getShowControls() { return showControls; }
- RepeatMode getRepeatMode() { return repeatMode; }
- GBool getSynchronousPlay() { return synchronousPlay; }
-
- GBool needFloatingWindow() { return hasFloatingWindow; }
- GBool needFullscreen() { return isFullscreen; }
-
-
- void getMovieSize(int& width, int& height);
- void getZoomFactor(int& num, int& denum);
- void getWindowPosition(double& x, double& y) { x = FWPosX; y = FWPosY; }
+ virtual void draw(Gfx *gfx, GBool printing);
+ GooString* getTitle() { return title; }
Movie* getMovie() { return movie; }
private:
void initialize(XRef *xrefA, Catalog *catalog, Dict *dict);
GooString* title; // T
- GooString* fileName; // Movie/F
-
- int width; // Movie/Aspect
- int height; // Movie/Aspect
- int rotationAngle; // Movie/Rotate
-
- PosterType posterType; // Movie/Poster
- Stream* posterStream;
-
- Time start; // A/Start
- Time duration; // A/Duration
- double rate; // A/Rate
- double volume; // A/Volume
-
- GBool showControls; // A/ShowControls
-
- RepeatMode repeatMode; // A/Mode
-
- GBool synchronousPlay; // A/Synchronous
-
- // floating window
- GBool hasFloatingWindow;
- unsigned short FWScaleNum; // A/FWScale
- unsigned short FWScaleDenum;
- GBool isFullscreen;
-
- double FWPosX; // A/FWPosition
- double FWPosY;
-
- Movie* movie;
+ Movie* movie; // Movie + A
};
@@ -797,7 +722,7 @@ class AnnotScreen: public Annot {
GooString* getTitle() { return title; }
AnnotAppearanceCharacs *getAppearCharacs() { return appearCharacs; }
- Object* getAction() { return &action; }
+ LinkAction* getAction() { return action; }
Object* getAdditionActions() { return &additionAction; }
private:
@@ -808,7 +733,7 @@ class AnnotScreen: public Annot {
AnnotAppearanceCharacs* appearCharacs; // MK
- Object action; // A
+ LinkAction *action; // A
Object additionAction; // AA
};
@@ -833,8 +758,7 @@ public:
virtual void draw(Gfx *gfx, GBool printing);
// getters
- Dict *getActionDict() const { return actionDict; }
- Object *getDest() { return &dest; }
+ LinkAction *getAction() const { return action; }
AnnotLinkEffect getLinkEffect() const { return linkEffect; }
Dict *getUriAction() const { return uriAction; }
AnnotQuadrilaterals *getQuadrilaterals() const { return quadrilaterals; }
@@ -843,8 +767,7 @@ protected:
void initialize(XRef *xrefA, Catalog *catalog, Dict *dict);
- Dict *actionDict; // A
- Object dest; // Dest
+ LinkAction *action; // A, Dest
AnnotLinkEffect linkEffect; // H (Default I)
Dict *uriAction; // PA
@@ -926,6 +849,8 @@ public:
AnnotLine(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
~AnnotLine();
+ virtual void draw(Gfx *gfx, GBool printing);
+
// getters
AnnotLineEndingStyle getStartStyle() const { return startStyle; }
AnnotLineEndingStyle getEndStyle() const { return endStyle; }
@@ -980,6 +905,8 @@ public:
AnnotTextMarkup(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
virtual ~AnnotTextMarkup();
+ virtual void draw(Gfx *gfx, GBool printing);
+
AnnotQuadrilaterals *getQuadrilaterals() const { return quadrilaterals; }
protected:
@@ -1021,6 +948,8 @@ public:
AnnotGeometry(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
~AnnotGeometry();
+ virtual void draw(Gfx *gfx, GBool printing);
+
// getters
AnnotColor *getInteriorColor() const { return interiorColor; }
AnnotBorderEffect *getBorderEffect() const { return borderEffect; }
@@ -1146,6 +1075,8 @@ public:
AnnotFileAttachment(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
~AnnotFileAttachment();
+ virtual void draw(Gfx *gfx, GBool printing);
+
// getters
Object *getFile() { return &file; }
GooString *getName() const { return name; }
@@ -1172,6 +1103,8 @@ public:
AnnotSound(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
~AnnotSound();
+ virtual void draw(Gfx *gfx, GBool printing);
+
// getters
Sound *getSound() { return sound; }
GooString *getName() const { return name; }
@@ -1202,15 +1135,20 @@ public:
};
AnnotWidget(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj);
+ AnnotWidget(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj, FormField *fieldA);
virtual ~AnnotWidget();
virtual void draw(Gfx *gfx, GBool printing);
+ void drawBorder();
+ void drawFormFieldButton(GfxResources *resources, GooString *da);
+ void drawFormFieldText(GfxResources *resources, GooString *da);
+ void drawFormFieldChoice(GfxResources *resources, GooString *da);
void generateFieldAppearance ();
AnnotWidgetHighlightMode getMode() { return mode; }
AnnotAppearanceCharacs *getAppearCharacs() { return appearCharacs; }
- Dict *getAction() { return action; }
+ LinkAction *getAction() { return action; }
Dict *getAdditionActions() { return additionActions; }
Dict *getParent() { return parent; }
@@ -1218,28 +1156,26 @@ private:
void initialize(XRef *xrefA, Catalog *catalog, Dict *dict);
- void drawText(GooString *text, GooString *da, GfxFontDict *fontDict,
+ void drawText(GooString *text, GooString *da, GfxResources *resources,
GBool multiline, int comb, int quadding,
GBool txField, GBool forceZapfDingbats,
GBool password=false);
- void drawListBox(GooString **text, GBool *selection,
- int nOptions, int topIdx,
- GooString *da, GfxFontDict *fontDict, GBool quadding);
+ void drawListBox(FormFieldChoice *fieldChoice,
+ GooString *da, GfxResources *resources, int quadding);
void layoutText(GooString *text, GooString *outBuf, int *i, GfxFont *font,
double *width, double widthLimit, int *charCount,
GBool noReencode);
void writeString(GooString *str, GooString *appearBuf);
Form *form;
- FormWidget *widget; // FormWidget object for this annotation
+ FormField *field; // FormField object for this annotation
AnnotWidgetHighlightMode mode; // H (Default I)
AnnotAppearanceCharacs *appearCharacs; // MK
- Dict *action; // A
+ LinkAction *action; // A
Dict *additionActions; // AA
// inherited from Annot
// AnnotBorderBS border; // BS
Dict *parent; // Parent
- GBool regen;
GBool addDingbatsResource;
};
@@ -1317,6 +1253,7 @@ public:
// Iterate through list of annotations.
int getNumAnnots() { return nAnnots; }
Annot *getAnnot(int i) { return annots[i]; }
+ void appendAnnot(Annot *annot);
private:
Annot* createAnnot(XRef *xref, Dict* dict, Catalog *catalog, Object *obj);
@@ -1324,6 +1261,7 @@ private:
Annot **annots;
int nAnnots;
+ int size;
};
#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Array.cc
index e7ec4e7dc5f..e7ec4e7dc5f 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Array.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Array.h
index a6aca260b9f..a6aca260b9f 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/ArthurOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/ArthurOutputDev.cc
index fbc8b01e2bc..68a1c7163da 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/ArthurOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/ArthurOutputDev.cc
@@ -14,10 +14,12 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2005-2009 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2008 Pino Toscano <pino@kde.org>
-// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2005-2009, 2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010 Pino Toscano <pino@kde.org>
+// Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
+// Copyright (C) 2010 Matthias Fauconneau <matthias.fauconneau@gmail.com>
+// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -49,6 +51,7 @@
#include <QtGui/QPainterPath>
//------------------------------------------------------------------------
+#ifdef HAVE_SPLASH
#include "splash/SplashFontFileID.h"
#include "splash/SplashFontFile.h"
#include "splash/SplashFontEngine.h"
@@ -77,38 +80,47 @@ private:
Ref r;
};
-
+#endif
//------------------------------------------------------------------------
// ArthurOutputDev
//------------------------------------------------------------------------
ArthurOutputDev::ArthurOutputDev(QPainter *painter):
- m_painter(painter)
+ m_painter(painter),
+ m_fontHinting(NoHinting)
{
m_currentBrush = QBrush(Qt::SolidPattern);
m_fontEngine = 0;
m_font = 0;
- m_image = 0;
}
ArthurOutputDev::~ArthurOutputDev()
{
+#ifdef HAVE_SPLASH
delete m_fontEngine;
+#endif
}
void ArthurOutputDev::startDoc(XRef *xrefA) {
xref = xrefA;
+#ifdef HAVE_SPLASH
delete m_fontEngine;
+
+ const bool isHintingEnabled = m_fontHinting != NoHinting;
+ const bool isSlightHinting = m_fontHinting == SlightHinting;
+
m_fontEngine = new SplashFontEngine(
#if HAVE_T1LIB_H
globalParams->getEnableT1lib(),
#endif
#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
globalParams->getEnableFreeType(),
- gFalse,
+ isHintingEnabled,
+ isSlightHinting,
#endif
m_painter->testRenderHint(QPainter::TextAntialiasing));
+#endif
}
void ArthurOutputDev::startPage(int pageNum, GfxState *state)
@@ -128,10 +140,6 @@ void ArthurOutputDev::startPage(int pageNum, GfxState *state)
void ArthurOutputDev::endPage() {
}
-void ArthurOutputDev::drawLink(Link *link, Catalog *catalog)
-{
-}
-
void ArthurOutputDev::saveState(GfxState *state)
{
m_painter->save();
@@ -161,7 +169,17 @@ void ArthurOutputDev::updateCTM(GfxState *state, double m11, double m12,
void ArthurOutputDev::updateLineDash(GfxState *state)
{
- // qDebug() << "updateLineDash";
+ double *dashPattern;
+ int dashLength;
+ double dashStart;
+ state->getLineDash(&dashPattern, &dashLength, &dashStart);
+ QVector<qreal> pattern(dashLength);
+ for (int i = 0; i < dashLength; ++i) {
+ pattern[i] = dashPattern[i];
+ }
+ m_currentPen.setDashPattern(pattern);
+ m_currentPen.setDashOffset(dashStart);
+ m_painter->setPen(m_currentPen);
}
void ArthurOutputDev::updateFlatness(GfxState *state)
@@ -203,13 +221,13 @@ void ArthurOutputDev::updateLineCap(GfxState *state)
void ArthurOutputDev::updateMiterLimit(GfxState *state)
{
- // We can't do mitre (or Miter) limit with Qt4 yet.
- // the limit is in state->getMiterLimit() when we get there
+ m_currentPen.setMiterLimit(state->getMiterLimit());
+ m_painter->setPen(m_currentPen);
}
void ArthurOutputDev::updateLineWidth(GfxState *state)
{
- m_currentPen.setWidthF(state->getTransformedLineWidth());
+ m_currentPen.setWidthF(state->getLineWidth());
m_painter->setPen(m_currentPen);
}
@@ -249,11 +267,12 @@ void ArthurOutputDev::updateStrokeOpacity(GfxState *state)
void ArthurOutputDev::updateFont(GfxState *state)
{
+#ifdef HAVE_SPLASH
GfxFont *gfxFont;
GfxFontType fontType;
SplashOutFontFileID *id;
SplashFontFile *fontFile;
- SplashFontSrc *fontsrc;
+ SplashFontSrc *fontsrc = NULL;
FoFiTrueType *ff;
Ref embRef;
Object refObj, strObj;
@@ -265,7 +284,7 @@ void ArthurOutputDev::updateFont(GfxState *state)
double *textMat;
double m11, m12, m21, m22, fontSize;
SplashCoord mat[4];
- int substIdx, n;
+ int n;
int faceIndex = 0;
SplashCoord matrix[6];
@@ -273,7 +292,6 @@ void ArthurOutputDev::updateFont(GfxState *state)
m_font = NULL;
fileName = NULL;
tmpBuf = NULL;
- substIdx = -1;
if (!(gfxFont = state->getFont())) {
goto err1;
@@ -326,7 +344,7 @@ void ArthurOutputDev::updateFont(GfxState *state)
if (fileName)
fontsrc->setFile(fileName, gFalse);
else
- fontsrc->setBuf(tmpBuf, tmpBufLen, gFalse);
+ fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
// load the font file
switch (fontType) {
@@ -468,12 +486,17 @@ void ArthurOutputDev::updateFont(GfxState *state)
mat[2] = m21; mat[3] = -m22;
m_font = m_fontEngine->getFont(fontFile, mat, matrix);
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
return;
err2:
delete id;
err1:
+ if (fontsrc && !fontsrc->isFile)
+ fontsrc->unref();
return;
+#endif
}
static QPainterPath convertPath(GfxState *state, GfxPath *path, Qt::FillRule fillRule)
@@ -513,7 +536,7 @@ static QPainterPath convertPath(GfxState *state, GfxPath *path, Qt::FillRule fil
void ArthurOutputDev::stroke(GfxState *state)
{
- m_painter->drawPath( convertPath( state, state->getPath(), Qt::OddEvenFill ) );
+ m_painter->strokePath( convertPath( state, state->getPath(), Qt::OddEvenFill ), m_currentPen );
}
void ArthurOutputDev::fill(GfxState *state)
@@ -540,7 +563,9 @@ void ArthurOutputDev::drawChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
CharCode code, int nBytes, Unicode *u, int uLen) {
+#ifdef HAVE_SPLASH
double x1, y1;
+ double x2, y2;
// SplashPath *path;
int render;
@@ -559,43 +584,36 @@ void ArthurOutputDev::drawChar(GfxState *state, double x, double y,
x -= originX;
y -= originY;
- state->transform(x, y, &x1, &y1);
// fill
if (!(render & 1)) {
- int x0, y0, xFrac, yFrac;
-
- x0 = static_cast<int>(floor(x1));
- xFrac = splashFloor((x1 - x0) * splashFontFraction);
- y0 = static_cast<int>(floor(y1));
- yFrac = splashFloor((y1 - y0) * splashFontFraction);
SplashPath * fontPath;
fontPath = m_font->getGlyphPath(code);
if (fontPath) {
QPainterPath qPath;
qPath.setFillRule(Qt::WindingFill);
for (int i = 0; i < fontPath->length; ++i) {
- if (fontPath->flags[i] & splashPathFirst) {
- qPath.moveTo(fontPath->pts[i].x+x0, fontPath->pts[i].y+y0);
- } else if (fontPath->flags[i] & splashPathCurve) {
- qPath.quadTo(fontPath->pts[i].x+x0, fontPath->pts[i].y+y0,
- fontPath->pts[i+1].x+x0, fontPath->pts[i+1].y+y0);
- ++i;
- }
-#ifdef __GNUC__
-#warning FIX THIS
-#endif
-// else if (fontPath->flags[i] & splashPathArcCW) {
-// qDebug() << "Need to implement arc";
-// }
- else {
- qPath.lineTo(fontPath->pts[i].x+x0, fontPath->pts[i].y+y0);
- }
- if (fontPath->flags[i] & splashPathLast) {
- qPath.closeSubpath();
- }
+ if (fontPath->flags[i] & splashPathFirst) {
+ state->transform(fontPath->pts[i].x+x, -fontPath->pts[i].y+y, &x1, &y1);
+ qPath.moveTo(x1,y1);
+ } else if (fontPath->flags[i] & splashPathCurve) {
+ state->transform(fontPath->pts[i].x+x, -fontPath->pts[i].y+y, &x1, &y1);
+ state->transform(fontPath->pts[i+1].x+x, -fontPath->pts[i+1].y+y, &x2, &y2);
+ qPath.quadTo(x1,y1,x2,y2);
+ ++i;
+ }
+ // FIXME fix this
+ // else if (fontPath->flags[i] & splashPathArcCW) {
+ // qDebug() << "Need to implement arc";
+ // }
+ else {
+ state->transform(fontPath->pts[i].x+x, -fontPath->pts[i].y+y, &x1, &y1);
+ qPath.lineTo(x1,y1);
+ }
+ if (fontPath->flags[i] & splashPathLast) {
+ qPath.closeSubpath();
+ }
}
- m_painter->save();
GfxRGB rgb;
QColor brushColour = m_currentBrush.color();
state->getFillRGB(&rgb);
@@ -606,7 +624,7 @@ void ArthurOutputDev::drawChar(GfxState *state, double x, double y,
penColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), state->getStrokeOpacity());
m_painter->setPen(penColour);
m_painter->drawPath( qPath );
- m_painter->restore();
+ delete fontPath;
}
}
@@ -636,6 +654,7 @@ void ArthurOutputDev::drawChar(GfxState *state, double x, double y,
}
*/
}
+#endif
}
GBool ArthurOutputDev::beginType3Char(GfxState *state, double x, double y,
@@ -745,75 +764,53 @@ void ArthurOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
GfxImageColorMap *colorMap,
GBool interpolate, int *maskColors, GBool inlineImg)
{
- unsigned char *buffer;
- unsigned int *dest;
+ unsigned int *data;
+ unsigned int *line;
int x, y;
ImageStream *imgStr;
Guchar *pix;
int i;
double *ctm;
QMatrix matrix;
- int is_identity_transform;
+ QImage image;
+ int stride;
- buffer = (unsigned char *)gmallocn3(width, height, 4);
-
/* TODO: Do we want to cache these? */
imgStr = new ImageStream(str, width,
colorMap->getNumPixelComps(),
colorMap->getBits());
imgStr->reset();
- /* ICCBased color space doesn't do any color correction
- * so check its underlying color space as well */
- is_identity_transform = colorMap->getColorSpace()->getMode() == csDeviceRGB ||
- (colorMap->getColorSpace()->getMode() == csICCBased &&
- ((GfxICCBasedColorSpace*)colorMap->getColorSpace())->getAlt()->getMode() == csDeviceRGB);
-
- if (maskColors) {
- for (y = 0; y < height; y++) {
- dest = (unsigned int *) (buffer + y * 4 * width);
- pix = imgStr->getLine();
- colorMap->getRGBLine (pix, dest, width);
+ image = QImage(width, height, QImage::Format_ARGB32);
+ data = (unsigned int *)image.bits();
+ stride = image.bytesPerLine()/4;
+ for (y = 0; y < height; y++) {
+ pix = imgStr->getLine();
+ line = data+y*stride;
+ colorMap->getRGBLine(pix, line, width);
+ if (maskColors) {
for (x = 0; x < width; x++) {
- for (i = 0; i < colorMap->getNumPixelComps(); ++i) {
-
- if (pix[i] < maskColors[2*i] * 255||
- pix[i] > maskColors[2*i+1] * 255) {
- *dest = *dest | 0xff000000;
- break;
- }
- }
- pix += colorMap->getNumPixelComps();
- dest++;
+ for (i = 0; i < colorMap->getNumPixelComps(); ++i) {
+ if (pix[i] < maskColors[2*i] * 255||
+ pix[i] > maskColors[2*i+1] * 255) {
+ *line = *line | 0xff000000;
+ break;
+ }
+ }
+ pix += colorMap->getNumPixelComps();
+ line++;
}
+ } else {
+ for (x = 0; x < width; x++) { *line = *line | 0xff000000; line++; }
}
-
- m_image = new QImage(buffer, width, height, QImage::Format_ARGB32);
- }
- else {
- for (y = 0; y < height; y++) {
- dest = (unsigned int *) (buffer + y * 4 * width);
- pix = imgStr->getLine();
- colorMap->getRGBLine (pix, dest, width);
- }
-
- m_image = new QImage(buffer, width, height, QImage::Format_RGB32);
}
- if (m_image == NULL || m_image->isNull()) {
- qDebug() << "Null image";
- delete imgStr;
- return;
- }
ctm = state->getCTM();
matrix.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
m_painter->setMatrix(matrix, true);
- m_painter->drawImage( QPoint(0,0), *m_image );
- delete m_image;
- m_image = 0;
- free (buffer);
+ m_painter->drawImage( QPoint(0,0), image );
delete imgStr;
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/ArthurOutputDev.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/ArthurOutputDev.h
index 1b80088da89..ed631a053ef 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/ArthurOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/ArthurOutputDev.h
@@ -15,7 +15,9 @@
//
// Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
// Copyright (C) 2005 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2010 Pino Toscano <pino@kde.org>
+// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -42,7 +44,7 @@ struct GfxRGB;
class SplashFont;
class SplashFontEngine;
-class SplashGlyphBitmap;
+struct SplashGlyphBitmap;
//------------------------------------------------------------------------
// ArthurOutputDev - Qt 4 QPainter renderer
@@ -50,6 +52,15 @@ class SplashGlyphBitmap;
class ArthurOutputDev: public OutputDev {
public:
+ /**
+ * Describes how fonts are distorted (aka hinted) to fit the pixel grid.
+ * More hinting means sharper edges and less adherence to the true letter shapes.
+ */
+ enum FontHinting {
+ NoHinting = 0, ///< Font shapes are left unchanged
+ SlightHinting, ///< Font shapes are distorted vertically only
+ FullHinting ///< Font shapes are distorted horizontally and vertically
+ };
// Constructor.
ArthurOutputDev(QPainter *painter );
@@ -57,6 +68,8 @@ public:
// Destructor.
virtual ~ArthurOutputDev();
+ void setFontHinting(FontHinting hinting) { m_fontHinting = hinting; }
+
//----- get info about output device
// Does this device use upside-down coordinates?
@@ -78,9 +91,6 @@ public:
// End a page.
virtual void endPage();
- //----- link borders
- virtual void drawLink(Link *link, Catalog *catalog);
-
//----- save/restore graphics state
virtual void saveState(GfxState *state);
virtual void restoreState(GfxState *state);
@@ -146,11 +156,11 @@ public:
private:
QPainter *m_painter;
+ FontHinting m_fontHinting;
QFont m_currentFont;
QPen m_currentPen;
QBrush m_currentBrush;
GBool m_needFontUpdate; // set when the font needs to be updated
- QImage *m_image;
SplashFontEngine *m_fontEngine;
SplashFont *m_font; // current font
XRef *xref; // xref table for current document
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFont.cc
index 329ff62fc39..329ff62fc39 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFont.h
index 8652034fd63..8652034fd63 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/CMap.cc
index 0e861c017f8..0e861c017f8 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/CMap.h
index 9de0a8702c9..9de0a8702c9 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.cc
new file mode 100644
index 00000000000..393383006b0
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.cc
@@ -0,0 +1,256 @@
+//========================================================================
+//
+// CachedFile.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2009 Stefan Thomas <thomas@eload24.com>
+// Copyright 2010, 2011 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#include <config.h>
+#include "CachedFile.h"
+
+//------------------------------------------------------------------------
+// CachedFile
+//------------------------------------------------------------------------
+
+CachedFile::CachedFile(CachedFileLoader *cachedFileLoaderA, GooString *uriA)
+{
+ uri = uriA;
+ loader = cachedFileLoaderA;
+
+ streamPos = 0;
+ chunks = new std::vector<Chunk>();
+ length = 0;
+
+ length = loader->init(uri, this);
+ refCnt = 1;
+
+ if (length != ((size_t) -1)) {
+ chunks->resize(length/CachedFileChunkSize + 1);
+ }
+ else {
+ error(-1, "Failed to initialize file cache for '%s'.", uri->getCString());
+ chunks->resize(0);
+ }
+}
+
+CachedFile::~CachedFile()
+{
+ delete uri;
+ delete loader;
+ delete chunks;
+}
+
+void CachedFile::incRefCnt() {
+ refCnt++;
+}
+
+void CachedFile::decRefCnt() {
+ if (--refCnt == 0)
+ delete this;
+}
+
+long int CachedFile::tell() {
+ return streamPos;
+}
+
+int CachedFile::seek(long int offset, int origin)
+{
+ if (origin == SEEK_SET) {
+ streamPos = offset;
+ } else if (origin == SEEK_CUR) {
+ streamPos += offset;
+ } else {
+ streamPos = length + offset;
+ }
+
+ if (streamPos > length) {
+ streamPos = 0;
+ return 1;
+ }
+
+ return 0;
+}
+
+int CachedFile::cache(const std::vector<ByteRange> &origRanges)
+{
+ std::vector<int> loadChunks;
+ int numChunks = length/CachedFileChunkSize + 1;
+ std::vector<bool> chunkNeeded(numChunks);
+ int startChunk, endChunk;
+ std::vector<ByteRange> chunk_ranges, all;
+ ByteRange range;
+ const std::vector<ByteRange> *ranges = &origRanges;
+
+ if (ranges->empty()) {
+ range.offset = 0;
+ range.length = length;
+ all.push_back(range);
+ ranges = &all;
+ }
+
+ for (int i = 0; i < numChunks; ++i)
+ chunkNeeded[i] = false;
+ for (size_t i = 0; i < ranges->size(); i++) {
+
+ if ((*ranges)[i].length == 0) continue;
+ if ((*ranges)[i].offset >= length) continue;
+
+ size_t start = (*ranges)[i].offset;
+ size_t end = start + (*ranges)[i].length - 1;
+ if (end >= length) end = length - 1;
+
+ startChunk = start / CachedFileChunkSize;
+ endChunk = end / CachedFileChunkSize;
+ for (int chunk = startChunk; chunk <= endChunk; chunk++) {
+ if ((*chunks)[chunk].state == chunkStateNew) {
+ chunkNeeded[chunk] = true;
+ }
+ }
+ }
+
+ int chunk = 0;
+ while (chunk < numChunks) {
+ while (!chunkNeeded[chunk] && (++chunk != numChunks)) ;
+ if (chunk == numChunks) break;
+ startChunk = chunk;
+ loadChunks.push_back(chunk);
+
+ while ((++chunk != numChunks) && chunkNeeded[chunk]) {
+ loadChunks.push_back(chunk);
+ }
+ endChunk = chunk - 1;
+
+ range.offset = startChunk * CachedFileChunkSize;
+ range.length = (endChunk - startChunk + 1) * CachedFileChunkSize;
+
+ chunk_ranges.push_back(range);
+ }
+
+ if (chunk_ranges.size() > 0) {
+ CachedFileWriter writer =
+ CachedFileWriter(this, &loadChunks);
+ return loader->load(chunk_ranges, &writer);
+ }
+
+ return 0;
+}
+
+size_t CachedFile::read(void *ptr, size_t unitsize, size_t count)
+{
+ size_t bytes = unitsize*count;
+ if (length < (streamPos + bytes)) {
+ bytes = length - streamPos;
+ }
+
+ if (bytes == 0) return 0;
+
+ // Load data
+ if (cache(streamPos, bytes) != 0) return 0;
+
+ // Copy data to buffer
+ size_t toCopy = bytes;
+ while (toCopy) {
+ int chunk = streamPos / CachedFileChunkSize;
+ int offset = streamPos % CachedFileChunkSize;
+ size_t len = CachedFileChunkSize-offset;
+
+ if (len > toCopy)
+ len = toCopy;
+
+ memcpy(ptr, (*chunks)[chunk].data + offset, len);
+ streamPos += len;
+ toCopy -= len;
+ ptr = (char*)ptr + len;
+ }
+
+ return bytes;
+}
+
+int CachedFile::cache(size_t offset, size_t length)
+{
+ std::vector<ByteRange> r;
+ ByteRange range;
+ range.offset = offset;
+ range.length = length;
+ r.push_back(range);
+ return cache(r);
+}
+
+//------------------------------------------------------------------------
+// CachedFileWriter
+//------------------------------------------------------------------------
+
+CachedFileWriter::CachedFileWriter(CachedFile *cachedFileA, std::vector<int> *chunksA)
+{
+ cachedFile = cachedFileA;
+ chunks = chunksA;
+
+ if (chunks) {
+ offset = 0;
+ it = (*chunks).begin();
+ }
+}
+
+CachedFileWriter::~CachedFileWriter()
+{
+}
+
+size_t CachedFileWriter::write(const char *ptr, size_t size)
+{
+ const char *cp = ptr;
+ size_t len = size;
+ size_t nfree, ncopy;
+ size_t written = 0;
+ size_t chunk;
+
+ if (!len) return 0;
+
+ while (len) {
+ if (chunks) {
+ if (offset == CachedFileChunkSize) {
+ it++;
+ if (it == (*chunks).end()) return written;
+ offset = 0;
+ }
+ chunk = *it;
+ } else {
+ offset = cachedFile->length % CachedFileChunkSize;
+ chunk = cachedFile->length / CachedFileChunkSize;
+ }
+
+ if (chunk >= cachedFile->chunks->size()) {
+ cachedFile->chunks->resize(chunk + 1);
+ }
+
+ nfree = CachedFileChunkSize - offset;
+ ncopy = (len >= nfree) ? nfree : len;
+ memcpy(&((*cachedFile->chunks)[chunk].data[offset]), cp, ncopy);
+ len -= ncopy;
+ cp += ncopy;
+ offset += ncopy;
+ written += ncopy;
+
+ if (!chunks) {
+ cachedFile->length += ncopy;
+ }
+
+ if (offset == CachedFileChunkSize) {
+ (*cachedFile->chunks)[chunk].state = CachedFile::chunkStateLoaded;
+ }
+ }
+
+ if ((chunk == (cachedFile->length / CachedFileChunkSize)) &&
+ (offset == (cachedFile->length % CachedFileChunkSize))) {
+ (*cachedFile->chunks)[chunk].state = CachedFile::chunkStateLoaded;
+ }
+
+ return written;
+}
+
+//------------------------------------------------------------------------
+
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.h
new file mode 100644
index 00000000000..b99ea1ecad4
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CachedFile.h
@@ -0,0 +1,146 @@
+//========================================================================
+//
+// CachedFile.h
+//
+// Caching files support.
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2009 Stefan Thomas <thomas@eload24.com>
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#ifndef CACHEDFILE_H
+#define CACHEDFILE_H
+
+#include "poppler-config.h"
+
+#include "goo/gtypes.h"
+#include "Object.h"
+#include "Stream.h"
+
+#include <vector>
+
+//------------------------------------------------------------------------
+
+#define CachedFileChunkSize 8192 // This should be a multiple of cachedStreamBufSize
+
+class GooString;
+class CachedFileLoader;
+
+//------------------------------------------------------------------------
+// CachedFile
+//
+// CachedFile gives FILE-like access to a document at a specified URI.
+// In the constructor, you specify a CachedFileLoader that handles loading
+// the data from the document. The CachedFile requests no more data then it
+// needs from the CachedFileLoader.
+//------------------------------------------------------------------------
+
+class CachedFile {
+
+friend class CachedFileWriter;
+
+public:
+
+ CachedFile(CachedFileLoader *cacheLoader, GooString *uri);
+
+ Guint getLength() { return length; }
+ long int tell();
+ int seek(long int offset, int origin);
+ size_t read(void * ptr, size_t unitsize, size_t count);
+ size_t write(const char *ptr, size_t size, size_t fromByte);
+ int cache(const std::vector<ByteRange> &ranges);
+
+ // Reference counting.
+ void incRefCnt();
+ void decRefCnt();
+
+private:
+
+ ~CachedFile();
+
+ enum ChunkState {
+ chunkStateNew = 0,
+ chunkStateLoaded
+ };
+
+ typedef struct {
+ ChunkState state;
+ char data[CachedFileChunkSize];
+ } Chunk;
+
+ int cache(size_t offset, size_t length);
+
+ CachedFileLoader *loader;
+ GooString *uri;
+
+ size_t length;
+ size_t streamPos;
+
+ std::vector<Chunk> *chunks;
+
+ int refCnt; // reference count
+
+};
+
+//------------------------------------------------------------------------
+// CachedFileWriter
+//
+// CachedFileWriter handles sequential writes to a CachedFile.
+// On construction, you specify the CachedFile and the chunks of it to which data
+// should be written.
+//------------------------------------------------------------------------
+
+class CachedFileWriter {
+
+public:
+
+ // Construct a CachedFile Writer.
+ // The caller is responsible for deleting the cachedFile and chunksA.
+ CachedFileWriter(CachedFile *cachedFile, std::vector<int> *chunksA);
+
+ ~CachedFileWriter();
+
+ // Writes size bytes from ptr to cachedFile, returns number of bytes written.
+ size_t write(const char *ptr, size_t size);
+
+private:
+
+ CachedFile *cachedFile;
+ std::vector<int> *chunks;
+ std::vector<int>::iterator it;
+ size_t offset;
+
+};
+
+//------------------------------------------------------------------------
+// CachedFileLoader
+//
+// CachedFileLoader is an abstact class that specifies the interface for
+// loadng data from an URI into a CachedFile.
+//------------------------------------------------------------------------
+
+class CachedFileLoader {
+
+public:
+
+ virtual ~CachedFileLoader() {};
+
+ // Initializes the file load.
+ // Returns the length of the file.
+ // The caller is responsible for deleting uri and cachedFile.
+ virtual size_t init(GooString *uri, CachedFile *cachedFile) = 0;
+
+ // Loads speficified byte ranges and passes it to the writer to store them.
+ // Returns 0 on success, Anything but 0 on failure.
+ // The caller is responsible for deleting the writer.
+ virtual int load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer) = 0;
+
+};
+
+//------------------------------------------------------------------------
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoFontEngine.cc
index f08d8939b73..95ac60d1a36 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoFontEngine.cc
@@ -18,11 +18,13 @@
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
// Copyright (C) 2005, 2009 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2006, 2007 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006, 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
// Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
// Copyright (C) 2008 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2009 Darren Kenny <darren.kenny@sun.com>
+// Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
+// Copyright (C) 2010 Jan Kümmel <jan+freedesktop@snorc.org>
//
// 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
@@ -64,7 +66,7 @@
CairoFont::CairoFont(Ref ref,
cairo_font_face_t *cairo_font_face,
Gushort *codeToGID,
- int codeToGIDLen,
+ Guint codeToGIDLen,
GBool substitute,
GBool printing) : ref(ref),
cairo_font_face(cairo_font_face),
@@ -164,14 +166,21 @@ _ft_done_face_uncached (void *closure)
static GBool
_ft_new_face_uncached (FT_Library lib,
const char *filename,
+ char *font_data,
+ int font_data_len,
FT_Face *face_out,
cairo_font_face_t **font_face_out)
{
FT_Face face;
cairo_font_face_t *font_face;
- if (FT_New_Face (lib, filename, 0, &face))
- return gFalse;
+ if (font_data == NULL) {
+ if (FT_New_Face (lib, filename, 0, &face))
+ return gFalse;
+ } else {
+ if (FT_New_Memory_Face (lib, (unsigned char *)font_data, font_data_len, 0, &face))
+ return gFalse;
+ }
font_face = cairo_ft_font_face_create_for_ft_face (face,
FT_LOAD_NO_HINTING |
@@ -256,6 +265,8 @@ _ft_done_face (void *closure)
static GBool
_ft_new_face (FT_Library lib,
const char *filename,
+ char *font_data,
+ int font_data_len,
FT_Face *face_out,
cairo_font_face_t **font_face_out)
{
@@ -263,37 +274,46 @@ _ft_new_face (FT_Library lib,
struct stat st;
struct _ft_face_data tmpl;
- /* if we fail to mmap the file, just pass it to FreeType instead */
- tmpl.fd = open (filename, O_RDONLY);
- if (tmpl.fd == -1)
- return _ft_new_face_uncached (lib, filename, face_out, font_face_out);
+ tmpl.fd = -1;
- if (fstat (tmpl.fd, &st) == -1) {
- close (tmpl.fd);
- return _ft_new_face_uncached (lib, filename, face_out, font_face_out);
- }
+ if (font_data == NULL) {
+ /* if we fail to mmap the file, just pass it to FreeType instead */
+ tmpl.fd = open (filename, O_RDONLY);
+ if (tmpl.fd == -1)
+ return _ft_new_face_uncached (lib, filename, font_data, font_data_len, face_out, font_face_out);
- tmpl.bytes = (unsigned char *) mmap (NULL, st.st_size,
- PROT_READ, MAP_PRIVATE,
- tmpl.fd, 0);
- if (tmpl.bytes == MAP_FAILED) {
- close (tmpl.fd);
- return _ft_new_face_uncached (lib, filename, face_out, font_face_out);
+ if (fstat (tmpl.fd, &st) == -1) {
+ close (tmpl.fd);
+ return _ft_new_face_uncached (lib, filename, font_data, font_data_len, face_out, font_face_out);
+ }
+
+ tmpl.bytes = (unsigned char *) mmap (NULL, st.st_size,
+ PROT_READ, MAP_PRIVATE,
+ tmpl.fd, 0);
+ if (tmpl.bytes == MAP_FAILED) {
+ close (tmpl.fd);
+ return _ft_new_face_uncached (lib, filename, font_data, font_data_len, face_out, font_face_out);
+ }
+ tmpl.size = st.st_size;
+ } else {
+ tmpl.bytes = (unsigned char*) font_data;
+ tmpl.size = font_data_len;
}
/* check to see if this is a duplicate of any of the currently open fonts */
tmpl.lib = lib;
- tmpl.size = st.st_size;
tmpl.hash = _djb_hash (tmpl.bytes, tmpl.size);
for (l = _ft_open_faces; l; l = l->next) {
if (_ft_face_data_equal (l, &tmpl)) {
+ if (tmpl.fd != -1) {
#if defined(__SUNPRO_CC) && defined(__sun) && defined(__SVR4)
- munmap ((char*)tmpl.bytes, tmpl.size);
+ munmap ((char*)tmpl.bytes, tmpl.size);
#else
- munmap (tmpl.bytes, tmpl.size);
+ munmap (tmpl.bytes, tmpl.size);
#endif
- close (tmpl.fd);
+ close (tmpl.fd);
+ }
*face_out = l->face;
*font_face_out = cairo_font_face_reference (l->font_face);
return gTrue;
@@ -305,13 +325,15 @@ _ft_new_face (FT_Library lib,
(FT_Byte *) tmpl.bytes, tmpl.size,
0, &tmpl.face))
{
+ if (tmpl.fd != -1) {
#if defined(__SUNPRO_CC) && defined(__sun) && defined(__SVR4)
- munmap ((char*)tmpl.bytes, tmpl.size);
+ munmap ((char*)tmpl.bytes, tmpl.size);
#else
- munmap (tmpl.bytes, tmpl.size);
+ munmap (tmpl.bytes, tmpl.size);
#endif
- close (tmpl.fd);
+ close (tmpl.fd);
+ }
return gFalse;
}
@@ -346,16 +368,14 @@ _ft_new_face (FT_Library lib,
CairoFreeTypeFont::CairoFreeTypeFont(Ref ref,
cairo_font_face_t *cairo_font_face,
- FT_Face face,
Gushort *codeToGID,
- int codeToGIDLen,
+ Guint codeToGIDLen,
GBool substitute) : CairoFont(ref,
cairo_font_face,
codeToGID,
codeToGIDLen,
substitute,
- gTrue),
- face(face) { }
+ gTrue) { }
CairoFreeTypeFont::~CairoFreeTypeFont() { }
@@ -363,10 +383,12 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
FT_Library lib, GBool useCIDs) {
Ref embRef;
Object refObj, strObj;
- GooString *tmpFileName, *fileName;
+ GooString *fileName;
+ char *fileNameC;
+ char *font_data;
+ int font_data_len;
DisplayFontParam *dfp;
- FILE *tmpFile;
- int c, i, n;
+ int i, n;
GfxFontType fontType;
char **enc;
char *name;
@@ -377,43 +399,25 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
cairo_font_face_t *font_face;
Gushort *codeToGID;
- int codeToGIDLen;
+ Guint codeToGIDLen;
dfp = NULL;
codeToGID = NULL;
codeToGIDLen = 0;
+ font_data = NULL;
+ font_data_len = 0;
+ fileName = NULL;
+ fileNameC = NULL;
GBool substitute = gFalse;
ref = *gfxFont->getID();
fontType = gfxFont->getType();
- tmpFileName = NULL;
-
if (gfxFont->getEmbeddedFontID(&embRef)) {
- if (!openTempFile(&tmpFileName, &tmpFile, "wb")) {
- error(-1, "Couldn't create temporary font file");
- goto err2;
- }
-
- refObj.initRef(embRef.num, embRef.gen);
- refObj.fetch(xref, &strObj);
- refObj.free();
- if (!strObj.isStream()) {
- error(-1, "Embedded font object is wrong type");
- strObj.free();
- fclose(tmpFile);
+ font_data = gfxFont->readEmbFontFile(xref, &font_data_len);
+ if (NULL == font_data)
goto err2;
- }
- strObj.streamReset();
- while ((c = strObj.streamGetChar()) != EOF) {
- fputc(c, tmpFile);
- }
- strObj.streamClose();
- strObj.free();
- fclose(tmpFile);
- fileName = tmpFileName;
-
} else if (!(fileName = gfxFont->getExtFontFile())) {
// look for a display font mapping or a substitute font
dfp = NULL;
@@ -439,11 +443,15 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
substitute = gTrue;
}
+ if (fileName != NULL) {
+ fileNameC = fileName->getCString();
+ }
+
switch (fontType) {
case fontType1:
case fontType1C:
case fontType1COT:
- if (! _ft_new_face (lib, fileName->getCString(), &face, &font_face)) {
+ if (! _ft_new_face (lib, fileNameC, font_data, font_data_len, &face, &font_face)) {
error(-1, "could not create type1 face");
goto err2;
}
@@ -459,8 +467,8 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
}
}
break;
-
case fontCIDType2:
+ case fontCIDType2OT:
codeToGID = NULL;
n = 0;
if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
@@ -471,7 +479,11 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
n * sizeof(Gushort));
}
} else {
- ff = FoFiTrueType::load(fileName->getCString());
+ if (font_data != NULL) {
+ ff = FoFiTrueType::make(font_data, font_data_len);
+ } else {
+ ff = FoFiTrueType::load(fileNameC);
+ }
if (! ff)
goto err2;
codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
@@ -480,7 +492,12 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
codeToGIDLen = n;
/* Fall through */
case fontTrueType:
- if (!(ff = FoFiTrueType::load(fileName->getCString()))) {
+ if (font_data != NULL) {
+ ff = FoFiTrueType::make(font_data, font_data_len);
+ } else {
+ ff = FoFiTrueType::load(fileNameC);
+ }
+ if (! ff) {
error(-1, "failed to load truetype font\n");
goto err2;
}
@@ -490,7 +507,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
codeToGIDLen = 256;
}
delete ff;
- if (! _ft_new_face (lib, fileName->getCString(), &face, &font_face)) {
+ if (! _ft_new_face (lib, fileNameC, font_data, font_data_len, &face, &font_face)) {
error(-1, "could not create truetype face\n");
goto err2;
}
@@ -504,13 +521,18 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
if (!useCIDs)
{
- if ((ff1c = FoFiType1C::load(fileName->getCString()))) {
- codeToGID = ff1c->getCIDToGIDMap(&codeToGIDLen);
+ if (font_data != NULL) {
+ ff1c = FoFiType1C::make(font_data, font_data_len);
+ } else {
+ ff1c = FoFiType1C::load(fileNameC);
+ }
+ if (ff1c) {
+ codeToGID = ff1c->getCIDToGIDMap((int *)&codeToGIDLen);
delete ff1c;
}
}
- if (! _ft_new_face (lib, fileName->getCString(), &face, &font_face)) {
+ if (! _ft_new_face (lib, fileNameC, font_data, font_data_len, &face, &font_face)) {
gfree(codeToGID);
codeToGID = NULL;
error(-1, "could not create cid face\n");
@@ -519,27 +541,19 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
break;
default:
- printf ("font type %d not handled\n", (int)fontType);
+ fprintf (stderr, "font type %d not handled\n", (int)fontType);
goto err2;
break;
}
- // delete the (temporary) font file -- with Unix hard link
- // semantics, this will remove the last link; otherwise it will
- // return an error, leaving the file to be deleted later
- if (fileName == tmpFileName) {
- unlink (fileName->getCString());
- delete tmpFileName;
- }
-
return new CairoFreeTypeFont(ref,
- font_face, face,
+ font_face,
codeToGID, codeToGIDLen,
substitute);
err2:
/* hmm? */
- printf ("some font thing failed\n");
+ fprintf (stderr, "some font thing failed\n");
return NULL;
}
@@ -654,7 +668,7 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, XRef *xref,
cairo_font_face_t *font_face;
Ref ref;
Gushort *codeToGID;
- int codeToGIDLen;
+ Guint codeToGIDLen;
int i, j;
char **enc;
Dict *charProcs;
@@ -679,7 +693,7 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, XRef *xref,
codeToGIDLen = 256;
for (i = 0; i < 256; ++i) {
codeToGID[i] = 0;
- if ((name = enc[i])) {
+ if (charProcs && (name = enc[i])) {
for (j = 0; j < charProcs->getLength(); j++) {
if (strcmp(name, charProcs->getKey(j)) == 0) {
codeToGID[i] = (Gushort) j;
@@ -693,10 +707,10 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, XRef *xref,
CairoType3Font::CairoType3Font(Ref ref,
XRef *xref,
- Catalog *cat,
+ Catalog *catalog,
cairo_font_face_t *cairo_font_face,
Gushort *codeToGID,
- int codeToGIDLen,
+ Guint codeToGIDLen,
GBool printing) : CairoFont(ref,
cairo_font_face,
codeToGID,
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoFontEngine.h
index f156cab728a..552b5e649fa 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoFontEngine.h
@@ -17,7 +17,7 @@
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2006 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2008 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
@@ -45,7 +45,7 @@ public:
CairoFont(Ref ref,
cairo_font_face_t *face,
Gushort *codeToGID,
- int codeToGIDLen,
+ Guint codeToGIDLen,
GBool substitute,
GBool printing);
virtual ~CairoFont();
@@ -61,7 +61,7 @@ protected:
cairo_font_face_t *cairo_font_face;
Gushort *codeToGID;
- int codeToGIDLen;
+ Guint codeToGIDLen;
GBool substitute;
GBool printing;
@@ -75,9 +75,8 @@ public:
virtual ~CairoFreeTypeFont();
private:
- CairoFreeTypeFont(Ref ref, cairo_font_face_t *cairo_font_face, FT_Face face,
- Gushort *codeToGID, int codeToGIDLen, GBool substitute);
- FT_Face face;
+ CairoFreeTypeFont(Ref ref, cairo_font_face_t *cairo_font_face,
+ Gushort *codeToGID, Guint codeToGIDLen, GBool substitute);
};
//------------------------------------------------------------------------
@@ -94,7 +93,7 @@ public:
private:
CairoType3Font(Ref ref, XRef *xref, Catalog *catalog,
cairo_font_face_t *cairo_font_face,
- Gushort *codeToGID, int codeToGIDLen,
+ Gushort *codeToGID, Guint codeToGIDLen,
GBool printing);
XRef *xref;
Catalog *catalog;
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoOutputDev.cc
index de8a6c27672..30c69f12451 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoOutputDev.cc
@@ -18,13 +18,14 @@
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005, 2009 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-// Copyright (C) 2006-2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2008 Carl Worth <cworth@cworth.org>
-// Copyright (C) 2008, 2009 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008-2011 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
// Copyright (C) 2008 Hib Eris <hib@hiberis.nl>
-// Copyright (C) 2009 David Benjamin <davidben@mit.edu>
+// Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
+// Copyright (C) 2011 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
@@ -43,6 +44,7 @@
#include <cairo.h>
#include "goo/gfile.h"
+#include "goo/gtypes_p.h"
#include "GlobalParams.h"
#include "Error.h"
#include "Object.h"
@@ -58,6 +60,8 @@
#include <splash/SplashBitmap.h>
#include "CairoOutputDev.h"
#include "CairoFontEngine.h"
+#include "CairoRescaleBox.h"
+#include "UTF8.h"
//------------------------------------------------------------------------
// #define LOG_CAIRO
@@ -123,15 +127,19 @@ CairoOutputDev::CairoOutputDev() {
fontEngine_owner = gFalse;
glyphs = NULL;
fill_pattern = NULL;
+ fill_color.r = fill_color.g = fill_color.b = 0;
stroke_pattern = NULL;
+ stroke_color.r = stroke_color.g = stroke_color.b = 0;
stroke_opacity = 1.0;
fill_opacity = 1.0;
textClipPath = NULL;
+ strokePathClip = NULL;
haveCSPattern = gFalse;
cairo = NULL;
currentFont = NULL;
prescaleImages = gTrue;
printing = gTrue;
+ use_show_text_glyphs = gFalse;
inType3Char = gFalse;
t3_glyph_has_bbox = gFalse;
@@ -145,6 +153,12 @@ CairoOutputDev::CairoOutputDev() {
text = NULL;
actualText = NULL;
+
+ // the SA parameter supposedly defaults to false, but Acrobat
+ // apparently hardwires it to true
+ stroke_adjust = globalParams->getStrokeAdjust();
+ align_stroke_coords = gFalse;
+ adjusted_stroke_width = gFalse;
}
CairoOutputDev::~CairoOutputDev() {
@@ -223,10 +237,10 @@ void CairoOutputDev::startDoc(XRef *xrefA, Catalog *catalogA,
void CairoOutputDev::startPage(int pageNum, GfxState *state) {
/* set up some per page defaults */
cairo_pattern_destroy(fill_pattern);
- fill_pattern = cairo_pattern_create_rgb(0., 0., 0.);
-
cairo_pattern_destroy(stroke_pattern);
- stroke_pattern = cairo_pattern_create_rgb(0., 0., 0.);
+
+ fill_pattern = cairo_pattern_create_rgb(0., 0., 0.);
+ stroke_pattern = cairo_pattern_reference(fill_pattern);
if (text)
text->startPage(state);
@@ -239,9 +253,6 @@ void CairoOutputDev::endPage() {
}
}
-void CairoOutputDev::drawLink(Link *link, Catalog *catalog) {
-}
-
void CairoOutputDev::saveState(GfxState *state) {
LOG(printf ("save\n"));
cairo_save (cairo);
@@ -269,10 +280,9 @@ void CairoOutputDev::restoreState(GfxState *state) {
updateBlendMode(state);
MaskStack* ms = maskStack;
- if (mask)
- cairo_pattern_destroy(mask);
-
if (ms) {
+ if (mask)
+ cairo_pattern_destroy(mask);
mask = ms->mask;
maskStack = ms->next;
delete ms;
@@ -404,83 +414,121 @@ void CairoOutputDev::updateMiterLimit(GfxState *state) {
void CairoOutputDev::updateLineWidth(GfxState *state) {
LOG(printf ("line width: %f\n", state->getLineWidth()));
+ adjusted_stroke_width = gFalse;
if (state->getLineWidth() == 0.0) {
/* find out how big pixels (device unit) are in the x and y directions
* choose the smaller of the two as our line width */
double x = 1.0, y = 1.0;
+ if (printing) {
+ // assume printer pixel size is 1/600 inch
+ x = 72.0/600;
+ y = 72.0/600;
+ }
cairo_device_to_user_distance(cairo, &x, &y);
cairo_set_line_width (cairo, MIN(fabs(x),fabs(y)));
} else {
- cairo_set_line_width (cairo, state->getLineWidth());
+ double width = state->getLineWidth();
+ if (stroke_adjust && !printing) {
+ double x, y;
+ x = y = width;
+
+ /* find out line width in device units */
+ cairo_user_to_device_distance(cairo, &x, &y);
+ if (x <= 1.0 && y <= 1.0) {
+ /* adjust width to at least one device pixel */
+ x = y = 1.0;
+ cairo_device_to_user_distance(cairo, &x, &y);
+ width = MIN(fabs(x),fabs(y));
+ adjusted_stroke_width = gTrue;
+ }
+ }
+ cairo_set_line_width (cairo, width);
}
if (cairo_shape)
cairo_set_line_width (cairo_shape, cairo_get_line_width (cairo));
}
void CairoOutputDev::updateFillColor(GfxState *state) {
- state->getFillRGB(&fill_color);
+ GfxRGB color = fill_color;
- cairo_pattern_destroy(fill_pattern);
- fill_pattern = cairo_pattern_create_rgba(fill_color.r / 65535.0,
- fill_color.g / 65535.0,
- fill_color.b / 65535.0,
- fill_opacity);
+ state->getFillRGB(&fill_color);
+ if (color.r != fill_color.r ||
+ color.g != fill_color.g ||
+ color.b != fill_color.b)
+ {
+ cairo_pattern_destroy(fill_pattern);
+ fill_pattern = cairo_pattern_create_rgba(colToDbl(fill_color.r),
+ colToDbl(fill_color.g),
+ colToDbl(fill_color.b),
+ fill_opacity);
- LOG(printf ("fill color: %d %d %d\n",
- fill_color.r, fill_color.g, fill_color.b));
+ LOG(printf ("fill color: %d %d %d\n",
+ fill_color.r, fill_color.g, fill_color.b));
+ }
}
void CairoOutputDev::updateStrokeColor(GfxState *state) {
+ GfxRGB color = stroke_color;
+
state->getStrokeRGB(&stroke_color);
+ if (color.r != stroke_color.r ||
+ color.g != stroke_color.g ||
+ color.b != stroke_color.b)
+ {
+ cairo_pattern_destroy(stroke_pattern);
+ stroke_pattern = cairo_pattern_create_rgba(colToDbl(stroke_color.r),
+ colToDbl(stroke_color.g),
+ colToDbl(stroke_color.b),
+ stroke_opacity);
- cairo_pattern_destroy(stroke_pattern);
- stroke_pattern = cairo_pattern_create_rgba(stroke_color.r / 65535.0,
- stroke_color.g / 65535.0,
- stroke_color.b / 65535.0,
- stroke_opacity);
-
- LOG(printf ("stroke color: %d %d %d\n",
- stroke_color.r, stroke_color.g, stroke_color.b));
+ LOG(printf ("stroke color: %d %d %d\n",
+ stroke_color.r, stroke_color.g, stroke_color.b));
+ }
}
void CairoOutputDev::updateFillOpacity(GfxState *state) {
- fill_opacity = state->getFillOpacity();
+ double opacity = fill_opacity;
- cairo_pattern_destroy(fill_pattern);
- fill_pattern = cairo_pattern_create_rgba(fill_color.r / 65535.0,
- fill_color.g / 65535.0,
- fill_color.b / 65535.0,
- fill_opacity);
+ fill_opacity = state->getFillOpacity();
+ if (opacity != fill_opacity) {
+ cairo_pattern_destroy(fill_pattern);
+ fill_pattern = cairo_pattern_create_rgba(colToDbl(fill_color.r),
+ colToDbl(fill_color.g),
+ colToDbl(fill_color.b),
+ fill_opacity);
- LOG(printf ("fill opacity: %f\n", fill_opacity));
+ LOG(printf ("fill opacity: %f\n", fill_opacity));
+ }
}
void CairoOutputDev::updateStrokeOpacity(GfxState *state) {
+ double opacity = stroke_opacity;
+
stroke_opacity = state->getStrokeOpacity();
+ if (opacity != stroke_opacity) {
+ cairo_pattern_destroy(stroke_pattern);
+ stroke_pattern = cairo_pattern_create_rgba(colToDbl(stroke_color.r),
+ colToDbl(stroke_color.g),
+ colToDbl(stroke_color.b),
+ stroke_opacity);
- cairo_pattern_destroy(stroke_pattern);
- stroke_pattern = cairo_pattern_create_rgba(stroke_color.r / 65535.0,
- stroke_color.g / 65535.0,
- stroke_color.b / 65535.0,
- stroke_opacity);
-
- LOG(printf ("stroke opacity: %f\n", stroke_opacity));
+ LOG(printf ("stroke opacity: %f\n", stroke_opacity));
+ }
}
void CairoOutputDev::updateFillColorStop(GfxState *state, double offset) {
state->getFillRGB(&fill_color);
cairo_pattern_add_color_stop_rgba(fill_pattern, offset,
- fill_color.r / 65535.0,
- fill_color.g / 65535.0,
- fill_color.b / 65535.0,
+ colToDbl(fill_color.r),
+ colToDbl(fill_color.g),
+ colToDbl(fill_color.b),
fill_opacity);
LOG(printf ("fill color stop: %f (%d, %d, %d)\n",
offset, fill_color.r, fill_color.g, fill_color.b));
}
void CairoOutputDev::updateBlendMode(GfxState *state) {
-#ifdef CAIRO_HAS_BLEND_MODES
switch (state->getBlendMode()) {
default:
case gfxBlendNormal:
@@ -533,7 +581,6 @@ void CairoOutputDev::updateBlendMode(GfxState *state) {
break;
}
LOG(printf ("blend mode: %d\n", (int)state->getBlendMode()));
-#endif /* CAIRO_HAS_BLEND_MODES */
}
void CairoOutputDev::updateFont(GfxState *state) {
@@ -555,6 +602,9 @@ void CairoOutputDev::updateFont(GfxState *state) {
font_face = currentFont->getFontFace();
cairo_set_font_face (cairo, font_face);
+
+ use_show_text_glyphs = state->getFont()->hasToUnicodeCMap() &&
+ cairo_surface_has_show_text_glyphs (cairo_get_target (cairo));
double fontSize = state->getFontSize();
double *m = state->getTextMat();
@@ -586,23 +636,31 @@ void CairoOutputDev::updateFont(GfxState *state) {
cairo_set_font_matrix (cairo, &matrix);
}
-void CairoOutputDev::updateRender(GfxState *state) {
- int rm;
- rm = state->getRender();
- if (rm == 7 && haveCSPattern) {
- haveCSPattern = gFalse;
- restoreState(state);
- }
+void CairoOutputDev::alignStrokeCoords(double *x, double *y)
+{
+ /* see http://www.cairographics.org/FAQ/#sharp_lines */
+ cairo_user_to_device (cairo, x, y);
+ *x = floor(*x) + 0.5;
+ *y = floor(*y) + 0.5;
+ cairo_device_to_user (cairo, x, y);
}
void CairoOutputDev::doPath(cairo_t *cairo, GfxState *state, GfxPath *path) {
GfxSubpath *subpath;
int i, j;
+ cairo_new_path (cairo);
for (i = 0; i < path->getNumSubpaths(); ++i) {
subpath = path->getSubpath(i);
if (subpath->getNumPoints() > 0) {
- cairo_move_to (cairo, subpath->getX(0), subpath->getY(0));
- j = 1;
+ if (align_stroke_coords) {
+ double x = subpath->getX(0);
+ double y = subpath->getY(0);
+ alignStrokeCoords(&x, &y);
+ cairo_move_to (cairo, x, y);
+ } else {
+ cairo_move_to (cairo, subpath->getX(0), subpath->getY(0));
+ }
+ j = 1;
while (j < subpath->getNumPoints()) {
if (subpath->getCurve(j)) {
cairo_curve_to( cairo,
@@ -612,7 +670,14 @@ void CairoOutputDev::doPath(cairo_t *cairo, GfxState *state, GfxPath *path) {
j += 3;
} else {
- cairo_line_to (cairo, subpath->getX(j), subpath->getY(j));
+ if (align_stroke_coords) {
+ double x = subpath->getX(j);
+ double y = subpath->getY(j);
+ alignStrokeCoords(&x, &y);
+ cairo_line_to (cairo, x, y);
+ } else {
+ cairo_line_to (cairo, subpath->getX(j), subpath->getY(j));
+ }
++j;
}
}
@@ -625,7 +690,17 @@ void CairoOutputDev::doPath(cairo_t *cairo, GfxState *state, GfxPath *path) {
}
void CairoOutputDev::stroke(GfxState *state) {
+ if (inType3Char) {
+ GfxGray gray;
+ state->getFillGray(&gray);
+ if (colToDbl(gray) > 0.5)
+ return;
+ }
+
+ if (adjusted_stroke_width)
+ align_stroke_coords = gTrue;
doPath (cairo, state, state->getPath());
+ align_stroke_coords = gFalse;
cairo_set_source (cairo, stroke_pattern);
LOG(printf ("stroke\n"));
cairo_stroke (cairo);
@@ -636,12 +711,26 @@ void CairoOutputDev::stroke(GfxState *state) {
}
void CairoOutputDev::fill(GfxState *state) {
+ if (inType3Char) {
+ GfxGray gray;
+ state->getFillGray(&gray);
+ if (colToDbl(gray) > 0.5)
+ return;
+ }
+
doPath (cairo, state, state->getPath());
cairo_set_fill_rule (cairo, CAIRO_FILL_RULE_WINDING);
cairo_set_source (cairo, fill_pattern);
LOG(printf ("fill\n"));
//XXX: how do we get the path
- cairo_fill (cairo);
+ if (mask) {
+ cairo_clip (cairo);
+ cairo_mask (cairo, mask);
+ } else if (strokePathClip) {
+ fillToStrokePathClip();
+ } else {
+ cairo_fill (cairo);
+ }
if (cairo_shape) {
cairo_set_fill_rule (cairo_shape, CAIRO_FILL_RULE_WINDING);
doPath (cairo_shape, state, state->getPath());
@@ -664,8 +753,8 @@ void CairoOutputDev::eoFill(GfxState *state) {
}
-GBool CairoOutputDev::tilingPatternFill(GfxState *state, Object *str,
- int paintType, Dict *resDict,
+GBool CairoOutputDev::tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
+ double *pmat, int paintType, int /*tilingType*/, Dict *resDict,
double *mat, double *bbox,
int x0, int y0, int x1, int y1,
double xStep, double yStep)
@@ -677,14 +766,23 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Object *str,
cairo_matrix_t matrix;
cairo_t *old_cairo;
double xMin, yMin, xMax, yMax;
+ double width, height;
+ int surface_width, surface_height;
+ StrokePathClip *strokePathTmp;
+
+ width = bbox[2] - bbox[0];
+ height = bbox[3] - bbox[1];
- if (xStep != bbox[2] || yStep != bbox[3])
+ if (xStep != width || yStep != height)
return gFalse;
/* TODO: implement the other cases here too */
+ surface_width = (int) ceil (width);
+ surface_height = (int) ceil (height);
+
surface = cairo_surface_create_similar (cairo_get_target (cairo),
CAIRO_CONTENT_COLOR_ALPHA,
- bbox[2], bbox[3]);
+ surface_width, surface_height);
if (cairo_surface_status (surface))
return gFalse;
@@ -694,9 +792,12 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Object *str,
box.x1 = bbox[0]; box.y1 = bbox[1];
box.x2 = bbox[2]; box.y2 = bbox[3];
+ strokePathTmp = strokePathClip;
+ strokePathClip = NULL;
gfx = new Gfx(xref, this, resDict, catalog, &box, NULL);
gfx->display(str);
delete gfx;
+ strokePathClip = strokePathTmp;
pattern = cairo_pattern_create_for_surface (cairo_get_target (cairo));
cairo_destroy (cairo);
@@ -707,11 +808,18 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Object *str,
state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax);
cairo_rectangle (cairo, xMin, yMin, xMax - xMin, yMax - yMin);
+ cairo_matrix_init_scale (&matrix, surface_width / width, surface_height / height);
+ cairo_pattern_set_matrix (pattern, &matrix);
+
cairo_matrix_init (&matrix, mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
cairo_transform (cairo, &matrix);
cairo_set_source (cairo, pattern);
cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
- cairo_fill (cairo);
+ if (strokePathClip) {
+ fillToStrokePathClip();
+ } else {
+ cairo_fill (cairo);
+ }
cairo_pattern_destroy (pattern);
@@ -734,6 +842,8 @@ GBool CairoOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading,
else
cairo_pattern_set_extend (fill_pattern, CAIRO_EXTEND_PAD);
+ LOG (printf ("axial-sh\n"));
+
// TODO: use the actual stops in the shading in the case
// of linear interpolation (Type 2 Exponential functions with N=1)
return gFalse;
@@ -764,6 +874,8 @@ GBool CairoOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shadin
else
cairo_pattern_set_extend (fill_pattern, CAIRO_EXTEND_NONE);
+ LOG (printf ("radial-sh\n"));
+
return gFalse;
}
@@ -772,6 +884,145 @@ GBool CairoOutputDev::radialShadedSupportExtend(GfxState *state, GfxRadialShadin
return (shading->getExtend0() == shading->getExtend1());
}
+#if CAIRO_VERSION == CAIRO_VERSION_ENCODE(1, 11, 2)
+GBool CairoOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading)
+{
+ double x0, y0, x1, y1, x2, y2;
+ GfxColor color[3];
+ int i, j;
+ GfxRGB rgb;
+
+ cairo_pattern_destroy(fill_pattern);
+ fill_pattern = cairo_pattern_create_mesh ();
+
+ for (i = 0; i < shading->getNTriangles(); i++) {
+ shading->getTriangle(i,
+ &x0, &y0, &color[0],
+ &x1, &y1, &color[1],
+ &x2, &y2, &color[2]);
+
+ cairo_pattern_mesh_begin_patch (fill_pattern);
+
+ cairo_pattern_mesh_move_to (fill_pattern, x0, y0);
+ cairo_pattern_mesh_line_to (fill_pattern, x1, y1);
+ cairo_pattern_mesh_line_to (fill_pattern, x2, y2);
+
+ for (j = 0; j < 3; j++) {
+ shading->getColorSpace()->getRGB(&color[j], &rgb);
+ cairo_pattern_mesh_set_corner_color_rgb (fill_pattern, j,
+ colToDbl(rgb.r),
+ colToDbl(rgb.g),
+ colToDbl(rgb.b));
+ }
+
+ cairo_pattern_mesh_end_patch (fill_pattern);
+ }
+
+ double xMin, yMin, xMax, yMax;
+ // get the clip region bbox
+ state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax);
+ state->moveTo(xMin, yMin);
+ state->lineTo(xMin, yMax);
+ state->lineTo(xMax, yMax);
+ state->lineTo(xMax, yMin);
+ state->closePath();
+ fill(state);
+ state->clearPath();
+
+ return gTrue;
+}
+
+GBool CairoOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading)
+{
+ int i, j, k;
+
+ cairo_pattern_destroy(fill_pattern);
+ fill_pattern = cairo_pattern_create_mesh ();
+
+ for (i = 0; i < shading->getNPatches(); i++) {
+ GfxPatch *patch = shading->getPatch(i);
+ GfxColor color;
+ GfxRGB rgb;
+
+ cairo_pattern_mesh_begin_patch (fill_pattern);
+
+ cairo_pattern_mesh_move_to (fill_pattern, patch->x[0][0], patch->y[0][0]);
+ cairo_pattern_mesh_curve_to (fill_pattern,
+ patch->x[0][1], patch->y[0][1],
+ patch->x[0][2], patch->y[0][2],
+ patch->x[0][3], patch->y[0][3]);
+
+ cairo_pattern_mesh_curve_to (fill_pattern,
+ patch->x[1][3], patch->y[1][3],
+ patch->x[2][3], patch->y[2][3],
+ patch->x[3][3], patch->y[3][3]);
+
+ cairo_pattern_mesh_curve_to (fill_pattern,
+ patch->x[3][2], patch->y[3][2],
+ patch->x[3][1], patch->y[3][1],
+ patch->x[3][0], patch->y[3][0]);
+
+ cairo_pattern_mesh_curve_to (fill_pattern,
+ patch->x[2][0], patch->y[2][0],
+ patch->x[1][0], patch->y[1][0],
+ patch->x[0][0], patch->y[0][0]);
+
+ cairo_pattern_mesh_set_control_point (fill_pattern, 0, patch->x[1][1], patch->y[1][1]);
+ cairo_pattern_mesh_set_control_point (fill_pattern, 1, patch->x[1][2], patch->y[1][2]);
+ cairo_pattern_mesh_set_control_point (fill_pattern, 2, patch->x[2][2], patch->y[2][2]);
+ cairo_pattern_mesh_set_control_point (fill_pattern, 3, patch->x[2][1], patch->y[2][1]);
+
+ for (j = 0; j < 4; j++) {
+ int u, v;
+
+ switch (j) {
+ case 0:
+ u = 0; v = 0;
+ break;
+ case 1:
+ u = 0; v = 1;
+ break;
+ case 2:
+ u = 1; v = 1;
+ break;
+ case 3:
+ u = 1; v = 0;
+ break;
+ }
+
+ if (shading->isParameterized()) {
+ shading->getParameterizedColor (patch->color[u][v].c[0], &color);
+ } else {
+ for (k = 0; k < shading->getColorSpace()->getNComps(); k++) {
+ // simply cast to the desired type; that's all what is needed.
+ color.c[k] = GfxColorComp (patch->color[u][v].c[k]);
+ }
+ }
+
+ shading->getColorSpace()->getRGB(&color, &rgb);
+ cairo_pattern_mesh_set_corner_color_rgb (fill_pattern, j,
+ colToDbl(rgb.r),
+ colToDbl(rgb.g),
+ colToDbl(rgb.b));
+ }
+ cairo_pattern_mesh_end_patch (fill_pattern);
+ }
+
+ double xMin, yMin, xMax, yMax;
+ // get the clip region bbox
+ state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax);
+ state->moveTo(xMin, yMin);
+ state->lineTo(xMin, yMax);
+ state->lineTo(xMax, yMax);
+ state->lineTo(xMax, yMin);
+ state->closePath();
+ fill(state);
+ state->clearPath();
+
+ return gTrue;
+}
+#endif /* CAIRO_VERSION == CAIRO_VERSION_ENCODE(1, 11, 2) */
+
void CairoOutputDev::clip(GfxState *state) {
doPath (cairo, state, state->getPath());
cairo_set_fill_rule (cairo, CAIRO_FILL_RULE_WINDING);
@@ -797,6 +1048,49 @@ void CairoOutputDev::eoClip(GfxState *state) {
}
+void CairoOutputDev::clipToStrokePath(GfxState *state) {
+ LOG(printf("clip-to-stroke-path\n"));
+ strokePathClip = (StrokePathClip*)gmalloc (sizeof(*strokePathClip));
+ doPath (cairo, state, state->getPath());
+ strokePathClip->path = cairo_copy_path (cairo);
+ cairo_get_matrix (cairo, &strokePathClip->ctm);
+ strokePathClip->line_width = cairo_get_line_width (cairo);
+ strokePathClip->dash_count = cairo_get_dash_count (cairo);
+ if (strokePathClip->dash_count) {
+ strokePathClip->dashes = (double*) gmallocn (sizeof(double), strokePathClip->dash_count);
+ cairo_get_dash (cairo, strokePathClip->dashes, &strokePathClip->dash_offset);
+ } else {
+ strokePathClip->dashes = NULL;
+ }
+ strokePathClip->cap = cairo_get_line_cap (cairo);
+ strokePathClip->join = cairo_get_line_join (cairo);
+ strokePathClip->miter = cairo_get_miter_limit (cairo);
+}
+
+void CairoOutputDev::fillToStrokePathClip() {
+ cairo_save (cairo);
+
+ cairo_set_matrix (cairo, &strokePathClip->ctm);
+ cairo_set_line_width (cairo, strokePathClip->line_width);
+ strokePathClip->dash_count = cairo_get_dash_count (cairo);
+ cairo_set_dash (cairo, strokePathClip->dashes, strokePathClip->dash_count, strokePathClip->dash_offset);
+ cairo_set_line_cap (cairo, strokePathClip->cap);
+ cairo_set_line_join (cairo, strokePathClip->join);
+ cairo_set_miter_limit (cairo, strokePathClip->miter);
+
+ cairo_new_path (cairo);
+ cairo_append_path (cairo, strokePathClip->path);
+ cairo_stroke (cairo);
+
+ cairo_restore (cairo);
+
+ cairo_path_destroy (strokePathClip->path);
+ if (strokePathClip->dashes)
+ gfree (strokePathClip->dashes);
+ gfree (strokePathClip);
+ strokePathClip = NULL;
+}
+
void CairoOutputDev::beginString(GfxState *state, GooString *s)
{
int len = s->getLength();
@@ -809,6 +1103,13 @@ void CairoOutputDev::beginString(GfxState *state, GooString *s)
glyphs = (cairo_glyph_t *) gmallocn (len, sizeof (cairo_glyph_t));
glyphCount = 0;
+ if (use_show_text_glyphs) {
+ clusters = (cairo_text_cluster_t *) gmallocn (len, sizeof (cairo_text_cluster_t));
+ clusterCount = 0;
+ utf8Max = len*2; // start with twice the number of glyphs. we will realloc if we need more.
+ utf8 = (char *) gmalloc (utf8Max);
+ utf8Count = 0;
+ }
}
void CairoOutputDev::drawChar(GfxState *state, double x, double y,
@@ -821,6 +1122,24 @@ void CairoOutputDev::drawChar(GfxState *state, double x, double y,
glyphs[glyphCount].x = x - originX;
glyphs[glyphCount].y = y - originY;
glyphCount++;
+ if (use_show_text_glyphs) {
+ if (utf8Max - utf8Count < uLen*6) {
+ // utf8 encoded characters can be up to 6 bytes
+ if (utf8Max > uLen*6)
+ utf8Max *= 2;
+ else
+ utf8Max += 2*uLen*6;
+ utf8 = (char *) grealloc (utf8, utf8Max);
+ }
+ clusters[clusterCount].num_bytes = 0;
+ for (int i = 0; i < uLen; i++) {
+ int size = mapUTF8 (u[i], utf8 + utf8Count, utf8Max - utf8Count);
+ utf8Count += size;
+ clusters[clusterCount].num_bytes += size;
+ }
+ clusters[clusterCount].num_glyphs = 1;
+ clusterCount++;
+ }
}
if (!text)
@@ -849,15 +1168,18 @@ void CairoOutputDev::endString(GfxState *state)
glyphs = NULL;
return;
}
-
- if (!(render & 1)) {
+
+ if (!(render & 1) && !haveCSPattern) {
LOG (printf ("fill string\n"));
cairo_set_source (cairo, fill_pattern);
- cairo_show_glyphs (cairo, glyphs, glyphCount);
+ if (use_show_text_glyphs)
+ cairo_show_text_glyphs (cairo, utf8, utf8Count, glyphs, glyphCount, clusters, clusterCount, (cairo_text_cluster_flags_t)0);
+ else
+ cairo_show_glyphs (cairo, glyphs, glyphCount);
if (cairo_shape)
cairo_show_glyphs (cairo_shape, glyphs, glyphCount);
}
-
+
// stroke
if ((render & 3) == 1 || (render & 3) == 2) {
LOG (printf ("stroke string\n"));
@@ -871,7 +1193,7 @@ void CairoOutputDev::endString(GfxState *state)
}
// clip
- if (render & 4) {
+ if (haveCSPattern || (render & 4)) {
LOG (printf ("clip string\n"));
// append the glyph path to textClipPath.
@@ -898,6 +1220,12 @@ void CairoOutputDev::endString(GfxState *state)
gfree (glyphs);
glyphs = NULL;
+ if (use_show_text_glyphs) {
+ gfree (clusters);
+ clusters = NULL;
+ gfree (utf8);
+ utf8 = NULL;
+ }
}
@@ -955,17 +1283,14 @@ void CairoOutputDev::type3D1(GfxState *state, double wx, double wy,
}
void CairoOutputDev::beginTextObject(GfxState *state) {
- if (state->getFillColorSpace()->getMode() == csPattern) {
+ if (!(state->getRender() & 4) && state->getFillColorSpace()->getMode() == csPattern) {
haveCSPattern = gTrue;
saveState(state);
- savedRender = state->getRender();
- state->setRender(7); // Set clip to text path
}
}
void CairoOutputDev::endTextObject(GfxState *state) {
if (haveCSPattern) {
- state->setRender(savedRender);
haveCSPattern = gFalse;
if (state->getFillColorSpace()->getMode() != csPattern) {
if (textClipPath) {
@@ -1065,6 +1390,9 @@ void CairoOutputDev::beginTransparencyGroup(GfxState * /*state*/, double * /*bbo
css->knockout = knockout;
css->next = groupColorSpaceStack;
groupColorSpaceStack = css;
+
+ LOG(printf ("begin transparency group. knockout: %s\n", knockout ? "yes":"no"));
+
if (knockout) {
knockoutCount++;
if (!cairo_shape) {
@@ -1102,11 +1430,12 @@ void CairoOutputDev::beginTransparencyGroup(GfxState * /*state*/, double * /*bbo
}
void CairoOutputDev::endTransparencyGroup(GfxState * /*state*/) {
-
if (group)
cairo_pattern_destroy(group);
group = cairo_pop_group (cairo);
+ LOG(printf ("end transparency group\n"));
+
if (groupColorSpaceStack->next && groupColorSpaceStack->next->knockout) {
if (shape)
cairo_pattern_destroy(shape);
@@ -1117,6 +1446,8 @@ void CairoOutputDev::endTransparencyGroup(GfxState * /*state*/) {
void CairoOutputDev::paintTransparencyGroup(GfxState * /*state*/, double * /*bbox*/) {
cairo_set_source (cairo, group);
+ LOG(printf ("paint transparency group\n"));
+
if (!mask) {
//XXX: deal with mask && shape case
if (shape) {
@@ -1155,8 +1486,6 @@ void CairoOutputDev::paintTransparencyGroup(GfxState * /*state*/, double * /*bbo
popTransparencyGroup();
}
-typedef unsigned int uint32_t;
-
static uint32_t luminocity(uint32_t x)
{
int r = (x >> 16) & 0xff;
@@ -1173,6 +1502,8 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
Function * transferFunc, GfxColor * backdropColor) {
cairo_pattern_destroy(mask);
+ LOG(printf ("set softMask\n"));
+
if (alpha == false) {
/* We need to mask according to the luminocity of the group.
* So we paint the group to an image surface convert it to a luminocity map
@@ -1204,10 +1535,11 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
GfxRGB backdropColorRGB;
groupColorSpaceStack->cs->getRGB(backdropColor, &backdropColorRGB);
/* paint the backdrop */
- cairo_set_source_rgb(maskCtx, backdropColorRGB.r / 65535.0,
- backdropColorRGB.g / 65535.0,
- backdropColorRGB.b / 65535.0);
-
+ cairo_set_source_rgb(maskCtx,
+ colToDbl(backdropColorRGB.r),
+ colToDbl(backdropColorRGB.g),
+ colToDbl(backdropColorRGB.b));
+ cairo_paint(maskCtx);
cairo_matrix_t mat;
cairo_get_matrix(cairo, &mat);
@@ -1215,9 +1547,13 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
/* make the device offset of the new mask match that of the group */
double x_offset, y_offset;
- cairo_surface_t *pats;
- cairo_pattern_get_surface(group, &pats);
- cairo_surface_get_device_offset(pats, &x_offset, &y_offset);
+ if (cairo_get_group_target(cairo) == cairo_get_target(cairo)) {
+ cairo_surface_get_device_offset(cairo_get_group_target(cairo), &x_offset, &y_offset);
+ } else {
+ cairo_surface_t *pats;
+ cairo_pattern_get_surface(group, &pats);
+ cairo_surface_get_device_offset(pats, &x_offset, &y_offset);
+ }
cairo_surface_set_device_offset(source, x_offset, y_offset);
/* paint the group */
@@ -1252,9 +1588,14 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
/* setup the new mask pattern */
mask = cairo_pattern_create_for_surface(source);
- cairo_matrix_t patMatrix;
- cairo_pattern_get_matrix(group, &patMatrix);
- cairo_pattern_set_matrix(mask, &patMatrix);
+
+ if (cairo_get_group_target(cairo) == cairo_get_target(cairo)) {
+ cairo_pattern_set_matrix(mask, &mat);
+ } else {
+ cairo_matrix_t patMatrix;
+ cairo_pattern_get_matrix(group, &patMatrix);
+ cairo_pattern_set_matrix(mask, &patMatrix);
+ }
cairo_surface_destroy(source);
} else {
@@ -1291,6 +1632,137 @@ void CairoOutputDev::endMaskClip(GfxState *state) {
clearSoftMask(state);
}
+/* Taken from cairo/doc/tutorial/src/singular.c */
+static void
+get_singular_values (const cairo_matrix_t *matrix,
+ double *major,
+ double *minor)
+{
+ double xx = matrix->xx, xy = matrix->xy;
+ double yx = matrix->yx, yy = matrix->yy;
+
+ double a = xx*xx+yx*yx;
+ double b = xy*xy+yy*yy;
+ double k = xx*xy+yx*yy;
+
+ double f = (a+b) * .5;
+ double g = (a-b) * .5;
+ double delta = sqrt (g*g + k*k);
+
+ if (major)
+ *major = sqrt (f + delta);
+ if (minor)
+ *minor = sqrt (f - delta);
+}
+
+void CairoOutputDev::getScaledSize(int orig_width,
+ int orig_height,
+ int *scaledWidth,
+ int *scaledHeight) {
+ cairo_matrix_t matrix;
+ cairo_get_matrix(cairo, &matrix);
+
+ double xScale;
+ double yScale;
+ if (orig_width > orig_height)
+ get_singular_values (&matrix, &xScale, &yScale);
+ else
+ get_singular_values (&matrix, &yScale, &xScale);
+
+ int tx, tx2, ty, ty2; /* the integer co-oridinates of the resulting image */
+ if (xScale >= 0) {
+ tx = splashRound(matrix.x0 - 0.01);
+ tx2 = splashRound(matrix.x0 + xScale + 0.01) - 1;
+ } else {
+ tx = splashRound(matrix.x0 + 0.01) - 1;
+ tx2 = splashRound(matrix.x0 + xScale - 0.01);
+ }
+ *scaledWidth = abs(tx2 - tx) + 1;
+ //scaledWidth = splashRound(fabs(xScale));
+ if (*scaledWidth == 0) {
+ // technically, this should draw nothing, but it generally seems
+ // better to draw a one-pixel-wide stripe rather than throwing it
+ // away
+ *scaledWidth = 1;
+ }
+ if (yScale >= 0) {
+ ty = splashFloor(matrix.y0 + 0.01);
+ ty2 = splashCeil(matrix.y0 + yScale - 0.01);
+ } else {
+ ty = splashCeil(matrix.y0 - 0.01);
+ ty2 = splashFloor(matrix.y0 + yScale + 0.01);
+ }
+ *scaledHeight = abs(ty2 - ty);
+ if (*scaledHeight == 0) {
+ *scaledHeight = 1;
+ }
+}
+
+cairo_surface_t *CairoOutputDev::downscaleSurface(cairo_surface_t *orig_surface) {
+ cairo_surface_t *dest_surface;
+ unsigned char *dest_buffer;
+ int dest_stride;
+ unsigned char *orig_buffer;
+ int orig_width, orig_height;
+ int orig_stride;
+ int scaledHeight;
+ int scaledWidth;
+ GBool res;
+
+ if (printing)
+ return NULL;
+
+ orig_width = cairo_image_surface_get_width (orig_surface);
+ orig_height = cairo_image_surface_get_height (orig_surface);
+ getScaledSize (orig_width, orig_height, &scaledWidth, &scaledHeight);
+ if (scaledWidth >= orig_width || scaledHeight >= orig_height)
+ return NULL;
+
+ dest_surface = cairo_surface_create_similar (orig_surface,
+ cairo_surface_get_content (orig_surface),
+ scaledWidth, scaledHeight);
+ dest_buffer = cairo_image_surface_get_data (dest_surface);
+ dest_stride = cairo_image_surface_get_stride (dest_surface);
+
+ orig_buffer = cairo_image_surface_get_data (orig_surface);
+ orig_stride = cairo_image_surface_get_stride (orig_surface);
+
+ res = downscale_box_filter((uint32_t *)orig_buffer,
+ orig_stride, orig_width, orig_height,
+ scaledWidth, scaledHeight, 0, 0,
+ scaledWidth, scaledHeight,
+ (uint32_t *)dest_buffer, dest_stride);
+ if (!res) {
+ cairo_surface_destroy (dest_surface);
+ return NULL;
+ }
+
+ return dest_surface;
+
+}
+
+cairo_filter_t
+CairoOutputDev::getFilterForSurface(cairo_surface_t *image,
+ GBool interpolate)
+{
+ if (interpolate)
+ return CAIRO_FILTER_BILINEAR;
+
+ int orig_width = cairo_image_surface_get_width (image);
+ int orig_height = cairo_image_surface_get_height (image);
+ if (orig_width == 0 || orig_height == 0)
+ return CAIRO_FILTER_NEAREST;
+
+ int scaled_width, scaled_height;
+ getScaledSize (orig_width, orig_height, &scaled_width, &scaled_height);
+
+ /* When scale factor is >= 400% we don't interpolate. See bugs #25268, #9860 */
+ if (scaled_width / orig_width >= 4 || scaled_height / orig_height >= 4)
+ return CAIRO_FILTER_NEAREST;
+
+ return CAIRO_FILTER_BILINEAR;
+}
+
void CairoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert,
GBool interpolate, GBool inlineImg) {
@@ -1300,6 +1772,20 @@ void CairoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
/* work around a cairo bug when scaling 1x1 surfaces */
if (width == 1 && height == 1) {
+ ImageStream *imgStr;
+ Guchar pix;
+ int invert_bit;
+
+ imgStr = new ImageStream(str, width, 1, 1);
+ imgStr->reset();
+ imgStr->getPixel(&pix);
+ imgStr->close();
+ delete imgStr;
+
+ invert_bit = invert ? 1 : 0;
+ if (pix ^ invert_bit)
+ return;
+
cairo_save (cairo);
cairo_rectangle (cairo, 0., 0., width, height);
cairo_fill (cairo);
@@ -1313,6 +1799,9 @@ void CairoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
return;
}
+ if (state->getFillColorSpace()->getMode() == csPattern)
+ cairo_push_group_with_content (cairo, CAIRO_CONTENT_ALPHA);
+
/* shape is 1.0 for painted areas, 0.0 for unpainted ones */
cairo_matrix_t matrix;
@@ -1324,6 +1813,12 @@ void CairoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
} else {
drawImageMaskRegular(state, ref, str, width, height, invert, interpolate, inlineImg);
}
+
+ if (state->getFillColorSpace()->getMode() == csPattern) {
+ if (mask)
+ cairo_pattern_destroy (mask);
+ mask = cairo_pop_group (cairo);
+ }
}
void CairoOutputDev::drawImageMaskRegular(GfxState *state, Object *ref, Stream *str,
@@ -1333,18 +1828,19 @@ void CairoOutputDev::drawImageMaskRegular(GfxState *state, Object *ref, Stream *
unsigned char *dest;
cairo_surface_t *image;
cairo_pattern_t *pattern;
- int x, y;
+ int x, y, i, bit;
ImageStream *imgStr;
Guchar *pix;
cairo_matrix_t matrix;
int invert_bit;
int row_stride;
+ cairo_filter_t filter;
/* TODO: Do we want to cache these? */
imgStr = new ImageStream(str, width, 1, 1);
imgStr->reset();
- image = cairo_image_surface_create (CAIRO_FORMAT_A8, width, height);
+ image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
if (cairo_surface_status (image))
goto cleanup;
@@ -1356,15 +1852,28 @@ void CairoOutputDev::drawImageMaskRegular(GfxState *state, Object *ref, Stream *
for (y = 0; y < height; y++) {
pix = imgStr->getLine();
dest = buffer + y * row_stride;
+ i = 0;
+ bit = 0;
for (x = 0; x < width; x++) {
-
- if (pix[x] ^ invert_bit)
- *dest++ = 0;
- else
- *dest++ = 255;
+ if (bit == 0)
+ dest[i] = 0;
+ if (!(pix[x] ^ invert_bit)) {
+#ifdef WORDS_BIGENDIAN
+ dest[i] |= (1 << (7 - bit));
+#else
+ dest[i] |= (1 << bit);
+#endif
+ }
+ bit++;
+ if (bit > 7) {
+ bit = 0;
+ i++;
+ }
}
}
+ filter = getFilterForSurface (image, interpolate);
+
cairo_surface_mark_dirty (image);
pattern = cairo_pattern_create_for_surface (image);
cairo_surface_destroy (image);
@@ -1373,32 +1882,40 @@ void CairoOutputDev::drawImageMaskRegular(GfxState *state, Object *ref, Stream *
LOG (printf ("drawImageMask %dx%d\n", width, height));
- /* we should actually be using CAIRO_FILTER_NEAREST here. However,
- * cairo doesn't yet do minifaction filtering causing scaled down
- * images with CAIRO_FILTER_NEAREST to look really bad */
- cairo_pattern_set_filter (pattern,
- interpolate ? CAIRO_FILTER_BEST : CAIRO_FILTER_FAST);
- cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
+ cairo_pattern_set_filter (pattern, filter);
+
+ if (!printing)
+ cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
cairo_matrix_init_translate (&matrix, 0, height);
cairo_matrix_scale (&matrix, width, -height);
cairo_pattern_set_matrix (pattern, &matrix);
+ if (cairo_pattern_status (pattern)) {
+ cairo_pattern_destroy (pattern);
+ goto cleanup;
+ }
if (state->getFillColorSpace()->getMode() == csPattern) {
mask = cairo_pattern_reference (pattern);
- } else {
+ } else if (!printing) {
cairo_save (cairo);
cairo_rectangle (cairo, 0., 0., 1., 1.);
cairo_clip (cairo);
cairo_mask (cairo, pattern);
cairo_restore (cairo);
+ } else {
+ cairo_mask (cairo, pattern);
}
if (cairo_shape) {
cairo_save (cairo_shape);
cairo_set_source (cairo_shape, pattern);
- cairo_rectangle (cairo_shape, 0., 0., 1., 1.);
- cairo_fill (cairo_shape);
+ if (!printing) {
+ cairo_rectangle (cairo_shape, 0., 0., 1., 1.);
+ cairo_fill (cairo_shape);
+ } else {
+ cairo_mask (cairo_shape, pattern);
+ }
cairo_restore (cairo_shape);
}
@@ -1644,6 +2161,12 @@ void CairoOutputDev::drawImageMaskPrescaled(GfxState *state, Object *ref, Stream
cairo_matrix_init_translate (&matrix, 0, scaledHeight);
cairo_matrix_scale (&matrix, scaledWidth, -scaledHeight);
cairo_pattern_set_matrix (pattern, &matrix);
+ if (cairo_pattern_status (pattern)) {
+ cairo_pattern_destroy (pattern);
+ imgStr->close();
+ delete imgStr;
+ return;
+ }
mask = cairo_pattern_reference (pattern);
} else {
@@ -1711,6 +2234,8 @@ void CairoOutputDev::drawMaskedImage(GfxState *state, Object *ref,
Guchar *pix;
int x, y;
int invert_bit;
+ cairo_filter_t filter;
+ cairo_filter_t maskFilter;
maskImgStr = new ImageStream(maskStr, maskWidth, 1, 1);
maskImgStr->reset();
@@ -1741,6 +2266,8 @@ void CairoOutputDev::drawMaskedImage(GfxState *state, Object *ref,
maskImgStr->close();
delete maskImgStr;
+ maskFilter = getFilterForSurface (maskImage, maskInterpolate);
+
cairo_surface_mark_dirty (maskImage);
maskPattern = cairo_pattern_create_for_surface (maskImage);
cairo_surface_destroy (maskImage);
@@ -1774,6 +2301,8 @@ void CairoOutputDev::drawMaskedImage(GfxState *state, Object *ref,
colorMap->getRGBLine (pix, dest, width);
}
+ filter = getFilterForSurface (image, interpolate);
+
cairo_surface_mark_dirty (image);
pattern = cairo_pattern_create_for_surface (image);
cairo_surface_destroy (image);
@@ -1782,33 +2311,53 @@ void CairoOutputDev::drawMaskedImage(GfxState *state, Object *ref,
LOG (printf ("drawMaskedImage %dx%d\n", width, height));
- cairo_pattern_set_filter (pattern,
- interpolate ? CAIRO_FILTER_BILINEAR : CAIRO_FILTER_FAST);
- cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
- cairo_pattern_set_filter (maskPattern,
- maskInterpolate ? CAIRO_FILTER_BILINEAR : CAIRO_FILTER_FAST);
- cairo_pattern_set_extend (maskPattern, CAIRO_EXTEND_PAD);
+ cairo_pattern_set_filter (pattern, filter);
+ cairo_pattern_set_filter (maskPattern, maskFilter);
+
+ if (!printing) {
+ cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
+ cairo_pattern_set_extend (maskPattern, CAIRO_EXTEND_PAD);
+ }
cairo_matrix_init_translate (&matrix, 0, height);
cairo_matrix_scale (&matrix, width, -height);
cairo_pattern_set_matrix (pattern, &matrix);
+ if (cairo_pattern_status (pattern)) {
+ cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (maskPattern);
+ goto cleanup;
+ }
cairo_matrix_init_translate (&maskMatrix, 0, maskHeight);
cairo_matrix_scale (&maskMatrix, maskWidth, -maskHeight);
cairo_pattern_set_matrix (maskPattern, &maskMatrix);
+ if (cairo_pattern_status (maskPattern)) {
+ cairo_pattern_destroy (maskPattern);
+ cairo_pattern_destroy (pattern);
+ goto cleanup;
+ }
- cairo_save (cairo);
- cairo_set_source (cairo, pattern);
- cairo_rectangle (cairo, 0., 0., 1., 1.);
- cairo_clip (cairo);
- cairo_mask (cairo, maskPattern);
- cairo_restore (cairo);
+ if (!printing) {
+ cairo_save (cairo);
+ cairo_set_source (cairo, pattern);
+ cairo_rectangle (cairo, 0., 0., 1., 1.);
+ cairo_clip (cairo);
+ cairo_mask (cairo, maskPattern);
+ cairo_restore (cairo);
+ } else {
+ cairo_set_source (cairo, pattern);
+ cairo_mask (cairo, maskPattern);
+ }
if (cairo_shape) {
cairo_save (cairo_shape);
cairo_set_source (cairo_shape, pattern);
- cairo_rectangle (cairo_shape, 0., 0., 1., 1.);
- cairo_fill (cairo_shape);
+ if (!printing) {
+ cairo_rectangle (cairo_shape, 0., 0., 1., 1.);
+ cairo_fill (cairo_shape);
+ } else {
+ cairo_mask (cairo_shape, pattern);
+ }
cairo_restore (cairo_shape);
}
@@ -1841,6 +2390,8 @@ void CairoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *s
cairo_matrix_t maskMatrix, matrix;
Guchar *pix;
int y;
+ cairo_filter_t filter;
+ cairo_filter_t maskFilter;
maskImgStr = new ImageStream(maskStr, maskWidth,
maskColorMap->getNumPixelComps(),
@@ -1865,6 +2416,8 @@ void CairoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *s
maskImgStr->close();
delete maskImgStr;
+ maskFilter = getFilterForSurface (maskImage, maskInterpolate);
+
cairo_surface_mark_dirty (maskImage);
maskPattern = cairo_pattern_create_for_surface (maskImage);
cairo_surface_destroy (maskImage);
@@ -1898,7 +2451,12 @@ void CairoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *s
colorMap->getRGBLine (pix, dest, width);
}
+ filter = getFilterForSurface (image, interpolate);
+
cairo_surface_mark_dirty (image);
+
+ setMimeData(str, ref, image);
+
pattern = cairo_pattern_create_for_surface (image);
cairo_surface_destroy (image);
if (cairo_pattern_status (pattern))
@@ -1906,38 +2464,70 @@ void CairoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *s
LOG (printf ("drawSoftMaskedImage %dx%d\n", width, height));
- //XXX: should set mask filter
- cairo_pattern_set_filter (pattern,
- interpolate ? CAIRO_FILTER_BILINEAR : CAIRO_FILTER_FAST);
- cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
- cairo_pattern_set_filter (maskPattern,
- maskInterpolate ? CAIRO_FILTER_BILINEAR : CAIRO_FILTER_FAST);
- cairo_pattern_set_extend (maskPattern, CAIRO_EXTEND_PAD);
+ cairo_pattern_set_filter (pattern, filter);
+ cairo_pattern_set_filter (maskPattern, maskFilter);
+
+ if (!printing) {
+ cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
+ cairo_pattern_set_extend (maskPattern, CAIRO_EXTEND_PAD);
+ }
cairo_matrix_init_translate (&matrix, 0, height);
cairo_matrix_scale (&matrix, width, -height);
cairo_pattern_set_matrix (pattern, &matrix);
+ if (cairo_pattern_status (pattern)) {
+ cairo_pattern_destroy (pattern);
+ cairo_pattern_destroy (maskPattern);
+ goto cleanup;
+ }
cairo_matrix_init_translate (&maskMatrix, 0, maskHeight);
cairo_matrix_scale (&maskMatrix, maskWidth, -maskHeight);
cairo_pattern_set_matrix (maskPattern, &maskMatrix);
+ if (cairo_pattern_status (maskPattern)) {
+ cairo_pattern_destroy (maskPattern);
+ cairo_pattern_destroy (pattern);
+ goto cleanup;
+ }
+
+ if (fill_opacity != 1.0)
+ cairo_push_group (cairo);
+ else
+ cairo_save (cairo);
- cairo_save (cairo);
cairo_set_source (cairo, pattern);
- cairo_rectangle (cairo, 0., 0.,
- MIN (width, maskWidth) / (double)width,
- MIN (height, maskHeight) / (double)height);
- cairo_clip (cairo);
+ if (!printing) {
+ cairo_rectangle (cairo, 0., 0.,
+ MIN (width, maskWidth) / (double)width,
+ MIN (height, maskHeight) / (double)height);
+ cairo_clip (cairo);
+ }
cairo_mask (cairo, maskPattern);
+
+ if (fill_opacity != 1.0) {
+ cairo_pop_group_to_source (cairo);
+ cairo_save (cairo);
+ if (!printing) {
+ cairo_rectangle (cairo, 0., 0.,
+ MIN (width, maskWidth) / (double)width,
+ MIN (height, maskHeight) / (double)height);
+ cairo_clip (cairo);
+ }
+ cairo_paint_with_alpha (cairo, fill_opacity);
+ }
cairo_restore (cairo);
if (cairo_shape) {
cairo_save (cairo_shape);
cairo_set_source (cairo_shape, pattern);
- cairo_rectangle (cairo_shape, 0., 0.,
- MIN (width, maskWidth) / (double)width,
- MIN (height, maskHeight) / (double)height);
- cairo_fill (cairo_shape);
+ if (!printing) {
+ cairo_rectangle (cairo_shape, 0., 0.,
+ MIN (width, maskWidth) / (double)width,
+ MIN (height, maskHeight) / (double)height);
+ cairo_fill (cairo_shape);
+ } else {
+ cairo_mask (cairo_shape, pattern);
+ }
cairo_restore (cairo_shape);
}
@@ -1949,6 +2539,78 @@ cleanup:
delete imgStr;
}
+GBool CairoOutputDev::getStreamData (Stream *str, char **buffer, int *length)
+{
+ int len, i;
+ char *strBuffer;
+
+ len = 0;
+ str->close();
+ str->reset();
+ while (str->getChar() != EOF) len++;
+ if (len == 0)
+ return gFalse;
+
+ strBuffer = (char *)gmalloc (len);
+
+ str->close();
+ str->reset();
+ for (i = 0; i < len; ++i)
+ strBuffer[i] = str->getChar();
+
+ *buffer = strBuffer;
+ *length = len;
+
+ return gTrue;
+}
+
+void CairoOutputDev::setMimeData(Stream *str, Object *ref, cairo_surface_t *image)
+{
+ char *strBuffer;
+ int len;
+ Object obj;
+
+ if (!printing || !(str->getKind() == strDCT || str->getKind() == strJPX))
+ return;
+
+ // colorspace in stream dict may be different from colorspace in jpx
+ // data
+ if (str->getKind() == strJPX) {
+ GBool hasColorSpace = !str->getDict()->lookup("ColorSpace", &obj)->isNull();
+ obj.free();
+ if (hasColorSpace)
+ return;
+ }
+
+ if (getStreamData (str->getNextStream(), &strBuffer, &len)) {
+ cairo_status_t st;
+
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
+ if (ref && ref->isRef()) {
+ Ref imgRef = ref->getRef();
+ GooString *surfaceId = new GooString("poppler-surface-");
+ surfaceId->appendf("{0:d}-{1:d}", imgRef.gen, imgRef.num);
+ char *idBuffer = copyString(surfaceId->getCString());
+ st = cairo_surface_set_mime_data (image, CAIRO_MIME_TYPE_UNIQUE_ID,
+ (const unsigned char *)idBuffer,
+ surfaceId->getLength(),
+ gfree, idBuffer);
+ if (st)
+ gfree(idBuffer);
+ delete surfaceId;
+ }
+#endif
+
+ st = cairo_surface_set_mime_data (image,
+ str->getKind() == strDCT ?
+ CAIRO_MIME_TYPE_JPEG : CAIRO_MIME_TYPE_JP2,
+ (const unsigned char *)strBuffer, len,
+ gfree, strBuffer);
+ if (st)
+ gfree (strBuffer);
+ }
+}
+
void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
@@ -1962,6 +2624,7 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
unsigned char *buffer;
int stride, i;
GfxRGB *lookup = NULL;
+ cairo_filter_t filter = CAIRO_FILTER_BILINEAR;
/* TODO: Do we want to cache these? */
imgStr = new ImageStream(str, width,
@@ -2043,22 +2706,43 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
}
gfree(lookup);
+ LOG (printf ("drawImage %dx%d\n", width, height));
+
+ cairo_surface_t *scaled_surface;
+
+ scaled_surface = downscaleSurface (image);
+ if (scaled_surface) {
+ if (cairo_surface_status (scaled_surface))
+ goto cleanup;
+ cairo_surface_destroy (image);
+ image = scaled_surface;
+ width = cairo_image_surface_get_width (image);
+ height = cairo_image_surface_get_height (image);
+ } else {
+ filter = getFilterForSurface (image, interpolate);
+ }
+
cairo_surface_mark_dirty (image);
+
+ setMimeData(str, ref, image);
+
pattern = cairo_pattern_create_for_surface (image);
cairo_surface_destroy (image);
if (cairo_pattern_status (pattern))
goto cleanup;
- LOG (printf ("drawImage %dx%d\n", width, height));
+ cairo_pattern_set_filter (pattern, filter);
- cairo_pattern_set_filter (pattern,
- interpolate ?
- CAIRO_FILTER_BILINEAR : CAIRO_FILTER_FAST);
- cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
+ if (!printing)
+ cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
cairo_matrix_init_translate (&matrix, 0, height);
cairo_matrix_scale (&matrix, width, -height);
cairo_pattern_set_matrix (pattern, &matrix);
+ if (cairo_pattern_status (pattern)) {
+ cairo_pattern_destroy (pattern);
+ goto cleanup;
+ }
if (!mask && fill_opacity != 1.0) {
maskPattern = cairo_pattern_create_rgba (1., 1., 1., fill_opacity);
@@ -2070,7 +2754,10 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
cairo_save (cairo);
cairo_set_source (cairo, pattern);
- cairo_rectangle (cairo, 0., 0., 1., 1.);
+ if (printing)
+ cairo_rectangle (cairo, 0., 0., width, height);
+ else
+ cairo_rectangle (cairo, 0., 0., 1., 1.);
if (maskPattern) {
cairo_clip (cairo);
cairo_mask (cairo, maskPattern);
@@ -2084,7 +2771,10 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
if (cairo_shape) {
cairo_save (cairo_shape);
cairo_set_source (cairo_shape, pattern);
- cairo_rectangle (cairo_shape, 0., 0., 1., 1.);
+ if (printing)
+ cairo_rectangle (cairo_shape, 0., 0., width, height);
+ else
+ cairo_rectangle (cairo_shape, 0., 0., 1., 1.);
cairo_fill (cairo_shape);
cairo_restore (cairo_shape);
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoOutputDev.h
index fb9c0d7e785..effa9ddd856 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoOutputDev.h
@@ -17,9 +17,10 @@
// Copyright (C) 2005-2008 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-// Copyright (C) 2006-2009 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2008, 2009 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2008, 2009, 2011 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
+// Copyright (C) 2010, 2011 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
@@ -106,7 +107,11 @@ public:
// Does this device use functionShadedFill(), axialShadedFill(), and
// radialShadedFill()? If this returns false, these shaded fills
// will be reduced to a series of other drawing operations.
- virtual GBool useShadedFills() { return gTrue; }
+#if CAIRO_VERSION == CAIRO_VERSION_ENCODE(1, 11, 2)
+ virtual GBool useShadedFills(int type) { return type <= 7; }
+#else
+ virtual GBool useShadedFills(int type) { return type < 4; }
+#endif
// Does this device use FillColorStop()?
virtual GBool useFillColorStop() { return gTrue; }
@@ -123,9 +128,6 @@ public:
// End a page.
virtual void endPage();
- //----- link borders
- virtual void drawLink(Link *link, Catalog *catalog);
-
//----- save/restore graphics state
virtual void saveState(GfxState *state);
virtual void restoreState(GfxState *state);
@@ -150,14 +152,14 @@ public:
//----- update text state
virtual void updateFont(GfxState *state);
- virtual void updateRender(GfxState *state);
//----- path painting
virtual void stroke(GfxState *state);
virtual void fill(GfxState *state);
virtual void eoFill(GfxState *state);
- virtual GBool tilingPatternFill(GfxState *state, Object *str,
- int paintType, Dict *resDict,
+ virtual void clipToStrokePath(GfxState *state);
+ virtual GBool tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
double *mat, double *bbox,
int x0, int y0, int x1, int y1,
double xStep, double yStep);
@@ -165,6 +167,10 @@ public:
virtual GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading);
virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax);
virtual GBool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading);
+#if CAIRO_VERSION == CAIRO_VERSION_ENCODE(1, 11, 2)
+ virtual GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading);
+ virtual GBool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading);
+#endif
//----- path clipping
virtual void clip(GfxState *state);
@@ -268,13 +274,37 @@ public:
protected:
void doPath(cairo_t *cairo, GfxState *state, GfxPath *path);
-
+ cairo_surface_t *downscaleSurface(cairo_surface_t *orig_surface);
+ void getScaledSize(int orig_width, int orig_height,
+ int *scaledWidth, int *scaledHeight);
+ cairo_filter_t getFilterForSurface(cairo_surface_t *image,
+ GBool interpolate);
+ GBool getStreamData (Stream *str, char **buffer, int *length);
+ void setMimeData(Stream *str, Object *ref, cairo_surface_t *image);
+ void fillToStrokePathClip();
+ void alignStrokeCoords(double *x, double *y);
+
GfxRGB fill_color, stroke_color;
cairo_pattern_t *fill_pattern, *stroke_pattern;
double fill_opacity;
double stroke_opacity;
+ GBool stroke_adjust;
+ GBool adjusted_stroke_width;
+ GBool align_stroke_coords;
CairoFont *currentFont;
-
+
+ struct StrokePathClip {
+ cairo_path_t *path;
+ cairo_matrix_t ctm;
+ double line_width;
+ double *dashes;
+ int dash_count;
+ double dash_offset;
+ cairo_line_cap_t cap;
+ cairo_line_join_t join;
+ double miter;
+ } *strokePathClip;
+
XRef *xref; // xref table for current document
Catalog *catalog;
@@ -288,9 +318,15 @@ protected:
cairo_matrix_t orig_matrix;
GBool needFontUpdate; // set when the font needs to be updated
GBool printing;
+ GBool use_show_text_glyphs;
cairo_surface_t *surface;
cairo_glyph_t *glyphs;
int glyphCount;
+ cairo_text_cluster_t *clusters;
+ int clusterCount;
+ char *utf8;
+ int utf8Count;
+ int utf8Max;
cairo_path_t *textClipPath;
GBool inType3Char; // inside a Type 3 CharProc
double t3_glyph_wx, t3_glyph_wy;
@@ -321,7 +357,6 @@ protected:
GBool haveCSPattern; // set if text has been drawn with a
// clipping render mode because of pattern colorspace
- int savedRender; // use if pattern colorspace
};
//------------------------------------------------------------------------
@@ -355,7 +390,11 @@ public:
// Does this device use functionShadedFill(), axialShadedFill(), and
// radialShadedFill()? If this returns false, these shaded fills
// will be reduced to a series of other drawing operations.
- virtual GBool useShadedFills() { return gTrue; }
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
+ virtual GBool useShadedFills(int type) { return type <= 7; }
+#else
+ virtual GBool useShadedFills(int type) { return type < 4; }
+#endif
// Does this device use FillColorStop()?
virtual GBool useFillColorStop() { return gFalse; }
@@ -367,9 +406,6 @@ public:
// Does this device need non-text content?
virtual GBool needNonText() { return gTrue; }
- //----- link borders
- virtual void drawLink(Link *link, Catalog *catalog) { }
-
//----- save/restore graphics state
virtual void saveState(GfxState *state) { }
virtual void restoreState(GfxState *state) { }
@@ -398,8 +434,8 @@ public:
virtual void stroke(GfxState *state) { }
virtual void fill(GfxState *state) { }
virtual void eoFill(GfxState *state) { }
- virtual GBool tilingPatternFill(GfxState *state, Object *str,
- int paintType, Dict *resDict,
+ virtual GBool tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
double *mat, double *bbox,
int x0, int y0, int x1, int y1,
double xStep, double yStep) { return gTrue; }
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.cc
new file mode 100644
index 00000000000..234322ad85a
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.cc
@@ -0,0 +1,351 @@
+/* -*- Mode: c; c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t; -*- */
+/*
+ * Copyright © 2009 Mozilla Corporation
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Mozilla Corporation not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. Mozilla Corporation makes no
+ * representations about the suitability of this software for any purpose. It
+ * is provided "as is" without express or implied warranty.
+ *
+ * MOZILLA CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
+ * SHALL MOZILLA CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ *
+ * Author: Jeff Muizelaar, Mozilla Corp.
+ */
+
+/* This implements a box filter that supports non-integer box sizes */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdint.h>
+#include <stdio.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <math.h>
+#include "goo/gmem.h"
+#include "goo/gtypes_p.h"
+#include "CairoRescaleBox.h"
+
+
+/* we work in fixed point where 1. == 1 << 24 */
+#define FIXED_SHIFT 24
+
+static void downsample_row_box_filter (
+ int start, int width,
+ uint32_t *src, uint32_t *dest,
+ int coverage[], int pixel_coverage)
+{
+ /* we need an array of the pixel contribution of each destination pixel on the boundaries.
+ * we invert the value to get the value on the other size of the box */
+ /*
+
+ value = a * contribution * 1/box_size
+ value += a * 1/box_size
+ value += a * 1/box_size
+ value += a * 1/box_size
+ value += a * (1 - contribution) * 1/box_size
+ a * (1/box_size - contribution * 1/box_size)
+
+ box size is constant
+
+
+ value = a * contribtion_a * 1/box_size + b * contribution_b * 1/box_size
+ contribution_b = (1 - contribution_a)
+ = (1 - contribution_a_next)
+ */
+
+ /* box size = ceil(src_width/dest_width) */
+ int x = 0;
+
+ /* skip to start */
+ /* XXX: it might be possible to do this directly instead of iteratively, however
+ * the iterative solution is simple */
+ while (x < start)
+ {
+ int box = 1 << FIXED_SHIFT;
+ int start_coverage = coverage[x];
+ box -= start_coverage;
+ src++;
+ while (box >= pixel_coverage)
+ {
+ src++;
+ box -= pixel_coverage;
+ }
+ x++;
+ }
+
+ while (x < start + width)
+ {
+ uint32_t a = 0;
+ uint32_t r = 0;
+ uint32_t g = 0;
+ uint32_t b = 0;
+ int box = 1 << FIXED_SHIFT;
+ int start_coverage = coverage[x];
+
+ a = ((*src >> 24) & 0xff) * start_coverage;
+ r = ((*src >> 16) & 0xff) * start_coverage;
+ g = ((*src >> 8) & 0xff) * start_coverage;
+ b = ((*src >> 0) & 0xff) * start_coverage;
+ src++;
+ x++;
+ box -= start_coverage;
+
+ while (box >= pixel_coverage)
+ {
+ a += ((*src >> 24) & 0xff) * pixel_coverage;
+ r += ((*src >> 16) & 0xff) * pixel_coverage;
+ g += ((*src >> 8) & 0xff) * pixel_coverage;
+ b += ((*src >> 0) & 0xff) * pixel_coverage;
+ src++;
+
+ box -= pixel_coverage;
+ }
+
+ /* multiply by whatever is leftover
+ * this ensures that we don't bias down.
+ * i.e. start_coverage + n*pixel_coverage + box == 1 << 24 */
+ if (box > 0)
+ {
+ a += ((*src >> 24) & 0xff) * box;
+ r += ((*src >> 16) & 0xff) * box;
+ g += ((*src >> 8) & 0xff) * box;
+ b += ((*src >> 0) & 0xff) * box;
+ }
+
+ a >>= FIXED_SHIFT;
+ r >>= FIXED_SHIFT;
+ g >>= FIXED_SHIFT;
+ b >>= FIXED_SHIFT;
+
+ *dest = (a << 24) | (r << 16) | (g << 8) | b;
+ dest++;
+ }
+}
+
+static void downsample_columns_box_filter (
+ int n,
+ int start_coverage,
+ int pixel_coverage,
+ uint32_t *src, uint32_t *dest)
+{
+ int stride = n;
+ while (n--) {
+ uint32_t a = 0;
+ uint32_t r = 0;
+ uint32_t g = 0;
+ uint32_t b = 0;
+ uint32_t *column_src = src;
+ int box = 1 << FIXED_SHIFT;
+
+ a = ((*column_src >> 24) & 0xff) * start_coverage;
+ r = ((*column_src >> 16) & 0xff) * start_coverage;
+ g = ((*column_src >> 8) & 0xff) * start_coverage;
+ b = ((*column_src >> 0) & 0xff) * start_coverage;
+ column_src += stride;
+ box -= start_coverage;
+
+ while (box >= pixel_coverage)
+ {
+ a += ((*column_src >> 24) & 0xff) * pixel_coverage;
+ r += ((*column_src >> 16) & 0xff) * pixel_coverage;
+ g += ((*column_src >> 8) & 0xff) * pixel_coverage;
+ b += ((*column_src >> 0) & 0xff) * pixel_coverage;
+ column_src += stride;
+ box -= pixel_coverage;
+ }
+
+ if (box > 0) {
+ a += ((*column_src >> 24) & 0xff) * box;
+ r += ((*column_src >> 16) & 0xff) * box;
+ g += ((*column_src >> 8) & 0xff) * box;
+ b += ((*column_src >> 0) & 0xff) * box;
+ }
+
+ a >>= FIXED_SHIFT;
+ r >>= FIXED_SHIFT;
+ g >>= FIXED_SHIFT;
+ b >>= FIXED_SHIFT;
+
+ *dest = (a << 24) | (r << 16) | (g << 8) | b;
+ dest++;
+ src++;
+ }
+}
+
+static int compute_coverage (int coverage[], int src_length, int dest_length)
+{
+ int i;
+ /* num = src_length/dest_length
+ total = sum(pixel) / num
+
+ pixel * 1/num == pixel * dest_length / src_length
+ */
+ /* the average contribution of each source pixel */
+ int ratio = ((1 << 24)*(long long int)dest_length)/src_length;
+ /* because ((1 << 24)*(long long int)dest_length) won't always be divisible by src_length
+ * we'll need someplace to put the other bits.
+ *
+ * We want to ensure a + n*ratio < 1<<24
+ *
+ * 1<<24
+ * */
+
+ double scale = (double)src_length/dest_length;
+
+ /* for each destination pixel compute the coverage of the left most pixel included in the box */
+ /* I have a proof of this, which this margin is too narrow to contain */
+ for (i=0; i<dest_length; i++)
+ {
+ float left_side = i*scale;
+ float right_side = (i+1)*scale;
+ float right_fract = right_side - floor (right_side);
+ float left_fract = ceil (left_side) - left_side;
+ int overage;
+ /* find out how many source pixels will be used to fill the box */
+ int count = floor (right_side) - ceil (left_side);
+ /* what's the maximum value this expression can become?
+ floor((i+1)*scale) - ceil(i*scale)
+
+ (i+1)*scale - i*scale == scale
+
+ since floor((i+1)*scale) <= (i+1)*scale
+ and ceil(i*scale) >= i*scale
+
+ floor((i+1)*scale) - ceil(i*scale) <= scale
+
+ further since: floor((i+1)*scale) - ceil(i*scale) is an integer
+
+ therefore:
+ floor((i+1)*scale) - ceil(i*scale) <= floor(scale)
+ */
+
+ if (left_fract == 0.)
+ count--;
+
+ /* compute how much the right-most pixel contributes */
+ overage = ratio*(right_fract);
+
+ /* the remainder is the the amount that the left-most pixel
+ * contributes */
+ coverage[i] = (1<<24) - (count * ratio + overage);
+ }
+
+ return ratio;
+}
+
+GBool downscale_box_filter(uint32_t *orig, int orig_stride, unsigned orig_width, unsigned orig_height,
+ signed scaled_width, signed scaled_height,
+ uint16_t start_column, uint16_t start_row,
+ uint16_t width, uint16_t height,
+ uint32_t *dest, int dst_stride)
+{
+ int pixel_coverage_x, pixel_coverage_y;
+ int dest_y;
+ int src_y = 0;
+ uint32_t *scanline = orig;
+ int *x_coverage = NULL;
+ int *y_coverage = NULL;
+ uint32_t *temp_buf = NULL;
+ GBool retval = gFalse;
+
+ x_coverage = (int *)gmallocn3 (orig_width, 1, sizeof(int));
+ y_coverage = (int *)gmallocn3 (orig_height, 1, sizeof(int));
+
+ /* we need to allocate enough room for ceil(src_height/dest_height)+1
+ Example:
+ src_height = 140
+ dest_height = 50
+ src_height/dest_height = 2.8
+
+ |-------------| 2.8 pixels
+ |----|----|----|----| 4 pixels
+ need to sample 3 pixels
+
+ |-------------| 2.8 pixels
+ |----|----|----|----| 4 pixels
+ need to sample 4 pixels
+ */
+
+ temp_buf = (uint32_t *)gmallocn3 ((orig_height + scaled_height-1)/scaled_height+1, scaled_width, sizeof(uint32_t));
+
+ if (!x_coverage || !y_coverage || !scanline || !temp_buf)
+ goto cleanup;
+
+ pixel_coverage_x = compute_coverage (x_coverage, orig_width, scaled_width);
+ pixel_coverage_y = compute_coverage (y_coverage, orig_height, scaled_height);
+
+ assert (width + start_column <= scaled_width);
+
+ /* skip the rows at the beginning */
+ for (dest_y = 0; dest_y < start_row; dest_y++)
+ {
+ int box = 1 << FIXED_SHIFT;
+ int start_coverage_y = y_coverage[dest_y];
+ box -= start_coverage_y;
+ src_y++;
+ while (box >= pixel_coverage_y)
+ {
+ box -= pixel_coverage_y;
+ src_y++;
+ }
+ }
+
+ for (; dest_y < start_row + height; dest_y++)
+ {
+ int columns = 0;
+ int box = 1 << FIXED_SHIFT;
+ int start_coverage_y = y_coverage[dest_y];
+
+ scanline = orig + src_y * orig_stride / 4;
+ downsample_row_box_filter (start_column, width, scanline, temp_buf + width * columns, x_coverage, pixel_coverage_x);
+ columns++;
+ src_y++;
+ box -= start_coverage_y;
+
+ while (box >= pixel_coverage_y)
+ {
+ scanline = orig + src_y * orig_stride / 4;
+ downsample_row_box_filter (start_column, width, scanline, temp_buf + width * columns, x_coverage, pixel_coverage_x);
+ columns++;
+ src_y++;
+ box -= pixel_coverage_y;
+ }
+
+ /* downsample any leftovers */
+ if (box > 0)
+ {
+ scanline = orig + src_y * orig_stride / 4;
+ downsample_row_box_filter (start_column, width, scanline, temp_buf + width * columns, x_coverage, pixel_coverage_x);
+ columns++;
+ }
+
+ /* now scale the rows we just downsampled in the y direction */
+ downsample_columns_box_filter (width, start_coverage_y, pixel_coverage_y, temp_buf, dest);
+ dest += dst_stride / 4;
+
+// assert(width*columns <= ((orig_height + scaled_height-1)/scaled_height+1) * width);
+ }
+// assert (src_y<=orig_height);
+
+ retval = gTrue;
+
+cleanup:
+ free (x_coverage);
+ free (y_coverage);
+ free (temp_buf);
+
+ return gTrue;
+}
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.h
new file mode 100644
index 00000000000..5349c87f306
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CairoRescaleBox.h
@@ -0,0 +1,12 @@
+#ifndef CAIRO_RESCALE_BOX_H
+#define CAIRO_RESCALE_BOX_H
+
+#include "goo/gtypes.h"
+
+GBool downscale_box_filter(unsigned int *orig, int orig_stride, unsigned orig_width, unsigned orig_height,
+ signed scaled_width, signed scaled_height,
+ unsigned short int start_column, unsigned short int start_row,
+ unsigned short int width, unsigned short int height,
+ unsigned int *dest, int dst_stride);
+
+#endif /* CAIRO_RESCALE_BOX_H */
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.cc
new file mode 100644
index 00000000000..a8c2e39621b
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.cc
@@ -0,0 +1,965 @@
+//========================================================================
+//
+// Catalog.cc
+//
+// Copyright 1996-2007 Glyph & Cog, LLC
+//
+//========================================================================
+
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
+// Copyright (C) 2005-2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005 Jeff Muizelaar <jrmuizel@nit.ca>
+// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
+// Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
+// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
+// Copyright (C) 2006, 2008, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
+// Copyright (C) 2008, 2011 Pino Toscano <pino@kde.org>
+// Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
+// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+//
+// 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
+//
+//========================================================================
+
+#include <config.h>
+
+#ifdef USE_GCC_PRAGMAS
+#pragma implementation
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include "goo/gmem.h"
+#include "Object.h"
+#include "XRef.h"
+#include "Array.h"
+#include "Dict.h"
+#include "Page.h"
+#include "Error.h"
+#include "Link.h"
+#include "PageLabelInfo.h"
+#include "Catalog.h"
+#include "Form.h"
+#include "OptionalContent.h"
+#include "ViewerPreferences.h"
+#include "FileSpec.h"
+
+//------------------------------------------------------------------------
+// Catalog
+//------------------------------------------------------------------------
+
+Catalog::Catalog(XRef *xrefA) {
+ Object catDict, pagesDict, pagesDictRef;
+ Object obj, obj2;
+ Object optContentProps;
+
+ ok = gTrue;
+ xref = xrefA;
+ pages = NULL;
+ pageRefs = NULL;
+ numPages = -1;
+ pagesSize = 0;
+ baseURI = NULL;
+ pageLabelInfo = NULL;
+ form = NULL;
+ optContent = NULL;
+ pageMode = pageModeNull;
+ pageLayout = pageLayoutNull;
+ destNameTree = NULL;
+ embeddedFileNameTree = NULL;
+ jsNameTree = NULL;
+ viewerPrefs = NULL;
+
+ pagesList = NULL;
+ pagesRefList = NULL;
+ attrsList = NULL;
+ kidsIdxList = NULL;
+ lastCachedPage = 0;
+
+ xref->getCatalog(&catDict);
+ if (!catDict.isDict()) {
+ error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
+ goto err1;
+ }
+ // get the AcroForm dictionary
+ catDict.dictLookup("AcroForm", &acroForm);
+
+ // read base URI
+ if (catDict.dictLookup("URI", &obj)->isDict()) {
+ if (obj.dictLookup("Base", &obj2)->isString()) {
+ baseURI = obj2.getString()->copy();
+ }
+ obj2.free();
+ }
+ obj.free();
+
+ // get the Optional Content dictionary
+ if (catDict.dictLookup("OCProperties", &optContentProps)->isDict()) {
+ optContent = new OCGs(&optContentProps, xref);
+ if (!optContent->isOk ()) {
+ delete optContent;
+ optContent = NULL;
+ }
+ }
+ optContentProps.free();
+
+ // get the ViewerPreferences dictionary
+ catDict.dictLookup("ViewerPreferences", &viewerPreferences);
+
+ // perform form-related loading after all widgets have been loaded
+ if (getForm())
+ getForm()->postWidgetsLoad(this);
+
+ catDict.free();
+ return;
+
+ err1:
+ catDict.free();
+ ok = gFalse;
+}
+
+Catalog::~Catalog() {
+ delete kidsIdxList;
+ if (attrsList) {
+ std::vector<PageAttrs *>::iterator it;
+ for (it = attrsList->begin() ; it < attrsList->end(); it++ ) {
+ delete *it;
+ }
+ delete attrsList;
+ }
+ delete pagesRefList;
+ if (pagesList) {
+ std::vector<Dict *>::iterator it;
+ for (it = pagesList->begin() ; it < pagesList->end(); it++ ) {
+ if (!(*it)->decRef()) {
+ delete *it;
+ }
+ }
+ delete pagesList;
+ }
+ if (pages) {
+ for (int i = 0; i < pagesSize; ++i) {
+ if (pages[i]) {
+ delete pages[i];
+ }
+ }
+ gfree(pages);
+ gfree(pageRefs);
+ }
+ names.free();
+ dests.free();
+ delete destNameTree;
+ delete embeddedFileNameTree;
+ delete jsNameTree;
+ if (baseURI) {
+ delete baseURI;
+ }
+ delete pageLabelInfo;
+ delete form;
+ delete optContent;
+ delete viewerPrefs;
+ metadata.free();
+ structTreeRoot.free();
+ outline.free();
+ acroForm.free();
+ viewerPreferences.free();
+}
+
+GooString *Catalog::readMetadata() {
+ GooString *s;
+ Dict *dict;
+ Object obj;
+
+ if (metadata.isNone()) {
+ Object catDict;
+
+ xref->getCatalog(&catDict);
+ if (catDict.isDict()) {
+ catDict.dictLookup("Metadata", &metadata);
+ } else {
+ error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
+ metadata.initNull();
+ }
+ catDict.free();
+ }
+
+ if (!metadata.isStream()) {
+ return NULL;
+ }
+ dict = metadata.streamGetDict();
+ if (!dict->lookup("Subtype", &obj)->isName("XML")) {
+ error(-1, "Unknown Metadata type: '%s'",
+ obj.isName() ? obj.getName() : "???");
+ }
+ obj.free();
+ s = new GooString();
+ metadata.getStream()->fillGooString(s);
+ metadata.streamClose();
+ return s;
+}
+
+Page *Catalog::getPage(int i)
+{
+ if (i < 1) return NULL;
+
+ if (i > lastCachedPage) {
+ if (cachePageTree(i) == gFalse) return NULL;
+ }
+ return pages[i-1];
+}
+
+Ref *Catalog::getPageRef(int i)
+{
+ if (i < 1) return NULL;
+
+ if (i > lastCachedPage) {
+ if (cachePageTree(i) == gFalse) return NULL;
+ }
+ return &pageRefs[i-1];
+}
+
+GBool Catalog::cachePageTree(int page)
+{
+ Dict *pagesDict;
+
+ if (pagesList == NULL) {
+
+ Object catDict;
+ Ref pagesRef;
+
+ xref->getCatalog(&catDict);
+
+ if (catDict.isDict()) {
+ Object pagesDictRef;
+ if (catDict.dictLookupNF("Pages", &pagesDictRef)->isRef() &&
+ pagesDictRef.getRefNum() >= 0 &&
+ pagesDictRef.getRefNum() < xref->getNumObjects()) {
+ pagesRef = pagesDictRef.getRef();
+ pagesDictRef.free();
+ } else {
+ error(-1, "Catalog dictionary does not contain a valid \"Pages\" entry");
+ pagesDictRef.free();
+ catDict.free();
+ return gFalse;
+ }
+ } else {
+ error(-1, "Could not find catalog dictionary");
+ catDict.free();
+ return gFalse;
+ }
+
+ Object obj;
+ catDict.dictLookup("Pages", &obj);
+ catDict.free();
+ // This should really be isDict("Pages"), but I've seen at least one
+ // PDF file where the /Type entry is missing.
+ if (obj.isDict()) {
+ obj.getDict()->incRef();
+ pagesDict = obj.getDict();
+ obj.free();
+ }
+ else {
+ error(-1, "Top-level pages object is wrong type (%s)", obj.getTypeName());
+ obj.free();
+ return gFalse;
+ }
+
+ pagesSize = getNumPages();
+ pages = (Page **)gmallocn(pagesSize, sizeof(Page *));
+ pageRefs = (Ref *)gmallocn(pagesSize, sizeof(Ref));
+ for (int i = 0; i < pagesSize; ++i) {
+ pages[i] = NULL;
+ pageRefs[i].num = -1;
+ pageRefs[i].gen = -1;
+ }
+
+ pagesList = new std::vector<Dict *>();
+ pagesList->push_back(pagesDict);
+ pagesRefList = new std::vector<Ref>();
+ pagesRefList->push_back(pagesRef);
+ attrsList = new std::vector<PageAttrs *>();
+ attrsList->push_back(new PageAttrs(NULL, pagesDict));
+ kidsIdxList = new std::vector<int>();
+ kidsIdxList->push_back(0);
+ lastCachedPage = 0;
+
+ }
+
+ while(1) {
+
+ if (page <= lastCachedPage) return gTrue;
+
+ if (pagesList->empty()) return gFalse;
+
+ pagesDict = pagesList->back();
+ Object kids;
+ pagesDict->lookup("Kids", &kids);
+ if (!kids.isArray()) {
+ error(-1, "Kids object (page %d) is wrong type (%s)",
+ lastCachedPage+1, kids.getTypeName());
+ kids.free();
+ return gFalse;
+ }
+
+ int kidsIdx = kidsIdxList->back();
+ if (kidsIdx >= kids.arrayGetLength()) {
+ if (!pagesList->back()->decRef()) {
+ delete pagesList->back();
+ }
+ pagesList->pop_back();
+ pagesRefList->pop_back();
+ delete attrsList->back();
+ attrsList->pop_back();
+ kidsIdxList->pop_back();
+ if (!kidsIdxList->empty()) kidsIdxList->back()++;
+ kids.free();
+ continue;
+ }
+
+ Object kidRef;
+ kids.arrayGetNF(kidsIdx, &kidRef);
+ if (!kidRef.isRef()) {
+ error(-1, "Kid object (page %d) is not an indirect reference (%s)",
+ lastCachedPage+1, kidRef.getTypeName());
+ kidRef.free();
+ kids.free();
+ return gFalse;
+ }
+
+ GBool loop = gFalse;;
+ for (size_t i = 0; i < pagesRefList->size(); i++) {
+ if (((*pagesRefList)[i]).num == kidRef.getRefNum()) {
+ loop = gTrue;
+ break;
+ }
+ }
+ if (loop) {
+ error(-1, "Loop in Pages tree");
+ kidRef.free();
+ kids.free();
+ kidsIdxList->back()++;
+ continue;
+ }
+
+ Object kid;
+ kids.arrayGet(kidsIdx, &kid);
+ kids.free();
+ if (kid.isDict("Page") || (kid.isDict() && !kid.getDict()->hasKey("Kids"))) {
+ PageAttrs *attrs = new PageAttrs(attrsList->back(), kid.getDict());
+ Page *p = new Page(xref, lastCachedPage+1, kid.getDict(),
+ kidRef.getRef(), attrs, form);
+ if (!p->isOk()) {
+ error(-1, "Failed to create page (page %d)", lastCachedPage+1);
+ delete p;
+ kidRef.free();
+ kid.free();
+ return gFalse;
+ }
+
+ if (lastCachedPage >= numPages) {
+ error(-1, "Page count in top-level pages object is incorrect");
+ kidRef.free();
+ kid.free();
+ return gFalse;
+ }
+
+ pages[lastCachedPage] = p;
+ pageRefs[lastCachedPage].num = kidRef.getRefNum();
+ pageRefs[lastCachedPage].gen = kidRef.getRefGen();
+
+ lastCachedPage++;
+ kidsIdxList->back()++;
+
+ // This should really be isDict("Pages"), but I've seen at least one
+ // PDF file where the /Type entry is missing.
+ } else if (kid.isDict()) {
+ attrsList->push_back(new PageAttrs(attrsList->back(), kid.getDict()));
+ pagesRefList->push_back(kidRef.getRef());
+ kid.getDict()->incRef();
+ pagesList->push_back(kid.getDict());
+ kidsIdxList->push_back(0);
+ } else {
+ error(-1, "Kid object (page %d) is wrong type (%s)",
+ lastCachedPage+1, kid.getTypeName());
+ kidsIdxList->back()++;
+ }
+ kidRef.free();
+ kid.free();
+
+ }
+
+ return gFalse;
+}
+
+int Catalog::findPage(int num, int gen) {
+ int i;
+
+ for (i = 0; i < getNumPages(); ++i) {
+ Ref *ref = getPageRef(i+1);
+ if (ref != NULL && ref->num == num && ref->gen == gen)
+ return i + 1;
+ }
+ return 0;
+}
+
+LinkDest *Catalog::findDest(GooString *name) {
+ LinkDest *dest;
+ Object obj1, obj2;
+ GBool found;
+
+ // try named destination dictionary then name tree
+ found = gFalse;
+ if (getDests()->isDict()) {
+ if (!getDests()->dictLookup(name->getCString(), &obj1)->isNull())
+ found = gTrue;
+ else
+ obj1.free();
+ }
+ if (!found) {
+ if (getDestNameTree()->lookup(name, &obj1))
+ found = gTrue;
+ else
+ obj1.free();
+ }
+ if (!found)
+ return NULL;
+
+ // construct LinkDest
+ dest = NULL;
+ if (obj1.isArray()) {
+ dest = new LinkDest(obj1.getArray());
+ } else if (obj1.isDict()) {
+ if (obj1.dictLookup("D", &obj2)->isArray())
+ dest = new LinkDest(obj2.getArray());
+ else
+ error(-1, "Bad named destination value");
+ obj2.free();
+ } else {
+ error(-1, "Bad named destination value");
+ }
+ obj1.free();
+ if (dest && !dest->isOk()) {
+ delete dest;
+ dest = NULL;
+ }
+
+ return dest;
+}
+
+FileSpec *Catalog::embeddedFile(int i)
+{
+ Object efDict;
+ Object obj;
+ obj = getEmbeddedFileNameTree()->getValue(i);
+ FileSpec *embeddedFile = 0;
+ if (obj.isRef()) {
+ Object fsDict;
+ embeddedFile = new FileSpec(obj.fetch(xref, &fsDict));
+ fsDict.free();
+ } else {
+ Object null;
+ embeddedFile = new FileSpec(&null);
+ }
+ return embeddedFile;
+}
+
+GooString *Catalog::getJS(int i)
+{
+ Object obj;
+ // getJSNameTree()->getValue(i) returns a shallow copy of the object so we
+ // do not need to free it
+ getJSNameTree()->getValue(i).fetch(xref, &obj);
+
+ if (!obj.isDict()) {
+ obj.free();
+ return 0;
+ }
+ Object obj2;
+ if (!obj.dictLookup("S", &obj2)->isName()) {
+ obj2.free();
+ obj.free();
+ return 0;
+ }
+ if (strcmp(obj2.getName(), "JavaScript")) {
+ obj2.free();
+ obj.free();
+ return 0;
+ }
+ obj2.free();
+ obj.dictLookup("JS", &obj2);
+ GooString *js = 0;
+ if (obj2.isString()) {
+ js = new GooString(obj2.getString());
+ }
+ else if (obj2.isStream()) {
+ Stream *stream = obj2.getStream();
+ js = new GooString();
+ stream->fillGooString(js);
+ }
+ obj2.free();
+ obj.free();
+ return js;
+}
+
+Catalog::PageMode Catalog::getPageMode() {
+
+ if (pageMode == pageModeNull) {
+
+ Object catDict, obj;
+
+ pageMode = pageModeNone;
+
+ xref->getCatalog(&catDict);
+ if (!catDict.isDict()) {
+ error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
+ catDict.free();
+ return pageMode;
+ }
+
+ if (catDict.dictLookup("PageMode", &obj)->isName()) {
+ if (obj.isName("UseNone"))
+ pageMode = pageModeNone;
+ else if (obj.isName("UseOutlines"))
+ pageMode = pageModeOutlines;
+ else if (obj.isName("UseThumbs"))
+ pageMode = pageModeThumbs;
+ else if (obj.isName("FullScreen"))
+ pageMode = pageModeFullScreen;
+ else if (obj.isName("UseOC"))
+ pageMode = pageModeOC;
+ else if (obj.isName("UseAttachments"))
+ pageMode = pageModeAttach;
+ }
+ obj.free();
+ catDict.free();
+ }
+ return pageMode;
+}
+
+Catalog::PageLayout Catalog::getPageLayout() {
+
+ if (pageLayout == pageLayoutNull) {
+
+ Object catDict, obj;
+
+ pageLayout = pageLayoutNone;
+
+ xref->getCatalog(&catDict);
+ if (!catDict.isDict()) {
+ error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
+ catDict.free();
+ return pageLayout;
+ }
+
+ pageLayout = pageLayoutNone;
+ if (catDict.dictLookup("PageLayout", &obj)->isName()) {
+ if (obj.isName("SinglePage"))
+ pageLayout = pageLayoutSinglePage;
+ if (obj.isName("OneColumn"))
+ pageLayout = pageLayoutOneColumn;
+ if (obj.isName("TwoColumnLeft"))
+ pageLayout = pageLayoutTwoColumnLeft;
+ if (obj.isName("TwoColumnRight"))
+ pageLayout = pageLayoutTwoColumnRight;
+ if (obj.isName("TwoPageLeft"))
+ pageLayout = pageLayoutTwoPageLeft;
+ if (obj.isName("TwoPageRight"))
+ pageLayout = pageLayoutTwoPageRight;
+ }
+ obj.free();
+ catDict.free();
+ }
+ return pageLayout;
+}
+
+NameTree::NameTree()
+{
+ size = 0;
+ length = 0;
+ entries = NULL;
+}
+
+NameTree::~NameTree()
+{
+ int i;
+
+ for (i = 0; i < length; i++)
+ delete entries[i];
+
+ gfree(entries);
+}
+
+NameTree::Entry::Entry(Array *array, int index) {
+ if (!array->getString(index, &name) || !array->getNF(index + 1, &value)) {
+ Object aux;
+ array->get(index, &aux);
+ if (aux.isString() && array->getNF(index + 1, &value) )
+ {
+ name.append(aux.getString());
+ }
+ else
+ error(-1, "Invalid page tree");
+ }
+}
+
+NameTree::Entry::~Entry() {
+ value.free();
+}
+
+void NameTree::addEntry(Entry *entry)
+{
+ if (length == size) {
+ if (length == 0) {
+ size = 8;
+ } else {
+ size *= 2;
+ }
+ entries = (Entry **) grealloc (entries, sizeof (Entry *) * size);
+ }
+
+ entries[length] = entry;
+ ++length;
+}
+
+void NameTree::init(XRef *xrefA, Object *tree) {
+ xref = xrefA;
+ parse(tree);
+}
+
+void NameTree::parse(Object *tree) {
+ Object names;
+ Object kids, kid;
+ int i;
+
+ if (!tree->isDict())
+ return;
+
+ // leaf node
+ if (tree->dictLookup("Names", &names)->isArray()) {
+ for (i = 0; i < names.arrayGetLength(); i += 2) {
+ NameTree::Entry *entry;
+
+ entry = new Entry(names.getArray(), i);
+ addEntry(entry);
+ }
+ }
+ names.free();
+
+ // root or intermediate node
+ if (tree->dictLookup("Kids", &kids)->isArray()) {
+ for (i = 0; i < kids.arrayGetLength(); ++i) {
+ if (kids.arrayGet(i, &kid)->isDict())
+ parse(&kid);
+ kid.free();
+ }
+ }
+ kids.free();
+}
+
+int NameTree::Entry::cmp(const void *voidKey, const void *voidEntry)
+{
+ GooString *key = (GooString *) voidKey;
+ Entry *entry = *(NameTree::Entry **) voidEntry;
+
+ return key->cmp(&entry->name);
+}
+
+GBool NameTree::lookup(GooString *name, Object *obj)
+{
+ Entry **entry;
+
+ entry = (Entry **) bsearch(name, entries,
+ length, sizeof(Entry *), Entry::cmp);
+ if (entry != NULL) {
+ (*entry)->value.fetch(xref, obj);
+ return gTrue;
+ } else {
+ printf("failed to look up %s\n", name->getCString());
+ obj->initNull();
+ return gFalse;
+ }
+}
+
+Object NameTree::getValue(int index)
+{
+ if (index < length) {
+ return entries[index]->value;
+ } else {
+ return Object();
+ }
+}
+
+GooString *NameTree::getName(int index)
+{
+ if (index < length) {
+ return &entries[index]->name;
+ } else {
+ return NULL;
+ }
+}
+
+GBool Catalog::labelToIndex(GooString *label, int *index)
+{
+ char *end;
+
+ PageLabelInfo *pli = getPageLabelInfo();
+ if (pli != NULL) {
+ if (!pli->labelToIndex(label, index))
+ return gFalse;
+ } else {
+ *index = strtol(label->getCString(), &end, 10) - 1;
+ if (*end != '\0')
+ return gFalse;
+ }
+
+ if (*index < 0 || *index >= getNumPages())
+ return gFalse;
+
+ return gTrue;
+}
+
+GBool Catalog::indexToLabel(int index, GooString *label)
+{
+ char buffer[32];
+
+ if (index < 0 || index >= getNumPages())
+ return gFalse;
+
+ PageLabelInfo *pli = getPageLabelInfo();
+ if (pli != NULL) {
+ return pli->indexToLabel(index, label);
+ } else {
+ snprintf(buffer, sizeof (buffer), "%d", index + 1);
+ label->append(buffer);
+ return gTrue;
+ }
+}
+
+int Catalog::getNumPages()
+{
+ if (numPages == -1)
+ {
+ Object catDict, pagesDict, obj;
+
+ xref->getCatalog(&catDict);
+ if (!catDict.isDict()) {
+ error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
+ catDict.free();
+ return 0;
+ }
+ catDict.dictLookup("Pages", &pagesDict);
+ catDict.free();
+
+ // This should really be isDict("Pages"), but I've seen at least one
+ // PDF file where the /Type entry is missing.
+ if (!pagesDict.isDict()) {
+ error(-1, "Top-level pages object is wrong type (%s)",
+ pagesDict.getTypeName());
+ pagesDict.free();
+ return 0;
+ }
+
+ pagesDict.dictLookup("Count", &obj);
+ // some PDF files actually use real numbers here ("/Count 9.0")
+ if (!obj.isNum()) {
+ error(-1, "Page count in top-level pages object is wrong type (%s)",
+ obj.getTypeName());
+ numPages = 0;
+ } else {
+ numPages = (int)obj.getNum();
+ }
+
+ obj.free();
+ pagesDict.free();
+ }
+
+ return numPages;
+}
+
+PageLabelInfo *Catalog::getPageLabelInfo()
+{
+ if (!pageLabelInfo) {
+ Object catDict;
+ Object obj;
+
+ xref->getCatalog(&catDict);
+ if (!catDict.isDict()) {
+ error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
+ catDict.free();
+ return NULL;
+ }
+
+ if (catDict.dictLookup("PageLabels", &obj)->isDict()) {
+ pageLabelInfo = new PageLabelInfo(&obj, getNumPages());
+ }
+ obj.free();
+ catDict.free();
+ }
+
+ return pageLabelInfo;
+}
+
+Object *Catalog::getStructTreeRoot()
+{
+ if (structTreeRoot.isNone())
+ {
+ Object catDict;
+
+ xref->getCatalog(&catDict);
+ if (catDict.isDict()) {
+ catDict.dictLookup("StructTreeRoot", &structTreeRoot);
+ } else {
+ error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
+ structTreeRoot.initNull();
+ }
+ catDict.free();
+ }
+
+ return &structTreeRoot;
+}
+
+Object *Catalog::getOutline()
+{
+ if (outline.isNone())
+ {
+ Object catDict;
+
+ xref->getCatalog(&catDict);
+ if (catDict.isDict()) {
+ catDict.dictLookup("Outlines", &outline);
+ } else {
+ error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
+ outline.initNull();
+ }
+ catDict.free();
+ }
+
+ return &outline;
+}
+
+Object *Catalog::getDests()
+{
+ if (dests.isNone())
+ {
+ Object catDict;
+
+ xref->getCatalog(&catDict);
+ if (catDict.isDict()) {
+ catDict.dictLookup("Dests", &dests);
+ } else {
+ error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
+ dests.initNull();
+ }
+ catDict.free();
+ }
+
+ return &dests;
+}
+
+Form *Catalog::getForm()
+{
+ if (!form) {
+ if (acroForm.isDict()) {
+ form = new Form(xref,&acroForm);
+ }
+ }
+
+ return form;
+}
+
+ViewerPreferences *Catalog::getViewerPreferences()
+{
+ if (!viewerPrefs) {
+ if (viewerPreferences.isDict()) {
+ viewerPrefs = new ViewerPreferences(viewerPreferences.getDict());
+ }
+ }
+
+ return viewerPrefs;
+}
+
+Object *Catalog::getNames()
+{
+ if (names.isNone())
+ {
+ Object catDict;
+
+ xref->getCatalog(&catDict);
+ if (catDict.isDict()) {
+ catDict.dictLookup("Names", &names);
+ } else {
+ error(-1, "Catalog object is wrong type (%s)", catDict.getTypeName());
+ names.initNull();
+ }
+ catDict.free();
+ }
+
+ return &names;
+}
+
+NameTree *Catalog::getDestNameTree()
+{
+ if (!destNameTree) {
+
+ destNameTree = new NameTree();
+
+ if (getNames()->isDict()) {
+ Object obj;
+
+ getNames()->dictLookup("Dests", &obj);
+ destNameTree->init(xref, &obj);
+ obj.free();
+ }
+
+ }
+
+ return destNameTree;
+}
+
+NameTree *Catalog::getEmbeddedFileNameTree()
+{
+ if (!embeddedFileNameTree) {
+
+ embeddedFileNameTree = new NameTree();
+
+ if (getNames()->isDict()) {
+ Object obj;
+
+ getNames()->dictLookup("EmbeddedFiles", &obj);
+ embeddedFileNameTree->init(xref, &obj);
+ obj.free();
+ }
+
+ }
+
+ return embeddedFileNameTree;
+}
+
+NameTree *Catalog::getJSNameTree()
+{
+ if (!jsNameTree) {
+
+ jsNameTree = new NameTree();
+
+ if (getNames()->isDict()) {
+ Object obj;
+
+ getNames()->dictLookup("JavaScript", &obj);
+ jsNameTree->init(xref, &obj);
+ obj.free();
+ }
+
+ }
+
+ return jsNameTree;
+}
+
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.h
index f5b389f201e..41be3b6fc8a 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Catalog.h
@@ -14,11 +14,12 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005, 2007, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007, 2009-2011 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2008 Pino Toscano <pino@kde.org>
+// Copyright (C) 2008, 2011 Pino Toscano <pino@kde.org>
+// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
//
// 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
@@ -32,6 +33,10 @@
#pragma interface
#endif
+#include "Object.h"
+
+#include <vector>
+
class XRef;
class Object;
class Page;
@@ -41,6 +46,8 @@ class LinkDest;
class PageLabelInfo;
class Form;
class OCGs;
+class ViewerPreferences;
+class FileSpec;
//------------------------------------------------------------------------
// NameTree
@@ -49,12 +56,11 @@ class OCGs;
class NameTree {
public:
NameTree();
+ ~NameTree();
void init(XRef *xref, Object *tree);
- void parse(Object *tree);
GBool lookup(GooString *name, Object *obj);
- void free();
int numEntries() { return length; };
- // iterator accessor
+ // iterator accessor, note it returns a shallow copy, do not free the object
Object getValue(int i);
GooString *getName(int i);
@@ -68,6 +74,7 @@ private:
static int cmp(const void *key, const void *entry);
};
+ void parse(Object *tree);
void addEntry(Entry *entry);
XRef *xref;
@@ -78,58 +85,6 @@ private:
// length is the number of real Entry
};
-class EmbFile {
-public:
- EmbFile(GooString *name, GooString *description,
- int size,
- GooString *createDate,
- GooString *modDate, GooString *checksum,
- GooString *mimetype,
- Object objStr) :
- m_name(name),
- m_description(description),
- m_size(size),
- m_createDate(createDate),
- m_modDate(modDate),
- m_checksum(checksum),
- m_mimetype(mimetype)
- {
- objStr.copy(&m_objStr);
- }
- EmbFile(Object *efDict, GooString *description = 0);
-
- ~EmbFile()
- {
- delete m_name;
- delete m_description;
- delete m_modDate;
- delete m_createDate;
- delete m_checksum;
- delete m_mimetype;
- m_objStr.free();
- }
-
- GooString *name() { return m_name; }
- GooString *description() { return m_description; }
- int size() { return m_size; }
- GooString *modDate() { return m_modDate; }
- GooString *createDate() { return m_createDate; }
- GooString *checksum() { return m_checksum; }
- GooString *mimeType() { return m_mimetype; }
- Object &streamObject() { return m_objStr; }
- bool isOk() { return m_objStr.isStream(); }
-
-private:
- GooString *m_name;
- GooString *m_description;
- int m_size;
- GooString *m_createDate;
- GooString *m_modDate;
- GooString *m_checksum;
- GooString *m_mimetype;
- Object m_objStr;
-};
-
//------------------------------------------------------------------------
// Catalog
//------------------------------------------------------------------------
@@ -147,13 +102,13 @@ public:
GBool isOk() { return ok; }
// Get number of pages.
- int getNumPages() { return numPages; }
+ int getNumPages();
// Get a page.
- Page *getPage(int i) { return pages[i-1]; }
+ Page *getPage(int i);
// Get the reference for a page object.
- Ref *getPageRef(int i) { return &pageRefs[i-1]; }
+ Ref *getPageRef(int i);
// Return base URI, or NULL if none.
GooString *getBaseURI() { return baseURI; }
@@ -163,7 +118,7 @@ public:
GooString *readMetadata();
// Return the structure tree root object.
- Object *getStructTreeRoot() { return &structTreeRoot; }
+ Object *getStructTreeRoot();
// Find a page, given its object ID. Returns page number, or 0 if
// not found.
@@ -173,16 +128,16 @@ public:
// NULL if <name> is not a destination.
LinkDest *findDest(GooString *name);
- Object *getDests() { return &dests; }
+ Object *getDests();
// Get the number of embedded files
- int numEmbeddedFiles() { return embeddedFileNameTree.numEntries(); }
+ int numEmbeddedFiles() { return getEmbeddedFileNameTree()->numEntries(); }
// Get the i'th file embedded (at the Document level) in the document
- EmbFile *embeddedFile(int i);
+ FileSpec *embeddedFile(int i);
// Get the number of javascript scripts
- int numJS() { return jsNameTree.numEntries(); }
+ int numJS() { return getJSNameTree()->numEntries(); }
// Get the i'th JavaScript script (at the Document level) in the document
GooString *getJS(int i);
@@ -191,13 +146,15 @@ public:
GBool labelToIndex(GooString *label, int *index);
GBool indexToLabel(int index, GooString *label);
- Object *getOutline() { return &outline; }
+ Object *getOutline();
Object *getAcroForm() { return &acroForm; }
OCGs *getOptContentConfig() { return optContent; }
- Form* getForm() { return form; }
+ Form* getForm();
+
+ ViewerPreferences *getViewerPreferences();
enum PageMode {
pageModeNone,
@@ -205,7 +162,8 @@ public:
pageModeThumbs,
pageModeFullScreen,
pageModeOC,
- pageModeAttach
+ pageModeAttach,
+ pageModeNull
};
enum PageLayout {
pageLayoutNone,
@@ -214,39 +172,56 @@ public:
pageLayoutTwoColumnLeft,
pageLayoutTwoColumnRight,
pageLayoutTwoPageLeft,
- pageLayoutTwoPageRight
+ pageLayoutTwoPageRight,
+ pageLayoutNull
};
// Returns the page mode.
- PageMode getPageMode() { return pageMode; }
- PageLayout getPageLayout() { return pageLayout; }
+ PageMode getPageMode();
+ PageLayout getPageLayout();
private:
+ // Get page label info.
+ PageLabelInfo *getPageLabelInfo();
+
XRef *xref; // the xref table for this PDF file
Page **pages; // array of pages
Ref *pageRefs; // object ID for each page
+ int lastCachedPage;
+ std::vector<Dict *> *pagesList;
+ std::vector<Ref> *pagesRefList;
+ std::vector<PageAttrs *> *attrsList;
+ std::vector<int> *kidsIdxList;
Form *form;
+ ViewerPreferences *viewerPrefs;
int numPages; // number of pages
int pagesSize; // size of pages array
Object dests; // named destination dictionary
- NameTree destNameTree; // named destination name-tree
- NameTree embeddedFileNameTree; // embedded file name-tree
- NameTree jsNameTree; // Java Script name-tree
+ Object names; // named names dictionary
+ NameTree *destNameTree; // named destination name-tree
+ NameTree *embeddedFileNameTree; // embedded file name-tree
+ NameTree *jsNameTree; // Java Script name-tree
GooString *baseURI; // base URI for URI-type links
Object metadata; // metadata stream
Object structTreeRoot; // structure tree root dictionary
Object outline; // outline dictionary
Object acroForm; // AcroForm dictionary
+ Object viewerPreferences; // ViewerPreference dictionary
OCGs *optContent; // Optional Content groups
GBool ok; // true if catalog is valid
PageLabelInfo *pageLabelInfo; // info about page labels
PageMode pageMode; // page mode
PageLayout pageLayout; // page layout
- int readPageTree(Dict *pages, PageAttrs *attrs, int start,
- char *alreadyRead);
+ GBool cachePageTree(int page); // Cache first <page> pages.
Object *findDestInTree(Object *tree, GooString *name, Object *obj);
+
+ Object *getNames();
+ NameTree *getDestNameTree();
+ NameTree *getEmbeddedFileNameTree();
+ NameTree *getJSNameTree();
+
};
#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/CharCodeToUnicode.cc
index 5941190a4ec..3cfa4020b50 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CharCodeToUnicode.cc
@@ -13,11 +13,13 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006, 2008, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2008-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2008 Vasile Gaburici <gaburici@cs.umd.edu>
+// Copyright (C) 2010 William Bader <williambader@hotmail.com>
+// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net>
//
// 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
@@ -34,6 +36,7 @@
#include <string.h>
#include "goo/gmem.h"
#include "goo/gfile.h"
+#include "goo/GooLikely.h"
#include "goo/GooString.h"
#include "Error.h"
#include "GlobalParams.h"
@@ -124,6 +127,7 @@ CharCodeToUnicode *CharCodeToUnicode::parseUnicodeToUnicode(
Unicode *uBuf = (Unicode *)gmallocn(uBufSize, sizeof(Unicode));
CharCodeToUnicode *ctu;
int line, n, i;
+ char *tokptr;
if (!(f = fopen(fileName->getCString(), "r"))) {
gfree(uBuf);
@@ -142,14 +146,14 @@ CharCodeToUnicode *CharCodeToUnicode::parseUnicodeToUnicode(
line = 0;
while (getLine(buf, sizeof(buf), f)) {
++line;
- if (!(tok = strtok(buf, " \t\r\n")) ||
+ if (!(tok = strtok_r(buf, " \t\r\n", &tokptr)) ||
sscanf(tok, "%x", &u0) != 1) {
error(-1, "Bad line (%d) in unicodeToUnicode file '%s'",
line, fileName->getCString());
continue;
}
n = 0;
- while ((tok = strtok(NULL, " \t\r\n"))) {
+ while ((tok = strtok_r(NULL, " \t\r\n", &tokptr))) {
if (n >= uBufSize)
{
uBufSize += 8;
@@ -307,8 +311,10 @@ void CharCodeToUnicode::parseCMap1(int (*getCharFunc)(void *), void *data,
error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
break;
}
- if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' &&
- n2 == 2 + nDigits && tok2[0] == '<' && tok2[n2 - 1] == '>')) {
+ if (!(((n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>') ||
+ (n1 == 4 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' && tok1[1] == '0' && tok1[2] == '0')) &&
+ ((n2 == 2 + nDigits && tok2[0] == '<' && tok2[n2 - 1] == '>') ||
+ (n2 == 4 + nDigits && tok2[0] == '<' && tok2[n2 - 1] == '>' && tok1[1] == '0' && tok1[2] == '0')))) {
error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
continue;
}
@@ -361,10 +367,15 @@ void CharCodeToUnicode::addMapping(CharCode code, char *uStr, int n,
if (code >= mapLen) {
oldLen = mapLen;
mapLen = (code + 256) & ~255;
- map = (Unicode *)greallocn(map, mapLen, sizeof(Unicode));
- for (i = oldLen; i < mapLen; ++i) {
- map[i] = 0;
- }
+ if (unlikely(code >= mapLen)) {
+ error(-1, "Illegal code value in CharCodeToUnicode::addMapping");
+ return;
+ } else {
+ map = (Unicode *)greallocn(map, mapLen, sizeof(Unicode));
+ for (i = oldLen; i < mapLen; ++i) {
+ map[i] = 0;
+ }
+ }
}
if (n <= 4) {
if (sscanf(uStr, "%x", &u) != 1) {
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/CharCodeToUnicode.h
index 1daedd7162c..3fdbf0f7216 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CharCodeToUnicode.h
@@ -17,7 +17,7 @@
//
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2011 Albert Astals Cid <aacid@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -33,12 +33,14 @@
#include "poppler-config.h"
#include "CharTypes.h"
+#include "goo/gtypes.h"
#if MULTITHREADED
#include "goo/GooMutex.h"
#endif
struct CharCodeToUnicodeString;
+class GooString;
//------------------------------------------------------------------------
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/CompactFontTables.h
index 757e1cb96fc..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CompactFontTables.h
@@ -6,9 +6,25 @@
//
//========================================================================
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2011 Albert Astals Cid <aacid@kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
#ifndef COMPACTFONTINFO_H
#define COMPACTFONTINFO_H
+#include "goo/gtypes.h"
+
static char *type1CStdStrings[391] = {
".notdef",
"space",
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.cc
new file mode 100644
index 00000000000..26e59e396b7
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.cc
@@ -0,0 +1,99 @@
+//========================================================================
+//
+// CurlCachedFile.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2009 Stefan Thomas <thomas@eload24.com>
+// Copyright 2010, 2011 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#include <config.h>
+
+#include "CurlCachedFile.h"
+
+#include "goo/GooString.h"
+
+//------------------------------------------------------------------------
+
+CurlCachedFileLoader::CurlCachedFileLoader()
+{
+ url = NULL;
+ cachedFile = NULL;
+ curl = NULL;
+}
+
+CurlCachedFileLoader::~CurlCachedFileLoader() {
+ curl_easy_cleanup(curl);
+}
+
+static size_t
+noop_cb(char *ptr, size_t size, size_t nmemb, void *ptr2)
+{
+ return size*nmemb;
+}
+
+size_t
+CurlCachedFileLoader::init(GooString *urlA, CachedFile *cachedFileA)
+{
+ double contentLength = -1;
+ long code = 0;
+ size_t size;
+
+ url = urlA;
+ cachedFile = cachedFileA;
+ curl = curl_easy_init();
+
+ curl_easy_setopt(curl, CURLOPT_URL, url->getCString());
+ curl_easy_setopt(curl, CURLOPT_HEADER, 1);
+ curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &noop_cb);
+ curl_easy_perform(curl);
+ curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
+ if (code) {
+ curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &contentLength);
+ size = contentLength;
+ } else {
+ error(-1, "Failed to get size of '%s'.", url->getCString());
+ size = -1;
+ }
+ curl_easy_reset(curl);
+
+ return size;
+}
+
+static
+size_t load_cb(const char *ptr, size_t size, size_t nmemb, void *data)
+{
+ CachedFileWriter *writer = (CachedFileWriter *) data;
+ return (writer->write) (ptr, size*nmemb);
+}
+
+int CurlCachedFileLoader::load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer)
+{
+ CURLcode r = CURLE_OK;
+ size_t fromByte, toByte;
+ for (size_t i = 0; i < ranges.size(); i++) {
+
+ fromByte = ranges[i].offset;
+ toByte = fromByte + ranges[i].length - 1;
+ GooString *range = GooString::format("{0:ud}-{1:ud}", fromByte, toByte);
+
+ curl_easy_setopt(curl, CURLOPT_URL, url->getCString());
+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, load_cb);
+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, writer);
+ curl_easy_setopt(curl, CURLOPT_RANGE, range->getCString());
+ r = curl_easy_perform(curl);
+ curl_easy_reset(curl);
+
+ delete range;
+
+ if (r != CURLE_OK) break;
+ }
+ return r;
+}
+
+//------------------------------------------------------------------------
+
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.h
new file mode 100644
index 00000000000..49882aba8ac
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlCachedFile.h
@@ -0,0 +1,40 @@
+//========================================================================
+//
+// CurlCachedFile.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#ifndef CURLCACHELOADER_H
+#define CURLCACHELOADER_H
+
+#include "poppler-config.h"
+#include "CachedFile.h"
+
+#include <curl/curl.h>
+
+//------------------------------------------------------------------------
+
+class CurlCachedFileLoader : public CachedFileLoader {
+
+public:
+
+ CurlCachedFileLoader();
+ ~CurlCachedFileLoader();
+ size_t init(GooString *url, CachedFile* cachedFile);
+ int load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer);
+
+private:
+
+ GooString *url;
+ CachedFile *cachedFile;
+ CURL *curl;
+
+};
+
+#endif
+
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.cc
new file mode 100644
index 00000000000..5b02b14a784
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.cc
@@ -0,0 +1,47 @@
+//========================================================================
+//
+// CurlPDFDocBuilder.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#include <config.h>
+
+#include "CurlPDFDocBuilder.h"
+
+#include "CachedFile.h"
+#include "CurlCachedFile.h"
+
+//------------------------------------------------------------------------
+// CurlPDFDocBuilder
+//------------------------------------------------------------------------
+
+PDFDoc *
+CurlPDFDocBuilder::buildPDFDoc(const GooString &uri,
+ GooString *ownerPassword, GooString *userPassword, void *guiDataA)
+{
+ Object obj;
+
+ CachedFile *cachedFile = new CachedFile(
+ new CurlCachedFileLoader(), uri.copy());
+
+ obj.initNull();
+ BaseStream *str = new CachedFileStream(
+ cachedFile, 0, gFalse, cachedFile->getLength(), &obj);
+
+ return new PDFDoc(str, ownerPassword, userPassword, guiDataA);
+}
+
+GBool CurlPDFDocBuilder::supports(const GooString &uri)
+{
+ if (uri.cmpN("http://", 7) == 0 || uri.cmpN("https://", 8) == 0) {
+ return gTrue;
+ } else {
+ return gFalse;
+ }
+}
+
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.h
new file mode 100644
index 00000000000..fb34862057c
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/CurlPDFDocBuilder.h
@@ -0,0 +1,33 @@
+//========================================================================
+//
+// CurlPDFDocBuilder.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#ifndef CURLPDFDOCBUILDER_H
+#define CURLPDFDOCBUILDER_H
+
+#include "PDFDocBuilder.h"
+
+//------------------------------------------------------------------------
+// CurlPDFDocBuilder
+//
+// The CurlPDFDocBuilder implements a PDFDocBuilder for 'http(s)://'.
+//------------------------------------------------------------------------
+
+class CurlPDFDocBuilder : public PDFDocBuilder {
+
+public:
+
+ PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
+ GooString *userPassword = NULL, void *guiDataA = NULL);
+ GBool supports(const GooString &uri);
+
+};
+
+#endif /* CURLPDFDOCBUILDER_H */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/DCTStream.cc
index 7c6ba7022a1..c0ef81df2f4 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/DCTStream.cc
@@ -5,8 +5,11 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2005 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright 2005-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright 2005-2010 Albert Astals Cid <aacid@kde.org>
// Copyright 2009 Ryszard Trojnacki <rysiek@menel.com>
+// Copyright 2010 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright 2011 Daiki Ueno <ueno@unixuser.org>
+// Copyright 2011 Tomas Hoger <thoger@redhat.com>
//
//========================================================================
@@ -20,7 +23,6 @@ static boolean str_fill_input_buffer(j_decompress_ptr cinfo)
{
int c;
struct str_src_mgr * src = (struct str_src_mgr *)cinfo->src;
- if (src->abort) return FALSE;
if (src->index == 0) {
c = 0xFF;
src->index++;
@@ -59,6 +61,7 @@ static void str_term_source(j_decompress_ptr cinfo)
DCTStream::DCTStream(Stream *strA, int colorXformA) :
FilterStream(strA) {
+ colorXform = colorXformA;
init();
}
@@ -69,14 +72,14 @@ DCTStream::~DCTStream() {
static void exitErrorHandler(jpeg_common_struct *error) {
j_decompress_ptr cinfo = (j_decompress_ptr)error;
- str_src_mgr * src = (struct str_src_mgr *)cinfo->src;
- src->abort = true;
+ str_error_mgr * err = (struct str_error_mgr *)cinfo->err;
+ longjmp(err->setjmp_buffer, 1);
}
void DCTStream::init()
{
- jpeg_std_error(&jerr);
- jerr.error_exit = &exitErrorHandler;
+ jpeg_std_error(&err.pub);
+ err.pub.error_exit = &exitErrorHandler;
src.pub.init_source = str_init_source;
src.pub.fill_input_buffer = str_fill_input_buffer;
src.pub.skip_input_data = str_skip_input_data;
@@ -86,13 +89,14 @@ void DCTStream::init()
src.pub.next_input_byte = NULL;
src.str = str;
src.index = 0;
- src.abort = false;
current = NULL;
limit = NULL;
- cinfo.err = &jerr;
- jpeg_create_decompress(&cinfo);
- cinfo.src = (jpeg_source_mgr *)&src;
+ cinfo.err = &err.pub;
+ if (!setjmp(err.setjmp_buffer)) {
+ jpeg_create_decompress(&cinfo);
+ cinfo.src = (jpeg_source_mgr *)&src;
+ }
row_buffer = NULL;
}
@@ -122,7 +126,6 @@ void DCTStream::reset() {
if (c == -1)
{
error(-1, "Could not find start of jpeg data");
- src.abort = true;
return;
}
if (c != 0xFF) c = 0;
@@ -139,41 +142,86 @@ void DCTStream::reset() {
}
}
- jpeg_read_header(&cinfo, TRUE);
- if (src.abort) return;
-
- if (!jpeg_start_decompress(&cinfo))
+ if (!setjmp(err.setjmp_buffer) && jpeg_read_header(&cinfo, TRUE) != JPEG_SUSPENDED)
{
- src.abort = true;
- return;
- }
+ // figure out color transform
+ if (colorXform == -1 && !cinfo.saw_Adobe_marker) {
+ if (cinfo.num_components == 3) {
+ if (cinfo.saw_JFIF_marker) {
+ colorXform = 1;
+ } else if (cinfo.cur_comp_info[0]->component_id == 82 &&
+ cinfo.cur_comp_info[1]->component_id == 71 &&
+ cinfo.cur_comp_info[2]->component_id == 66) { // ASCII "RGB"
+ colorXform = 0;
+ } else {
+ colorXform = 1;
+ }
+ } else {
+ colorXform = 0;
+ }
+ } else if (cinfo.saw_Adobe_marker) {
+ colorXform = cinfo.Adobe_transform;
+ }
- row_stride = cinfo.output_width * cinfo.output_components;
- row_buffer = cinfo.mem->alloc_sarray((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+ switch (cinfo.num_components) {
+ case 3:
+ cinfo.jpeg_color_space = colorXform ? JCS_YCbCr : JCS_RGB;
+ break;
+ case 4:
+ cinfo.jpeg_color_space = colorXform ? JCS_YCCK : JCS_CMYK;
+ break;
+ }
+
+ jpeg_start_decompress(&cinfo);
+
+ row_stride = cinfo.output_width * cinfo.output_components;
+ row_buffer = cinfo.mem->alloc_sarray((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+ }
}
+// we can not go with inline since gcc
+// refuses to inline because of setjmp
+#define DO_GET_CHAR \
+ if (current == limit) { \
+ if (cinfo.output_scanline < cinfo.output_height) \
+ { \
+ if (!setjmp(err.setjmp_buffer)) \
+ { \
+ if (!jpeg_read_scanlines(&cinfo, row_buffer, 1)) c = EOF; \
+ else { \
+ current = &row_buffer[0][0]; \
+ limit = &row_buffer[0][(cinfo.output_width - 1) * cinfo.output_components] + cinfo.output_components; \
+ c = *current; \
+ ++current; \
+ } \
+ } \
+ else c = EOF; \
+ } \
+ else c = EOF; \
+ } else { \
+ c = *current; \
+ ++current; \
+ } \
+
int DCTStream::getChar() {
- if (src.abort) return EOF;
-
int c;
- if (current == limit) {
- if (cinfo.output_scanline < cinfo.output_height)
- {
- if (!jpeg_read_scanlines(&cinfo, row_buffer, 1)) return EOF;
- current = &row_buffer[0][0];
- limit = &row_buffer[0][(cinfo.output_width - 1) * cinfo.output_components] + cinfo.output_components;
- }
- else return EOF;
- }
- c = *current;
- ++current;
+ DO_GET_CHAR
+
return c;
}
+int DCTStream::getChars(int nChars, Guchar *buffer) {
+ int c;
+ for (int i = 0; i < nChars; ++i) {
+ DO_GET_CHAR
+ if (likely(c != EOF)) buffer[i] = c;
+ else return i;
+ }
+ return nChars;
+}
+
int DCTStream::lookChar() {
- if (src.abort) return EOF;
-
return *current;
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/DCTStream.h
index 29f8cf9d43c..ad864cadd52 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/DCTStream.h
@@ -6,13 +6,14 @@
//
// Copyright 2005 Jeff Muizelaar <jeff@infidigm.net>
// Copyright 2005 Martin Kretzschmar <martink@gnome.org>
-// Copyright 2005-2007, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright 2005-2007, 2009-2011 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright 2011 Daiki Ueno <ueno@unixuser.org>
//
//========================================================================
#ifndef DCTSTREAM_H
#define DCTSTREAM_H
-#include <config.h>
#ifdef USE_GCC_PRAGMAS
#pragma interface
@@ -23,9 +24,11 @@
#pragma implementation
#endif
+#include "poppler-config.h"
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
+#include <setjmp.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -33,7 +36,6 @@
#include <ctype.h>
#include "goo/gmem.h"
#include "goo/gfile.h"
-#include "poppler-config.h"
#include "Error.h"
#include "Object.h"
#include "Decrypt.h"
@@ -48,9 +50,12 @@ struct str_src_mgr {
JOCTET buffer;
Stream *str;
int index;
- bool abort;
};
+struct str_error_mgr {
+ struct jpeg_error_mgr pub;
+ jmp_buf setjmp_buffer;
+};
class DCTStream: public FilterStream {
public:
@@ -63,15 +68,18 @@ public:
virtual int lookChar();
virtual GooString *getPSFilter(int psLevel, char *indent);
virtual GBool isBinary(GBool last = gTrue);
- Stream *getRawStream() { return str; }
private:
void init();
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
+
+ int colorXform;
JSAMPLE *current;
JSAMPLE *limit;
struct jpeg_decompress_struct cinfo;
- struct jpeg_error_mgr jerr;
+ struct str_error_mgr err;
struct str_src_mgr src;
JSAMPARRAY row_buffer;
};
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Decrypt.cc
index ca294d39e00..2373a66abf0 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Decrypt.cc
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2008 Julien Rebetez <julien@fhtagn.net>
-// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 Matthias Franz <matthias@ktug.or.kr>
// Copyright (C) 2009 David Benjamin <davidben@mit.edu>
//
@@ -229,6 +229,8 @@ DecryptStream::DecryptStream(Stream *strA, Guchar *fileKey,
if ((objKeyLength = keyLength + 5) > 16) {
objKeyLength = 16;
}
+
+ charactersRead = 0;
}
DecryptStream::~DecryptStream() {
@@ -350,6 +352,10 @@ static void rc4InitKey(Guchar *key, int keyLen, Guchar *state) {
for (i = 0; i < 256; ++i)
state[i] = i;
+
+ if (unlikely(keyLen == 0))
+ return;
+
index1 = index2 = 0;
for (i = 0; i < 256; ++i) {
index2 = (key[index1] + state[i] + index2) % 256;
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Decrypt.h
index feb701444e2..feb701444e2 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Dict.cc
index a899bca16c0..1428113b7ed 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Dict.cc
@@ -16,7 +16,8 @@
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -29,6 +30,7 @@
#pragma implementation
#endif
+#include <algorithm>
#include <stddef.h>
#include <string.h>
#include "goo/gmem.h"
@@ -40,11 +42,37 @@
// Dict
//------------------------------------------------------------------------
+static const int SORT_LENGTH_LOWER_LIMIT = 32;
+
+static inline bool cmpDictEntries(const DictEntry &e1, const DictEntry &e2)
+{
+ return strcmp(e1.key, e2.key) < 0;
+}
+
+static int binarySearch(const char *key, DictEntry *entries, int length)
+{
+ int first = 0;
+ int end = length - 1;
+ while (first <= end) {
+ const int middle = (first + end) / 2;
+ const int res = strcmp(key, entries[middle].key);
+ if (res == 0) {
+ return middle;
+ } else if (res < 0) {
+ end = middle - 1;
+ } else {
+ first = middle + 1;
+ }
+ }
+ return -1;
+}
+
Dict::Dict(XRef *xrefA) {
xref = xrefA;
entries = NULL;
size = length = 0;
ref = 1;
+ sorted = gFalse;
}
Dict::Dict(Dict* dictA) {
@@ -52,6 +80,7 @@ Dict::Dict(Dict* dictA) {
size = length = dictA->length;
ref = 1;
+ sorted = dictA->sorted;
entries = (DictEntry *)gmallocn(size, sizeof(DictEntry));
for (int i=0; i<length; i++) {
entries[i].key = strdup(dictA->entries[i].key);
@@ -70,6 +99,12 @@ Dict::~Dict() {
}
void Dict::add(char *key, Object *val) {
+ if (sorted) {
+ // We use add on very few occasions so
+ // virtually this will never be hit
+ sorted = gFalse;
+ }
+
if (length == size) {
if (length == 0) {
size = 8;
@@ -84,33 +119,60 @@ void Dict::add(char *key, Object *val) {
}
inline DictEntry *Dict::find(char *key) {
- int i;
+ if (!sorted && length >= SORT_LENGTH_LOWER_LIMIT)
+ {
+ sorted = gTrue;
+ std::sort(entries, entries+length, cmpDictEntries);
+ }
+
+ if (sorted) {
+ const int pos = binarySearch(key, entries, length);
+ if (pos != -1) {
+ return &entries[pos];
+ }
+ } else {
+ int i;
- for (i = length - 1; i >=0; --i) {
- if (!strcmp(key, entries[i].key))
- return &entries[i];
+ for (i = length - 1; i >=0; --i) {
+ if (!strcmp(key, entries[i].key))
+ return &entries[i];
+ }
}
return NULL;
}
+GBool Dict::hasKey(char *key) {
+ return find(key) != NULL;
+}
+
void Dict::remove(char *key) {
- int i;
- bool found = false;
- DictEntry tmp;
- if(length == 0) return;
-
- for(i=0; i<length; i++) {
- if (!strcmp(key, entries[i].key)) {
- found = true;
- break;
+ if (sorted) {
+ const int pos = binarySearch(key, entries, length);
+ if (pos != -1) {
+ length -= 1;
+ if (pos != length) {
+ memmove(&entries[pos], &entries[pos + 1], (length - pos) * sizeof(DictEntry));
+ }
+ }
+ } else {
+ int i;
+ bool found = false;
+ DictEntry tmp;
+ if(length == 0) return;
+
+ for(i=0; i<length; i++) {
+ if (!strcmp(key, entries[i].key)) {
+ found = true;
+ break;
+ }
}
+ if(!found) return;
+ //replace the deleted entry with the last entry
+ length -= 1;
+ tmp = entries[length];
+ if (i!=length) //don't copy the last entry if it is deleted
+ entries[i] = tmp;
}
- if(!found) return;
- //replace the deleted entry with the last entry
- length -= 1;
- tmp = entries[length];
- if (i!=length) //don't copy the last entry if it is deleted
- entries[i] = tmp;
}
void Dict::set(char *key, Object *val) {
@@ -131,10 +193,10 @@ GBool Dict::is(char *type) {
return (e = find("Type")) && e->val.isName(type);
}
-Object *Dict::lookup(char *key, Object *obj) {
+Object *Dict::lookup(char *key, Object *obj, std::set<int> *fetchOriginatorNums) {
DictEntry *e;
- return (e = find(key)) ? e->val.fetch(xref, obj) : obj->initNull();
+ return (e = find(key)) ? e->val.fetch(xref, obj, fetchOriginatorNums) : obj->initNull();
}
Object *Dict::lookupNF(char *key, Object *obj) {
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Dict.h
index bb747d579bd..f4ed64a5dbf 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Dict.h
@@ -16,6 +16,8 @@
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org>
+// Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -70,7 +72,7 @@ public:
// Look up an entry and return the value. Returns a null object
// if <key> is not in the dictionary.
- Object *lookup(char *key, Object *obj);
+ Object *lookup(char *key, Object *obj, std::set<int> *fetchOriginatorNums = NULL);
Object *lookupNF(char *key, Object *obj);
GBool lookupInt(const char *key, const char *alt_key, int *value);
@@ -83,9 +85,14 @@ public:
// trailer dictionary, which is read before the xref table is
// parsed.
void setXRef(XRef *xrefA) { xref = xrefA; }
+
+ XRef *getXRef() { return xref; }
+
+ GBool hasKey(char *key);
private:
+ GBool sorted;
XRef *xref; // the xref table for this PDF file
DictEntry *entries; // array of entries
int size; // size of <entries> array
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Error.cc
index fc2bef4371c..fc2bef4371c 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Error.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Error.h
index 07f3d1f92ad..07f3d1f92ad 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.cc
index 4df6139402b..7807864b295 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.cc
@@ -25,6 +25,134 @@
#include "FileSpec.h"
+EmbFile::EmbFile(Object *efStream)
+{
+ m_size = -1;
+ m_createDate = NULL;
+ m_modDate = NULL;
+ m_checksum = NULL;
+ m_mimetype = NULL;
+
+ efStream->copy(&m_objStr);
+
+ if (efStream->isStream()) {
+ // dataDict corresponds to Table 3.41 in the PDF1.6 spec.
+ Dict *dataDict = efStream->streamGetDict();
+
+ // subtype is normally the mimetype
+ Object subtypeName;
+ if (dataDict->lookup("Subtype", &subtypeName)->isName()) {
+ m_mimetype = new GooString(subtypeName.getName());
+ }
+ subtypeName.free();
+
+ // paramDict corresponds to Table 3.42 in the PDF1.6 spec
+ Object paramDict;
+ if (dataDict->lookup("Params", &paramDict)->isDict()) {
+ Object paramObj;
+ if (paramDict.dictLookup("ModDate", &paramObj)->isString())
+ m_modDate = new GooString(paramObj.getString());
+ paramObj.free();
+
+ if (paramDict.dictLookup("CreationDate", &paramObj)->isString())
+ m_createDate = new GooString(paramObj.getString());
+ paramObj.free();
+
+ if (paramDict.dictLookup("Size", &paramObj)->isInt())
+ m_size = paramObj.getInt();
+ paramObj.free();
+
+ if (paramDict.dictLookup("CheckSum", &paramObj)->isString())
+ m_checksum = new GooString(paramObj.getString());
+ paramObj.free();
+ }
+ paramDict.free();
+ }
+}
+
+EmbFile::~EmbFile()
+{
+ delete m_createDate;
+ delete m_modDate;
+ delete m_checksum;
+ delete m_mimetype;
+ m_objStr.free();
+}
+
+FileSpec::FileSpec(Object *fileSpecA)
+{
+ ok = gTrue;
+ fileName = NULL;
+ platformFileName = NULL;
+ embFile = NULL;
+ desc = NULL;
+ fileSpecA->copy(&fileSpec);
+
+ Object obj1;
+ if (!getFileSpecName(fileSpecA, &obj1)) {
+ ok = gFalse;
+ obj1.free();
+ error(-1, "Invalid FileSpec");
+ return;
+ }
+
+ fileName = obj1.getString()->copy();
+ obj1.free();
+
+ if (fileSpec.isDict()) {
+ if (fileSpec.dictLookup("EF", &obj1)->isDict()) {
+ if (!obj1.dictLookupNF("F", &fileStream)->isRef()) {
+ ok = gFalse;
+ fileStream.free();
+ error(-1, "Invalid FileSpec: Embedded file stream is not an indirect reference");
+ obj1.free();
+ return;
+ }
+ }
+ obj1.free();
+ }
+
+ if (fileSpec.dictLookup("Desc", &obj1)->isString())
+ desc = obj1.getString()->copy();
+ obj1.free();
+}
+
+FileSpec::~FileSpec()
+{
+ fileSpec.free();
+ fileStream.free();
+ delete fileName;
+ delete platformFileName;
+ delete embFile;
+ delete desc;
+}
+
+EmbFile *FileSpec::getEmbeddedFile()
+{
+ if (embFile)
+ return embFile;
+
+ Object obj1;
+ XRef *xref = fileSpec.getDict()->getXRef();
+ embFile = new EmbFile(fileStream.fetch(xref, &obj1));
+ obj1.free();
+
+ return embFile;
+}
+
+GooString *FileSpec::getFileNameForPlatform()
+{
+ if (platformFileName)
+ return platformFileName;
+
+ Object obj1;
+ if (getFileSpecNameForPlatform(&fileSpec, &obj1))
+ platformFileName = obj1.getString()->copy();
+ obj1.free();
+
+ return platformFileName;
+}
+
GBool getFileSpecName (Object *fileSpec, Object *fileName)
{
if (fileSpec->isString()) {
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.h
new file mode 100644
index 00000000000..e26cdcf8b0a
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/FileSpec.h
@@ -0,0 +1,73 @@
+//========================================================================
+//
+// FileSpec.h
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
+#ifndef FILE_SPEC_H
+#define FILE_SPEC_H
+
+#ifdef USE_GCC_PRAGMAS
+#pragma interface
+#endif
+
+#include "Object.h"
+
+class EmbFile {
+public:
+ EmbFile(Object *efStream);
+ ~EmbFile();
+
+ int size() { return m_size; }
+ GooString *modDate() { return m_modDate; }
+ GooString *createDate() { return m_createDate; }
+ GooString *checksum() { return m_checksum; }
+ GooString *mimeType() { return m_mimetype; }
+ Stream *stream() { return isOk() ? m_objStr.getStream() : NULL; }
+ GBool isOk() { return m_objStr.isStream(); }
+
+private:
+ int m_size;
+ GooString *m_createDate;
+ GooString *m_modDate;
+ GooString *m_checksum;
+ GooString *m_mimetype;
+ Object m_objStr;
+};
+
+class FileSpec {
+public:
+ FileSpec(Object *fileSpec);
+ ~FileSpec();
+
+ GBool isOk() { return ok; }
+
+ GooString *getFileName() const { return fileName; }
+ GooString *getFileNameForPlatform();
+ GooString *getDescription() const { return desc; }
+ EmbFile *getEmbeddedFile();
+
+private:
+ GBool ok;
+
+ Object fileSpec;
+
+ GooString *fileName; // F, UF, DOS, Mac, Unix
+ GooString *platformFileName;
+ Object fileStream; // Ref to F entry in UF
+ EmbFile *embFile;
+ GooString *desc; // Desc
+};
+
+GBool getFileSpecName (Object *fileSpec, Object *fileName);
+GBool getFileSpecNameForPlatform (Object *fileSpec, Object *fileName);
+
+#endif /* FILE_SPEC_H */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/FlateStream.cc
index 487ce94761c..ef477b36077 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/FlateStream.cc
@@ -3,6 +3,7 @@
// FlateStream.cc
//
// Copyright (C) 2005, Jeff Muizelaar <jeff@infidigm.net>
+// Copyright (C) 2010, Albert Astals Cid <aacid@kde.org>
//
// This file is under the GPLv2 or later license
//
@@ -44,10 +45,12 @@ void FlateStream::reset() {
}
int FlateStream::getRawChar() {
- if (fill_buffer())
- return EOF;
+ return doGetRawChar();
+}
- return out_buf[out_pos++];
+void FlateStream::getRawChars(int nChars, int *buffer) {
+ for (int i = 0; i < nChars; ++i)
+ buffer[i] = doGetRawChar();
}
int FlateStream::getChar() {
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/FlateStream.h
index f4be9e471e1..dba00d0a89a 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/FlateStream.h
@@ -3,6 +3,7 @@
// FlateStream.h
//
// Copyright (C) 2005, Jeff Muizelaar <jeff@infidigm.net>
+// Copyright (C) 2010, 2011, Albert Astals Cid <aacid@kde.org>
//
// This file is under the GPLv2 or later license
//
@@ -10,7 +11,6 @@
#ifndef FLATESTREAM_H
#define FLATESTREAM_H
-#include <config.h>
#ifdef USE_GCC_PRAGMAS
#pragma interface
@@ -21,6 +21,7 @@
#pragma implementation
#endif
+#include "poppler-config.h"
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
@@ -31,7 +32,6 @@
#include <ctype.h>
#include "goo/gmem.h"
#include "goo/gfile.h"
-#include "poppler-config.h"
#include "Error.h"
#include "Object.h"
#include "Decrypt.h"
@@ -51,10 +51,18 @@ public:
virtual int getChar();
virtual int lookChar();
virtual int getRawChar();
+ virtual void getRawChars(int nChars, int *buffer);
virtual GooString *getPSFilter(int psLevel, char *indent);
virtual GBool isBinary(GBool last = gTrue);
private:
+ inline int doGetRawChar() {
+ if (fill_buffer())
+ return EOF;
+
+ return out_buf[out_pos++];
+ }
+
int fill_buffer(void);
z_stream d_stream;
StreamPredictor *pred;
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/FontEncodingTables.cc
index cd8d8926542..cd8d8926542 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/FontEncodingTables.h
index 8b0a1e7e993..8b0a1e7e993 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/FontInfo.cc
index 0037e071c73..440e6f5aee9 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/FontInfo.cc
@@ -3,10 +3,14 @@
// FontInfo.cc
//
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005-2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2008, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
// Copyright (C) 2006 Kouhei Sutou <kou@cozmixng.org>
// Copyright (C) 2009 Pino Toscano <pino@kde.org>
+// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2010 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2010 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011 Carlos Garcia Campos <carlosgc@gnome.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -39,15 +43,9 @@
FontInfoScanner::FontInfoScanner(PDFDoc *docA, int firstPage) {
doc = docA;
currentPage = firstPage + 1;
- fonts = NULL;
- fontsLen = fontsSize = 0;
- visitedXObjects = NULL;
- visitedXObjectsLen = visitedXObjectsSize = 0;
}
FontInfoScanner::~FontInfoScanner() {
- gfree(fonts);
- gfree(visitedXObjects);
}
GooList *FontInfoScanner::scan(int nPages) {
@@ -70,12 +68,13 @@ GooList *FontInfoScanner::scan(int nPages) {
}
for (int pg = currentPage; pg < lastPage; ++pg) {
- page = doc->getCatalog()->getPage(pg);
+ page = doc->getPage(pg);
+ if (!page) continue;
+
if ((resDict = page->getResourceDict())) {
scanFonts(resDict, result);
}
- annots = new Annots(doc->getXRef(), doc->getCatalog(), page->getAnnots(&obj1));
- obj1.free();
+ annots = page->getAnnots(doc->getCatalog());
for (int i = 0; i < annots->getNumAnnots(); ++i) {
if (annots->getAnnot(i)->getAppearance(&obj1)->isStream()) {
obj1.streamGetDict()->lookup("Resources", &obj2);
@@ -86,7 +85,6 @@ GooList *FontInfoScanner::scan(int nPages) {
}
obj1.free();
}
- delete annots;
}
currentPage = lastPage;
@@ -95,7 +93,7 @@ GooList *FontInfoScanner::scan(int nPages) {
}
void FontInfoScanner::scanFonts(Dict *resDict, GooList *fontsList) {
- Object obj1, obj2, xObjDict, xObj, xObj2, resObj;
+ Object obj1, obj2, objDict, resObj;
Ref r;
GfxFontDict *gfxFontDict;
GfxFont *font;
@@ -116,26 +114,13 @@ void FontInfoScanner::scanFonts(Dict *resDict, GooList *fontsList) {
}
if (gfxFontDict) {
for (i = 0; i < gfxFontDict->getNumFonts(); ++i) {
- int k;
if ((font = gfxFontDict->getFont(i))) {
Ref fontRef = *font->getID();
- GBool alreadySeen = gFalse;
- // check for an already-seen font
- for (k = 0; k < fontsLen; ++k) {
- if (fontRef.num == fonts[k].num && fontRef.gen == fonts[k].gen) {
- alreadySeen = gTrue;
- }
- }
-
- // add this font to the list
- if (!alreadySeen) {
+ // add this font to the list if not already found
+ if (fonts.find(fontRef.num) == fonts.end()) {
fontsList->append(new FontInfo(font, doc));
- if (fontsLen == fontsSize) {
- fontsSize += 32;
- fonts = (Ref *)grealloc(fonts, fontsSize * sizeof(Ref));
- }
- fonts[fontsLen++] = *font->getID();
+ fonts.insert(fontRef.num);
}
}
}
@@ -145,46 +130,38 @@ void FontInfoScanner::scanFonts(Dict *resDict, GooList *fontsList) {
// recursively scan any resource dictionaries in objects in this
// resource dictionary
- resDict->lookup("XObject", &xObjDict);
- if (xObjDict.isDict()) {
- for (i = 0; i < xObjDict.dictGetLength(); ++i) {
- xObjDict.dictGetValNF(i, &xObj);
- if (xObj.isRef()) {
- GBool alreadySeen = gFalse;
- // check for an already-seen XObject
- for (int k = 0; k < visitedXObjectsLen; ++k) {
- if (xObj.getRef().num == visitedXObjects[k].num &&
- xObj.getRef().gen == visitedXObjects[k].gen) {
- alreadySeen = gTrue;
+ char *resTypes[] = { "XObject", "Pattern" };
+ for (Guint resType = 0; resType < sizeof(resTypes) / sizeof(resTypes[0]); ++resType) {
+ resDict->lookup(resTypes[resType], &objDict);
+ if (objDict.isDict()) {
+ for (i = 0; i < objDict.dictGetLength(); ++i) {
+ objDict.dictGetValNF(i, &obj1);
+ if (obj1.isRef()) {
+ // check for an already-seen object
+ const Ref r = obj1.getRef();
+ if (visitedObjects.find(r.num) != visitedObjects.end()) {
+ obj1.free();
+ continue;
}
- }
- if (alreadySeen) {
- xObj.free();
- continue;
+ visitedObjects.insert(r.num);
}
- if (visitedXObjectsLen == visitedXObjectsSize) {
- visitedXObjectsSize += 32;
- visitedXObjects = (Ref *)grealloc(visitedXObjects, visitedXObjectsSize * sizeof(Ref));
- }
- visitedXObjects[visitedXObjectsLen++] = xObj.getRef();
- }
+ obj1.fetch(doc->getXRef(), &obj2);
- xObj.fetch(doc->getXRef(), &xObj2);
-
- if (xObj2.isStream()) {
- xObj2.streamGetDict()->lookup("Resources", &resObj);
- if (resObj.isDict() && resObj.getDict() != resDict) {
- scanFonts(resObj.getDict(), fontsList);
+ if (obj2.isStream()) {
+ obj2.streamGetDict()->lookup("Resources", &resObj);
+ if (resObj.isDict() && resObj.getDict() != resDict) {
+ scanFonts(resObj.getDict(), fontsList);
+ }
+ resObj.free();
}
- resObj.free();
+ obj1.free();
+ obj2.free();
}
- xObj.free();
- xObj2.free();
}
+ objDict.free();
}
- xObjDict.free();
}
FontInfo::FontInfo(GfxFont *font, PDFDoc *doc) {
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/FontInfo.h
index 79eafea4429..733194db6a3 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/FontInfo.h
@@ -3,7 +3,7 @@
// FontInfo.h
//
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005-2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2008, 2010, 2011 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
// Copyright (C) 2009 Pino Toscano <pino@kde.org>
//
@@ -23,9 +23,13 @@
#ifndef FONT_INFO_H
#define FONT_INFO_H
+#include "Object.h"
#include "goo/gtypes.h"
#include "goo/GooList.h"
+class GfxFont;
+class PDFDoc;
+
class FontInfo {
public:
enum Type {
@@ -84,13 +88,8 @@ private:
PDFDoc *doc;
int currentPage;
- Ref *fonts;
- int fontsLen;
- int fontsSize;
-
- Ref *visitedXObjects;
- int visitedXObjectsLen;
- int visitedXObjectsSize;
+ std::set<int> fonts;
+ std::set<int> visitedObjects;
void scanFonts(Dict *resDict, GooList *fontsList);
};
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Form.cc
index 7ccc96bf75c..1f8b064b807 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Form.cc
@@ -5,14 +5,15 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2006-2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright 2007-2009 Albert Astals Cid <aacid@kde.org>
-// Copyright 2007-2008 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright 2007-2011 Albert Astals Cid <aacid@kde.org>
+// Copyright 2007-2008, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright 2007 Adrian Johnson <ajohnson@redneon.com>
// Copyright 2007 Iñigo Martínez <inigomartinez@gmail.com>
-// Copyright 2008 Pino Toscano <pino@kde.org>
+// Copyright 2008, 2011 Pino Toscano <pino@kde.org>
// Copyright 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright 2009 Matthias Drochner <M.Drochner@fz-juelich.de>
// Copyright 2009 KDAB via Guillermo Amaral <gamaral@amaral.com.mx>
+// Copyright 2010 Mark Riedesel <mark@klowner.com>
//
//========================================================================
@@ -22,6 +23,7 @@
#pragma implementation
#endif
+#include <set>
#include <stddef.h>
#include <string.h>
#include "goo/gmem.h"
@@ -30,11 +32,13 @@
#include "Object.h"
#include "Array.h"
#include "Dict.h"
+#include "Gfx.h"
#include "Form.h"
#include "XRef.h"
#include "PDFDocEncoding.h"
#include "Annot.h"
#include "Catalog.h"
+#include "Link.h"
//return a newly allocated char* containing an UTF16BE string of size length
char* pdfDocEncodingToUTF16 (GooString* orig, int* length)
@@ -59,77 +63,61 @@ char* pdfDocEncodingToUTF16 (GooString* orig, int* length)
FormWidget::FormWidget(XRef *xrefA, Object *aobj, unsigned num, Ref aref, FormField *fieldA)
{
- Object obj1, obj2;
ref = aref;
- double t;
ID = 0;
- defaultsLoaded = gFalse;
- fontSize = 0.0;
- modified = gFalse;
childNum = num;
xref = xrefA;
aobj->copy(&obj);
type = formUndef;
field = fieldA;
- Dict *dict = obj.getDict();
-
- if (!dict->lookup("Rect", &obj1)->isArray()) {
- error(-1, "Annotation rectangle is wrong type");
- goto err2;
- }
- if (!obj1.arrayGet(0, &obj2)->isNum()) {
- error(-1, "Bad annotation rectangle");
- goto err1;
- }
- x1 = obj2.getNum();
- obj2.free();
- if (!obj1.arrayGet(1, &obj2)->isNum()) {
- error(-1, "Bad annotation rectangle");
- goto err1;
- }
- y1 = obj2.getNum();
- obj2.free();
- if (!obj1.arrayGet(2, &obj2)->isNum()) {
- error(-1, "Bad annotation rectangle");
- goto err1;
- }
- x2 = obj2.getNum();
- obj2.free();
- if (!obj1.arrayGet(3, &obj2)->isNum()) {
- error(-1, "Bad annotation rectangle");
- goto err1;
- }
- y2 = obj2.getNum();
- obj2.free();
- obj1.free();
- //swap coords if needed
- if (x1 > x2) {
- t = x1;
- x1 = x2;
- x2 = t;
- }
- if (y1 > y2) {
- t = y1;
- y1 = y2;
- y2 = t;
- }
-
- err1:
- obj2.free();
- err2:
- obj1.free();
+ widget = NULL;
}
FormWidget::~FormWidget()
{
+ if (widget)
+ widget->decRefCnt();
obj.free ();
}
+#ifdef DEBUG_FORMS
+void FormWidget::print(int indent) {
+ printf ("%*s+ (%d %d): [widget]\n", indent, "", ref.num, ref.gen);
+}
+#endif
+
+void FormWidget::createWidgetAnnotation(Catalog *catalog) {
+ if (widget)
+ return;
+
+ Object obj1;
+ obj1.initRef(ref.num, ref.gen);
+ widget = new AnnotWidget(xref, obj.getDict(), catalog, &obj1, field);
+ obj1.free();
+}
+
+GBool FormWidget::inRect(double x, double y) const {
+ return widget ? widget->inRect(x, y) : gFalse;
+}
+
+void FormWidget::getRect(double *x1, double *y1, double *x2, double *y2) const {
+ if (widget)
+ widget->getRect(x1, y1, x2, y2);
+}
+
+double FormWidget::getFontSize() const {
+ return widget ? widget->getFontSize() : 0.;
+}
+
bool FormWidget::isReadOnly() const
{
return field->isReadOnly();
}
+GBool FormWidget::isModified() const {
+ return field->isModified();
+}
+
int FormWidget::encodeID (unsigned pageNum, unsigned fieldNum)
{
return (pageNum << 4*sizeof(unsigned)) + fieldNum;
@@ -141,26 +129,24 @@ void FormWidget::decodeID (unsigned id, unsigned* pageNum, unsigned* fieldNum)
*fieldNum = (id << 4*sizeof(unsigned)) >> 4*sizeof(unsigned);
}
-void FormWidget::updateField (const char *key, Object *value)
-{
- Object *obj1;
- Ref ref1;
- Object obj2;
-
- if (obj.getDict()->lookup ("FT", &obj2)->isName ()) {
- // It's a composed (annot + field) dict
- obj1 = &obj;
- ref1 = ref;
- } else {
- // It's an annot dict, we have to modify the Field (parent) dict
- obj1 = field->getObj ();
- ref1 = field->getRef ();
- }
- obj2.free ();
+GooString *FormWidget::getPartialName() const {
+ return field->getPartialName();
+}
+
+GooString *FormWidget::getAlternateUiName() const {
+ return field->getAlternateUiName();
+}
- obj1->getDict ()->set (const_cast<char*>(key), value);
- //notify the xref about the update
- xref->setModifiedObject(obj1, ref1);
+GooString *FormWidget::getMappingName() const {
+ return field->getMappingName();
+}
+
+GooString *FormWidget::getFullyQualifiedName() {
+ return field->getFullyQualifiedName();
+}
+
+LinkAction *FormWidget::getActivationAction() {
+ return widget ? widget->getAction() : NULL;
}
FormWidgetButton::FormWidgetButton (XRef *xrefA, Object *aobj, unsigned num, Ref ref, FormField *p) :
@@ -169,9 +155,36 @@ FormWidgetButton::FormWidgetButton (XRef *xrefA, Object *aobj, unsigned num, Ref
type = formButton;
parent = static_cast<FormFieldButton*>(field);
onStr = NULL;
- state = gFalse;
siblingsID = NULL;
numSiblingsID = 0;
+
+ Object obj1, obj2;
+
+ // Find the name of the ON state in the AP dictionnary
+ // The reference say the Off state, if it existe, _must_ be stored in the AP dict under the name /Off
+ // The "on" state may be stored under any other name
+ if (obj.dictLookup("AP", &obj1)->isDict()) {
+ if (obj1.dictLookup("N", &obj2)->isDict()) {
+ for (int i = 0; i < obj2.dictGetLength(); i++) {
+ char *key = obj2.dictGetKey(i);
+ if (strcmp (key, "Off") != 0) {
+ onStr = new GooString (key);
+ break;
+ }
+ }
+ }
+ obj2.free();
+ }
+ obj1.free();
+}
+
+char *FormWidgetButton::getOnStr() {
+ if (onStr)
+ return onStr->getCString();
+
+ // 12.7.4.2.3 Check Boxes
+ // Yes should be used as the name for the on state
+ return parent->getButtonType() == formButtonCheck ? (char *)"Yes" : NULL;
}
FormWidgetButton::~FormWidgetButton ()
@@ -186,108 +199,29 @@ FormButtonType FormWidgetButton::getButtonType () const
return parent->getButtonType ();
}
-void FormWidgetButton::setState (GBool astate, GBool calledByParent)
-{
- //pushButtons don't have state
- if (parent->getButtonType() == formButtonPush)
+void FormWidgetButton::setAppearanceState(char *state) {
+ if (!widget)
return;
- //the state modification may be denied by the parent. e.g we don't want to let the user put all combo boxes to false
- if (!calledByParent) { //avoid infinite recursion
- modified = gTrue;
- if (!parent->setState(childNum, astate)) {
- return;
- }
- }
- state = astate;
-
- //update appearance
- char *offStr = "Off";
- Object obj1;
- obj1.initName(state?getOnStr():offStr);
- updateField ("V", &obj1);
-
- obj1.initName(state?getOnStr():offStr);
- //modify the Appearance State entry as well
- obj.getDict()->set("AS", &obj1);
- //notify the xref about the update
- xref->setModifiedObject(&obj, ref);
+ widget->setAppearanceState(state);
}
-void FormWidgetButton::loadDefaults ()
+void FormWidgetButton::setState (GBool astate)
{
- if (defaultsLoaded)
- return;
-
- defaultsLoaded = gTrue;
-
- Dict *dict = obj.getDict();
- Object obj1;
-
//pushButtons don't have state
- if (parent->getButtonType() != formButtonPush ){
- //find the name of the state in the AP dictionnary (/Yes, /Off)
- //The reference say the Off state, if it existe, _must_ be stored in the AP dict under the name /Off
- //The "on" state may be stored under any other name
- if (dict->lookup("AP", &obj1)->isDict()) {
- Dict *tmpDict = obj1.getDict();
- int length = tmpDict->getLength();
- for(int i=0; i<length; i++) {
- Object obj2;
- tmpDict->getVal(i, &obj2);
- if (obj2.isDict()) {
- Dict *tmpDict2 = obj2.getDict();
- int length2 = tmpDict2->getLength();
- for(int j=0; j<length2; j++) {
- Object obj3;
- tmpDict2->getVal(j, &obj3);
- char *key = tmpDict2->getKey(j);
- if(strcmp(key, "Off")) { //if we don't have Off, we have the name of the "on" state
- onStr = new GooString (key);
- }
- obj3.free();
- if (onStr)
- break;
- }
- } else if (obj2.isStream()) {
- // TODO do something with str and obj3
- Stream *str = obj2.getStream();
- Dict *tmpDict2 = str->getDict();
- Object obj3;
- tmpDict2->lookup("Length", &obj3);
- onStr = new GooString ("D");
- obj3.free();
- }
- obj2.free();
- if (onStr)
- break;
- }
- }
- obj1.free();
+ if (parent->getButtonType() == formButtonPush)
+ return;
- //We didn't found the "on" state for the button
- if (!onStr) {
- error(-1, "FormWidgetButton:: unable to find the on state for the button\n");
- onStr = new GooString(""); // TODO is this the best solution?
- }
- }
+ // Silently return if can't set ON state
+ if (astate && !onStr)
+ return;
- if (Form::fieldLookup(dict, "V", &obj1)->isName()) {
- Object obj2;
- if (dict->lookup("AS", &obj2)->isName(obj1.getName())) {
- if (strcmp (obj1.getName(), "Off") != 0) {
- setState(gTrue);
- }
- }
- obj2.free();
- } else if (obj1.isArray()) { //handle the case where we have multiple choices
- error(-1, "FormWidgetButton:: multiple choice isn't supported yet\n");
- }
- obj1.free();
+ parent->setState(astate ? onStr->getCString() : (char *)"Off");
+ // Parent will call setAppearanceState()
}
GBool FormWidgetButton::getState ()
{
- return state;
+ return onStr ? parent->getState(onStr->getCString()) : gFalse;
}
void FormWidgetButton::setNumSiblingsID (int i)
@@ -304,38 +238,6 @@ FormWidgetText::FormWidgetText (XRef *xrefA, Object *aobj, unsigned num, Ref ref
parent = static_cast<FormFieldText*>(field);
}
-void FormWidgetText::loadDefaults ()
-{
- if (defaultsLoaded)
- return;
-
- defaultsLoaded = gTrue;
-
- Dict *dict = obj.getDict();
- Object obj1;
-
- if (Form::fieldLookup(dict, "V", &obj1)->isString()) {
- if (obj1.getString()->hasUnicodeMarker()) {
- if (obj1.getString()->getLength() <= 2) {
- } else {
- parent->setContentCopy(obj1.getString());
- }
- } else {
- if (obj1.getString()->getLength() > 0) {
- //non-unicode string -- assume pdfDocEncoding and try to convert to UTF16BE
- int tmp_length;
- char* tmp_str = pdfDocEncodingToUTF16(obj1.getString(), &tmp_length);
- GooString* str1 = new GooString(tmp_str, tmp_length);
- parent->setContentCopy(str1);
- delete str1;
- delete []tmp_str;
- }
- }
- }
- obj1.free();
-
-}
-
GooString* FormWidgetText::getContent ()
{
return parent->getContent();
@@ -393,23 +295,7 @@ void FormWidgetText::setContent(GooString* new_content)
return;
}
- modified = gTrue;
- if (new_content == NULL) {
- parent->setContentCopy(NULL);
- } else {
- //append the unicode marker <FE FF> if needed
- if (!new_content->hasUnicodeMarker()) {
- new_content->insert(0, 0xff);
- new_content->insert(0, 0xfe);
- }
-
- GooString *cont = new GooString(new_content);
- parent->setContentCopy(cont);
-
- Object obj1;
- obj1.initString(cont);
- updateField ("V", &obj1);
- }
+ parent->setContentCopy(new_content);
}
FormWidgetChoice::FormWidgetChoice(XRef *xrefA, Object *aobj, unsigned num, Ref ref, FormField *p) :
@@ -419,144 +305,10 @@ FormWidgetChoice::FormWidgetChoice(XRef *xrefA, Object *aobj, unsigned num, Ref
parent = static_cast<FormFieldChoice*>(field);
}
-void FormWidgetChoice::loadDefaults ()
-{
- if (defaultsLoaded)
- return;
-
- defaultsLoaded = gTrue;
-
- Dict *dict = obj.getDict();
- Object obj1;
- if (dict->lookup("Opt", &obj1)->isArray()) {
- Object obj2;
- parent->_setNumChoices(obj1.arrayGetLength());
- parent->_createChoicesTab();
- for(int i=0; i<parent->getNumChoices(); i++) {
- obj1.arrayGet(i, &obj2);
- if(obj2.isString()) {
- parent->_setChoiceExportVal(i, obj2.getString()->copy());
- parent->_setChoiceOptionName(i, obj2.getString()->copy());
- } else if (obj2.isArray()) { // [Export_value, Displayed_text]
- Object obj3,obj4;
- if (obj2.arrayGetLength() < 2) {
- error(-1, "FormWidgetChoice:: invalid Opt entry -- array's length < 2\n");
- parent->_setChoiceExportVal(i, new GooString(""));
- parent->_setChoiceOptionName(i, new GooString(""));
- continue;
- }
- obj2.arrayGet(0, &obj3);
- obj2.arrayGet(1, &obj4);
- parent->_setChoiceExportVal(i, obj3.getString()->copy());
- parent->_setChoiceOptionName(i, obj4.getString()->copy());
- obj3.free();
- obj4.free();
- } else {
- error(-1, "FormWidgetChoice:: invalid %d Opt entry\n", i);
- parent->_setChoiceExportVal(i, new GooString(""));
- parent->_setChoiceOptionName(i, new GooString(""));
- }
- obj2.free();
- }
- } else {
- //empty choice
- }
- obj1.free();
-
- bool* tmpCurrentChoice = new bool[parent->getNumChoices()];
- memset(tmpCurrentChoice, 0, sizeof(bool)*parent->getNumChoices());
-
- //find default choice
- if (Form::fieldLookup(dict, "V", &obj1)->isString()) {
- for(int i=0; i<parent->getNumChoices(); i++) {
- if (parent->getChoice(i)->cmp(obj1.getString()) == 0) {
- tmpCurrentChoice[i] = true;
- break;
- }
- }
- } else if (obj1.isArray()) {
- for(int i=0; i<obj1.arrayGetLength(); i++) {
- Object obj2;
- obj1.arrayGet(i, &obj2);
- for(int j=0; j<parent->getNumChoices(); j++) {
- if (parent->getChoice(j)->cmp(obj2.getString()) == 0) {
- tmpCurrentChoice[i] = true;
- }
- }
-
- obj2.free();
- }
- }
- obj1.free();
-
- //convert choice's human readable strings to UTF16
- //and update the /Opt dict entry to reflect this change
-#ifdef UPDATE_OPT
- Object *objOpt = new Object();
- objOpt->initArray(xref);
-#endif
- for(int i=0; i<parent->getNumChoices(); i++) {
- if (parent->getChoice(i)->hasUnicodeMarker()) { //string already in UTF16, do nothing
-
- } else { //string in pdfdocencoding, convert to UTF16
- int len;
- char* buffer = pdfDocEncodingToUTF16(parent->getChoice(i), &len);
- parent->getChoice(i)->Set(buffer, len);
- delete [] buffer;
- }
- #ifdef UPDATE_OPT
- Object *obj2 = new Object();
- obj2->initString(choices[i]);
- objOpt->getArray()->add(obj2);
- #endif
- }
- //set default choice now that we have UTF16 strings
- for (int i=0; i<parent->getNumChoices(); i++) {
- if (tmpCurrentChoice[i])
- parent->select(i);
- }
-#ifdef UPDATE_OPT
- updateField ("Opt", objOpt);
-#endif
- delete [] tmpCurrentChoice;
-}
-
FormWidgetChoice::~FormWidgetChoice()
{
}
-void FormWidgetChoice::_updateV ()
-{
- Object obj1;
- //this is an editable combo-box with user-entered text
- if (hasEdit() && parent->getEditChoice()) {
- obj1.initString(new GooString(parent->getEditChoice()));
- } else {
- int numSelected = parent->getNumSelected();
- if (numSelected == 0) {
- obj1.initString(new GooString(""));
- } else if (numSelected == 1) {
- for(int i=0; i<parent->getNumChoices(); i++) {
- if (parent->isSelected(i)) {
- obj1.initString(new GooString(parent->getChoice(i)));
- break;
- }
- }
- } else {
- obj1.initArray(xref);
- for(int i=0; i<parent->getNumChoices(); i++) {
- if (parent->isSelected(i)) {
- Object obj2;
- obj2.initString(new GooString(parent->getChoice(i)));
- obj1.arrayAdd(&obj2);
- }
- }
- }
- }
- updateField ("V", &obj1);
- modified = gTrue;
-}
-
bool FormWidgetChoice::_checkRange (int i)
{
if (i < 0 || i >= parent->getNumChoices()) {
@@ -573,9 +325,7 @@ void FormWidgetChoice::select (int i)
return;
}
if (!_checkRange(i)) return;
- modified = gTrue;
parent->select(i);
- _updateV();
}
void FormWidgetChoice::toggle (int i)
@@ -585,9 +335,7 @@ void FormWidgetChoice::toggle (int i)
return;
}
if (!_checkRange(i)) return;
- modified = gTrue;
parent->toggle(i);
- _updateV();
}
void FormWidgetChoice::deselectAll ()
@@ -596,9 +344,7 @@ void FormWidgetChoice::deselectAll ()
error(-1, "FormWidgetChoice::deselectAll called on a read only field\n");
return;
}
- modified = gTrue;
parent->deselectAll();
- _updateV();
}
GooString* FormWidgetChoice::getEditChoice ()
@@ -627,18 +373,7 @@ void FormWidgetChoice::setEditChoice (GooString* new_content)
return;
}
- modified = gTrue;
- if (new_content == NULL) {
- parent->setEditChoice(NULL);
- } else {
- //append the unicode marker <FE FF> if needed
- if (!new_content->hasUnicodeMarker()) {
- new_content->insert(0, 0xff);
- new_content->insert(0, 0xfe);
- }
- parent->setEditChoice(new_content);
- }
- _updateV();
+ parent->setEditChoice(new_content);
}
int FormWidgetChoice::getNumChoices()
@@ -693,71 +428,91 @@ FormWidgetSignature::FormWidgetSignature(XRef *xrefA, Object *aobj, unsigned num
// FormField
//========================================================================
-FormField::FormField(XRef* xrefA, Object *aobj, const Ref& aref, FormFieldType ty)
+FormField::FormField(XRef* xrefA, Object *aobj, const Ref& aref, FormField *parentA, std::set<int> *usedParents, FormFieldType ty)
{
xref = xrefA;
aobj->copy(&obj);
Dict* dict = obj.getDict();
ref.num = ref.gen = 0;
type = ty;
+ parent = parentA;
numChildren = 0;
children = NULL;
terminal = false;
widgets = NULL;
readOnly = false;
+ defaultAppearance = NULL;
+ fullyQualifiedName = NULL;
+ quadding = quaddingLeftJustified;
+ hasQuadding = gFalse;
+ modified = gFalse;
+
ref = aref;
Object obj1;
//childs
if (dict->lookup("Kids", &obj1)->isArray()) {
- Array *array = obj1.getArray();
- int length = array->getLength();
// Load children
- for(int i=0; i<length; i++) {
- Object obj2,obj3;
- Object childRef;
- array->get(i, &obj2);
- array->getNF(i, &childRef);
- if (!obj2.isDict ()) {
- error (-1, "Reference to an invalid or non existant object");
- continue;
+ for (int i = 0 ; i < obj1.arrayGetLength(); i++) {
+ Object childRef, childObj;
+
+ if (!obj1.arrayGetNF(i, &childRef)->isRef()) {
+ error (-1, "Invalid form field renference");
+ childRef.free();
+ continue;
}
- //field child
- if (dict->lookup ("FT", &obj3)->isName()) {
- // If I'm not a generic container field and my children
- // are widgets, create widgets for them
- Object obj4;
-
- if (obj2.dictLookup("Subtype",&obj4)->isName()) {
- _createWidget(&obj2, childRef.getRef());
- }
- obj4.free();
- } else if(obj2.dictLookup("FT", &obj3)->isName() || obj2.dictLookup("Kids", &obj3)->isArray()) {
- if(terminal) error(-1, "Field can't have both Widget AND Field as kids\n");
-
- numChildren++;
- children = (FormField**)greallocn(children, numChildren, sizeof(FormField*));
+ if (!obj1.arrayGet(i, &childObj)->isDict()) {
+ error (-1, "Form field child is not a dictionary");
+ childObj.free();
+ childRef.free();
+ continue;
+ }
+
+ const Ref ref = childRef.getRef();
+ if (usedParents->find(ref.num) == usedParents->end()) {
+ Object obj2, obj3;
+ // Field child: it could be a form field or a widget or composed dict
+ if (childObj.dictLookupNF("Parent", &obj2)->isRef() || childObj.dictLookup("Parent", &obj3)->isDict()) {
+ // Child is a form field or composed dict
+ // We create the field, if it's composed
+ // it will create the widget as a child
+ std::set<int> usedParentsAux = *usedParents;
+ usedParentsAux.insert(ref.num);
+ obj2.free();
+ obj3.free();
+ if (terminal) {
+ error(-1, "Field can't have both Widget AND Field as kids\n");
+ continue;
+ }
+
+ numChildren++;
+ children = (FormField**)greallocn(children, numChildren, sizeof(FormField*));
+ children[numChildren - 1] = Form::createFieldFromDict(&childObj, xref, ref, this, &usedParentsAux);
+ } else if (childObj.dictLookup("Subtype", &obj2)->isName("Widget")) {
+ // Child is a widget annotation
+ if (!terminal && numChildren > 0) {
+ error(-1, "Field can't have both Widget AND Field as kids\n");
+ obj2.free();
+ obj3.free();
+ continue;
+ }
+ _createWidget(&childObj, ref);
+ }
+ obj2.free();
obj3.free();
- children[numChildren-1] = Form::createFieldFromDict (&obj2, xrefA, childRef.getRef());
- }
- // 1 - we will handle 'collapsed' fields (field + annot in the same dict)
- // as if the annot was in the Kids array of the field
- else if (obj2.dictLookup("Subtype",&obj3)->isName()) {
- _createWidget(&obj2, childRef.getRef());
}
- obj2.free();
- obj3.free();
+ childObj.free();
+ childRef.free();
}
+ } else {
+ // No children, if it's a composed dict, create the child widget
+ obj1.free();
+ if (dict->lookup("Subtype", &obj1)->isName("Widget"))
+ _createWidget(&obj, ref);
+ obj1.free();
}
- obj1.free();
- // As said in 1, if this is a 'collapsed' field, behave like if we had a
- // child annot
- if (dict->lookup("Subtype", &obj1)->isName()) {
- _createWidget(aobj, ref);
- }
- obj1.free();
-
+
//flags
if (Form::fieldLookup(dict, "Ff", &obj1)->isInt()) {
int flags = obj1.getInt();
@@ -772,6 +527,38 @@ FormField::FormField(XRef* xrefA, Object *aobj, const Ref& aref, FormFieldType t
}
}
obj1.free();
+
+ // Variable Text
+ if (Form::fieldLookup(dict, "DA", &obj1)->isString())
+ defaultAppearance = obj1.getString()->copy();
+ obj1.free();
+
+ if (Form::fieldLookup(dict, "Q", &obj1)->isInt()) {
+ quadding = static_cast<VariableTextQuadding>(obj1.getInt());
+ hasQuadding = gTrue;
+ }
+ obj1.free();
+
+ if (dict->lookup("T", &obj1)->isString()) {
+ partialName = obj1.getString()->copy();
+ } else {
+ partialName = NULL;
+ }
+ obj1.free();
+
+ if (dict->lookup("TU", &obj1)->isString()) {
+ alternateUiName = obj1.getString()->copy();
+ } else {
+ alternateUiName = NULL;
+ }
+ obj1.free();
+
+ if(dict->lookup("TM", &obj1)->isString()) {
+ mappingName = obj1.getString()->copy();
+ } else {
+ mappingName = NULL;
+ }
+ obj1.free();
}
FormField::~FormField()
@@ -788,29 +575,56 @@ FormField::~FormField()
gfree (widgets);
}
obj.free();
+
+ delete defaultAppearance;
+ delete partialName;
+ delete alternateUiName;
+ delete mappingName;
+ delete fullyQualifiedName;
}
-void FormField::loadChildrenDefaults ()
+#ifdef DEBUG_FORMS
+void FormField::print(int indent)
{
- if(!terminal) {
- for(int i=0; i<numChildren; i++) {
- children[i]->loadChildrenDefaults();
- }
+ printf ("%*s- (%d %d): [container] terminal: %s children: %d\n", indent, "", ref.num, ref.gen,
+ terminal ? "Yes" : "No", numChildren);
+}
+
+void FormField::printTree(int indent)
+{
+ print(indent);
+ if (terminal) {
+ for (int i = 0; i < numChildren; i++)
+ widgets[i]->print(indent + 4);
} else {
- for (int i=0; i<numChildren; i++) {
- widgets[i]->loadDefaults();
- }
+ for (int i = 0; i < numChildren; i++)
+ children[i]->printTree(indent + 4);
}
}
+#endif
void FormField::fillChildrenSiblingsID()
{
- if(terminal) return;
- for (int i=0; i<numChildren; i++) {
+ if (terminal)
+ return;
+ for (int i = 0; i < numChildren; i++) {
children[i]->fillChildrenSiblingsID();
}
}
+void FormField::createWidgetAnnotations(Catalog *catalog) {
+ if (terminal) {
+ for (int i = 0; i < numChildren; i++)
+ widgets[i]->createWidgetAnnotation(catalog);
+ } else {
+ for (int i = 0; i < numChildren; i++)
+ children[i]->createWidgetAnnotations(catalog);
+ }
+}
+
+GBool FormField::isModified() const {
+ return modified ? gTrue : parent ? parent->isModified() : gFalse;
+}
void FormField::_createWidget (Object *obj, Ref aref)
{
@@ -855,16 +669,62 @@ FormWidget* FormField::findWidgetByRef (Ref aref)
return NULL;
}
+GooString* FormField::getFullyQualifiedName() {
+ Object obj1, obj2;
+ Object parent;
+ GooString *parent_name;
+ GooString *full_name;
+
+ if (fullyQualifiedName)
+ return fullyQualifiedName;
+
+ full_name = new GooString();
+
+ obj.copy(&obj1);
+ while (obj1.dictLookup("Parent", &parent)->isDict()) {
+ if (parent.dictLookup("T", &obj2)->isString()) {
+ parent_name = obj2.getString();
+
+ if (parent_name->hasUnicodeMarker()) {
+ parent_name->del(0, 2); // Remove the unicode BOM
+ full_name->insert(0, "\0.", 2); // 2-byte unicode period
+ } else {
+ full_name->insert(0, '.'); // 1-byte ascii period
+ }
+
+ full_name->insert(0, parent_name);
+ obj2.free();
+ }
+ obj1.free();
+ parent.copy(&obj1);
+ parent.free();
+ }
+ obj1.free();
+ parent.free();
+
+ if (partialName) {
+ full_name->append(partialName);
+ } else {
+ int len = full_name->getLength();
+ // Remove the last period
+ if (len > 0)
+ full_name->del(len - 1, 1);
+ }
+
+ fullyQualifiedName = full_name;
+ return fullyQualifiedName;
+}
//------------------------------------------------------------------------
// FormFieldButton
//------------------------------------------------------------------------
-FormFieldButton::FormFieldButton(XRef *xrefA, Object *aobj, const Ref& ref)
- : FormField(xrefA, aobj, ref, formButton)
+FormFieldButton::FormFieldButton(XRef *xrefA, Object *aobj, const Ref& ref, FormField *parent, std::set<int> *usedParents)
+ : FormField(xrefA, aobj, ref, parent, usedParents, formButton)
{
Dict* dict = obj.getDict();
active_child = -1;
noAllOff = false;
+ appearanceState.initNull();
Object obj1;
btype = formButtonCheck;
@@ -883,8 +743,37 @@ FormFieldButton::FormFieldButton(XRef *xrefA, Object *aobj, const Ref& ref)
error(-1, "FormFieldButton:: radiosInUnison flag unimplemented, please report a bug with a testcase\n");
}
}
+
+ if (btype != formButtonPush) {
+ // Even though V is inheritable we are interested in the value of this
+ // field, if not present it's probably because it's a button in a set.
+ dict->lookup("V", &appearanceState);
+ }
+}
+
+#ifdef DEBUG_FORMS
+static char *_getButtonType(FormButtonType type)
+{
+ switch (type) {
+ case formButtonPush:
+ return "push";
+ case formButtonCheck:
+ return "check";
+ case formButtonRadio:
+ return "radio";
+ default:
+ break;
+ }
+ return "unknown";
}
+void FormFieldButton::print(int indent)
+{
+ printf ("%*s- (%d %d): [%s] terminal: %s children: %d\n", indent, "", ref.num, ref.gen,
+ _getButtonType(btype), terminal ? "Yes" : "No", numChildren);
+}
+#endif
+
void FormFieldButton::fillChildrenSiblingsID()
{
if (!terminal) {
@@ -904,7 +793,7 @@ void FormFieldButton::fillChildrenSiblingsID()
}
}
-GBool FormFieldButton::setState (int num, GBool s)
+GBool FormFieldButton::setState(char *state)
{
if (readOnly) {
error(-1, "FormFieldButton::setState called on a readOnly field\n");
@@ -913,48 +802,91 @@ GBool FormFieldButton::setState (int num, GBool s)
// A check button could behave as a radio button
// when it's in a set of more than 1 buttons
- if (btype == formButtonRadio || btype == formButtonCheck) {
- if (!s && noAllOff)
- return gFalse; //don't allow to set all radio to off
-
- if (s == gTrue) {
- active_child = num;
- for(int i=0; i<numChildren; i++) {
- if (i==active_child) continue;
- static_cast<FormWidgetButton*>(widgets[i])->setState(gFalse, gTrue);
- }
+ if (btype != formButtonRadio && btype != formButtonCheck)
+ return gFalse;
- //The parent field's V entry holds a name object corresponding to the ap-
- //pearance state of whichever child field is currently in the on state
- if (active_child >= 0) {
- FormWidgetButton* actChild = static_cast<FormWidgetButton*>(widgets[active_child]);
- if (actChild->getOnStr()) {
- Object obj1;
- obj1.initName(actChild->getOnStr());
- obj.getDict()->set("V", &obj1);
- xref->setModifiedObject(&obj, ref);
- }
- }
- } else {
- active_child = -1;
- Object obj1;
- obj1.initName("Off");
- obj.getDict()->set("V", &obj1);
- xref->setModifiedObject(&obj, ref);
+ if (terminal && parent && parent->getType() == formButton && appearanceState.isNull()) {
+ // It's button in a set, set state on parent
+ if (static_cast<FormFieldButton*>(parent)->setState(state)) {
+ modified = gTrue;
+ return gTrue;
+ }
+ return gFalse;
+ }
+
+ GBool isOn = strcmp(state, "Off") != 0;
+
+ if (!isOn && noAllOff)
+ return gFalse; // Don't allow to set all radio to off
+
+ char *current = getAppearanceState();
+ GBool currentFound = gFalse, newFound = gFalse;
+
+ for (int i = 0; i < numChildren; i++) {
+ FormWidgetButton *widget;
+
+ // If radio button is a terminal field we want the widget at i, but
+ // if it's not terminal, the child widget is a composed dict, so
+ // we want the ony child widget of the children at i
+ if (terminal)
+ widget = static_cast<FormWidgetButton*>(widgets[i]);
+ else
+ widget = static_cast<FormWidgetButton*>(children[i]->getWidget(0));
+
+ if (!widget->getOnStr())
+ continue;
+
+ char *onStr = widget->getOnStr();
+ if (current && strcmp(current, onStr) == 0) {
+ widget->setAppearanceState("Off");
+ if (!isOn)
+ break;
+ currentFound = gTrue;
+ }
+
+ if (isOn && strcmp(state, onStr) == 0) {
+ widget->setAppearanceState(state);
+ newFound = gTrue;
}
+
+ if (currentFound && newFound)
+ break;
}
+
+ updateState(state);
+ modified = gTrue;
+
return gTrue;
}
+GBool FormFieldButton::getState(char *state) {
+ if (appearanceState.isName(state))
+ return gTrue;
+
+ return (parent && parent->getType() == formButton) ? static_cast<FormFieldButton*>(parent)->getState(state) : gFalse;
+}
+
+void FormFieldButton::updateState(char *state) {
+ Object obj1;
+
+ appearanceState.free();
+ appearanceState.initName(state);
+
+ appearanceState.copy(&obj1);
+ obj.getDict()->set("V", &obj1);
+ xref->setModifiedObject(&obj, ref);
+}
+
FormFieldButton::~FormFieldButton()
{
+ appearanceState.free();
}
//------------------------------------------------------------------------
// FormFieldText
//------------------------------------------------------------------------
-FormFieldText::FormFieldText(XRef *xrefA, Object *aobj, const Ref& ref)
- : FormField(xrefA, aobj, ref, formText)
+FormFieldText::FormFieldText(XRef *xrefA, Object *aobj, const Ref& ref, FormField *parent, std::set<int> *usedParents)
+ : FormField(xrefA, aobj, ref, parent, usedParents, formText)
{
Dict* dict = obj.getDict();
Object obj1;
@@ -985,20 +917,56 @@ FormFieldText::FormFieldText(XRef *xrefA, Object *aobj, const Ref& ref)
maxLen = obj1.getInt();
}
obj1.free();
+
+ if (Form::fieldLookup(dict, "V", &obj1)->isString()) {
+ if (obj1.getString()->hasUnicodeMarker()) {
+ if (obj1.getString()->getLength() > 2)
+ content = obj1.getString()->copy();
+ } else if (obj1.getString()->getLength() > 0) {
+ //non-unicode string -- assume pdfDocEncoding and try to convert to UTF16BE
+ int tmp_length;
+ char* tmp_str = pdfDocEncodingToUTF16(obj1.getString(), &tmp_length);
+ content = new GooString(tmp_str, tmp_length);
+ delete [] tmp_str;
+ }
+ }
+ obj1.free();
}
+#ifdef DEBUG_FORMS
+void FormFieldText::print(int indent)
+{
+ printf ("%*s- (%d %d): [text] terminal: %s children: %d\n", indent, "", ref.num, ref.gen,
+ terminal ? "Yes" : "No", numChildren);
+}
+#endif
+
GooString* FormFieldText::getContentCopy ()
{
if (!content) return NULL;
- return new GooString(*content);
+ return new GooString(content);
}
void FormFieldText::setContentCopy (GooString* new_content)
{
- if(content) {
- delete content;
+ delete content;
+ content = NULL;
+
+ if (new_content) {
+ content = new_content->copy();
+
+ //append the unicode marker <FE FF> if needed
+ if (!content->hasUnicodeMarker()) {
+ content->insert(0, 0xff);
+ content->insert(0, 0xfe);
+ }
}
- content = new_content->copy();
+
+ Object obj1;
+ obj1.initString(content ? content->copy() : new GooString(""));
+ obj.getDict()->set("V", &obj1);
+ xref->setModifiedObject(&obj, ref);
+ modified = gTrue;
}
FormFieldText::~FormFieldText()
@@ -1010,12 +978,13 @@ FormFieldText::~FormFieldText()
//------------------------------------------------------------------------
// FormFieldChoice
//------------------------------------------------------------------------
-FormFieldChoice::FormFieldChoice(XRef *xrefA, Object *aobj, const Ref& ref)
- : FormField(xrefA, aobj, ref, formChoice)
+FormFieldChoice::FormFieldChoice(XRef *xrefA, Object *aobj, const Ref& ref, FormField *parent, std::set<int> *usedParents)
+ : FormField(xrefA, aobj, ref, parent, usedParents, formChoice)
{
numChoices = 0;
choices = NULL;
editedChoice = NULL;
+ topIdx = 0;
Dict* dict = obj.getDict();
Object obj1;
@@ -1037,11 +1006,95 @@ FormFieldChoice::FormFieldChoice(XRef *xrefA, Object *aobj, const Ref& ref)
}
obj1.free();
+ if (dict->lookup("TI", &obj1)->isInt())
+ topIdx = obj1.getInt();
+ obj1.free();
+
+ if (dict->lookup("Opt", &obj1)->isArray()) {
+ Object obj2;
+
+ numChoices = obj1.arrayGetLength();
+ choices = new ChoiceOpt[numChoices];
+ memset(choices, 0, sizeof(ChoiceOpt) * numChoices);
+
+ for (int i = 0; i < numChoices; i++) {
+ if (obj1.arrayGet(i, &obj2)->isString()) {
+ choices[i].optionName = obj2.getString()->copy();
+ } else if (obj2.isArray()) { // [Export_value, Displayed_text]
+ Object obj3;
+
+ if (obj2.arrayGetLength() < 2) {
+ error(-1, "FormWidgetChoice:: invalid Opt entry -- array's length < 2\n");
+ continue;
+ }
+ if (obj2.arrayGet(0, &obj3)->isString())
+ choices[i].exportVal = obj3.getString()->copy();
+ else
+ error(-1, "FormWidgetChoice:: invalid Opt entry -- exported value not a string\n");
+ obj3.free();
+
+ if (obj2.arrayGet(1, &obj3)->isString())
+ choices[i].optionName = obj3.getString()->copy();
+ else
+ error(-1, "FormWidgetChoice:: invalid Opt entry -- choice name not a string\n");
+ obj3.free();
+ } else {
+ error(-1, "FormWidgetChoice:: invalid %d Opt entry\n", i);
+ }
+ obj2.free();
+ }
+ } else {
+ //empty choice
+ }
+ obj1.free();
+
+ // find selected items and convert choice's human readable strings to UTF16
+ if (Form::fieldLookup(dict, "V", &obj1)->isString()) {
+ for (int i = 0; i < numChoices; i++) {
+ if (!choices[i].optionName)
+ continue;
+
+ if (choices[i].optionName->cmp(obj1.getString()) == 0)
+ choices[i].selected = true;
+
+ if (!choices[i].optionName->hasUnicodeMarker()) {
+ int len;
+ char* buffer = pdfDocEncodingToUTF16(choices[i].optionName, &len);
+ choices[i].optionName->Set(buffer, len);
+ delete [] buffer;
+ }
+ }
+ } else if (obj1.isArray()) {
+ for (int i = 0; i < numChoices; i++) {
+ if (!choices[i].optionName)
+ continue;
+
+ for (int j = 0; j < obj1.arrayGetLength(); j++) {
+ Object obj2;
+
+ obj1.arrayGet(i, &obj2);
+ if (choices[i].optionName->cmp(obj2.getString()) == 0) {
+ choices[i].selected = true;
+ obj2.free();
+ break;
+ }
+ obj2.free();
+ }
+
+ if (!choices[i].optionName->hasUnicodeMarker()) {
+ int len;
+ char* buffer = pdfDocEncodingToUTF16(choices[i].optionName, &len);
+ choices[i].optionName->Set(buffer, len);
+ delete [] buffer;
+ }
+ }
+ }
+ obj1.free();
}
FormFieldChoice::~FormFieldChoice()
{
- for (int i=0; i<numChoices; i++) {
+ for (int i = 0; i < numChoices; i++) {
delete choices[i].exportVal;
delete choices[i].optionName;
}
@@ -1049,33 +1102,91 @@ FormFieldChoice::~FormFieldChoice()
delete editedChoice;
}
-void FormFieldChoice::deselectAll ()
+#ifdef DEBUG_FORMS
+void FormFieldChoice::print(int indent)
{
- for(int i=0; i<numChoices; i++) {
+ printf ("%*s- (%d %d): [choice] terminal: %s children: %d\n", indent, "", ref.num, ref.gen,
+ terminal ? "Yes" : "No", numChildren);
+}
+#endif
+
+void FormFieldChoice::updateSelection() {
+ Object obj1;
+
+ //this is an editable combo-box with user-entered text
+ if (edit && editedChoice) {
+ obj1.initString(editedChoice->copy());
+ } else {
+ int numSelected = getNumSelected();
+ if (numSelected == 0) {
+ obj1.initString(new GooString(""));
+ } else if (numSelected == 1) {
+ for (int i = 0; numChoices; i++) {
+ if (choices[i].optionName && choices[i].selected) {
+ obj1.initString(choices[i].optionName->copy());
+ break;
+ }
+ }
+ } else {
+ obj1.initArray(xref);
+ for (int i = 0; i < numChoices; i++) {
+ if (choices[i].optionName && choices[i].selected) {
+ Object obj2;
+ obj2.initString(choices[i].optionName->copy());
+ obj1.arrayAdd(&obj2);
+ }
+ }
+ }
+ }
+
+ obj.getDict()->set("V", &obj1);
+ xref->setModifiedObject(&obj, ref);
+ modified = gTrue;
+}
+
+void FormFieldChoice::unselectAll ()
+{
+ for (int i = 0; i < numChoices; i++) {
choices[i].selected = false;
}
}
+void FormFieldChoice::deselectAll () {
+ unselectAll();
+ updateSelection();
+}
+
void FormFieldChoice::toggle (int i)
{
choices[i].selected = !choices[i].selected;
+ updateSelection();
}
void FormFieldChoice::select (int i)
{
- if (!multiselect)
- deselectAll();
+ if (!multiselect)
+ unselectAll();
choices[i].selected = true;
+ updateSelection();
}
void FormFieldChoice::setEditChoice (GooString* new_content)
{
- if (editedChoice)
- delete editedChoice;
+ delete editedChoice;
+ editedChoice = NULL;
- deselectAll();
+ unselectAll();
- editedChoice = new_content->copy();
+ if (new_content) {
+ editedChoice = new_content->copy();
+
+ //append the unicode marker <FE FF> if needed
+ if (!editedChoice->hasUnicodeMarker()) {
+ editedChoice->insert(0, 0xff);
+ editedChoice->insert(0, 0xfe);
+ }
+ }
+ updateSelection();
}
GooString* FormFieldChoice::getEditChoice ()
@@ -1093,19 +1204,23 @@ int FormFieldChoice::getNumSelected ()
return cnt;
}
-void FormFieldChoice::_createChoicesTab ()
-{
- choices = new ChoiceOpt[numChoices];
- for(int i=0; i<numChoices; i++) {
- choices[i].selected = false;
+GooString *FormFieldChoice::getSelectedChoice() {
+ if (edit && editedChoice)
+ return editedChoice;
+
+ for (int i = 0; i < numChoices; i++) {
+ if (choices[i].optionName && choices[i].selected)
+ return choices[i].optionName;
}
+
+ return NULL;
}
//------------------------------------------------------------------------
// FormFieldSignature
//------------------------------------------------------------------------
-FormFieldSignature::FormFieldSignature(XRef *xrefA, Object *dict, const Ref& ref)
- : FormField(xrefA, dict, ref, formSignature)
+FormFieldSignature::FormFieldSignature(XRef *xrefA, Object *dict, const Ref& ref, FormField *parent, std::set<int> *usedParents)
+ : FormField(xrefA, dict, ref, parent, usedParents, formSignature)
{
}
@@ -1114,6 +1229,14 @@ FormFieldSignature::~FormFieldSignature()
}
+#ifdef DEBUG_FORMS
+void FormFieldSignature::print(int indent)
+{
+ printf ("%*s- (%d %d): [signature] terminal: %s children: %d\n", indent, "", ref.num, ref.gen,
+ terminal ? "Yes" : "No", numChildren);
+}
+#endif
+
//------------------------------------------------------------------------
// Form
//------------------------------------------------------------------------
@@ -1128,11 +1251,34 @@ Form::Form(XRef *xrefA, Object* acroFormA)
size = 0;
numFields = 0;
rootFields = NULL;
+ quadding = quaddingLeftJustified;
+ defaultAppearance = NULL;
+ defaultResources = NULL;
acroForm->dictLookup("NeedAppearances", &obj1);
needAppearances = (obj1.isBool() && obj1.getBool());
obj1.free();
+ if (acroForm->dictLookup("DA", &obj1)->isString())
+ defaultAppearance = obj1.getString()->copy();
+ obj1.free();
+
+ if (acroForm->dictLookup("Q", &obj1)->isInt())
+ quadding = static_cast<VariableTextQuadding>(obj1.getInt());
+ obj1.free();
+
+ acroForm->dictLookup("DR", &resDict);
+ if (resDict.isDict()) {
+ // At a minimum, this dictionary shall contain a Font entry
+ if (resDict.dictLookup("Font", &obj1)->isDict())
+ defaultResources = new GfxResources(xref, resDict.getDict(), NULL);
+ obj1.free();
+ }
+ if (!defaultResources) {
+ resDict.free();
+ resDict.initNull();
+ }
+
acroForm->dictLookup("Fields", &obj1);
if (obj1.isArray()) {
Array *array = obj1.getArray();
@@ -1161,7 +1307,8 @@ Form::Form(XRef *xrefA, Object* acroFormA)
rootFields = (FormField**)greallocn(rootFields,size,sizeof(FormField*));
}
- rootFields[numFields++] = createFieldFromDict (&obj2, xrefA, oref.getRef());
+ std::set<int> usedParents;
+ rootFields[numFields++] = createFieldFromDict (&obj2, xrefA, oref.getRef(), NULL, &usedParents);
obj2.free();
oref.free();
@@ -1170,6 +1317,11 @@ Form::Form(XRef *xrefA, Object* acroFormA)
error(-1, "Can't get Fields array\n");
}
obj1.free ();
+
+#ifdef DEBUG_FORMS
+ for (int i = 0; i < numFields; i++)
+ rootFields[i]->printTree();
+#endif
}
Form::~Form() {
@@ -1177,10 +1329,13 @@ Form::~Form() {
for(i = 0; i< numFields; ++i)
delete rootFields[i];
gfree (rootFields);
+ delete defaultAppearance;
+ delete defaultResources;
+ resDict.free();
}
// Look up an inheritable field dictionary entry.
-Object *Form::fieldLookup(Dict *field, char *key, Object *obj) {
+static Object *fieldLookup(Dict *field, char *key, Object *obj, std::set<int> *usedParents) {
Dict *dict;
Object parent;
@@ -1189,8 +1344,23 @@ Object *Form::fieldLookup(Dict *field, char *key, Object *obj) {
return obj;
}
obj->free();
- if (dict->lookup("Parent", &parent)->isDict()) {
- fieldLookup(parent.getDict(), key, obj);
+ dict->lookupNF("Parent", &parent);
+ if (parent.isRef()) {
+ const Ref ref = parent.getRef();
+ if (usedParents->find(ref.num) == usedParents->end()) {
+ usedParents->insert(ref.num);
+
+ Object obj2;
+ parent.fetch(dict->getXRef(), &obj2);
+ if (obj2.isDict()) {
+ fieldLookup(obj2.getDict(), key, obj, usedParents);
+ } else {
+ obj->initNull();
+ }
+ obj2.free();
+ }
+ } else if (parent.isDict()) {
+ fieldLookup(parent.getDict(), key, obj, usedParents);
} else {
obj->initNull();
}
@@ -1198,34 +1368,42 @@ Object *Form::fieldLookup(Dict *field, char *key, Object *obj) {
return obj;
}
-FormField *Form::createFieldFromDict (Object* obj, XRef *xrefA, const Ref& pref)
+Object *Form::fieldLookup(Dict *field, char *key, Object *obj) {
+ std::set<int> usedParents;
+ return ::fieldLookup(field, key, obj, &usedParents);
+}
+
+FormField *Form::createFieldFromDict (Object* obj, XRef *xrefA, const Ref& pref, FormField *parent, std::set<int> *usedParents)
{
Object obj2;
FormField *field;
if (Form::fieldLookup(obj->getDict (), "FT", &obj2)->isName("Btn")) {
- field = new FormFieldButton(xrefA, obj, pref);
+ field = new FormFieldButton(xrefA, obj, pref, parent, usedParents);
} else if (obj2.isName("Tx")) {
- field = new FormFieldText(xrefA, obj, pref);
+ field = new FormFieldText(xrefA, obj, pref, parent, usedParents);
} else if (obj2.isName("Ch")) {
- field = new FormFieldChoice(xrefA, obj, pref);
+ field = new FormFieldChoice(xrefA, obj, pref, parent, usedParents);
} else if (obj2.isName("Sig")) {
- field = new FormFieldSignature(xrefA, obj, pref);
+ field = new FormFieldSignature(xrefA, obj, pref, parent, usedParents);
} else { //we don't have an FT entry => non-terminal field
- field = new FormField(xrefA, obj, pref);
+ field = new FormField(xrefA, obj, pref, parent, usedParents);
}
obj2.free();
-
- field->loadChildrenDefaults();
return field;
}
-void Form::postWidgetsLoad ()
+void Form::postWidgetsLoad (Catalog *catalog)
{
- for(int i=0; i<numFields; i++) {
- rootFields[i]->fillChildrenSiblingsID();
- }
+ // We create the widget annotations associated to
+ // every form widget here, because the AnnotWidget constructor
+ // needs the form object that gets from the catalog. When constructing
+ // a FormWidget the Catalog is still creating the form object
+ for (int i = 0; i < numFields; i++) {
+ rootFields[i]->fillChildrenSiblingsID();
+ rootFields[i]->createWidgetAnnotations(catalog);
+ }
}
FormWidget* Form::findWidgetByRef (Ref aref)
@@ -1241,50 +1419,42 @@ FormWidget* Form::findWidgetByRef (Ref aref)
// FormPageWidgets
//------------------------------------------------------------------------
-FormPageWidgets::FormPageWidgets (XRef *xrefA, Object* annots, unsigned int page, Form *form)
+FormPageWidgets::FormPageWidgets (Annots *annots, unsigned int page, Form *form)
{
- Object obj1;
numWidgets = 0;
widgets = NULL;
- xref = xrefA;
- if (annots->isArray() && form) {
- size = annots->arrayGetLength();
+
+ if (annots && annots->getNumAnnots() > 0 && form) {
+ size = annots->getNumAnnots();
widgets = (FormWidget**)greallocn(widgets, size, sizeof(FormWidget*));
/* For each entry in the page 'Annots' dict, try to find
a matching form field */
for (int i = 0; i < size; ++i) {
- if (!annots->arrayGetNF(i, &obj1)->isRef()) {
+ Annot *annot = annots->getAnnot(i);
+
+ if (annot->getType() != Annot::typeWidget)
+ continue;
+
+ if (!annot->getHasRef()) {
/* Since all entry in a form field's kid dict needs to be
indirect references, if this annot isn't indirect, it isn't
related to a form field */
- obj1.free();
continue;
}
- Ref r = obj1.getRef();
+
+ Ref r = annot->getRef();
/* Try to find a form field which either has this Annot in its Kids entry
or is merged with this Annot */
FormWidget* tmp = form->findWidgetByRef(r);
- if(tmp) {
+ if (tmp) {
// We've found a corresponding form field, link it
tmp->setID(FormWidget::encodeID(page, numWidgets));
widgets[numWidgets++] = tmp;
- //create a temporary Annot to get the font size
- Object obj2;
- if (annots->arrayGet(i, &obj2)->isDict()) {
- Annot *ann;
-
- ann = new Annot(xref, obj2.getDict(), NULL);
- tmp->setFontSize(ann->getFontSize());
- delete ann;
- }
- obj2.free();
- }
-
- obj1.free();
+ }
}
- }
+ }
}
FormPageWidgets::~FormPageWidgets()
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Form.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Form.h
index 35d66afc184..0cfc95bd722 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Form.h
@@ -5,8 +5,10 @@
// This file is licensed under the GPLv2 or later
//
// Copyright 2006 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright 2007, 2008 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright 2007-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright 2007, 2008, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright 2007-2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010 Mark Riedesel <mark@klowner.com>
+// Copyright 2011 Pino Toscano <pino@kde.org>
//
//========================================================================
@@ -18,13 +20,18 @@
#endif
#include "Object.h"
-#include "goo/GooVector.h"
+
+#include <set>
class GooString;
class Array;
class Dict;
class Annot;
+class AnnotWidget;
+class Annots;
class Catalog;
+class LinkAction;
+class GfxResources;
enum FormFieldType {
formButton,
@@ -40,6 +47,12 @@ enum FormButtonType {
formButtonRadio
};
+enum VariableTextQuadding {
+ quaddingLeftJustified,
+ quaddingCentered,
+ quaddingRightJustified
+};
+
class Form;
class FormField;
class FormFieldButton;
@@ -57,16 +70,11 @@ class FormWidget {
public:
virtual ~FormWidget();
- // see the description of FormField::LoadChildrenDefaults
- virtual void loadDefaults () {}
-
// Check if point is inside the field bounding rect
- GBool inRect(double x, double y)
- { return x1 <= x && x <= x2 && y1 <= y && y <= y2; }
+ GBool inRect(double x, double y) const;
// Get the field bounding rect
- void getRect(double *xa1, double *ya1, double *xa2, double *ya2)
- { *xa1 = x1; *ya1 = y1; *xa2 = x2; *ya2 = y2; }
+ void getRect(double *x1, double *y1, double *x2, double *y2) const;
unsigned getID () { return ID; }
void setID (unsigned int i) { ID=i; }
@@ -80,30 +88,41 @@ public:
void setChildNum (unsigned i) { childNum = i; }
unsigned getChildNum () { return childNum; }
- void setFontSize(double f) { fontSize = f; }
- double getFontSize () { return fontSize; }
+ double getFontSize() const;
+
+ GooString *getPartialName() const;
+ GooString *getAlternateUiName() const;
+ GooString *getMappingName() const;
+ GooString *getFullyQualifiedName();
- GBool isModified () { return modified; }
+ GBool isModified () const;
bool isReadOnly() const;
+ LinkAction *getActivationAction();
+
// return the unique ID corresponding to pageNum/fieldNum
static int encodeID (unsigned pageNum, unsigned fieldNum);
// decode id and retrieve pageNum and fieldNum
static void decodeID (unsigned id, unsigned* pageNum, unsigned* fieldNum);
+ void createWidgetAnnotation(Catalog *catalog);
+ AnnotWidget *getWidgetAnnotation() const { return widget; }
+
+#ifdef DEBUG_FORMS
+ void print(int indent = 0);
+#endif
+
protected:
FormWidget(XRef *xrefA, Object *aobj, unsigned num, Ref aref, FormField *fieldA);
- void updateField (const char *key, Object *value);
-
+ AnnotWidget *widget;
FormField* field;
FormFieldType type;
Object obj;
Ref ref;
XRef *xref;
- GBool defaultsLoaded;
- GBool modified;
+
//index of this field in the parent's child list
unsigned childNum;
@@ -116,11 +135,6 @@ protected:
(decoding) pageNum = id >> 4*sizeof(unsigned); fieldNum = (id << 4*sizeof(unsigned)) >> 4*sizeof(unsigned);
*/
unsigned ID;
-
- double x1, y1; // lower left corner
- double x2, y2; // upper right corner
- double fontSize; //font size if this widget has text
-
};
//------------------------------------------------------------------------
@@ -134,12 +148,11 @@ public:
FormButtonType getButtonType() const;
- void setState (GBool state, GBool calledByParent=gFalse);
+ void setState (GBool state);
GBool getState ();
- char* getOnStr () { return onStr->getCString(); }
-
- void loadDefaults();
+ char* getOnStr();
+ void setAppearanceState(char *state);
void setNumSiblingsID (int i);
void setSiblingsID (int i, unsigned id) { siblingsID[i] = id; }
@@ -154,7 +167,6 @@ protected:
int numSiblingsID;
GooString *onStr;
FormFieldButton *parent;
- GBool state;
};
//------------------------------------------------------------------------
@@ -172,8 +184,6 @@ public:
//except a UTF16BE string
void setContent(GooString* new_content);
- void loadDefaults ();
-
bool isMultiline () const;
bool isPassword () const;
bool isFileSelect () const;
@@ -195,7 +205,6 @@ public:
FormWidgetChoice(XRef *xrefA, Object *dict, unsigned num, Ref ref, FormField *p);
~FormWidgetChoice();
- void loadDefaults ();
int getNumChoices();
//return the display name of the i-th choice (UTF16BE)
GooString* getChoice(int i);
@@ -223,7 +232,6 @@ public:
bool commitOnSelChange () const;
bool isListBox () const;
protected:
- void _updateV ();
bool _checkRange (int i);
FormFieldChoice *parent;
};
@@ -248,7 +256,7 @@ protected:
class FormField {
public:
- FormField(XRef* xrefa, Object *aobj, const Ref& aref, FormFieldType t=formUndef);
+ FormField(XRef* xrefa, Object *aobj, const Ref& aref, FormField *parent, std::set<int> *usedParents, FormFieldType t=formUndef);
virtual ~FormField();
@@ -260,17 +268,34 @@ public:
void setReadOnly (bool b) { readOnly = b; }
bool isReadOnly () const { return readOnly; }
+ GBool isModified () const;
+
+ GooString* getDefaultAppearance() const { return defaultAppearance; }
+ GBool hasTextQuadding() const { return hasQuadding; }
+ VariableTextQuadding getTextQuadding() const { return quadding; }
+
+ GooString *getPartialName() const { return partialName; }
+ GooString *getAlternateUiName() const { return alternateUiName; }
+ GooString *getMappingName() const { return mappingName; }
+ GooString *getFullyQualifiedName();
+
FormWidget* findWidgetByRef (Ref aref);
- // Since while loading their defaults, children may call parents methods, it's better
- // to do that when parents are completly constructed
- void loadChildrenDefaults();
+ FormWidget *getWidget(int i) { return terminal ? widgets[i] : NULL; }
// only implemented in FormFieldButton
virtual void fillChildrenSiblingsID ();
+ void createWidgetAnnotations(Catalog *catalog);
+
+#ifdef DEBUG_FORMS
+ void printTree(int indent = 0);
+ virtual void print(int indent = 0);
+#endif
+
protected:
void _createWidget (Object *obj, Ref aref);
+ void createChildren(std::set<int> *usedParents);
FormFieldType type; // field type
Ref ref;
@@ -278,9 +303,21 @@ public:
Object obj;
XRef *xref;
FormField **children;
+ FormField *parent;
int numChildren;
FormWidget **widgets;
bool readOnly;
+ GBool modified;
+
+ GooString *partialName; // T field
+ GooString *alternateUiName; // TU field
+ GooString *mappingName; // TM field
+ GooString *fullyQualifiedName;
+
+ // Variable Text
+ GooString *defaultAppearance;
+ GBool hasQuadding;
+ VariableTextQuadding quadding;
private:
FormField() {}
@@ -293,23 +330,33 @@ private:
class FormFieldButton: public FormField {
public:
- FormFieldButton(XRef *xrefA, Object *dict, const Ref& ref);
+ FormFieldButton(XRef *xrefA, Object *dict, const Ref& ref, FormField *parent, std::set<int> *usedParents);
FormButtonType getButtonType () { return btype; }
bool noToggleToOff () const { return noAllOff; }
// returns gTrue if the state modification is accepted
- GBool setState (int num, GBool s);
-
+ GBool setState (char *state);
+ GBool getState(char *state);
+
+ char *getAppearanceState() { return appearanceState.isName() ? appearanceState.getName() : NULL; }
+
void fillChildrenSiblingsID ();
+#ifdef DEBUG_FORMS
+ void print(int indent = 0);
+#endif
+
virtual ~FormFieldButton();
protected:
+ void updateState(char *state);
+
FormButtonType btype;
int size;
int active_child; //only used for combo box
bool noAllOff;
+ Object appearanceState; // V
};
//------------------------------------------------------------------------
@@ -318,7 +365,7 @@ protected:
class FormFieldText: public FormField {
public:
- FormFieldText(XRef *xrefA, Object *dict, const Ref& ref);
+ FormFieldText(XRef *xrefA, Object *dict, const Ref& ref, FormField *parent, std::set<int> *usedParents);
GooString* getContent () { return content; }
GooString* getContentCopy ();
@@ -334,6 +381,10 @@ public:
bool isRichText () const { return richText; }
int getMaxLen () const { return maxLen; }
+
+#ifdef DEBUG_FORMS
+ void print(int indent = 0);
+#endif
protected:
GooString* content;
bool multiline;
@@ -352,13 +403,15 @@ protected:
class FormFieldChoice: public FormField {
public:
- FormFieldChoice(XRef *xrefA, Object *aobj, const Ref& ref);
+ FormFieldChoice(XRef *xrefA, Object *aobj, const Ref& ref, FormField *parent, std::set<int> *usedParents);
virtual ~FormFieldChoice();
int getNumChoices() { return numChoices; }
- GooString* getChoice(int i) { return choices[i].optionName; }
- GooString* getExportVal (int i) { return choices[i].exportVal; }
+ GooString* getChoice(int i) { return choices ? choices[i].optionName : NULL; }
+ GooString* getExportVal (int i) { return choices ? choices[i].exportVal : NULL; }
+ // For multi-select choices it returns the first one
+ GooString* getSelectedChoice();
//select the i-th choice
void select (int i);
@@ -385,13 +438,16 @@ public:
bool commitOnSelChange () const { return doCommitOnSelChange; }
bool isListBox () const { return !combo; }
- /* these functions _must_ only be used by FormWidgetChoice */
- void _setNumChoices (int i) { numChoices = i; }
- void _createChoicesTab ();
- void _setChoiceExportVal (int i, GooString* str) { choices[i].exportVal = str; }
- void _setChoiceOptionName (int i, GooString* str) { choices[i].optionName = str; }
+ int getTopIndex() const { return topIdx; }
+
+#ifdef DEBUG_FORMS
+ void print(int indent = 0);
+#endif
protected:
+ void unselectAll();
+ void updateSelection();
+
bool combo;
bool edit;
bool multiselect;
@@ -406,7 +462,8 @@ protected:
int numChoices;
ChoiceOpt* choices;
- GooString* editedChoice;
+ GooString* editedChoice;
+ int topIdx; // TI
};
//------------------------------------------------------------------------
@@ -415,9 +472,13 @@ protected:
class FormFieldSignature: public FormField {
public:
- FormFieldSignature(XRef *xrefA, Object *dict, const Ref& ref);
+ FormFieldSignature(XRef *xrefA, Object *dict, const Ref& ref, FormField *parent, std::set<int> *usedParents);
virtual ~FormFieldSignature();
+
+#ifdef DEBUG_FORMS
+ void print(int indent = 0);
+#endif
};
//------------------------------------------------------------------------
@@ -437,16 +498,20 @@ public:
/* Creates a new Field of the type specified in obj's dict.
used in Form::Form and FormField::FormField */
- static FormField *createFieldFromDict (Object* obj, XRef *xref, const Ref& aref);
+ static FormField *createFieldFromDict (Object* obj, XRef *xref, const Ref& aref, FormField *parent, std::set<int> *usedParents);
Object *getObj () const { return acroForm; }
GBool getNeedAppearances () const { return needAppearances; }
int getNumFields() const { return numFields; }
FormField* getRootField(int i) const { return rootFields[i]; }
+ GooString* getDefaultAppearance() const { return defaultAppearance; }
+ VariableTextQuadding getTextQuadding() const { return quadding; }
+ GfxResources* getDefaultResources() const { return defaultResources; }
+ Object* getDefaultResourcesObj() { return &resDict; }
FormWidget* findWidgetByRef (Ref aref);
- void postWidgetsLoad();
+ void postWidgetsLoad(Catalog *catalog);
private:
FormField** rootFields;
int numFields;
@@ -454,6 +519,12 @@ private:
XRef* xref;
Object *acroForm;
GBool needAppearances;
+ GfxResources *defaultResources;
+ Object resDict;
+
+ // Variable Text
+ GooString *defaultAppearance;
+ VariableTextQuadding quadding;
};
//------------------------------------------------------------------------
@@ -462,7 +533,7 @@ private:
class FormPageWidgets {
public:
- FormPageWidgets (XRef *xrefA, Object* annots, unsigned int page, Form *form);
+ FormPageWidgets (Annots* annots, unsigned int page, Form *form);
~FormPageWidgets();
int getNumWidgets() const { return numWidgets; }
@@ -472,8 +543,6 @@ private:
FormWidget** widgets;
int numWidgets;
int size;
- unsigned pageNum;
- XRef* xref;
};
#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Function.cc
index 73a6b5f3e62..b63ae8180a9 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Function.cc
@@ -13,8 +13,10 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006, 2008, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2008-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
+// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
+// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
//
// 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
@@ -38,7 +40,6 @@
#include "Stream.h"
#include "Error.h"
#include "Function.h"
-#include "PopplerCache.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
@@ -55,6 +56,11 @@ Function::~Function() {
}
Function *Function::parse(Object *funcObj) {
+ std::set<int> usedParents;
+ return parse(funcObj, &usedParents);
+}
+
+Function *Function::parse(Object *funcObj, std::set<int> *usedParents) {
Function *func;
Dict *dict;
int funcType;
@@ -84,7 +90,7 @@ Function *Function::parse(Object *funcObj) {
} else if (funcType == 2) {
func = new ExponentialFunction(funcObj, dict);
} else if (funcType == 3) {
- func = new StitchingFunction(funcObj, dict);
+ func = new StitchingFunction(funcObj, dict, usedParents);
} else if (funcType == 4) {
func = new PostScriptFunction(funcObj, dict);
} else {
@@ -422,7 +428,11 @@ void SampledFunction::transform(double *in, double *out) {
for (k = 0, t = j; k < m; ++k, t >>= 1) {
idx += idxMul[k] * (e[k][t & 1]);
}
- sBuf[j] = samples[idx];
+ if (likely(idx >= 0 && idx < nSamples)) {
+ sBuf[j] = samples[idx];
+ } else {
+ sBuf[j] = 0; // TODO Investigate if this is what Adobe does
+ }
}
// do m sets of interpolations
@@ -519,6 +529,7 @@ ExponentialFunction::ExponentialFunction(Object *funcObj, Dict *dict) {
e = obj1.getNum();
obj1.free();
+ isLinear = fabs(e-1.) < 1e-10;
ok = gTrue;
return;
@@ -549,7 +560,7 @@ void ExponentialFunction::transform(double *in, double *out) {
x = in[0];
}
for (i = 0; i < n; ++i) {
- out[i] = c0[i] + pow(x, e) * (c1[i] - c0[i]);
+ out[i] = c0[i] + (isLinear ? x : pow(x, e)) * (c1[i] - c0[i]);
if (hasRange) {
if (out[i] < range[i][0]) {
out[i] = range[i][0];
@@ -565,7 +576,7 @@ void ExponentialFunction::transform(double *in, double *out) {
// StitchingFunction
//------------------------------------------------------------------------
-StitchingFunction::StitchingFunction(Object *funcObj, Dict *dict) {
+StitchingFunction::StitchingFunction(Object *funcObj, Dict *dict, std::set<int> *usedParents) {
Object obj1, obj2;
int i;
@@ -598,7 +609,19 @@ StitchingFunction::StitchingFunction(Object *funcObj, Dict *dict) {
funcs[i] = NULL;
}
for (i = 0; i < k; ++i) {
- if (!(funcs[i] = Function::parse(obj1.arrayGet(i, &obj2)))) {
+ std::set<int> usedParentsAux = *usedParents;
+ obj1.arrayGetNF(i, &obj2);
+ if (obj2.isRef()) {
+ const Ref ref = obj2.getRef();
+ if (usedParentsAux.find(ref.num) == usedParentsAux.end()) {
+ usedParentsAux.insert(ref.num);
+ obj2.free();
+ obj1.arrayGet(i, &obj2);
+ } else {
+ goto err2;
+ }
+ }
+ if (!(funcs[i] = Function::parse(&obj2, &usedParentsAux))) {
goto err2;
}
if (i > 0 && (funcs[i]->getInputSize() != 1 ||
@@ -655,6 +678,7 @@ StitchingFunction::StitchingFunction(Object *funcObj, Dict *dict) {
}
}
+ n = funcs[0]->getOutputSize();
ok = gTrue;
return;
@@ -991,6 +1015,9 @@ void PSStack::roll(int n, int j) {
PSObject obj;
int i, k;
+ if (unlikely(n == 0)) {
+ return;
+ }
if (j >= 0) {
j %= n;
} else {
@@ -1012,92 +1039,16 @@ void PSStack::roll(int n, int j) {
}
} else {
j = n - j;
- obj = stack[sp + n - 1];
- for (k = sp + n - 1; k > sp; --k) {
- stack[k] = stack[k-1];
+ for (i = 0; i < j; ++i) {
+ obj = stack[sp + n - 1];
+ for (k = sp + n - 1; k > sp; --k) {
+ stack[k] = stack[k-1];
+ }
+ stack[sp] = obj;
}
- stack[sp] = obj;
}
}
-class PostScriptFunctionKey : public PopplerCacheKey
-{
- public:
- PostScriptFunctionKey(int sizeA, double *inA, bool copyA)
- {
- init(sizeA, inA, copyA);
- }
-
- PostScriptFunctionKey(const PostScriptFunctionKey &key)
- {
- init(key.size, key.in, key.copied);
- }
-
- void init(int sizeA, double *inA, bool copyA)
- {
- copied = copyA;
- size = sizeA;
- if (copied) {
- in = new double[size];
- for (int i = 0; i < size; ++i) in[i] = inA[i];
- } else {
- in = inA;
- }
- }
-
- ~PostScriptFunctionKey()
- {
- if (copied) delete[] in;
- }
-
- bool operator==(const PopplerCacheKey &key) const
- {
- const PostScriptFunctionKey *k = static_cast<const PostScriptFunctionKey*>(&key);
- if (size == k->size) {
- bool equal = true;
- for (int i = 0; equal && i < size; ++i) {
- equal = in[i] == k->in[i];
- }
- return equal;
- } else {
- return false;
- }
- }
-
- bool copied;
- int size;
- double *in;
-};
-
-class PostScriptFunctionItem : public PopplerCacheItem
-{
- public:
- PostScriptFunctionItem(int sizeA, double *outA)
- {
- init(sizeA, outA);
- }
-
- PostScriptFunctionItem(const PostScriptFunctionItem &item)
- {
- init(item.size, item.out);
- }
-
- void init(int sizeA, double *outA)
- {
- size = sizeA;
- out = new double[size];
- for (int i = 0; i < size; ++i) out[i] = outA[i];
- }
-
- ~PostScriptFunctionItem()
- {
- delete[] out;
- }
-
- int size;
- double *out;
-};
-
PostScriptFunction::PostScriptFunction(Object *funcObj, Dict *dict) {
Stream *str;
int codePtr;
@@ -1107,7 +1058,6 @@ PostScriptFunction::PostScriptFunction(Object *funcObj, Dict *dict) {
codeString = NULL;
codeSize = 0;
ok = gFalse;
- cache = new PopplerCache(5);
//----- initialize the generic stuff
if (!init(dict)) {
@@ -1144,8 +1094,6 @@ PostScriptFunction::PostScriptFunction(Object *funcObj, Dict *dict) {
ok = gTrue;
- stack = new PSStack();
-
err2:
str->close();
err1:
@@ -1157,58 +1105,33 @@ PostScriptFunction::PostScriptFunction(PostScriptFunction *func) {
code = (PSObject *)gmallocn(codeSize, sizeof(PSObject));
memcpy(code, func->code, codeSize * sizeof(PSObject));
codeString = func->codeString->copy();
- stack = new PSStack();
- memcpy(stack, func->stack, sizeof(PSStack));
-
- cache = new PopplerCache(func->cache->size());
- for (int i = 0; i < func->cache->numberOfItems(); ++i)
- {
- PostScriptFunctionKey *key = new PostScriptFunctionKey(*(PostScriptFunctionKey*)func->cache->key(i));
- PostScriptFunctionItem *item = new PostScriptFunctionItem(*(PostScriptFunctionItem*)func->cache->item(i));
- cache->put(key, item);
- }
}
PostScriptFunction::~PostScriptFunction() {
gfree(code);
delete codeString;
- delete stack;
- delete cache;
}
void PostScriptFunction::transform(double *in, double *out) {
+ PSStack stack;
int i;
- PostScriptFunctionKey key(m, in, false);
- PopplerCacheItem *item = cache->lookup(key);
- if (item) {
- PostScriptFunctionItem *it = static_cast<PostScriptFunctionItem *>(item);
- for (int i = 0; i < n; ++i) {
- out[i] = it->out[i];
- }
- return;
- }
-
- stack->clear();
for (i = 0; i < m; ++i) {
//~ may need to check for integers here
- stack->pushReal(in[i]);
+ stack.pushReal(in[i]);
}
- exec(stack, 0);
+ exec(&stack, 0);
for (i = n - 1; i >= 0; --i) {
- out[i] = stack->popNum();
+ out[i] = stack.popNum();
if (out[i] < range[i][0]) {
out[i] = range[i][0];
} else if (out[i] > range[i][1]) {
out[i] = range[i][1];
}
}
+ stack.clear();
- PostScriptFunctionKey *newKey = new PostScriptFunctionKey(m, in, true);
- PostScriptFunctionItem *newItem = new PostScriptFunctionItem(n, out);
- cache->put(newKey, newItem);
-
- // if (!stack->empty()) {
+ // if (!stack.empty()) {
// error(-1, "Extra values on stack at end of PostScript function");
// }
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Function.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Function.h
index 2dcccb06a1b..d6ac893e494 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Function.h
@@ -13,7 +13,9 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
+// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -29,6 +31,7 @@
#include "goo/gtypes.h"
#include "Object.h"
+#include <set>
class Dict;
class Stream;
@@ -83,6 +86,7 @@ public:
virtual GBool isOk() = 0;
protected:
+ static Function *parse(Object *funcObj, std::set<int> *usedParents);
int m, n; // size of input and output tuples
double // min and max values for function domain
@@ -174,6 +178,7 @@ private:
double c0[funcMaxOutputs];
double c1[funcMaxOutputs];
double e;
+ bool isLinear;
GBool ok;
};
@@ -184,7 +189,7 @@ private:
class StitchingFunction: public Function {
public:
- StitchingFunction(Object *funcObj, Dict *dict);
+ StitchingFunction(Object *funcObj, Dict *dict, std::set<int> *usedParents);
virtual ~StitchingFunction();
virtual Function *copy() { return new StitchingFunction(this); }
virtual int getType() { return 3; }
@@ -235,10 +240,8 @@ private:
GooString *codeString;
PSObject *code;
- PSStack *stack;
int codeSize;
GBool ok;
- PopplerCache *cache;
};
#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Gfx.cc
index 60eb78a60b2..bca60e2f45f 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Gfx.cc
@@ -14,13 +14,13 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
-// Copyright (C) 2005-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Thorkild Stray <thorkild@ifi.uio.no>
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2006-2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2007, 2008 Brad Hards <bradh@kde.org>
-// Copyright (C) 2007 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2007, 2011 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
@@ -28,9 +28,11 @@
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2008 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2009 M Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
-// Copyright (C) 2009 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2011 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 William Bader <williambader@hotmail.com>
-// Copyright (C) 2009 David Benjamin <davidben@mit.edu>
+// Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
+// Copyright (C) 2010 Nils Höglund <nils.hoglund@gmail.com>
+// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.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
@@ -98,18 +100,26 @@
#define radialColorDelta (dblToCol(1 / 256.0))
// Max recursive depth for a Gouraud triangle shading fill.
+//
+// Triangles will be split at most gouraudMaxDepth times (each time into 4
+// smaller ones). That makes pow(4,gouraudMaxDepth) many triangles for
+// every triangle.
#define gouraudMaxDepth 6
// Max delta allowed in any color component for a Gouraud triangle
// shading fill.
-#define gouraudColorDelta (dblToCol(1 / 256.0))
+#define gouraudColorDelta (dblToCol(3. / 256.0))
+
+// Gouraud triangle: if the three color parameters differ by at more than this percend of
+// the total color parameter range, the triangle will be refined
+#define gouraudParameterizedColorDelta 5e-3
// Max recursive depth for a patch mesh shading fill.
#define patchMaxDepth 6
// Max delta allowed in any color component for a patch mesh shading
// fill.
-#define patchColorDelta (dblToCol(1 / 256.0))
+#define patchColorDelta (dblToCol((3. / 256.0)))
//------------------------------------------------------------------------
// Operator table
@@ -307,7 +317,8 @@ static inline GBool isSameGfxColor(const GfxColor &colorA, const GfxColor &color
// GfxResources
//------------------------------------------------------------------------
-GfxResources::GfxResources(XRef *xref, Dict *resDict, GfxResources *nextA) {
+GfxResources::GfxResources(XRef *xref, Dict *resDict, GfxResources *nextA) :
+ gStateCache(2, xref) {
Object obj1, obj2;
Ref r;
@@ -480,11 +491,27 @@ GfxShading *GfxResources::lookupShading(char *name, Gfx *gfx) {
}
GBool GfxResources::lookupGState(char *name, Object *obj) {
+ if (!lookupGStateNF(name, obj))
+ return gFalse;
+
+ if (!obj->isRef())
+ return gTrue;
+
+ const Ref ref = obj->getRef();
+ if (!gStateCache.lookup(ref, obj)->isNull())
+ return gTrue;
+ obj->free();
+
+ gStateCache.put(ref)->copy(obj);
+ return gTrue;
+}
+
+GBool GfxResources::lookupGStateNF(char *name, Object *obj) {
GfxResources *resPtr;
for (resPtr = this; resPtr; resPtr = resPtr->next) {
if (resPtr->gStateDict.isDict()) {
- if (!resPtr->gStateDict.dictLookup(name, obj)->isNull()) {
+ if (!resPtr->gStateDict.dictLookupNF(name, obj)->isNull()) {
return gTrue;
}
obj->free();
@@ -518,6 +545,7 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, int pageNum, Dict *resDict, Catalog *cata
drawText = gFalse;
maskHaveCSPattern = gFalse;
mcStack = NULL;
+ parser = NULL;
// start the resource stack
res = new GfxResources(xref, resDict, NULL);
@@ -525,6 +553,8 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, int pageNum, Dict *resDict, Catalog *cata
// initialize
out = outA;
state = new GfxState(hDPI, vDPI, box, rotate, out->upsideDown());
+ stackHeight = 1;
+ pushStateGuard();
fontChanged = gFalse;
clip = clipNone;
ignoreUndef = 0;
@@ -570,6 +600,7 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict, Catalog *catalogA,
drawText = gFalse;
maskHaveCSPattern = gFalse;
mcStack = NULL;
+ parser = NULL;
// start the resource stack
res = new GfxResources(xref, resDict, NULL);
@@ -577,6 +608,8 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict, Catalog *catalogA,
// initialize
out = outA;
state = new GfxState(72, 72, box, 0, gFalse);
+ stackHeight = 1;
+ pushStateGuard();
fontChanged = gFalse;
clip = clipNone;
ignoreUndef = 0;
@@ -601,7 +634,12 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict, Catalog *catalogA,
}
Gfx::~Gfx() {
+ while (stateGuards.size()) {
+ popStateGuard();
+ }
+ // There shouldn't be more saves, but pop them if there were any
while (state->hasSaves()) {
+ error(-1, "Found state under last state guard. Popping.");
restoreState();
}
if (!subPage) {
@@ -649,10 +687,12 @@ void Gfx::go(GBool topLevel) {
int lastAbortCheck;
// scan a sequence of objects
+ pushStateGuard();
updateLevel = lastAbortCheck = 0;
numArgs = 0;
parser->getObj(&obj);
while (!obj.isEOF()) {
+ commandAborted = gFalse;
// got a command - execute it
if (obj.isCmd()) {
@@ -700,6 +740,14 @@ void Gfx::go(GBool topLevel) {
updateLevel = 0;
}
+ // did the command throw an exception
+ if (commandAborted) {
+ // don't propogate; recursive drawing comes from Form XObjects which
+ // should probably be drawn in a separate context anyway for caching
+ commandAborted = gFalse;
+ break;
+ }
+
// check for an abort
if (abortCheckCbk) {
if (updateLevel - lastAbortCheck > 10) {
@@ -747,6 +795,8 @@ void Gfx::go(GBool topLevel) {
args[i].free();
}
+ popStateGuard();
+
// update display
if (topLevel && updateLevel > 0) {
out->dump();
@@ -772,6 +822,7 @@ void Gfx::execOp(Object *cmd, Object args[], int numArgs) {
if (op->numArgs >= 0) {
if (numArgs < op->numArgs) {
error(getPos(), "Too few (%d) args to '%s' operator", numArgs, name);
+ commandAborted = gTrue;
return;
}
if (numArgs > op->numArgs) {
@@ -970,6 +1021,11 @@ void Gfx::opSetExtGState(Object args[], int numArgs) {
}
}
obj2.free();
+ if (obj1.dictLookup("OPM", &obj2)->isInt()) {
+ state->setOverprintMode(obj2.getInt());
+ out->updateOverprintMode(state);
+ }
+ obj2.free();
// stroke adjust
if (obj1.dictLookup("SA", &obj2)->isBool()) {
@@ -1210,7 +1266,13 @@ void Gfx::doSoftMask(Object *str, GBool alpha,
}
for (i = 0; i < 4; ++i) {
obj1.arrayGet(i, &obj2);
- bbox[i] = obj2.getNum();
+ if (likely(obj2.isNum())) bbox[i] = obj2.getNum();
+ else {
+ obj2.free();
+ obj1.free();
+ error(getPos(), "Bad form bounding box (non number)");
+ return;
+ }
obj2.free();
}
obj1.free();
@@ -1220,7 +1282,8 @@ void Gfx::doSoftMask(Object *str, GBool alpha,
if (obj1.isArray()) {
for (i = 0; i < 6; ++i) {
obj1.arrayGet(i, &obj2);
- m[i] = obj2.getNum();
+ if (likely(obj2.isNum())) m[i] = obj2.getNum();
+ else m[i] = 0;
obj2.free();
}
} else {
@@ -1256,40 +1319,53 @@ void Gfx::opSetRenderingIntent(Object args[], int numArgs) {
void Gfx::opSetFillGray(Object args[], int numArgs) {
GfxColor color;
+ GfxColorSpace *colorSpace;
+ Object obj;
- if (textHaveCSPattern) {
+ if (textHaveCSPattern && drawText) {
GBool needFill = out->deviceHasTextClip(state);
out->endTextObject(state);
if (needFill) {
doPatternFill(gTrue);
}
out->restoreState(state);
- state->setFillPattern(NULL);
- state->setFillColorSpace(new GfxDeviceGrayColorSpace());
- out->updateFillColorSpace(state);
- color.c[0] = dblToCol(args[0].getNum());
- state->setFillColor(&color);
- out->updateFillColor(state);
+ }
+ state->setFillPattern(NULL);
+ res->lookupColorSpace("DefaultGray", &obj);
+ if (obj.isNull()) {
+ colorSpace = new GfxDeviceGrayColorSpace();
+ } else {
+ colorSpace = GfxColorSpace::parse(&obj, this);
+ }
+ obj.free();
+ state->setFillColorSpace(colorSpace);
+ out->updateFillColorSpace(state);
+ color.c[0] = dblToCol(args[0].getNum());
+ state->setFillColor(&color);
+ out->updateFillColor(state);
+ if (textHaveCSPattern) {
out->beginTextObject(state);
out->updateRender(state);
out->updateTextMat(state);
out->updateTextPos(state);
textHaveCSPattern = gFalse;
- } else {
- state->setFillPattern(NULL);
- state->setFillColorSpace(new GfxDeviceGrayColorSpace());
- out->updateFillColorSpace(state);
- color.c[0] = dblToCol(args[0].getNum());
- state->setFillColor(&color);
- out->updateFillColor(state);
}
}
void Gfx::opSetStrokeGray(Object args[], int numArgs) {
GfxColor color;
+ GfxColorSpace *colorSpace;
+ Object obj;
state->setStrokePattern(NULL);
- state->setStrokeColorSpace(new GfxDeviceGrayColorSpace());
+ res->lookupColorSpace("DefaultGray", &obj);
+ if (obj.isNull()) {
+ colorSpace = new GfxDeviceGrayColorSpace();
+ } else {
+ colorSpace = GfxColorSpace::parse(&obj, this);
+ }
+ obj.free();
+ state->setStrokeColorSpace(colorSpace);
out->updateStrokeColorSpace(state);
color.c[0] = dblToCol(args[0].getNum());
state->setStrokeColor(&color);
@@ -1298,31 +1374,57 @@ void Gfx::opSetStrokeGray(Object args[], int numArgs) {
void Gfx::opSetFillCMYKColor(Object args[], int numArgs) {
GfxColor color;
+ GfxColorSpace *colorSpace;
+ Object obj;
int i;
- if (textHaveCSPattern) {
- colorSpaceText = new GfxDeviceCMYKColorSpace();
- for (i = 0; i < 4; ++i) {
- colorText.c[i] = dblToCol(args[i].getNum());
+ if (textHaveCSPattern && drawText) {
+ GBool needFill = out->deviceHasTextClip(state);
+ out->endTextObject(state);
+ if (needFill) {
+ doPatternFill(gTrue);
}
+ out->restoreState(state);
+ }
+ res->lookupColorSpace("DefaultCMYK", &obj);
+ if (obj.isNull()) {
+ colorSpace = new GfxDeviceCMYKColorSpace();
} else {
- state->setFillPattern(NULL);
- state->setFillColorSpace(new GfxDeviceCMYKColorSpace());
- out->updateFillColorSpace(state);
- for (i = 0; i < 4; ++i) {
- color.c[i] = dblToCol(args[i].getNum());
- }
- state->setFillColor(&color);
- out->updateFillColor(state);
+ colorSpace = GfxColorSpace::parse(&obj, this);
+ }
+ obj.free();
+ state->setFillPattern(NULL);
+ state->setFillColorSpace(colorSpace);
+ out->updateFillColorSpace(state);
+ for (i = 0; i < 4; ++i) {
+ color.c[i] = dblToCol(args[i].getNum());
+ }
+ state->setFillColor(&color);
+ out->updateFillColor(state);
+ if (textHaveCSPattern) {
+ out->beginTextObject(state);
+ out->updateRender(state);
+ out->updateTextMat(state);
+ out->updateTextPos(state);
+ textHaveCSPattern = gFalse;
}
}
void Gfx::opSetStrokeCMYKColor(Object args[], int numArgs) {
GfxColor color;
+ GfxColorSpace *colorSpace;
+ Object obj;
int i;
state->setStrokePattern(NULL);
- state->setStrokeColorSpace(new GfxDeviceCMYKColorSpace());
+ res->lookupColorSpace("DefaultCMYK", &obj);
+ if (obj.isNull()) {
+ colorSpace = new GfxDeviceCMYKColorSpace();
+ } else {
+ colorSpace = GfxColorSpace::parse(&obj, this);
+ }
+ obj.free();
+ state->setStrokeColorSpace(colorSpace);
out->updateStrokeColorSpace(state);
for (i = 0; i < 4; ++i) {
color.c[i] = dblToCol(args[i].getNum());
@@ -1332,32 +1434,58 @@ void Gfx::opSetStrokeCMYKColor(Object args[], int numArgs) {
}
void Gfx::opSetFillRGBColor(Object args[], int numArgs) {
+ Object obj;
+ GfxColorSpace *colorSpace;
GfxColor color;
int i;
- if (textHaveCSPattern) {
- colorSpaceText = new GfxDeviceRGBColorSpace();
- for (i = 0; i < 3; ++i) {
- colorText.c[i] = dblToCol(args[i].getNum());
+ if (textHaveCSPattern && drawText) {
+ GBool needFill = out->deviceHasTextClip(state);
+ out->endTextObject(state);
+ if (needFill) {
+ doPatternFill(gTrue);
}
+ out->restoreState(state);
+ }
+ state->setFillPattern(NULL);
+ res->lookupColorSpace("DefaultRGB", &obj);
+ if (obj.isNull()) {
+ colorSpace = new GfxDeviceRGBColorSpace();
} else {
- state->setFillPattern(NULL);
- state->setFillColorSpace(new GfxDeviceRGBColorSpace());
- out->updateFillColorSpace(state);
- for (i = 0; i < 3; ++i) {
- color.c[i] = dblToCol(args[i].getNum());
- }
- state->setFillColor(&color);
- out->updateFillColor(state);
+ colorSpace = GfxColorSpace::parse(&obj, this);
+ }
+ obj.free();
+ state->setFillColorSpace(colorSpace);
+ out->updateFillColorSpace(state);
+ for (i = 0; i < 3; ++i) {
+ color.c[i] = dblToCol(args[i].getNum());
+ }
+ state->setFillColor(&color);
+ out->updateFillColor(state);
+ if (textHaveCSPattern) {
+ out->beginTextObject(state);
+ out->updateRender(state);
+ out->updateTextMat(state);
+ out->updateTextPos(state);
+ textHaveCSPattern = gFalse;
}
}
void Gfx::opSetStrokeRGBColor(Object args[], int numArgs) {
+ Object obj;
+ GfxColorSpace *colorSpace;
GfxColor color;
int i;
state->setStrokePattern(NULL);
- state->setStrokeColorSpace(new GfxDeviceRGBColorSpace());
+ res->lookupColorSpace("DefaultRGB", &obj);
+ if (obj.isNull()) {
+ colorSpace = new GfxDeviceRGBColorSpace();
+ } else {
+ colorSpace = GfxColorSpace::parse(&obj, this);
+ }
+ obj.free();
+ state->setStrokeColorSpace(colorSpace);
out->updateStrokeColorSpace(state);
for (i = 0; i < 3; ++i) {
color.c[i] = dblToCol(args[i].getNum());
@@ -1371,7 +1499,6 @@ void Gfx::opSetFillColorSpace(Object args[], int numArgs) {
GfxColorSpace *colorSpace;
GfxColor color;
- state->setFillPattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
if (obj.isNull()) {
colorSpace = GfxColorSpace::parse(&args[0], this);
@@ -1380,28 +1507,29 @@ void Gfx::opSetFillColorSpace(Object args[], int numArgs) {
}
obj.free();
if (colorSpace) {
+ if (textHaveCSPattern && drawText) {
+ GBool needFill = out->deviceHasTextClip(state);
+ out->endTextObject(state);
+ if (needFill) {
+ doPatternFill(gTrue);
+ }
+ out->restoreState(state);
+ }
+ state->setFillPattern(NULL);
state->setFillColorSpace(colorSpace);
out->updateFillColorSpace(state);
colorSpace->getDefaultColor(&color);
state->setFillColor(&color);
out->updateFillColor(state);
- if (drawText) {
- if (colorSpace->getMode() == csPattern) {
- colorSpaceText = NULL;
- textHaveCSPattern = gTrue;
- out->beginTextObject(state);
- } else if (textHaveCSPattern) {
- GBool needFill = out->deviceHasTextClip(state);
- out->endTextObject(state);
- if (needFill) {
- doPatternFill(gTrue);
- }
- out->beginTextObject(state);
- out->updateRender(state);
- out->updateTextMat(state);
- out->updateTextPos(state);
- textHaveCSPattern = gFalse;
- }
+ if (textHaveCSPattern) {
+ out->beginTextObject(state);
+ out->updateRender(state);
+ out->updateTextMat(state);
+ out->updateTextPos(state);
+ textHaveCSPattern = colorSpace->getMode() == csPattern;
+ } else if (drawText && out->supportTextCSPattern(state)) {
+ out->beginTextObject(state);
+ textHaveCSPattern = gTrue;
}
} else {
error(getPos(), "Bad color space (fill)");
@@ -1480,6 +1608,8 @@ void Gfx::opSetFillColorN(Object args[], int numArgs) {
for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
if (args[i].isNum()) {
color.c[i] = dblToCol(args[i].getNum());
+ } else {
+ color.c[i] = 0; // TODO Investigate if this is what Adobe does
}
}
state->setFillColor(&color);
@@ -1499,6 +1629,8 @@ void Gfx::opSetFillColorN(Object args[], int numArgs) {
for (i = 0; i < numArgs && i < gfxColorMaxComps; ++i) {
if (args[i].isNum()) {
color.c[i] = dblToCol(args[i].getNum());
+ } else {
+ color.c[i] = 0; // TODO Investigate if this is what Adobe does
}
}
state->setFillColor(&color);
@@ -1523,6 +1655,8 @@ void Gfx::opSetStrokeColorN(Object args[], int numArgs) {
for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
if (args[i].isNum()) {
color.c[i] = dblToCol(args[i].getNum());
+ } else {
+ color.c[i] = 0; // TODO Investigate if this is what Adobe does
}
}
state->setStrokeColor(&color);
@@ -1542,6 +1676,8 @@ void Gfx::opSetStrokeColorN(Object args[], int numArgs) {
for (i = 0; i < numArgs && i < gfxColorMaxComps; ++i) {
if (args[i].isNum()) {
color.c[i] = dblToCol(args[i].getNum());
+ } else {
+ color.c[i] = 0; // TODO Investigate if this is what Adobe does
}
}
state->setStrokeColor(&color);
@@ -2005,9 +2141,9 @@ void Gfx::doTilingPatternFill(GfxTilingPattern *tPat,
m1[4] = m[4];
m1[5] = m[5];
if (out->useTilingPatternFill() &&
- out->tilingPatternFill(state, tPat->getContentStream(),
- tPat->getPaintType(), tPat->getResDict(),
- m1, tPat->getBBox(),
+ out->tilingPatternFill(state, catalog, tPat->getContentStream(),
+ tPat->getMatrix(), tPat->getPaintType(), tPat->getTilingType(),
+ tPat->getResDict(), m1, tPat->getBBox(),
xi0, yi0, xi1, yi1, xstep, ystep)) {
goto restore;
} else {
@@ -2054,7 +2190,8 @@ void Gfx::doShadingPatternFill(GfxShadingPattern *sPat,
state->lineTo(xMin, yMax);
state->closePath();
state->clip();
- out->clip(state);
+ if (!textHaveCSPattern && !maskHaveCSPattern)
+ out->clip(state);
state->setPath(savedPath->copy());
}
@@ -2229,7 +2366,7 @@ void Gfx::doFunctionShFill(GfxFunctionShading *shading) {
double x0, y0, x1, y1;
GfxColor colors[4];
- if (out->useShadedFills() &&
+ if (out->useShadedFills( shading->getType() ) &&
out->functionShadedFill(state, shading)) {
return;
}
@@ -2412,7 +2549,7 @@ void Gfx::doAxialShFill(GfxAxialShading *shading) {
}
}
- if (out->useShadedFills() &&
+ if (out->useShadedFills( shading->getType() ) &&
out->axialShadedFill(state, shading, tMin, tMax)) {
return;
}
@@ -2472,7 +2609,7 @@ void Gfx::doAxialShFill(GfxAxialShading *shading) {
if (out->useFillColorStop()) {
// make sure we add stop color when t = tMin
state->setFillColor(&color0);
- out->updateFillColorStop(state, (tt - tMin)/(tMax - tMin));
+ out->updateFillColorStop(state, 0);
}
// compute the coordinates of the point on the t axis at t = tMin;
@@ -2655,6 +2792,27 @@ void Gfx::doAxialShFill(GfxAxialShading *shading) {
}
}
+static inline void getShadingColorRadialHelper(double t0, double t1, double t, GfxRadialShading *shading, GfxColor *color)
+{
+ if (t0 < t1) {
+ if (t < t0) {
+ shading->getColor(t0, color);
+ } else if (t > t1) {
+ shading->getColor(t1, color);
+ } else {
+ shading->getColor(t, color);
+ }
+ } else {
+ if (t > t0) {
+ shading->getColor(t0, color);
+ } else if (t < t1) {
+ shading->getColor(t1, color);
+ } else {
+ shading->getColor(t, color);
+ }
+ }
+}
+
void Gfx::doRadialShFill(GfxRadialShading *shading) {
double xMin, yMin, xMax, yMax;
double x0, y0, r0, x1, y1, r1, t0, t1;
@@ -2686,7 +2844,7 @@ void Gfx::doRadialShFill(GfxRadialShading *shading) {
theta = 0;
sz = 0; // make gcc happy
} else {
- sz = -r0 / (r1 - r0);
+ sz = (r1 > r0) ? -r0 / (r1 - r0) : -r1 / (r0 - r1);
xz = x0 + sz * (x1 - x0);
yz = y0 + sz * (y1 - y0);
enclosed = (xz - x0) * (xz - x0) + (yz - y0) * (yz - y0) <= r0 * r0;
@@ -2764,7 +2922,7 @@ void Gfx::doRadialShFill(GfxRadialShading *shading) {
}
}
- if (out->useShadedFills() &&
+ if (out->useShadedFills( shading->getType() ) &&
out->radialShadedFill(state, shading, sMin, sMax)) {
return;
}
@@ -2807,13 +2965,7 @@ void Gfx::doRadialShFill(GfxRadialShading *shading) {
xa = x0 + sa * (x1 - x0);
ya = y0 + sa * (y1 - y0);
ra = r0 + sa * (r1 - r0);
- if (ta < t0) {
- shading->getColor(t0, &colorA);
- } else if (ta > t1) {
- shading->getColor(t1, &colorA);
- } else {
- shading->getColor(ta, &colorA);
- }
+ getShadingColorRadialHelper(t0, t1, ta, shading, &colorA);
needExtend = !out->radialShadedSupportExtend(state, shading);
@@ -2829,42 +2981,31 @@ void Gfx::doRadialShFill(GfxRadialShading *shading) {
ib = radialMaxSplits;
sb = sMax;
tb = t0 + sb * (t1 - t0);
- if (tb < t0) {
- shading->getColor(t0, &colorB);
- } else if (tb > t1) {
- shading->getColor(t1, &colorB);
- } else {
- shading->getColor(tb, &colorB);
- }
+ getShadingColorRadialHelper(t0, t1, tb, shading, &colorB);
while (ib - ia > 1) {
- if (isSameGfxColor(colorB, colorA, nComps, radialColorDelta) && ib < radialMaxSplits) {
- // The shading is not necessarily lineal so having two points with the
- // same color does not mean all the areas in between have the same color too
- // Do another bisection to be a bit more sure we are not doing something wrong
- GfxColor colorC;
- int ic = (ia + ib) / 2;
- double sc = sMin + ((double)ic / (double)radialMaxSplits) * (sMax - sMin);
- double tc = t0 + sc * (t1 - t0);
- if (tc < t0) {
- shading->getColor(t0, &colorC);
- } else if (tc > t1) {
- shading->getColor(t1, &colorC);
- } else {
- shading->getColor(tc, &colorC);
- }
- if (isSameGfxColor(colorC, colorA, nComps, radialColorDelta))
- break;
+ if (isSameGfxColor(colorB, colorA, nComps, radialColorDelta)) {
+ // The shading is not necessarily lineal so having two points with the
+ // same color does not mean all the areas in between have the same color too
+ int ic = ia + 1;
+ for (; ic <= ib; ic++) {
+ GfxColor colorC;
+ const double sc = sMin + ((double)ic / (double)radialMaxSplits) * (sMax - sMin);
+ const double tc = t0 + sc * (t1 - t0);
+ getShadingColorRadialHelper(t0, t1, tc, shading, &colorC);
+ if (!isSameGfxColor(colorC, colorA, nComps, radialColorDelta)) {
+ break;
+ }
+ }
+ ib = (ic > ia + 1) ? ic - 1 : ia + 1;
+ sb = sMin + ((double)ib / (double)radialMaxSplits) * (sMax - sMin);
+ tb = t0 + sb * (t1 - t0);
+ getShadingColorRadialHelper(t0, t1, tb, shading, &colorB);
+ break;
}
ib = (ia + ib) / 2;
sb = sMin + ((double)ib / (double)radialMaxSplits) * (sMax - sMin);
tb = t0 + sb * (t1 - t0);
- if (tb < t0) {
- shading->getColor(t0, &colorB);
- } else if (tb > t1) {
- shading->getColor(t1, &colorB);
- } else {
- shading->getColor(tb, &colorB);
- }
+ getShadingColorRadialHelper(t0, t1, tb, shading, &colorB);
}
// compute center and radius of the circle
@@ -3035,22 +3176,57 @@ void Gfx::doRadialShFill(GfxRadialShading *shading) {
void Gfx::doGouraudTriangleShFill(GfxGouraudTriangleShading *shading) {
double x0, y0, x1, y1, x2, y2;
- GfxColor color0, color1, color2;
int i;
- for (i = 0; i < shading->getNTriangles(); ++i) {
- shading->getTriangle(i, &x0, &y0, &color0,
- &x1, &y1, &color1,
- &x2, &y2, &color2);
- gouraudFillTriangle(x0, y0, &color0, x1, y1, &color1, x2, y2, &color2,
- shading->getColorSpace()->getNComps(), 0);
+ if (out->useShadedFills( shading->getType()) && !contentIsHidden()) {
+ if (out->gouraudTriangleShadedFill( state, shading))
+ return;
}
+
+ // preallocate a path (speed improvements)
+ state->moveTo(0., 0.);
+ state->lineTo(1., 0.);
+ state->lineTo(0., 1.);
+ state->closePath();
+
+ GfxState::ReusablePathIterator *reusablePath = state->getReusablePath();
+
+ if (shading->isParameterized()) {
+ // work with parameterized values:
+ double color0, color1, color2;
+ // a relative threshold:
+ const double refineColorThreshold = gouraudParameterizedColorDelta *
+ (shading->getParameterDomainMax() - shading->getParameterDomainMin());
+ for (i = 0; i < shading->getNTriangles(); ++i) {
+ shading->getTriangle(i, &x0, &y0, &color0,
+ &x1, &y1, &color1,
+ &x2, &y2, &color2);
+ gouraudFillTriangle(x0, y0, color0, x1, y1, color1, x2, y2, color2, refineColorThreshold, 0, shading, reusablePath);
+ }
+
+ } else {
+ // this always produces output -- even for parameterized ranges.
+ // But it ignores the parameterized color map (the function).
+ //
+ // Note that using this code in for parameterized shadings might be
+ // correct in circumstances (namely if the function is linear in the actual
+ // triangle), but in general, it will simply be wrong.
+ GfxColor color0, color1, color2;
+ for (i = 0; i < shading->getNTriangles(); ++i) {
+ shading->getTriangle(i, &x0, &y0, &color0,
+ &x1, &y1, &color1,
+ &x2, &y2, &color2);
+ gouraudFillTriangle(x0, y0, &color0, x1, y1, &color1, x2, y2, &color2, shading->getColorSpace()->getNComps(), 0, reusablePath);
+ }
+ }
+
+ delete reusablePath;
}
void Gfx::gouraudFillTriangle(double x0, double y0, GfxColor *color0,
double x1, double y1, GfxColor *color1,
double x2, double y2, GfxColor *color2,
- int nComps, int depth) {
+ int nComps, int depth, GfxState::ReusablePathIterator *path) {
double x01, y01, x12, y12, x20, y20;
GfxColor color01, color12, color20;
int i;
@@ -3064,13 +3240,15 @@ void Gfx::gouraudFillTriangle(double x0, double y0, GfxColor *color0,
if (i == nComps || depth == gouraudMaxDepth) {
state->setFillColor(color0);
out->updateFillColor(state);
- state->moveTo(x0, y0);
- state->lineTo(x1, y1);
- state->lineTo(x2, y2);
- state->closePath();
+
+ path->reset(); assert(!path->isEnd());
+ path->setCoord(x0,y0); path->next(); assert(!path->isEnd());
+ path->setCoord(x1,y1); path->next(); assert(!path->isEnd());
+ path->setCoord(x2,y2); path->next(); assert(!path->isEnd());
+ path->setCoord(x0,y0); path->next(); assert( path->isEnd());
+
if (!contentIsHidden())
out->fill(state);
- state->clearPath();
} else {
x01 = 0.5 * (x0 + x1);
y01 = 0.5 * (y0 + y1);
@@ -3078,27 +3256,85 @@ void Gfx::gouraudFillTriangle(double x0, double y0, GfxColor *color0,
y12 = 0.5 * (y1 + y2);
x20 = 0.5 * (x2 + x0);
y20 = 0.5 * (y2 + y0);
- //~ if the shading has a Function, this should interpolate on the
- //~ function parameter, not on the color components
for (i = 0; i < nComps; ++i) {
color01.c[i] = (color0->c[i] + color1->c[i]) / 2;
color12.c[i] = (color1->c[i] + color2->c[i]) / 2;
color20.c[i] = (color2->c[i] + color0->c[i]) / 2;
}
gouraudFillTriangle(x0, y0, color0, x01, y01, &color01,
- x20, y20, &color20, nComps, depth + 1);
+ x20, y20, &color20, nComps, depth + 1, path);
gouraudFillTriangle(x01, y01, &color01, x1, y1, color1,
- x12, y12, &color12, nComps, depth + 1);
+ x12, y12, &color12, nComps, depth + 1, path);
gouraudFillTriangle(x01, y01, &color01, x12, y12, &color12,
- x20, y20, &color20, nComps, depth + 1);
+ x20, y20, &color20, nComps, depth + 1, path);
gouraudFillTriangle(x20, y20, &color20, x12, y12, &color12,
- x2, y2, color2, nComps, depth + 1);
+ x2, y2, color2, nComps, depth + 1, path);
+ }
+}
+void Gfx::gouraudFillTriangle(double x0, double y0, double color0,
+ double x1, double y1, double color1,
+ double x2, double y2, double color2,
+ double refineColorThreshold, int depth, GfxGouraudTriangleShading *shading, GfxState::ReusablePathIterator *path) {
+ const double meanColor = (color0 + color1 + color2) / 3;
+
+ const bool isFineEnough =
+ fabs(color0 - meanColor) < refineColorThreshold &&
+ fabs(color1 - meanColor) < refineColorThreshold &&
+ fabs(color2 - meanColor) < refineColorThreshold;
+
+ if (isFineEnough || depth == gouraudMaxDepth) {
+ GfxColor color;
+
+ shading->getParameterizedColor(meanColor, &color);
+ state->setFillColor(&color);
+ out->updateFillColor(state);
+
+ path->reset(); assert(!path->isEnd());
+ path->setCoord(x0,y0); path->next(); assert(!path->isEnd());
+ path->setCoord(x1,y1); path->next(); assert(!path->isEnd());
+ path->setCoord(x2,y2); path->next(); assert(!path->isEnd());
+ path->setCoord(x0,y0); path->next(); assert( path->isEnd());
+
+ if (!contentIsHidden())
+ out->fill(state);
+ } else {
+ const double x01 = 0.5 * (x0 + x1);
+ const double y01 = 0.5 * (y0 + y1);
+ const double x12 = 0.5 * (x1 + x2);
+ const double y12 = 0.5 * (y1 + y2);
+ const double x20 = 0.5 * (x2 + x0);
+ const double y20 = 0.5 * (y2 + y0);
+ const double color01 = (color0 + color1) / 2.;
+ const double color12 = (color1 + color2) / 2.;
+ const double color20 = (color2 + color0) / 2.;
+ ++depth;
+ gouraudFillTriangle(x0, y0, color0,
+ x01, y01, color01,
+ x20, y20, color20,
+ refineColorThreshold, depth, shading, path);
+ gouraudFillTriangle(x01, y01, color01,
+ x1, y1, color1,
+ x12, y12, color12,
+ refineColorThreshold, depth, shading, path);
+ gouraudFillTriangle(x01, y01, color01,
+ x12, y12, color12,
+ x20, y20, color20,
+ refineColorThreshold, depth, shading, path);
+ gouraudFillTriangle(x20, y20, color20,
+ x12, y12, color12,
+ x2, y2, color2,
+ refineColorThreshold, depth, shading, path);
}
}
void Gfx::doPatchMeshShFill(GfxPatchMeshShading *shading) {
int start, i;
+ if (out->useShadedFills( shading->getType()) && !contentIsHidden()) {
+ if (out->patchMeshShadedFill( state, shading))
+ return;
+ }
+
if (shading->getNPatches() > 128) {
start = 3;
} else if (shading->getNPatches() > 64) {
@@ -3108,32 +3344,68 @@ void Gfx::doPatchMeshShFill(GfxPatchMeshShading *shading) {
} else {
start = 0;
}
+ /*
+ * Parameterized shadings take one parameter [t_0,t_e]
+ * and map it into the color space.
+ *
+ * Consequently, all color values are stored as doubles.
+ *
+ * These color values are interpreted as parameters for parameterized
+ * shadings and as colorspace entities otherwise.
+ *
+ * The only difference is that color space entities are stored into
+ * DOUBLE arrays, not into arrays of type GfxColorComp.
+ */
+ const int colorComps = shading->getColorSpace()->getNComps();
+ double refineColorThreshold;
+ if( shading->isParameterized() ) {
+ refineColorThreshold = gouraudParameterizedColorDelta *
+ (shading->getParameterDomainMax() - shading->getParameterDomainMin());
+
+ } else {
+ refineColorThreshold = patchColorDelta;
+ }
+
for (i = 0; i < shading->getNPatches(); ++i) {
- fillPatch(shading->getPatch(i), shading->getColorSpace()->getNComps(),
- start);
+ fillPatch(shading->getPatch(i),
+ colorComps,
+ shading->isParameterized() ? 1 : colorComps,
+ refineColorThreshold,
+ start,
+ shading);
}
}
-void Gfx::fillPatch(GfxPatch *patch, int nComps, int depth) {
+
+void Gfx::fillPatch(GfxPatch *patch, int colorComps, int patchColorComps, double refineColorThreshold, int depth, GfxPatchMeshShading *shading) {
GfxPatch patch00, patch01, patch10, patch11;
double xx[4][8], yy[4][8];
double xxm, yym;
int i;
- for (i = 0; i < nComps; ++i) {
- if (abs(patch->color[0][0].c[i] - patch->color[0][1].c[i])
- > patchColorDelta ||
- abs(patch->color[0][1].c[i] - patch->color[1][1].c[i])
- > patchColorDelta ||
- abs(patch->color[1][1].c[i] - patch->color[1][0].c[i])
- > patchColorDelta ||
- abs(patch->color[1][0].c[i] - patch->color[0][0].c[i])
- > patchColorDelta) {
+ for (i = 0; i < patchColorComps; ++i) {
+ // these comparisons are done in double arithmetics.
+ //
+ // For non-parameterized shadings, they are done in color space
+ // components.
+ if (fabs(patch->color[0][0].c[i] - patch->color[0][1].c[i]) > refineColorThreshold ||
+ fabs(patch->color[0][1].c[i] - patch->color[1][1].c[i]) > refineColorThreshold ||
+ fabs(patch->color[1][1].c[i] - patch->color[1][0].c[i]) > refineColorThreshold ||
+ fabs(patch->color[1][0].c[i] - patch->color[0][0].c[i]) > refineColorThreshold) {
break;
}
}
- if (i == nComps || depth == patchMaxDepth) {
- state->setFillColor(&patch->color[0][0]);
+ if (i == patchColorComps || depth == patchMaxDepth) {
+ GfxColor flatColor;
+ if( shading->isParameterized() ) {
+ shading->getParameterizedColor( patch->color[0][0].c[0], &flatColor );
+ } else {
+ for( i = 0; i<colorComps; ++i ) {
+ // simply cast to the desired type; that's all what is needed.
+ flatColor.c[i] = GfxColorComp(patch->color[0][0].c[i]);
+ }
+ }
+ state->setFillColor(&flatColor);
out->updateFillColor(state);
state->moveTo(patch->x[0][0], patch->y[0][0]);
state->curveTo(patch->x[0][1], patch->y[0][1],
@@ -3211,9 +3483,7 @@ void Gfx::fillPatch(GfxPatch *patch, int nComps, int depth) {
patch11.x[3][i-4] = xx[3][i];
patch11.y[3][i-4] = yy[3][i];
}
- //~ if the shading has a Function, this should interpolate on the
- //~ function parameter, not on the color components
- for (i = 0; i < nComps; ++i) {
+ for (i = 0; i < patchColorComps; ++i) {
patch00.color[0][0].c[i] = patch->color[0][0].c[i];
patch00.color[0][1].c[i] = (patch->color[0][0].c[i] +
patch->color[0][1].c[i]) / 2;
@@ -3236,10 +3506,10 @@ void Gfx::fillPatch(GfxPatch *patch, int nComps, int depth) {
patch11.color[0][0].c[i] = patch00.color[1][1].c[i];
patch10.color[0][1].c[i] = patch00.color[1][1].c[i];
}
- fillPatch(&patch00, nComps, depth + 1);
- fillPatch(&patch10, nComps, depth + 1);
- fillPatch(&patch01, nComps, depth + 1);
- fillPatch(&patch11, nComps, depth + 1);
+ fillPatch(&patch00, colorComps, patchColorComps, refineColorThreshold, depth + 1, shading);
+ fillPatch(&patch10, colorComps, patchColorComps, refineColorThreshold, depth + 1, shading);
+ fillPatch(&patch01, colorComps, patchColorComps, refineColorThreshold, depth + 1, shading);
+ fillPatch(&patch11, colorComps, patchColorComps, refineColorThreshold, depth + 1, shading);
}
}
@@ -3280,8 +3550,7 @@ void Gfx::opBeginText(Object args[], int numArgs) {
out->updateTextMat(state);
out->updateTextPos(state);
fontChanged = gTrue;
- if (out->supportTextCSPattern(state)) {
- colorSpaceText = NULL;
+ if (!(state->getRender() & 4) && out->supportTextCSPattern(state)) {
textHaveCSPattern = gTrue;
}
}
@@ -3290,19 +3559,11 @@ void Gfx::opEndText(Object args[], int numArgs) {
GBool needFill = out->deviceHasTextClip(state);
out->endTextObject(state);
drawText = gFalse;
- if (out->supportTextCSPattern(state) && textHaveCSPattern) {
+ if (textHaveCSPattern) {
if (needFill) {
doPatternFill(gTrue);
}
out->restoreState(state);
- if (colorSpaceText != NULL) {
- state->setFillPattern(NULL);
- state->setFillColorSpace(colorSpaceText);
- out->updateFillColorSpace(state);
- state->setFillColor(&colorText);
- out->updateFillColor(state);
- colorSpaceText = NULL;
- }
}
textHaveCSPattern = gFalse;
}
@@ -3344,9 +3605,22 @@ void Gfx::opSetTextLeading(Object args[], int numArgs) {
}
void Gfx::opSetTextRender(Object args[], int numArgs) {
+ int rm = state->getRender();
state->setRender(args[0].getInt());
- if (args[0].getInt() == 7) {
+ if ((args[0].getInt() & 4) && textHaveCSPattern && drawText) {
+ GBool needFill = out->deviceHasTextClip(state);
+ out->endTextObject(state);
+ if (needFill) {
+ doPatternFill(gTrue);
+ }
+ out->restoreState(state);
+ out->beginTextObject(state);
+ out->updateTextMat(state);
+ out->updateTextPos(state);
textHaveCSPattern = gFalse;
+ } else if ((rm & 4) && !(args[0].getInt() & 4) && out->supportTextCSPattern(state) && drawText) {
+ out->beginTextObject(state);
+ textHaveCSPattern = gTrue;
}
out->updateRender(state);
}
@@ -3917,11 +4191,32 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
if (!obj1.isNull()) {
colorSpace = GfxColorSpace::parse(&obj1, this);
} else if (csMode == streamCSDeviceGray) {
- colorSpace = new GfxDeviceGrayColorSpace();
+ Object objCS;
+ res->lookupColorSpace("DefaultGray", &objCS);
+ if (objCS.isNull()) {
+ colorSpace = new GfxDeviceGrayColorSpace();
+ } else {
+ colorSpace = GfxColorSpace::parse(&objCS, this);
+ }
+ objCS.free();
} else if (csMode == streamCSDeviceRGB) {
- colorSpace = new GfxDeviceRGBColorSpace();
+ Object objCS;
+ res->lookupColorSpace("DefaultRGB", &objCS);
+ if (objCS.isNull()) {
+ colorSpace = new GfxDeviceRGBColorSpace();
+ } else {
+ colorSpace = GfxColorSpace::parse(&objCS, this);
+ }
+ objCS.free();
} else if (csMode == streamCSDeviceCMYK) {
- colorSpace = new GfxDeviceCMYKColorSpace();
+ Object objCS;
+ res->lookupColorSpace("DefaultCMYK", &objCS);
+ if (objCS.isNull()) {
+ colorSpace = new GfxDeviceCMYKColorSpace();
+ } else {
+ colorSpace = GfxColorSpace::parse(&objCS, this);
+ }
+ objCS.free();
} else {
colorSpace = NULL;
}
@@ -4182,8 +4477,14 @@ void Gfx::doForm(Object *str) {
}
for (i = 0; i < 4; ++i) {
bboxObj.arrayGet(i, &obj1);
- bbox[i] = obj1.getNum();
- obj1.free();
+ if (likely(obj1.isNum())) {
+ bbox[i] = obj1.getNum();
+ obj1.free();
+ } else {
+ obj1.free();
+ error(getPos(), "Bad form bounding box value");
+ return;
+ }
}
bboxObj.free();
@@ -4192,7 +4493,8 @@ void Gfx::doForm(Object *str) {
if (matrixObj.isArray()) {
for (i = 0; i < 6; ++i) {
matrixObj.arrayGet(i, &obj1);
- m[i] = obj1.getNum();
+ if (likely(obj1.isNum())) m[i] = obj1.getNum();
+ else m[i] = 0;
obj1.free();
}
} else {
@@ -4406,8 +4708,13 @@ Stream *Gfx::buildImageStream() {
obj.free();
// make stream
- str = new EmbedStream(parser->getStream(), &dict, gFalse, 0);
- str = str->addFilters(&dict);
+ if (parser->getStream()) {
+ str = new EmbedStream(parser->getStream(), &dict, gFalse, 0);
+ str = str->addFilters(&dict);
+ } else {
+ str = NULL;
+ dict.free();
+ }
return str;
}
@@ -4497,7 +4804,8 @@ void Gfx::opBeginMarkedContent(Object args[], int numArgs) {
bool visible = contentConfig->optContentIsVisible( &markedContent );
MarkedContentStack *mc = mcStack;
mc->ocSuppressed = !(visible);
- }
+ }
+ markedContent.free();
} else {
error(getPos(), "DID NOT find %s", name1);
}
@@ -4516,6 +4824,8 @@ void Gfx::opBeginMarkedContent(Object args[], int numArgs) {
if(numArgs == 2 && args[1].isDict ()) {
out->beginMarkedContent(args[0].getName(),args[1].getDict());
+ } else if(numArgs == 1) {
+ out->beginMarkedContent(args[0].getName(),NULL);
}
}
@@ -4606,8 +4916,14 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
}
for (i = 0; i < 4; ++i) {
bboxObj.arrayGet(i, &obj1);
- bbox[i] = obj1.getNum();
- obj1.free();
+ if (likely(obj1.isNum())) {
+ bbox[i] = obj1.getNum();
+ obj1.free();
+ } else {
+ obj1.free();
+ error(getPos(), "Bad form bounding box value");
+ return;
+ }
}
bboxObj.free();
@@ -4676,7 +4992,7 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
out->updateStrokeColorSpace(state);
}
if (aColor && (aColor->getSpace() == AnnotColor::colorRGB)) {
- double *values = aColor->getValues();
+ const double *values = aColor->getValues();
r = values[0];
g = values[1];
b = values[2];
@@ -4720,14 +5036,35 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
}
}
+int Gfx::bottomGuard() {
+ return stateGuards[stateGuards.size()-1];
+}
+
+void Gfx::pushStateGuard() {
+ stateGuards.push_back(stackHeight);
+}
+
+void Gfx::popStateGuard() {
+ while (stackHeight > bottomGuard() && state->hasSaves())
+ restoreState();
+ stateGuards.pop_back();
+}
+
void Gfx::saveState() {
out->saveState(state);
state = state->save();
+ stackHeight++;
}
void Gfx::restoreState() {
+ if (stackHeight <= bottomGuard() || !state->hasSaves()) {
+ error(-1, "Restoring state when no valid states to pop");
+ commandAborted = gTrue;
+ return;
+ }
state = state->restore();
out->restoreState(state);
+ stackHeight--;
}
void Gfx::pushResources(Dict *resDict) {
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Gfx.h
index bb762600de4..ce7b2d87260 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Gfx.h
@@ -16,9 +16,11 @@
// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
// Copyright (C) 2007 Iñigo Martínez <inigomartinez@gmail.com>
// Copyright (C) 2008 Brad Hards <bradh@kde.org>
-// Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2009 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2008, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2009-2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2010 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2010 David Benjamin <davidben@mit.edu>
+// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.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
@@ -32,12 +34,15 @@
#pragma interface
#endif
+#include "poppler-config.h"
#include "goo/gtypes.h"
#include "goo/GooList.h"
#include "GfxState.h"
#include "Object.h"
#include "PopplerCache.h"
+#include <vector>
+
class GooString;
class XRef;
class Array;
@@ -113,6 +118,7 @@ public:
GfxPattern *lookupPattern(char *name, Gfx *gfx);
GfxShading *lookupShading(char *name, Gfx *gfx);
GBool lookupGState(char *name, Object *obj);
+ GBool lookupGStateNF(char *name, Object *obj);
GfxResources *getNext() { return next; }
@@ -124,6 +130,7 @@ private:
Object patternDict;
Object shadingDict;
Object gStateDict;
+ PopplerObjectCache gStateCache;
Object propertiesDict;
GfxResources *next;
};
@@ -161,9 +168,15 @@ public:
// Save graphics state.
void saveState();
+ // Push a new state guard
+ void pushStateGuard();
+
// Restore graphics state.
void restoreState();
+ // Pop to state guard and pop guard
+ void popStateGuard();
+
// Get the current graphics state object.
GfxState *getState() { return state; }
@@ -185,12 +198,13 @@ private:
GBool textHaveCSPattern; // in text drawing and text has pattern colorspace
GBool drawText; // in text drawing
GBool maskHaveCSPattern; // in mask drawing and mask has pattern colorspace
- GfxColorSpace *colorSpaceText;// colorspace after text has filled with pattern
- GfxColor colorText; // fill color after after text has filled with pattern
+ GBool commandAborted; // did the previous command abort the drawing?
GfxResources *res; // resource stack
int updateLevel;
GfxState *state; // current graphics state
+ int stackHeight; // the height of the current graphics stack
+ std::vector<int> stateGuards; // a stack of state limits; to guard against unmatched pops
GBool fontChanged; // set if font or text matrix has changed
GfxClipType clip; // do a clip?
int ignoreUndef; // current BX/EX nesting level
@@ -218,6 +232,8 @@ private:
GBool checkArg(Object *arg, TchkType type);
int getPos();
+ int bottomGuard();
+
// graphics state operators
void opSave(Object args[], int numArgs);
void opRestore(Object args[], int numArgs);
@@ -286,9 +302,13 @@ private:
void gouraudFillTriangle(double x0, double y0, GfxColor *color0,
double x1, double y1, GfxColor *color1,
double x2, double y2, GfxColor *color2,
- int nComps, int depth);
+ int nComps, int depth, GfxState::ReusablePathIterator *path);
+ void gouraudFillTriangle(double x0, double y0, double color0,
+ double x1, double y1, double color1,
+ double x2, double y2, double color2,
+ double refineColorThreshold, int depth, GfxGouraudTriangleShading *shading, GfxState::ReusablePathIterator *path);
void doPatchMeshShFill(GfxPatchMeshShading *shading);
- void fillPatch(GfxPatch *patch, int nComps, int depth);
+ void fillPatch(GfxPatch *patch, int colorComps, int patchColorComps, double refineColorThreshold, int depth, GfxPatchMeshShading *shading);
void doEndPath();
// path clipping operators
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxFont.cc
index e7d564a4e09..114c7971d80 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxFont.cc
@@ -10,7 +10,10 @@
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
-// Copyright (C) 2005, 2006, 2008, 2009 Albert Astals Cid <aacid@kde.org>
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2005, 2006, 2008-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
@@ -19,9 +22,11 @@
// Copyright (C) 2007 Ed Catmur <ed@catmur.co.uk>
// Copyright (C) 2008 Jonathan Kew <jonathan_kew@sil.org>
// Copyright (C) 2008 Ed Avis <eda@waniasset.com>
-// Copyright (C) 2008 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2008, 2010 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2009 Peter Kerzum <kerzum@yandex-team.ru>
-// Copyright (C) 2009 David Benjamin <davidben@mit.edu>
+// Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
+// Copyright (C) 2011 Axel Strübing <axel.struebing@freenet.de>
+// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -38,6 +43,7 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <algorithm>
#include "goo/gmem.h"
#include "Error.h"
#include "Object.h"
@@ -175,6 +181,7 @@ GfxFont::GfxFont(char *tagA, Ref idA, GooString *nameA) {
weight = WeightNotDefined;
refCnt = 1;
dfp = NULL;
+ hasToUnicode = gFalse;
}
GfxFont::~GfxFont() {
@@ -421,17 +428,13 @@ CharCodeToUnicode *GfxFont::readToUnicodeCMap(Dict *fontDict, int nBits,
CharCodeToUnicode *ctu) {
GooString *buf;
Object obj1;
- int c;
if (!fontDict->lookup("ToUnicode", &obj1)->isStream()) {
obj1.free();
return NULL;
}
buf = new GooString();
- obj1.streamReset();
- while ((c = obj1.streamGetChar()) != EOF) {
- buf->append(c);
- }
+ obj1.getStream()->fillGooString(buf);
obj1.streamClose();
obj1.free();
if (ctu) {
@@ -439,6 +442,7 @@ CharCodeToUnicode *GfxFont::readToUnicodeCMap(Dict *fontDict, int nBits,
} else {
ctu = CharCodeToUnicode::parseCMap(buf, nBits);
}
+ hasToUnicode = gTrue;
delete buf;
return ctu;
}
@@ -488,8 +492,6 @@ char *GfxFont::readEmbFontFile(XRef *xref, int *len) {
char *buf;
Object obj1, obj2;
Stream *str;
- int c;
- int size, i;
obj1.initRef(embFontID.num, embFontID.gen);
obj1.fetch(xref, &obj2);
@@ -503,17 +505,7 @@ char *GfxFont::readEmbFontFile(XRef *xref, int *len) {
}
str = obj2.getStream();
- buf = NULL;
- i = size = 0;
- str->reset();
- while ((c = str->getChar()) != EOF) {
- if (i == size) {
- size += 4096;
- buf = (char *)grealloc(buf, size);
- }
- buf[i++] = c;
- }
- *len = i;
+ buf = (char*)str->toUnsignedChars(len);
str->close();
obj2.free();
@@ -1227,7 +1219,7 @@ Gushort *Gfx8BitFont::getCodeToGIDMap(FoFiTrueType *ff) {
cmap = 0;
useMacRoman = gFalse;
useUnicode = gFalse;
- if (hasEncoding) {
+ if (hasEncoding || type == fontType1) {
if (usesMacRomanEnc && macRomanCmap >= 0) {
cmap = macRomanCmap;
useMacRoman = gTrue;
@@ -1315,14 +1307,12 @@ Dict *Gfx8BitFont::getResources() {
// GfxCIDFont
//------------------------------------------------------------------------
-static int CDECL cmpWidthExcep(const void *w1, const void *w2) {
- return ((GfxFontCIDWidthExcep *)w1)->first -
- ((GfxFontCIDWidthExcep *)w2)->first;
+static bool cmpWidthExcep(const GfxFontCIDWidthExcep &w1, const GfxFontCIDWidthExcep &w2) {
+ return w1.first < w2.first;
}
-static int CDECL cmpWidthExcepV(const void *w1, const void *w2) {
- return ((GfxFontCIDWidthExcepV *)w1)->first -
- ((GfxFontCIDWidthExcepV *)w2)->first;
+static bool cmpWidthExcepV(const GfxFontCIDWidthExcepV &w1, const GfxFontCIDWidthExcepV &w2) {
+ return w1.first < w2.first;
}
GfxCIDFont::GfxCIDFont(XRef *xref, char *tagA, Ref idA, GooString *nameA,
@@ -1344,6 +1334,7 @@ GfxCIDFont::GfxCIDFont(XRef *xref, char *tagA, Ref idA, GooString *nameA,
descent = -0.35;
fontBBox[0] = fontBBox[1] = fontBBox[2] = fontBBox[3] = 0;
cMap = NULL;
+ cMapName = NULL;
ctu = NULL;
widths.defWidth = 1.0;
widths.defHeight = -1.0;
@@ -1489,13 +1480,15 @@ GfxCIDFont::GfxCIDFont(XRef *xref, char *tagA, Ref idA, GooString *nameA,
cMapName = new GooString(obj1.getName());
cMap = globalParams->getCMap(collection, cMapName);
}
- delete collection;
- delete cMapName;
if (!cMap) {
error(-1, "Unknown CMap '%s' for character collection '%s'",
cMapName->getCString(), collection->getCString());
+ delete collection;
+ delete cMapName;
goto err2;
}
+ delete collection;
+ delete cMapName;
obj1.free();
// CIDToGIDMap (for embedded TrueType fonts)
@@ -1580,8 +1573,7 @@ GfxCIDFont::GfxCIDFont(XRef *xref, char *tagA, Ref idA, GooString *nameA,
obj3.free();
obj2.free();
}
- qsort(widths.exceps, widths.nExceps, sizeof(GfxFontCIDWidthExcep),
- &cmpWidthExcep);
+ std::sort(widths.exceps, widths.exceps + widths.nExceps, &cmpWidthExcep);
}
obj1.free();
@@ -1664,8 +1656,7 @@ GfxCIDFont::GfxCIDFont(XRef *xref, char *tagA, Ref idA, GooString *nameA,
obj3.free();
obj2.free();
}
- qsort(widths.excepsV, widths.nExcepsV, sizeof(GfxFontCIDWidthExcepV),
- &cmpWidthExcepV);
+ std::sort(widths.excepsV, widths.excepsV + widths.nExcepsV, &cmpWidthExcepV);
}
obj1.free();
@@ -1713,7 +1704,16 @@ int GfxCIDFont::getNextChar(char *s, int len, CharCode *code,
*code = (CharCode)(cid = cMap->getCID(s, len, &n));
if (ctu) {
- *uLen = ctu->mapToUnicode(cid, u);
+ if (hasToUnicode) {
+ int i = 0, c = 0;
+ while (i < n) {
+ c = (c << 8 ) + (s[i] & 0xff);
+ ++i;
+ }
+ *uLen = ctu->mapToUnicode(c, u);
+ } else {
+ *uLen = ctu->mapToUnicode(cid, u);
+ }
} else {
*uLen = 0;
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxFont.h
index 55f8692e349..fe4f7ea5027 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxFont.h
@@ -19,6 +19,8 @@
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
+// Copyright (C) 2011 Axel Strübing <axel.struebing@freenet.de>
+// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -220,6 +222,9 @@ public:
Unicode **u, int *uLen,
double *dx, double *dy, double *ox, double *oy) = 0;
+ // Does this font have a toUnicode map?
+ GBool hasToUnicodeCMap() { return hasToUnicode; }
+
/* XXX: dfp shouldn't be public, however the font finding code is currently in
* GlobalParams. Instead it should be inside the GfxFont class. However,
* getDisplayFont currently uses FCcfg so moving it is not as simple. */
@@ -253,6 +258,7 @@ protected:
double descent; // max depth below baseline
int refCnt;
GBool ok;
+ GBool hasToUnicode;
};
//------------------------------------------------------------------------
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState.cc
index d53c0cb5f87..78951c316a2 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState.cc
@@ -15,11 +15,14 @@
//
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2006 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2006-2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006-2011 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2009 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009, 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Christian Persch <chpe@gnome.org>
+// Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
+// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
+// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -32,6 +35,7 @@
#pragma implementation
#endif
+#include <algorithm>
#include <stddef.h>
#include <math.h>
#include <string.h>
@@ -49,11 +53,11 @@
//------------------------------------------------------------------------
-GBool Matrix::invertTo(Matrix *other)
+GBool Matrix::invertTo(Matrix *other) const
{
double det;
- det = 1 / (m[0] * m[3] - m[1] * m[2]);
+ det = 1 / determinant();
other->m[0] = m[3] * det;
other->m[1] = -m[1] * det;
other->m[2] = -m[2] * det;
@@ -64,7 +68,7 @@ GBool Matrix::invertTo(Matrix *other)
return gTrue;
}
-void Matrix::transform(double x, double y, double *tx, double *ty)
+void Matrix::transform(double x, double y, double *tx, double *ty) const
{
double temp_x, temp_y;
@@ -75,6 +79,21 @@ void Matrix::transform(double x, double y, double *tx, double *ty)
*ty = temp_y;
}
+// Matrix norm, taken from _cairo_matrix_transformed_circle_major_axis
+double Matrix::norm() const
+{
+ double f, g, h, i, j;
+
+ i = m[0]*m[0] + m[1]*m[1];
+ j = m[2]*m[2] + m[3]*m[3];
+
+ f = 0.5 * (i + j);
+ g = 0.5 * (i - j);
+ h = m[0]*m[2] + m[1]*m[3];
+
+ return sqrt (f + hypot (g, h));
+}
+
//------------------------------------------------------------------------
struct GfxBlendModeInfo {
@@ -509,6 +528,23 @@ void GfxDeviceGrayColorSpace::getRGBLine(Guchar *in, unsigned int *out,
out[i] = (in[i] << 16) | (in[i] << 8) | (in[i] << 0);
}
+void GfxDeviceGrayColorSpace::getRGBLine(Guchar *in, Guchar *out, int length) {
+ for (int i = 0; i < length; i++) {
+ *out++ = in[i];
+ *out++ = in[i];
+ *out++ = in[i];
+ }
+}
+
+void GfxDeviceGrayColorSpace::getRGBXLine(Guchar *in, Guchar *out, int length) {
+ for (int i = 0; i < length; i++) {
+ *out++ = in[i];
+ *out++ = in[i];
+ *out++ = in[i];
+ *out++ = 255;
+ }
+}
+
void GfxDeviceGrayColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
cmyk->c = cmyk->m = cmyk->y = 0;
cmyk->k = clip01(gfxColorComp1 - color->c[0]);
@@ -567,26 +603,32 @@ GfxColorSpace *GfxCalGrayColorSpace::parse(Array *arr) {
if (obj1.dictLookup("WhitePoint", &obj2)->isArray() &&
obj2.arrayGetLength() == 3) {
obj2.arrayGet(0, &obj3);
- cs->whiteX = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->whiteX = obj3.getNum();
obj3.free();
obj2.arrayGet(1, &obj3);
- cs->whiteY = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->whiteY = obj3.getNum();
obj3.free();
obj2.arrayGet(2, &obj3);
- cs->whiteZ = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->whiteZ = obj3.getNum();
obj3.free();
}
obj2.free();
if (obj1.dictLookup("BlackPoint", &obj2)->isArray() &&
obj2.arrayGetLength() == 3) {
obj2.arrayGet(0, &obj3);
- cs->blackX = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->blackX = obj3.getNum();
obj3.free();
obj2.arrayGet(1, &obj3);
- cs->blackY = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->blackY = obj3.getNum();
obj3.free();
obj2.arrayGet(2, &obj3);
- cs->blackZ = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->blackZ = obj3.getNum();
obj3.free();
}
obj2.free();
@@ -613,12 +655,11 @@ GfxColorSpace *GfxCalGrayColorSpace::parse(Array *arr) {
// (not multiply by the white point)
void GfxCalGrayColorSpace::getXYZ(GfxColor *color,
double *pX, double *pY, double *pZ) {
- double A;
-
- A = colToDbl(color->c[0]);
- *pX = pow(A,gamma);
- *pY = pow(A,gamma);
- *pZ = pow(A,gamma);
+ const double A = colToDbl(color->c[0]);
+ const double xyzColor = pow(A,gamma);
+ *pX = xyzColor;
+ *pY = xyzColor;
+ *pZ = xyzColor;
}
void GfxCalGrayColorSpace::getGray(GfxColor *color, GfxGray *gray) {
@@ -672,10 +713,9 @@ void GfxCalGrayColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
r = xyzrgb[0][0] * X + xyzrgb[0][1] * Y + xyzrgb[0][2] * Z;
g = xyzrgb[1][0] * X + xyzrgb[1][1] * Y + xyzrgb[1][2] * Z;
b = xyzrgb[2][0] * X + xyzrgb[2][1] * Y + xyzrgb[2][2] * Z;
- rgb->r = dblToCol(pow(clip01(r * kr), 0.5));
- rgb->g = dblToCol(pow(clip01(g * kg), 0.5));
- rgb->b = dblToCol(pow(clip01(b * kb), 0.5));
- rgb->r = rgb->g = rgb->b = clip01(color->c[0]);
+ rgb->r = dblToCol(sqrt(clip01(r * kr)));
+ rgb->g = dblToCol(sqrt(clip01(g * kg)));
+ rgb->b = dblToCol(sqrt(clip01(b * kb)));
}
void GfxCalGrayColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
@@ -768,6 +808,22 @@ void GfxDeviceRGBColorSpace::getRGBLine(Guchar *in, unsigned int *out,
out[i] = (p[0] << 16) | (p[1] << 8) | (p[2] << 0);
}
+void GfxDeviceRGBColorSpace::getRGBLine(Guchar *in, Guchar *out, int length) {
+ for (int i = 0; i < length; i++) {
+ *out++ = *in++;
+ *out++ = *in++;
+ *out++ = *in++;
+ }
+}
+
+void GfxDeviceRGBColorSpace::getRGBXLine(Guchar *in, Guchar *out, int length) {
+ for (int i = 0; i < length; i++) {
+ *out++ = *in++;
+ *out++ = *in++;
+ *out++ = *in++;
+ *out++ = 255;
+ }
+}
void GfxDeviceRGBColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
GfxColorComp c, m, y, k;
@@ -844,39 +900,48 @@ GfxColorSpace *GfxCalRGBColorSpace::parse(Array *arr) {
if (obj1.dictLookup("WhitePoint", &obj2)->isArray() &&
obj2.arrayGetLength() == 3) {
obj2.arrayGet(0, &obj3);
- cs->whiteX = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->whiteX = obj3.getNum();
obj3.free();
obj2.arrayGet(1, &obj3);
- cs->whiteY = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->whiteY = obj3.getNum();
obj3.free();
obj2.arrayGet(2, &obj3);
- cs->whiteZ = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->whiteZ = obj3.getNum();
obj3.free();
}
obj2.free();
if (obj1.dictLookup("BlackPoint", &obj2)->isArray() &&
obj2.arrayGetLength() == 3) {
obj2.arrayGet(0, &obj3);
- cs->blackX = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->blackX = obj3.getNum();
obj3.free();
obj2.arrayGet(1, &obj3);
- cs->blackY = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->blackY = obj3.getNum();
obj3.free();
obj2.arrayGet(2, &obj3);
- cs->blackZ = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->blackZ = obj3.getNum();
obj3.free();
}
obj2.free();
if (obj1.dictLookup("Gamma", &obj2)->isArray() &&
obj2.arrayGetLength() == 3) {
obj2.arrayGet(0, &obj3);
- cs->gammaR = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->gammaR = obj3.getNum();
obj3.free();
obj2.arrayGet(1, &obj3);
- cs->gammaG = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->gammaG = obj3.getNum();
obj3.free();
obj2.arrayGet(2, &obj3);
- cs->gammaB = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->gammaB = obj3.getNum();
obj3.free();
}
obj2.free();
@@ -884,7 +949,8 @@ GfxColorSpace *GfxCalRGBColorSpace::parse(Array *arr) {
obj2.arrayGetLength() == 9) {
for (i = 0; i < 9; ++i) {
obj2.arrayGet(i, &obj3);
- cs->mat[i] = obj3.getNum();
+ if (likely(obj3.isNum()))
+ cs->mat[i] = obj3.getNum();
obj3.free();
}
}
@@ -909,12 +975,12 @@ void GfxCalRGBColorSpace::getXYZ(GfxColor *color,
double *pX, double *pY, double *pZ) {
double A, B, C;
- A = colToDbl(color->c[0]);
- B = colToDbl(color->c[1]);
- C = colToDbl(color->c[2]);
- *pX = mat[0]*pow(A,gammaR)+mat[3]*pow(B,gammaG)+mat[6]*pow(C,gammaB);
- *pY = mat[1]*pow(A,gammaR)+mat[4]*pow(B,gammaG)+mat[7]*pow(C,gammaB);
- *pZ = mat[2]*pow(A,gammaR)+mat[5]*pow(B,gammaG)+mat[8]*pow(C,gammaB);
+ A = pow(colToDbl(color->c[0]), gammaR);
+ B = pow(colToDbl(color->c[1]), gammaG);
+ C = pow(colToDbl(color->c[2]), gammaB);
+ *pX = mat[0] * A + mat[3] * B + mat[6] * C;
+ *pY = mat[1] * A + mat[4] * B + mat[7] * C;
+ *pZ = mat[2] * A + mat[5] * B + mat[8] * C;
}
void GfxCalRGBColorSpace::getGray(GfxColor *color, GfxGray *gray) {
@@ -965,9 +1031,9 @@ void GfxCalRGBColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
r = xyzrgb[0][0] * X + xyzrgb[0][1] * Y + xyzrgb[0][2] * Z;
g = xyzrgb[1][0] * X + xyzrgb[1][1] * Y + xyzrgb[1][2] * Z;
b = xyzrgb[2][0] * X + xyzrgb[2][1] * Y + xyzrgb[2][2] * Z;
- rgb->r = dblToCol(pow(clip01(r), 0.5));
- rgb->g = dblToCol(pow(clip01(g), 0.5));
- rgb->b = dblToCol(pow(clip01(b), 0.5));
+ rgb->r = dblToCol(sqrt(clip01(r)));
+ rgb->g = dblToCol(sqrt(clip01(g)));
+ rgb->b = dblToCol(sqrt(clip01(b)));
}
void GfxCalRGBColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
@@ -1053,6 +1119,55 @@ void GfxDeviceCMYKColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
rgb->b = clip01(dblToCol(b));
}
+static inline void GfxDeviceCMYKColorSpacegetRGBLineHelper(Guchar *&in, double &r, double &g, double &b)
+{
+ double c, m, y, k, c1, m1, y1, k1;
+
+ c = byteToDbl(*in++);
+ m = byteToDbl(*in++);
+ y = byteToDbl(*in++);
+ k = byteToDbl(*in++);
+ c1 = 1 - c;
+ m1 = 1 - m;
+ y1 = 1 - y;
+ k1 = 1 - k;
+ cmykToRGBMatrixMultiplication(c, m, y, k, c1, m1, y1, k1, r, g, b);
+}
+
+void GfxDeviceCMYKColorSpace::getRGBLine(Guchar *in, unsigned int *out, int length)
+{
+ double r, g, b;
+ for (int i = 0; i < length; i++) {
+ GfxDeviceCMYKColorSpacegetRGBLineHelper(in, r, g, b);
+ *out++ = (dblToByte(clip01(r)) << 16) | (dblToByte(clip01(g)) << 8) | dblToByte(clip01(b));
+ }
+}
+
+void GfxDeviceCMYKColorSpace::getRGBLine(Guchar *in, Guchar *out, int length)
+{
+ double r, g, b;
+
+ for (int i = 0; i < length; i++) {
+ GfxDeviceCMYKColorSpacegetRGBLineHelper(in, r, g, b);
+ *out++ = dblToByte(clip01(r));
+ *out++ = dblToByte(clip01(g));
+ *out++ = dblToByte(clip01(b));
+ }
+}
+
+void GfxDeviceCMYKColorSpace::getRGBXLine(Guchar *in, Guchar *out, int length)
+{
+ double r, g, b;
+
+ for (int i = 0; i < length; i++) {
+ GfxDeviceCMYKColorSpacegetRGBLineHelper(in, r, g, b);
+ *out++ = dblToByte(clip01(r));
+ *out++ = dblToByte(clip01(g));
+ *out++ = dblToByte(clip01(b));
+ *out++ = 255;
+ }
+}
+
void GfxDeviceCMYKColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
cmyk->c = clip01(color->c[0]);
cmyk->m = clip01(color->c[1]);
@@ -1246,9 +1361,9 @@ void GfxLabColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
r = xyzrgb[0][0] * X + xyzrgb[0][1] * Y + xyzrgb[0][2] * Z;
g = xyzrgb[1][0] * X + xyzrgb[1][1] * Y + xyzrgb[1][2] * Z;
b = xyzrgb[2][0] * X + xyzrgb[2][1] * Y + xyzrgb[2][2] * Z;
- rgb->r = dblToCol(pow(clip01(r * kr), 0.5));
- rgb->g = dblToCol(pow(clip01(g * kg), 0.5));
- rgb->b = dblToCol(pow(clip01(b * kb), 0.5));
+ rgb->r = dblToCol(sqrt(clip01(r * kr)));
+ rgb->g = dblToCol(sqrt(clip01(g * kg)));
+ rgb->b = dblToCol(sqrt(clip01(b * kb)));
}
void GfxLabColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
@@ -1465,13 +1580,16 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, Gfx *gfx) {
cs = new GfxICCBasedColorSpace(nCompsA, altA, &iccProfileStreamA);
if (dict->lookup("Range", &obj2)->isArray() &&
obj2.arrayGetLength() == 2 * nCompsA) {
+ Object obj4;
for (i = 0; i < nCompsA; ++i) {
obj2.arrayGet(2*i, &obj3);
- cs->rangeMin[i] = obj3.getNum();
- obj3.free();
- obj2.arrayGet(2*i+1, &obj3);
- cs->rangeMax[i] = obj3.getNum();
+ obj2.arrayGet(2*i+1, &obj4);
+ if (obj3.isNum() && obj4.isNum()) {
+ cs->rangeMin[i] = obj3.getNum();
+ cs->rangeMax[i] = obj4.getNum();
+ }
obj3.free();
+ obj4.free();
}
}
obj2.free();
@@ -1481,22 +1599,11 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, Gfx *gfx) {
arr->get(1, &obj1);
dict = obj1.streamGetDict();
Guchar *profBuf;
- unsigned int bufSize;
Stream *iccStream = obj1.getStream();
- int c;
- unsigned int size = 0;
+ int length = 0;
- bufSize = 65536;
- profBuf = (Guchar *)gmallocn(bufSize,1);
- iccStream->reset();
- while ((c = iccStream->getChar()) != EOF) {
- if (bufSize <= size) {
- bufSize += 65536;
- profBuf = (Guchar *)greallocn(profBuf,bufSize,1);
- }
- profBuf[size++] = c;
- }
- cmsHPROFILE hp = cmsOpenProfileFromMem(profBuf,size);
+ profBuf = iccStream->toUnsignedChars(&length, 65536, 65536);
+ cmsHPROFILE hp = cmsOpenProfileFromMem(profBuf,length);
gfree(profBuf);
if (hp == 0) {
error(-1, "read ICCBased color space profile error");
@@ -1591,13 +1698,33 @@ void GfxICCBasedColorSpace::getRGBLine(Guchar *in, unsigned int *out,
int length) {
#ifdef USE_CMS
if (lineTransform != 0) {
- for (int i = 0;i < length;i++) {
- Guchar tmp[gfxColorMaxComps];
+ Guchar* tmp = (Guchar *)gmallocn(3 * length, sizeof(Guchar));
+ lineTransform->doTransform(in, tmp, length);
+ for (int i = 0; i < length; ++i) {
+ Guchar *current = tmp + (i * 3);
+ out[i] = (current[0] << 16) | (current[1] << 8) | current[2];
+ }
+ gfree(tmp);
+ } else {
+ alt->getRGBLine(in, out, length);
+ }
+#else
+ alt->getRGBLine(in, out, length);
+#endif
+}
- lineTransform->doTransform(in,tmp,1);
- in += nComps;
- out[i] = (tmp[0] << 16) | (tmp[1] << 8) | tmp[2];
+void GfxICCBasedColorSpace::getRGBLine(Guchar *in, Guchar *out, int length) {
+#ifdef USE_CMS
+ if (lineTransform != 0) {
+ Guchar* tmp = (Guchar *)gmallocn(3 * length, sizeof(Guchar));
+ lineTransform->doTransform(in, tmp, length);
+ Guchar *current = tmp;
+ for (int i = 0; i < length; ++i) {
+ *out++ = *current++;
+ *out++ = *current++;
+ *out++ = *current++;
}
+ gfree(tmp);
} else {
alt->getRGBLine(in, out, length);
}
@@ -1606,6 +1733,27 @@ void GfxICCBasedColorSpace::getRGBLine(Guchar *in, unsigned int *out,
#endif
}
+void GfxICCBasedColorSpace::getRGBXLine(Guchar *in, Guchar *out, int length) {
+#ifdef USE_CMS
+ if (lineTransform != 0) {
+ Guchar* tmp = (Guchar *)gmallocn(3 * length, sizeof(Guchar));
+ lineTransform->doTransform(in, tmp, length);
+ Guchar *current = tmp;
+ for (int i = 0; i < length; ++i) {
+ *out++ = *current++;
+ *out++ = *current++;
+ *out++ = *current++;
+ *out++ = 255;
+ }
+ gfree(tmp);
+ } else {
+ alt->getRGBXLine(in, out, length);
+ }
+#else
+ alt->getRGBXLine(in, out, length);
+#endif
+}
+
void GfxICCBasedColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
#ifdef USE_CMS
if (transform != NULL && displayPixelType == PT_CMYK) {
@@ -1715,7 +1863,6 @@ GfxColorSpace *GfxIndexedColorSpace::parse(Array *arr, Gfx *gfx) {
GfxColorSpace *baseA;
int indexHighA;
Object obj1;
- int x;
char *s;
int n, i, j;
@@ -1752,12 +1899,10 @@ GfxColorSpace *GfxIndexedColorSpace::parse(Array *arr, Gfx *gfx) {
if (obj1.isStream()) {
obj1.streamReset();
for (i = 0; i <= indexHighA; ++i) {
- for (j = 0; j < n; ++j) {
- if ((x = obj1.streamGetChar()) == EOF) {
- error(-1, "Bad Indexed color space (lookup table stream too short) padding with zeroes");
- x = 0;
- }
- cs->lookup[i*n + j] = (Guchar)x;
+ const int readChars = obj1.streamGetChars(n, &cs->lookup[i*n]);
+ for (j = readChars; j < n; ++j) {
+ error(-1, "Bad Indexed color space (lookup table stream too short) padding with zeroes");
+ cs->lookup[i*n + j] = 0;
}
}
obj1.streamClose();
@@ -1829,6 +1974,38 @@ void GfxIndexedColorSpace::getRGBLine(Guchar *in, unsigned int *out, int length)
gfree (line);
}
+void GfxIndexedColorSpace::getRGBLine(Guchar *in, Guchar *out, int length)
+{
+ Guchar *line;
+ int i, j, n;
+
+ n = base->getNComps();
+ line = (Guchar *) gmallocn (length, n);
+ for (i = 0; i < length; i++)
+ for (j = 0; j < n; j++)
+ line[i * n + j] = lookup[in[i] * n + j];
+
+ base->getRGBLine(line, out, length);
+
+ gfree (line);
+}
+
+void GfxIndexedColorSpace::getRGBXLine(Guchar *in, Guchar *out, int length)
+{
+ Guchar *line;
+ int i, j, n;
+
+ n = base->getNComps();
+ line = (Guchar *) gmallocn (length, n);
+ for (i = 0; i < length; i++)
+ for (j = 0; j < n; j++)
+ line[i * n + j] = lookup[in[i] * n + j];
+
+ base->getRGBXLine(line, out, length);
+
+ gfree (line);
+}
+
void GfxIndexedColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
GfxColor color2;
@@ -2519,15 +2696,25 @@ GBool GfxShading::init(Dict *dict, Gfx *gfx) {
hasBBox = gFalse;
if (dict->lookup("BBox", &obj1)->isArray()) {
if (obj1.arrayGetLength() == 4) {
- hasBBox = gTrue;
- xMin = obj1.arrayGet(0, &obj2)->getNum();
- obj2.free();
- yMin = obj1.arrayGet(1, &obj2)->getNum();
- obj2.free();
- xMax = obj1.arrayGet(2, &obj2)->getNum();
- obj2.free();
- yMax = obj1.arrayGet(3, &obj2)->getNum();
+ Object obj3, obj4, obj5;
+ obj1.arrayGet(0, &obj2);
+ obj1.arrayGet(1, &obj3);
+ obj1.arrayGet(2, &obj4);
+ obj1.arrayGet(3, &obj5);
+ if (obj2.isNum() && obj3.isNum() && obj4.isNum() && obj5.isNum())
+ {
+ hasBBox = gTrue;
+ xMin = obj2.getNum();
+ yMin = obj3.getNum();
+ xMax = obj4.getNum();
+ yMax = obj5.getNum();
+ } else {
+ error(-1, "Bad BBox in shading dictionary (Values not numbers)");
+ }
obj2.free();
+ obj3.free();
+ obj4.free();
+ obj5.free();
} else {
error(-1, "Bad BBox in shading dictionary");
}
@@ -2693,22 +2880,17 @@ void GfxFunctionShading::getColor(double x, double y, GfxColor *color) {
}
//------------------------------------------------------------------------
-// GfxAxialShading
+// GfxUnivariateShading
//------------------------------------------------------------------------
-GfxAxialShading::GfxAxialShading(double x0A, double y0A,
- double x1A, double y1A,
- double t0A, double t1A,
- Function **funcsA, int nFuncsA,
- GBool extend0A, GBool extend1A):
- GfxShading(2)
+GfxUnivariateShading::GfxUnivariateShading(int typeA,
+ double t0A, double t1A,
+ Function **funcsA, int nFuncsA,
+ GBool extend0A, GBool extend1A):
+ GfxShading(typeA)
{
int i;
- x0 = x0A;
- y0 = y0A;
- x1 = x1A;
- y1 = y1A;
t0 = t0A;
t1 = t1A;
nFuncs = nFuncsA;
@@ -2717,17 +2899,19 @@ GfxAxialShading::GfxAxialShading(double x0A, double y0A,
}
extend0 = extend0A;
extend1 = extend1A;
+
+ cacheSize = 0;
+ lastMatch = 0;
+ cacheBounds = NULL;
+ cacheCoeff = NULL;
+ cacheValues = NULL;
}
-GfxAxialShading::GfxAxialShading(GfxAxialShading *shading):
+GfxUnivariateShading::GfxUnivariateShading(GfxUnivariateShading *shading):
GfxShading(shading)
{
int i;
- x0 = shading->x0;
- y0 = shading->y0;
- x1 = shading->x1;
- y1 = shading->y1;
t0 = shading->t0;
t1 = shading->t1;
nFuncs = shading->nFuncs;
@@ -2736,14 +2920,174 @@ GfxAxialShading::GfxAxialShading(GfxAxialShading *shading):
}
extend0 = shading->extend0;
extend1 = shading->extend1;
+
+ cacheSize = 0;
+ lastMatch = 0;
+ cacheBounds = NULL;
+ cacheCoeff = NULL;
+ cacheValues = NULL;
}
-GfxAxialShading::~GfxAxialShading() {
+GfxUnivariateShading::~GfxUnivariateShading() {
int i;
for (i = 0; i < nFuncs; ++i) {
delete funcs[i];
}
+
+ gfree (cacheBounds);
+}
+
+void GfxUnivariateShading::getColor(double t, GfxColor *color) {
+ double out[gfxColorMaxComps];
+ int i, nComps;
+
+ // NB: there can be one function with n outputs or n functions with
+ // one output each (where n = number of color components)
+ nComps = nFuncs * funcs[0]->getOutputSize();
+
+ if (cacheSize > 0) {
+ double x, ix, *l, *u, *upper;
+
+ if (cacheBounds[lastMatch - 1] >= t) {
+ upper = std::lower_bound (cacheBounds, cacheBounds + lastMatch - 1, t);
+ lastMatch = upper - cacheBounds;
+ lastMatch = std::min<int>(std::max<int>(1, lastMatch), cacheSize - 1);
+ } else if (cacheBounds[lastMatch] < t) {
+ upper = std::lower_bound (cacheBounds + lastMatch + 1, cacheBounds + cacheSize, t);
+ lastMatch = upper - cacheBounds;
+ lastMatch = std::min<int>(std::max<int>(1, lastMatch), cacheSize - 1);
+ }
+
+ x = (t - cacheBounds[lastMatch-1]) * cacheCoeff[lastMatch];
+ ix = 1.0 - x;
+ u = cacheValues + lastMatch * nComps;
+ l = u - nComps;
+
+ for (i = 0; i < nComps; ++i) {
+ out[i] = ix * l[i] + x * u[i];
+ }
+ } else {
+ for (i = 0; i < nComps; ++i) {
+ out[i] = 0;
+ }
+ for (i = 0; i < nFuncs; ++i) {
+ funcs[i]->transform(&t, &out[i]);
+ }
+ }
+
+ for (i = 0; i < nComps; ++i) {
+ color->c[i] = dblToCol(out[i]);
+ }
+}
+
+void GfxUnivariateShading::setupCache(const Matrix *ctm,
+ double xMin, double yMin,
+ double xMax, double yMax) {
+ double sMin, sMax, tMin, tMax, upperBound;
+ int i, j, nComps, maxSize;
+
+ gfree (cacheBounds);
+ cacheBounds = NULL;
+ cacheSize = 0;
+
+ // NB: there can be one function with n outputs or n functions with
+ // one output each (where n = number of color components)
+ nComps = nFuncs * funcs[0]->getOutputSize();
+
+ getParameterRange(&sMin, &sMax, xMin, yMin, xMax, yMax);
+ upperBound = ctm->norm() * getDistance(sMin, sMax);
+ maxSize = (int)ceil(upperBound);
+ maxSize = std::max<int>(maxSize, 2);
+
+ {
+ double x[4], y[4];
+
+ ctm->transform(xMin, yMin, &x[0], &y[0]);
+ ctm->transform(xMax, yMin, &x[1], &y[1]);
+ ctm->transform(xMin, yMax, &x[2], &y[2]);
+ ctm->transform(xMax, yMax, &x[3], &y[3]);
+
+ xMin = xMax = x[0];
+ yMin = yMax = y[0];
+ for (i = 1; i < 4; i++) {
+ xMin = std::min<double>(xMin, x[i]);
+ yMin = std::min<double>(yMin, y[i]);
+ xMax = std::max<double>(xMax, x[i]);
+ yMax = std::max<double>(yMax, y[i]);
+ }
+ }
+
+ if (maxSize > (xMax-xMin) * (yMax-yMin)) {
+ return;
+ }
+
+ if (t0 < t1) {
+ tMin = t0 + sMin * (t1 - t0);
+ tMax = t0 + sMax * (t1 - t0);
+ } else {
+ tMin = t0 + sMax * (t1 - t0);
+ tMax = t0 + sMin * (t1 - t0);
+ }
+
+ cacheBounds = (double *)gmallocn(maxSize, sizeof(double) * (nComps + 2));
+ cacheCoeff = cacheBounds + maxSize;
+ cacheValues = cacheCoeff + maxSize;
+
+ if (cacheSize != 0) {
+ for (j = 0; j < cacheSize; ++j) {
+ cacheCoeff[j] = 1 / (cacheBounds[j+1] - cacheBounds[j]);
+ }
+ } else if (tMax != tMin) {
+ double step = (tMax - tMin) / (maxSize - 1);
+ double coeff = (maxSize - 1) / (tMax - tMin);
+
+ cacheSize = maxSize;
+
+ for (j = 0; j < cacheSize; ++j) {
+ cacheBounds[j] = tMin + j * step;
+ cacheCoeff[j] = coeff;
+
+ for (i = 0; i < nComps; ++i) {
+ cacheValues[j*nComps + i] = 0;
+ }
+ for (i = 0; i < nFuncs; ++i) {
+ funcs[i]->transform(&cacheBounds[j], &cacheValues[j*nComps + i]);
+ }
+ }
+ }
+
+ lastMatch = 1;
+}
+
+
+//------------------------------------------------------------------------
+// GfxAxialShading
+//------------------------------------------------------------------------
+
+GfxAxialShading::GfxAxialShading(double x0A, double y0A,
+ double x1A, double y1A,
+ double t0A, double t1A,
+ Function **funcsA, int nFuncsA,
+ GBool extend0A, GBool extend1A):
+ GfxUnivariateShading(2, t0A, t1A, funcsA, nFuncsA, extend0A, extend1A)
+{
+ x0 = x0A;
+ y0 = y0A;
+ x1 = x1A;
+ y1 = y1A;
+}
+
+GfxAxialShading::GfxAxialShading(GfxAxialShading *shading):
+ GfxUnivariateShading(shading)
+{
+ x0 = shading->x0;
+ y0 = shading->y0;
+ x1 = shading->x1;
+ y1 = shading->y1;
+}
+
+GfxAxialShading::~GfxAxialShading() {
}
GfxAxialShading *GfxAxialShading::parse(Dict *dict, Gfx *gfx) {
@@ -2759,14 +3103,21 @@ GfxAxialShading *GfxAxialShading::parse(Dict *dict, Gfx *gfx) {
x0A = y0A = x1A = y1A = 0;
if (dict->lookup("Coords", &obj1)->isArray() &&
obj1.arrayGetLength() == 4) {
- x0A = obj1.arrayGet(0, &obj2)->getNum();
- obj2.free();
- y0A = obj1.arrayGet(1, &obj2)->getNum();
- obj2.free();
- x1A = obj1.arrayGet(2, &obj2)->getNum();
- obj2.free();
- y1A = obj1.arrayGet(3, &obj2)->getNum();
+ Object obj3, obj4, obj5;
+ obj1.arrayGet(0, &obj2);
+ obj1.arrayGet(1, &obj3);
+ obj1.arrayGet(2, &obj4);
+ obj1.arrayGet(3, &obj5);
+ if (obj2.isNum() && obj3.isNum() && obj4.isNum() && obj5.isNum()) {
+ x0A = obj2.getNum();
+ y0A = obj3.getNum();
+ x1A = obj4.getNum();
+ y1A = obj5.getNum();
+ }
obj2.free();
+ obj3.free();
+ obj4.free();
+ obj5.free();
} else {
error(-1, "Missing or invalid Coords in shading dictionary");
goto err1;
@@ -2777,10 +3128,15 @@ GfxAxialShading *GfxAxialShading::parse(Dict *dict, Gfx *gfx) {
t1A = 1;
if (dict->lookup("Domain", &obj1)->isArray() &&
obj1.arrayGetLength() == 2) {
- t0A = obj1.arrayGet(0, &obj2)->getNum();
- obj2.free();
- t1A = obj1.arrayGet(1, &obj2)->getNum();
+ Object obj3;
+ obj1.arrayGet(0, &obj2);
+ obj1.arrayGet(1, &obj3);
+ if (obj2.isNum() && obj3.isNum()) {
+ t0A = obj2.getNum();
+ t1A = obj3.getNum();
+ }
obj2.free();
+ obj3.free();
}
obj1.free();
@@ -2835,79 +3191,101 @@ GfxShading *GfxAxialShading::copy() {
return new GfxAxialShading(this);
}
-void GfxAxialShading::getColor(double t, GfxColor *color) {
- double out[gfxColorMaxComps];
- int i;
+double GfxAxialShading::getDistance(double sMin, double sMax) {
+ double xMin, yMin, xMax, yMax;
- // NB: there can be one function with n outputs or n functions with
- // one output each (where n = number of color components)
- for (i = 0; i < gfxColorMaxComps; ++i) {
- out[i] = 0;
- }
- for (i = 0; i < nFuncs; ++i) {
- funcs[i]->transform(&t, &out[i]);
- }
- for (i = 0; i < gfxColorMaxComps; ++i) {
- color->c[i] = dblToCol(out[i]);
- }
+ xMin = x0 + sMin * (x1 - x0);
+ yMin = y0 + sMin * (y1 - y0);
+ xMax = x0 + sMax * (x1 - x0);
+ yMax = y0 + sMax * (y1 - y0);
+
+ return hypot(xMax-xMin, yMax-yMin);
}
+void GfxAxialShading::getParameterRange(double *lower, double *upper,
+ double xMin, double yMin,
+ double xMax, double yMax) {
+ double pdx, pdy, invsqnorm, tdx, tdy, t, range[2];
+
+ // Linear gradients are orthogonal to the line passing through their
+ // extremes. Because of convexity, the parameter range can be
+ // computed as the convex hull (one the real line) of the parameter
+ // values of the 4 corners of the box.
+ //
+ // The parameter value t for a point (x,y) can be computed as:
+ //
+ // t = (p2 - p1) . (x,y) / |p2 - p1|^2
+ //
+ // t0 is the t value for the top left corner
+ // tdx is the difference between left and right corners
+ // tdy is the difference between top and bottom corners
+
+ pdx = x1 - x0;
+ pdy = y1 - y0;
+ invsqnorm = 1.0 / (pdx * pdx + pdy * pdy);
+ pdx *= invsqnorm;
+ pdy *= invsqnorm;
+
+ t = (xMin - x0) * pdx + (yMin - y0) * pdy;
+ tdx = (xMax - xMin) * pdx;
+ tdy = (yMax - yMin) * pdy;
+
+ // Because of the linearity of the t value, tdx can simply be added
+ // the t0 to move along the top edge. After this, *lower and *upper
+ // represent the parameter range for the top edge, so extending it
+ // to include the whole box simply requires adding tdy to the
+ // correct extreme.
+
+ range[0] = range[1] = t;
+ if (tdx < 0)
+ range[0] += tdx;
+ else
+ range[1] += tdx;
+
+ if (tdy < 0)
+ range[0] += tdy;
+ else
+ range[1] += tdy;
+
+ *lower = std::max<double>(0., std::min<double>(1., range[0]));
+ *upper = std::max<double>(0., std::min<double>(1., range[1]));
+}
+
//------------------------------------------------------------------------
// GfxRadialShading
//------------------------------------------------------------------------
+#ifndef RADIAL_EPSILON
+#define RADIAL_EPSILON (1. / 1024 / 1024)
+#endif
+
GfxRadialShading::GfxRadialShading(double x0A, double y0A, double r0A,
double x1A, double y1A, double r1A,
double t0A, double t1A,
Function **funcsA, int nFuncsA,
GBool extend0A, GBool extend1A):
- GfxShading(3)
+ GfxUnivariateShading(3, t0A, t1A, funcsA, nFuncsA, extend0A, extend1A)
{
- int i;
-
x0 = x0A;
y0 = y0A;
r0 = r0A;
x1 = x1A;
y1 = y1A;
r1 = r1A;
- t0 = t0A;
- t1 = t1A;
- nFuncs = nFuncsA;
- for (i = 0; i < nFuncs; ++i) {
- funcs[i] = funcsA[i];
- }
- extend0 = extend0A;
- extend1 = extend1A;
}
GfxRadialShading::GfxRadialShading(GfxRadialShading *shading):
- GfxShading(shading)
+ GfxUnivariateShading(shading)
{
- int i;
-
x0 = shading->x0;
y0 = shading->y0;
r0 = shading->r0;
x1 = shading->x1;
y1 = shading->y1;
r1 = shading->r1;
- t0 = shading->t0;
- t1 = shading->t1;
- nFuncs = shading->nFuncs;
- for (i = 0; i < nFuncs; ++i) {
- funcs[i] = shading->funcs[i]->copy();
- }
- extend0 = shading->extend0;
- extend1 = shading->extend1;
}
GfxRadialShading::~GfxRadialShading() {
- int i;
-
- for (i = 0; i < nFuncs; ++i) {
- delete funcs[i];
- }
}
GfxRadialShading *GfxRadialShading::parse(Dict *dict, Gfx *gfx) {
@@ -3003,21 +3381,313 @@ GfxShading *GfxRadialShading::copy() {
return new GfxRadialShading(this);
}
-void GfxRadialShading::getColor(double t, GfxColor *color) {
- double out[gfxColorMaxComps];
- int i;
+double GfxRadialShading::getDistance(double sMin, double sMax) {
+ double xMin, yMin, rMin, xMax, yMax, rMax;
- // NB: there can be one function with n outputs or n functions with
- // one output each (where n = number of color components)
- for (i = 0; i < gfxColorMaxComps; ++i) {
- out[i] = 0;
+ xMin = x0 + sMin * (x1 - x0);
+ yMin = y0 + sMin * (y1 - y0);
+ rMin = r0 + sMin * (r1 - r0);
+
+ xMax = x0 + sMax * (x1 - x0);
+ yMax = y0 + sMax * (y1 - y0);
+ rMax = r0 + sMax * (r1 - r0);
+
+ return hypot(xMax-xMin, yMax-yMin) + fabs(rMax-rMin);
+}
+
+// extend range, adapted from cairo, radialExtendRange
+static GBool
+radialExtendRange (double range[2], double value, GBool valid)
+{
+ if (!valid)
+ range[0] = range[1] = value;
+ else if (value < range[0])
+ range[0] = value;
+ else if (value > range[1])
+ range[1] = value;
+
+ return gTrue;
+}
+
+inline void radialEdge(double num, double den, double delta, double lower, double upper,
+ double dr, double mindr, GBool &valid, double *range)
+{
+ if (fabs (den) >= RADIAL_EPSILON) {
+ double t_edge, v;
+ t_edge = (num) / (den);
+ v = t_edge * (delta);
+ if (t_edge * dr >= mindr && (lower) <= v && v <= (upper))
+ valid = radialExtendRange (range, t_edge, valid);
}
- for (i = 0; i < nFuncs; ++i) {
- funcs[i]->transform(&t, &out[i]);
+}
+
+inline void radialCorner1(double x, double y, double &b, double dx, double dy, double cr,
+ double dr, double mindr, GBool &valid, double *range)
+{
+ b = (x) * dx + (y) * dy + cr * dr;
+ if (fabs (b) >= RADIAL_EPSILON) {
+ double t_corner;
+ double x2 = (x) * (x);
+ double y2 = (y) * (y);
+ double cr2 = (cr) * (cr);
+ double c = x2 + y2 - cr2;
+
+ t_corner = 0.5 * c / b;
+ if (t_corner * dr >= mindr)
+ valid = radialExtendRange (range, t_corner, valid);
+ }
+}
+
+inline void radialCorner2(double x, double y, double a, double &b, double &c, double &d, double dx, double dy, double cr,
+ double inva, double dr, double mindr, GBool &valid, double *range)
+{
+ b = (x) * dx + (y) * dy + cr * dr;
+ c = (x) * (x) + (y) * (y) - cr * cr;
+ d = b * b - a * c;
+ if (d >= 0) {
+ double t_corner;
+
+ d = sqrt (d);
+ t_corner = (b + d) * inva;
+ if (t_corner * dr >= mindr)
+ valid = radialExtendRange (range, t_corner, valid);
+ t_corner = (b - d) * inva;
+ if (t_corner * dr >= mindr)
+ valid = radialExtendRange (range, t_corner, valid);
+ }
+}
+void GfxRadialShading::getParameterRange(double *lower, double *upper,
+ double xMin, double yMin,
+ double xMax, double yMax) {
+ double cx, cy, cr, dx, dy, dr;
+ double a, x_focus, y_focus;
+ double mindr, minx, miny, maxx, maxy;
+ double range[2];
+ GBool valid;
+
+ // A radial pattern is considered degenerate if it can be
+ // represented as a solid or clear pattern. This corresponds to one
+ // of the two cases:
+ //
+ // 1) The radii are both very small:
+ // |dr| < FLT_EPSILON && min (r0, r1) < FLT_EPSILON
+ //
+ // 2) The two circles have about the same radius and are very
+ // close to each other (approximately a cylinder gradient that
+ // doesn't move with the parameter):
+ // |dr| < FLT_EPSILON && max (|dx|, |dy|) < 2 * FLT_EPSILON
+
+ if (xMin >= xMax || yMin >=yMax ||
+ (fabs (r0 - r1) < RADIAL_EPSILON &&
+ (std::min<double>(r0, r1) < RADIAL_EPSILON ||
+ std::max<double>(fabs (x0 - x1), fabs (y0 - y1)) < 2 * RADIAL_EPSILON))) {
+ *lower = *upper = 0;
+ return;
}
- for (i = 0; i < gfxColorMaxComps; ++i) {
- color->c[i] = dblToCol(out[i]);
+
+ range[0] = range[1] = 0;
+ valid = gFalse;
+
+ x_focus = y_focus = 0; // silence gcc
+
+ cx = x0;
+ cy = y0;
+ cr = r0;
+ dx = x1 - cx;
+ dy = y1 - cy;
+ dr = r1 - cr;
+
+ // translate by -(cx, cy) to simplify computations
+ xMin -= cx;
+ yMin -= cy;
+ xMax -= cx;
+ yMax -= cy;
+
+ // enlarge boundaries slightly to avoid rounding problems in the
+ // parameter range computation
+ xMin -= RADIAL_EPSILON;
+ yMin -= RADIAL_EPSILON;
+ xMax += RADIAL_EPSILON;
+ yMax += RADIAL_EPSILON;
+
+ // enlarge boundaries even more to avoid rounding problems when
+ // testing if a point belongs to the box
+ minx = xMin - RADIAL_EPSILON;
+ miny = yMin - RADIAL_EPSILON;
+ maxx = xMax + RADIAL_EPSILON;
+ maxy = yMax + RADIAL_EPSILON;
+
+ // we dont' allow negative radiuses, so we will be checking that
+ // t*dr >= mindr to consider t valid
+ mindr = -(cr + RADIAL_EPSILON);
+
+ // After the previous transformations, the start circle is centered
+ // in the origin and has radius cr. A 1-unit change in the t
+ // parameter corresponds to dx,dy,dr changes in the x,y,r of the
+ // circle (center coordinates, radius).
+ //
+ // To compute the minimum range needed to correctly draw the
+ // pattern, we start with an empty range and extend it to include
+ // the circles touching the bounding box or within it.
+
+ // Focus, the point where the circle has radius == 0.
+ //
+ // r = cr + t * dr = 0
+ // t = -cr / dr
+ //
+ // If the radius is constant (dr == 0) there is no focus (the
+ // gradient represents a cylinder instead of a cone).
+ if (fabs (dr) >= RADIAL_EPSILON) {
+ double t_focus;
+
+ t_focus = -cr / dr;
+ x_focus = t_focus * dx;
+ y_focus = t_focus * dy;
+ if (minx <= x_focus && x_focus <= maxx &&
+ miny <= y_focus && y_focus <= maxy)
+ {
+ valid = radialExtendRange (range, t_focus, valid);
+ }
}
+
+ // Circles externally tangent to box edges.
+ //
+ // All circles have center in (dx, dy) * t
+ //
+ // If the circle is tangent to the line defined by the edge of the
+ // box, then at least one of the following holds true:
+ //
+ // (dx*t) + (cr + dr*t) == x0 (left edge)
+ // (dx*t) - (cr + dr*t) == x1 (right edge)
+ // (dy*t) + (cr + dr*t) == y0 (top edge)
+ // (dy*t) - (cr + dr*t) == y1 (bottom edge)
+ //
+ // The solution is only valid if the tangent point is actually on
+ // the edge, i.e. if its y coordinate is in [y0,y1] for left/right
+ // edges and if its x coordinate is in [x0,x1] for top/bottom edges.
+ //
+ // For the first equation:
+ //
+ // (dx + dr) * t = x0 - cr
+ // t = (x0 - cr) / (dx + dr)
+ // y = dy * t
+ //
+ // in the code this becomes:
+ //
+ // t_edge = (num) / (den)
+ // v = (delta) * t_edge
+ //
+ // If the denominator in t is 0, the pattern is tangent to a line
+ // parallel to the edge under examination. The corner-case where the
+ // boundary line is the same as the edge is handled by the focus
+ // point case and/or by the a==0 case.
+
+ // circles tangent (externally) to left/right/top/bottom edge
+ radialEdge(xMin - cr, dx + dr, dy, miny, maxy, dr, mindr, valid, range);
+ radialEdge(xMax + cr, dx - dr, dy, miny, maxy, dr, mindr, valid, range);
+ radialEdge(yMin - cr, dy + dr, dx, minx, maxx, dr, mindr, valid, range);
+ radialEdge(yMax + cr, dy - dr, dx, minx, maxx, dr, mindr, valid, range);
+
+ // Circles passing through a corner.
+ //
+ // A circle passing through the point (x,y) satisfies:
+ //
+ // (x-t*dx)^2 + (y-t*dy)^2 == (cr + t*dr)^2
+ //
+ // If we set:
+ // a = dx^2 + dy^2 - dr^2
+ // b = x*dx + y*dy + cr*dr
+ // c = x^2 + y^2 - cr^2
+ // we have:
+ // a*t^2 - 2*b*t + c == 0
+
+ a = dx * dx + dy * dy - dr * dr;
+ if (fabs (a) < RADIAL_EPSILON * RADIAL_EPSILON) {
+ double b;
+
+ // Ensure that gradients with both a and dr small are
+ // considered degenerate.
+ // The floating point version of the degeneracy test implemented
+ // in _radial_pattern_is_degenerate() is:
+ //
+ // 1) The circles are practically the same size:
+ // |dr| < RADIAL_EPSILON
+ // AND
+ // 2a) The circles are both very small:
+ // min (r0, r1) < RADIAL_EPSILON
+ // OR
+ // 2b) The circles are very close to each other:
+ // max (|dx|, |dy|) < 2 * RADIAL_EPSILON
+ //
+ // Assuming that the gradient is not degenerate, we want to
+ // show that |a| < RADIAL_EPSILON^2 implies |dr| >= RADIAL_EPSILON.
+ //
+ // If the gradient is not degenerate yet it has |dr| <
+ // RADIAL_EPSILON, (2b) is false, thus:
+ //
+ // max (|dx|, |dy|) >= 2*RADIAL_EPSILON
+ // which implies:
+ // 4*RADIAL_EPSILON^2 <= max (|dx|, |dy|)^2 <= dx^2 + dy^2
+ //
+ // From the definition of a, we get:
+ // a = dx^2 + dy^2 - dr^2 < RADIAL_EPSILON^2
+ // dx^2 + dy^2 - RADIAL_EPSILON^2 < dr^2
+ // 3*RADIAL_EPSILON^2 < dr^2
+ //
+ // which is inconsistent with the hypotheses, thus |dr| <
+ // RADIAL_EPSILON is false or the gradient is degenerate.
+
+ assert (fabs (dr) >= RADIAL_EPSILON);
+
+ // If a == 0, all the circles are tangent to a line in the
+ // focus point. If this line is within the box extents, we
+ // should add the circle with infinite radius, but this would
+ // make the range unbounded. We will be limiting the range to
+ // [0,1] anyway, so we simply add the biggest legitimate
+ // circle (it happens for 0 or for 1).
+ if (dr < 0) {
+ valid = radialExtendRange (range, 0, valid);
+ } else {
+ valid = radialExtendRange (range, 1, valid);
+ }
+
+ // Nondegenerate, nonlimit circles passing through the corners.
+ //
+ // a == 0 && a*t^2 - 2*b*t + c == 0
+ //
+ // t = c / (2*b)
+ //
+ // The b == 0 case has just been handled, so we only have to
+ // compute this if b != 0.
+
+ // circles touching each corner
+ radialCorner1(xMin, yMin, b, dx, dy, cr, dr, mindr, valid, range);
+ radialCorner1(xMin, yMax, b, dx, dy, cr, dr, mindr, valid, range);
+ radialCorner1(xMax, yMin, b, dx, dy, cr, dr, mindr, valid, range);
+ radialCorner1(xMax, yMax, b, dx, dy, cr, dr, mindr, valid, range);
+ } else {
+ double inva, b, c, d;
+
+ inva = 1 / a;
+
+ // Nondegenerate, nonlimit circles passing through the corners.
+ //
+ // a != 0 && a*t^2 - 2*b*t + c == 0
+ //
+ // t = (b +- sqrt (b*b - a*c)) / a
+ //
+ // If the argument of sqrt() is negative, then no circle
+ // passes through the corner.
+
+ // circles touching each corner
+ radialCorner2(xMin, yMin, a, b, c, d, dx, dy, cr, inva, dr, mindr, valid, range);
+ radialCorner2(xMin, yMax, a, b, c, d, dx, dy, cr, inva, dr, mindr, valid, range);
+ radialCorner2(xMax, yMin, a, b, c, d, dx, dy, cr, inva, dr, mindr, valid, range);
+ radialCorner2(xMax, yMax, a, b, c, d, dx, dy, cr, inva, dr, mindr, valid, range);
+ }
+
+ *lower = std::max<double>(0., std::min<double>(1., range[0]));
+ *upper = std::max<double>(0., std::min<double>(1., range[1]));
}
//------------------------------------------------------------------------
@@ -3362,6 +4032,8 @@ void GfxGouraudTriangleShading::getTriangle(
double out[gfxColorMaxComps];
int v, j;
+ assert(!isParameterized());
+
v = triangles[i][0];
*x0 = vertices[v].x;
*y0 = vertices[v].y;
@@ -3406,6 +4078,39 @@ void GfxGouraudTriangleShading::getTriangle(
}
}
+void GfxGouraudTriangleShading::getParameterizedColor(double t, GfxColor *color) {
+ double out[gfxColorMaxComps];
+
+ for (int j = 0; j < nFuncs; ++j) {
+ funcs[j]->transform(&t, &out[j]);
+ }
+ for (int j = 0; j < gfxColorMaxComps; ++j) {
+ color->c[j] = dblToCol(out[j]);
+ }
+}
+
+void GfxGouraudTriangleShading::getTriangle(int i,
+ double *x0, double *y0, double *color0,
+ double *x1, double *y1, double *color1,
+ double *x2, double *y2, double *color2) {
+ int v;
+
+ assert(isParameterized());
+
+ v = triangles[i][0];
+ *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]);
+ v = triangles[i][2];
+ *x2 = vertices[v].x;
+ *y2 = vertices[v].y;
+ *color2 = colToDbl(vertices[v].color.c[0]);
+}
+
//------------------------------------------------------------------------
// GfxPatchMeshShading
//------------------------------------------------------------------------
@@ -3463,7 +4168,7 @@ GfxPatchMeshShading *GfxPatchMeshShading::parse(int typeA, Dict *dict,
Guint flag;
double x[16], y[16];
Guint xi, yi;
- GfxColorComp c[4][gfxColorMaxComps];
+ double c[4][gfxColorMaxComps];
Guint ci[4];
GfxShadingBitBuf *bitBuf;
Object obj1, obj2;
@@ -3585,7 +4290,12 @@ GfxPatchMeshShading *GfxPatchMeshShading::parse(int typeA, Dict *dict,
if (!bitBuf->getBits(compBits, &ci[j])) {
break;
}
- c[i][j] = dblToCol(cMin[j] + cMul[j] * (double)ci[j]);
+ c[i][j] = cMin[j] + cMul[j] * (double)ci[j];
+ if( nFuncsA == 0 ) {
+ // ... and colorspace values can also be stored into doubles.
+ // They will be casted later.
+ c[i][j] = dblToCol(c[i][j]);
+ }
}
if (j < nComps) {
break;
@@ -3962,6 +4672,17 @@ GfxPatchMeshShading *GfxPatchMeshShading::parse(int typeA, Dict *dict,
return NULL;
}
+void GfxPatchMeshShading::getParameterizedColor(double t, GfxColor *color) {
+ double out[gfxColorMaxComps];
+
+ for (int j = 0; j < nFuncs; ++j) {
+ funcs[j]->transform(&t, &out[j]);
+ }
+ for (int j = 0; j < gfxColorMaxComps; ++j) {
+ color->c[j] = dblToCol(out[j]);
+ }
+}
+
GfxShading *GfxPatchMeshShading::copy() {
return new GfxPatchMeshShading(this);
}
@@ -4261,8 +4982,7 @@ void GfxImageColorMap::getRGBLine(Guchar *in, unsigned int *out, int length) {
int i, j;
Guchar *inp, *tmp_line;
- if ((colorSpace2 && !colorSpace2->useGetRGBLine ()) ||
- (!colorSpace2 && !colorSpace->useGetRGBLine ())) {
+ if (!useRGBLine()) {
GfxRGB rgb;
inp = in;
@@ -4303,6 +5023,95 @@ void GfxImageColorMap::getRGBLine(Guchar *in, unsigned int *out, int length) {
}
+void GfxImageColorMap::getRGBLine(Guchar *in, Guchar *out, int length) {
+ int i, j;
+ Guchar *inp, *tmp_line;
+
+ if (!useRGBLine()) {
+ GfxRGB rgb;
+
+ inp = in;
+ for (i = 0; i < length; i++) {
+ getRGB (inp, &rgb);
+ *out++ = colToByte(rgb.r);
+ *out++ = colToByte(rgb.g);
+ *out++ = colToByte(rgb.b);
+ inp += nComps;
+ }
+ return;
+ }
+
+ switch (colorSpace->getMode()) {
+ case csIndexed:
+ case csSeparation:
+ tmp_line = (Guchar *) gmallocn (length, nComps2);
+ for (i = 0; i < length; i++) {
+ for (j = 0; j < nComps2; j++) {
+ tmp_line[i * nComps2 + j] = byte_lookup[in[i] * nComps2 + j];
+ }
+ }
+ colorSpace2->getRGBLine(tmp_line, out, length);
+ gfree (tmp_line);
+ break;
+
+ default:
+ inp = in;
+ for (j = 0; j < length; j++)
+ for (i = 0; i < nComps; i++) {
+ *inp = byte_lookup[*inp * nComps + i];
+ inp++;
+ }
+ colorSpace->getRGBLine(in, out, length);
+ break;
+ }
+
+}
+
+void GfxImageColorMap::getRGBXLine(Guchar *in, Guchar *out, int length) {
+ int i, j;
+ Guchar *inp, *tmp_line;
+
+ if (!useRGBLine()) {
+ GfxRGB rgb;
+
+ inp = in;
+ for (i = 0; i < length; i++) {
+ getRGB (inp, &rgb);
+ *out++ = colToByte(rgb.r);
+ *out++ = colToByte(rgb.g);
+ *out++ = colToByte(rgb.b);
+ *out++ = 255;
+ inp += nComps;
+ }
+ return;
+ }
+
+ switch (colorSpace->getMode()) {
+ case csIndexed:
+ case csSeparation:
+ tmp_line = (Guchar *) gmallocn (length, nComps2);
+ for (i = 0; i < length; i++) {
+ for (j = 0; j < nComps2; j++) {
+ tmp_line[i * nComps2 + j] = byte_lookup[in[i] * nComps2 + j];
+ }
+ }
+ colorSpace2->getRGBXLine(tmp_line, out, length);
+ gfree (tmp_line);
+ break;
+
+ default:
+ inp = in;
+ for (j = 0; j < length; j++)
+ for (i = 0; i < nComps; i++) {
+ *inp = byte_lookup[*inp * nComps + i];
+ inp++;
+ }
+ colorSpace->getRGBXLine(in, out, length);
+ break;
+ }
+
+}
+
void GfxImageColorMap::getCMYK(Guchar *x, GfxCMYK *cmyk) {
GfxColor color;
int i;
@@ -4519,6 +5328,46 @@ void GfxPath::offset(double dx, double dy) {
//------------------------------------------------------------------------
// GfxState
//------------------------------------------------------------------------
+GfxState::ReusablePathIterator::ReusablePathIterator(GfxPath *path)
+ : path(path),
+ subPathOff(0),
+ coordOff(0),
+ numCoords(0),
+ curSubPath(NULL)
+{
+ if( path->getNumSubpaths() ) {
+ curSubPath = path->getSubpath(subPathOff);
+ numCoords = curSubPath->getNumPoints();
+ }
+}
+
+bool GfxState::ReusablePathIterator::isEnd() const {
+ return coordOff >= numCoords;
+}
+
+void GfxState::ReusablePathIterator::next() {
+ ++coordOff;
+ if (coordOff == numCoords) {
+ ++subPathOff;
+ if (subPathOff < path->getNumSubpaths()) {
+ coordOff = 0;
+ curSubPath = path->getSubpath(subPathOff);
+ numCoords = curSubPath->getNumPoints();
+ }
+ }
+}
+
+void GfxState::ReusablePathIterator::setCoord(double x, double y) {
+ curSubPath->setX(coordOff, x);
+ curSubPath->setY(coordOff, y);
+}
+
+void GfxState::ReusablePathIterator::reset() {
+ coordOff = 0;
+ subPathOff = 0;
+ curSubPath = path->getSubpath(0);
+ numCoords = curSubPath->getNumPoints();
+}
GfxState::GfxState(double hDPIA, double vDPIA, PDFRectangle *pageBox,
int rotateA, GBool upsideDown) {
@@ -4582,6 +5431,7 @@ GfxState::GfxState(double hDPIA, double vDPIA, PDFRectangle *pageBox,
strokeOpacity = 1;
fillOverprint = gFalse;
strokeOverprint = gFalse;
+ overprintMode = 0;
transfer[0] = transfer[1] = transfer[2] = transfer[3] = NULL;
lineWidth = 1;
@@ -4780,23 +5630,12 @@ void GfxState::getFontTransMat(double *m11, double *m12,
void GfxState::setCTM(double a, double b, double c,
double d, double e, double f) {
- int i;
-
ctm[0] = a;
ctm[1] = b;
ctm[2] = c;
ctm[3] = d;
ctm[4] = e;
ctm[5] = f;
-
- // avoid FP exceptions on badly messed up PDF files
- for (i = 0; i < 6; ++i) {
- if (ctm[i] > 1e10) {
- ctm[i] = 1e10;
- } else if (ctm[i] < -1e10) {
- ctm[i] = -1e10;
- }
- }
}
void GfxState::concatCTM(double a, double b, double c,
@@ -4805,7 +5644,6 @@ void GfxState::concatCTM(double a, double b, double c,
double b1 = ctm[1];
double c1 = ctm[2];
double d1 = ctm[3];
- int i;
ctm[0] = a * a1 + b * c1;
ctm[1] = a * b1 + b * d1;
@@ -4813,15 +5651,6 @@ void GfxState::concatCTM(double a, double b, double c,
ctm[3] = c * b1 + d * d1;
ctm[4] = e * a1 + f * c1 + ctm[4];
ctm[5] = e * b1 + f * d1 + ctm[5];
-
- // avoid FP exceptions on badly messed up PDF files
- for (i = 0; i < 6; ++i) {
- if (ctm[i] > 1e10) {
- ctm[i] = 1e10;
- } else if (ctm[i] < -1e10) {
- ctm[i] = -1e10;
- }
- }
}
void GfxState::shiftCTM(double tx, double ty) {
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState.h
index 74f74ce1184..d8f0972ef7b 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState.h
@@ -17,7 +17,10 @@
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2006 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2009 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009-2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
+// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
+// Copyright (C) 2011 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
@@ -31,10 +34,14 @@
#pragma interface
#endif
+#include "poppler-config.h"
+
#include "goo/gtypes.h"
#include "Object.h"
#include "Function.h"
+#include <assert.h>
+
class Array;
class Gfx;
class GfxFont;
@@ -46,8 +53,10 @@ class Matrix {
public:
double m[6];
- GBool invertTo(Matrix *other);
- void transform(double x, double y, double *tx, double *ty);
+ GBool invertTo(Matrix *other) const;
+ void transform(double x, double y, double *tx, double *ty) const;
+ double determinant() const { return m[0] * m[3] - m[1] * m[2]; }
+ double norm() const;
};
//------------------------------------------------------------------------
@@ -90,6 +99,14 @@ static inline double colToDbl(GfxColorComp x) {
return (double)x / (double)gfxColorComp1;
}
+static inline Guchar dblToByte(double x) {
+ return (Guchar)(x * 255.0);
+}
+
+static inline double byteToDbl(Guchar x) {
+ return (double)x / (double)255.0;
+}
+
static inline GfxColorComp byteToCol(Guchar x) {
// (x / 255) << 16 = (0.0000000100000001... * x) << 16
// = ((x << 8) + (x) + (x >> 8) + ...) << 16
@@ -185,12 +202,14 @@ public:
virtual void getGray(GfxColor *color, GfxGray *gray) = 0;
virtual void getRGB(GfxColor *color, GfxRGB *rgb) = 0;
virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk) = 0;
- virtual void getGrayLine(Guchar */*in*/, Guchar */*out*/, int /*length*/) {}
- virtual void getRGBLine(Guchar */*in*/, unsigned int */*out*/, int /*length*/) {}
+ virtual void getGrayLine(Guchar * /*in*/, Guchar * /*out*/, int /*length*/) { error(-1, "GfxColorSpace::getGrayLine this should not happen"); }
+ virtual void getRGBLine(Guchar * /*in*/, unsigned int * /*out*/, int /*length*/) { error(-1, "GfxColorSpace::getRGBLine (first variant) this should not happen"); }
+ virtual void getRGBLine(Guchar * /*in*/, Guchar * /*out*/, int /*length*/) { error(-1, "GfxColorSpace::getRGBLine (second variant) this should not happen"); }
+ virtual void getRGBXLine(Guchar * /*in*/, Guchar * /*out*/, int /*length*/) { error(-1, "GfxColorSpace::getRGBXLine this should not happen"); }
- // Does this ColorSpace use getRGBLine?
+ // Does this ColorSpace support getRGBLine?
virtual GBool useGetRGBLine() { return gFalse; }
- // Does this ColorSpace use getGrayLine?
+ // Does this ColorSpace support getGrayLine?
virtual GBool useGetGrayLine() { return gFalse; }
// Return the number of color components.
@@ -243,6 +262,8 @@ public:
virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
virtual void getGrayLine(Guchar *in, Guchar *out, int length);
virtual void getRGBLine(Guchar *in, unsigned int *out, int length);
+ virtual void getRGBLine(Guchar *in, Guchar *out, int length);
+ virtual void getRGBXLine(Guchar *in, Guchar *out, int length);
virtual GBool useGetRGBLine() { return gTrue; }
virtual GBool useGetGrayLine() { return gTrue; }
@@ -310,6 +331,8 @@ public:
virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
virtual void getGrayLine(Guchar *in, Guchar *out, int length);
virtual void getRGBLine(Guchar *in, unsigned int *out, int length);
+ virtual void getRGBLine(Guchar *in, Guchar *out, int length);
+ virtual void getRGBXLine(Guchar *in, Guchar *out, int length);
virtual GBool useGetRGBLine() { return gTrue; }
virtual GBool useGetGrayLine() { return gTrue; }
@@ -379,6 +402,10 @@ public:
virtual void getGray(GfxColor *color, GfxGray *gray);
virtual void getRGB(GfxColor *color, GfxRGB *rgb);
virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
+ virtual void getRGBLine(Guchar *in, unsigned int *out, int length);
+ virtual void getRGBLine(Guchar *, Guchar *out, int length);
+ virtual void getRGBXLine(Guchar *in, Guchar *out, int length);
+ virtual GBool useGetRGBLine() { return gTrue; }
virtual int getNComps() { return 4; }
virtual void getDefaultColor(GfxColor *color);
@@ -452,6 +479,8 @@ public:
virtual void getRGB(GfxColor *color, GfxRGB *rgb);
virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
virtual void getRGBLine(Guchar *in, unsigned int *out, int length);
+ virtual void getRGBLine(Guchar *in, Guchar *out, int length);
+ virtual void getRGBXLine(Guchar *in, Guchar *out, int length);
virtual GBool useGetRGBLine();
@@ -495,6 +524,8 @@ public:
virtual void getRGB(GfxColor *color, GfxRGB *rgb);
virtual void getCMYK(GfxColor *color, GfxCMYK *cmyk);
virtual void getRGBLine(Guchar *in, unsigned int *out, int length);
+ virtual void getRGBLine(Guchar *in, Guchar *out, int length);
+ virtual void getRGBXLine(Guchar *in, Guchar *out, int length);
virtual GBool useGetRGBLine() { return gTrue; }
@@ -743,6 +774,51 @@ protected:
};
//------------------------------------------------------------------------
+// GfxUnivariateShading
+//------------------------------------------------------------------------
+
+class GfxUnivariateShading: public GfxShading {
+public:
+
+ GfxUnivariateShading(int typeA,
+ double t0A, double t1A,
+ Function **funcsA, int nFuncsA,
+ GBool extend0A, GBool extend1A);
+ GfxUnivariateShading(GfxUnivariateShading *shading);
+ virtual ~GfxUnivariateShading();
+
+ double getDomain0() { return t0; }
+ double getDomain1() { return t1; }
+ GBool getExtend0() { return extend0; }
+ GBool getExtend1() { return extend1; }
+ int getNFuncs() { return nFuncs; }
+ Function *getFunc(int i) { return funcs[i]; }
+ void getColor(double t, GfxColor *color);
+
+ void setupCache(const Matrix *ctm,
+ double xMin, double yMin,
+ double xMax, double yMax);
+
+ virtual void getParameterRange(double *lower, double *upper,
+ double xMin, double yMin,
+ double xMax, double yMax) = 0;
+
+ virtual double getDistance(double tMin, double tMax) = 0;
+
+private:
+
+ double t0, t1;
+ Function *funcs[gfxColorMaxComps];
+ int nFuncs;
+ GBool extend0, extend1;
+
+ int cacheSize, lastMatch;
+ double *cacheBounds;
+ double *cacheCoeff;
+ double *cacheValues;
+};
+
+//------------------------------------------------------------------------
// GfxFunctionShading
//------------------------------------------------------------------------
@@ -779,7 +855,7 @@ private:
// GfxAxialShading
//------------------------------------------------------------------------
-class GfxAxialShading: public GfxShading {
+class GfxAxialShading: public GfxUnivariateShading {
public:
GfxAxialShading(double x0A, double y0A,
@@ -796,28 +872,23 @@ public:
void getCoords(double *x0A, double *y0A, double *x1A, double *y1A)
{ *x0A = x0; *y0A = y0; *x1A = x1; *y1A = y1; }
- double getDomain0() { return t0; }
- double getDomain1() { return t1; }
- GBool getExtend0() { return extend0; }
- GBool getExtend1() { return extend1; }
- int getNFuncs() { return nFuncs; }
- Function *getFunc(int i) { return funcs[i]; }
- void getColor(double t, GfxColor *color);
+
+ virtual void getParameterRange(double *lower, double *upper,
+ double xMin, double yMin,
+ double xMax, double yMax);
+
+ virtual double getDistance(double tMin, double tMax);
private:
double x0, y0, x1, y1;
- double t0, t1;
- Function *funcs[gfxColorMaxComps];
- int nFuncs;
- GBool extend0, extend1;
};
//------------------------------------------------------------------------
// GfxRadialShading
//------------------------------------------------------------------------
-class GfxRadialShading: public GfxShading {
+class GfxRadialShading: public GfxUnivariateShading {
public:
GfxRadialShading(double x0A, double y0A, double r0A,
@@ -835,21 +906,16 @@ public:
void getCoords(double *x0A, double *y0A, double *r0A,
double *x1A, double *y1A, double *r1A)
{ *x0A = x0; *y0A = y0; *r0A = r0; *x1A = x1; *y1A = y1; *r1A = r1; }
- double getDomain0() { return t0; }
- double getDomain1() { return t1; }
- GBool getExtend0() { return extend0; }
- GBool getExtend1() { return extend1; }
- int getNFuncs() { return nFuncs; }
- Function *getFunc(int i) { return funcs[i]; }
- void getColor(double t, GfxColor *color);
+
+ virtual void getParameterRange(double *lower, double *upper,
+ double xMin, double yMin,
+ double xMax, double yMax);
+
+ virtual double getDistance(double tMin, double tMax);
private:
double x0, y0, r0, x1, y1, r1;
- double t0, t1;
- Function *funcs[gfxColorMaxComps];
- int nFuncs;
- GBool extend0, extend1;
};
//------------------------------------------------------------------------
@@ -876,10 +942,37 @@ public:
virtual GfxShading *copy();
int getNTriangles() { return nTriangles; }
+
+ bool isParameterized() const { return nFuncs > 0; }
+
+ /**
+ * @precondition isParameterized() == true
+ */
+ double getParameterDomainMin() const { assert(isParameterized()); return funcs[0]->getDomainMin(0); }
+
+ /**
+ * @precondition isParameterized() == true
+ */
+ double getParameterDomainMax() const { assert(isParameterized()); return funcs[0]->getDomainMax(0); }
+
+ /**
+ * @precondition isParameterized() == false
+ */
void getTriangle(int i, double *x0, double *y0, GfxColor *color0,
double *x1, double *y1, GfxColor *color1,
double *x2, double *y2, GfxColor *color2);
+ /**
+ * Variant for functions.
+ *
+ * @precondition isParameterized() == true
+ */
+ void getTriangle(int i, double *x0, double *y0, double *color0,
+ double *x1, double *y1, double *color1,
+ double *x2, double *y2, double *color2);
+
+ void getParameterizedColor(double t, GfxColor *color);
+
private:
GfxGouraudVertex *vertices;
@@ -894,10 +987,32 @@ private:
// GfxPatchMeshShading
//------------------------------------------------------------------------
+/**
+ * A tensor product cubic bezier patch consisting of 4x4 points and 4 color
+ * values.
+ *
+ * See the Shading Type 7 specifications. Note that Shading Type 6 is also
+ * represented using GfxPatch.
+ */
struct GfxPatch {
+ /**
+ * Represents a single color value for the patch.
+ */
+ struct ColorValue {
+ /**
+ * For parameterized patches, only element 0 is valid; it contains
+ * the single parameter.
+ *
+ * For non-parameterized patches, c contains all color components
+ * as decoded from the input stream. In this case, you will need to
+ * use dblToCol() before assigning them to GfxColor.
+ */
+ double c[gfxColorMaxComps];
+ };
+
double x[4][4];
double y[4][4];
- GfxColor color[2][2];
+ ColorValue color[2][2];
};
class GfxPatchMeshShading: public GfxShading {
@@ -915,6 +1030,20 @@ public:
int getNPatches() { return nPatches; }
GfxPatch *getPatch(int i) { return &patches[i]; }
+ bool isParameterized() const { return nFuncs > 0; }
+
+ /**
+ * @precondition isParameterized() == true
+ */
+ double getParameterDomainMin() const { assert(isParameterized()); return funcs[0]->getDomainMin(0); }
+
+ /**
+ * @precondition isParameterized() == true
+ */
+ double getParameterDomainMax() const { assert(isParameterized()); return funcs[0]->getDomainMax(0); }
+
+ void getParameterizedColor(double t, GfxColor *color);
+
private:
GfxPatch *patches;
@@ -952,11 +1081,15 @@ public:
// Get decode table.
double getDecodeLow(int i) { return decodeLow[i]; }
double getDecodeHigh(int i) { return decodeLow[i] + decodeRange[i]; }
+
+ bool useRGBLine() { return (colorSpace2 && colorSpace2->useGetRGBLine ()) || (!colorSpace2 && colorSpace->useGetRGBLine ()); }
// Convert an image pixel to a color.
void getGray(Guchar *x, GfxGray *gray);
void getRGB(Guchar *x, GfxRGB *rgb);
void getRGBLine(Guchar *in, unsigned int *out, int length);
+ void getRGBLine(Guchar *in, Guchar *out, int length);
+ void getRGBXLine(Guchar *in, Guchar *out, int length);
void getGrayLine(Guchar *in, Guchar *out, int length);
void getCMYK(Guchar *x, GfxCMYK *cmyk);
void getColor(Guchar *x, GfxColor *color);
@@ -1002,6 +1135,9 @@ public:
double getY(int i) { return y[i]; }
GBool getCurve(int i) { return curve[i]; }
+ void setX(int i, double a) { x[i] = a; }
+ void setY(int i, double a) { y[i] = a; }
+
// Get last point.
double getLastX() { return x[n-1]; }
double getLastY() { return y[n-1]; }
@@ -1096,6 +1232,61 @@ private:
class GfxState {
public:
+ /**
+ * When GfxState::getReusablePath() is invoked, the currently active
+ * path is taken per reference and its coordinates can be re-edited.
+ *
+ * A ReusablePathIterator is intented to reduce overhead when the same
+ * path type is used a lot of times, only with different coordinates. It
+ * allows just to update the coordinates (occuring in the same order as
+ * in the original path).
+ */
+ class ReusablePathIterator {
+ public:
+ /**
+ * Creates the ReusablePathIterator. This should only be done from
+ * GfxState::getReusablePath().
+ *
+ * @param path the path as it is used so far. Changing this path,
+ * deleting it or starting a new path from scratch will most likely
+ * invalidate the iterator (and may cause serious problems). Make
+ * sure the path's memory structure is not changed during the
+ * lifetime of the ReusablePathIterator.
+ */
+ ReusablePathIterator( GfxPath* path );
+
+ /**
+ * Returns true if and only if the current iterator position is
+ * beyond the last valid point.
+ *
+ * A call to setCoord() will be undefined.
+ */
+ bool isEnd() const;
+
+ /**
+ * Advances the iterator.
+ */
+ void next();
+
+ /**
+ * Updates the coordinates associated to the current iterator
+ * position.
+ */
+ void setCoord( double x, double y );
+
+ /**
+ * Resets the iterator.
+ */
+ void reset();
+ private:
+ GfxPath *path;
+ int subPathOff;
+
+ int coordOff;
+ int numCoords;
+
+ GfxSubpath *curSubPath;
+ };
// Construct a default GfxState, for a device with resolution <hDPI>
// x <vDPI>, page box <pageBox>, page rotation <rotateA>, and
@@ -1144,6 +1335,7 @@ public:
double getStrokeOpacity() { return strokeOpacity; }
GBool getFillOverprint() { return fillOverprint; }
GBool getStrokeOverprint() { return strokeOverprint; }
+ int getOverprintMode() { return overprintMode; }
Function **getTransfer() { return transfer; }
double getLineWidth() { return lineWidth; }
void getLineDash(double **dash, int *length, double *start)
@@ -1214,6 +1406,7 @@ public:
void setStrokeOpacity(double opac) { strokeOpacity = opac; }
void setFillOverprint(GBool op) { fillOverprint = op; }
void setStrokeOverprint(GBool op) { strokeOverprint = op; }
+ void setOverprintMode(int op) { overprintMode = op; }
void setTransfer(Function **funcs);
void setLineWidth(double width) { lineWidth = width; }
void setLineDash(double *dash, int length, double start);
@@ -1274,6 +1467,7 @@ public:
// Misc
GBool parseBlendMode(Object *obj, GfxBlendMode *mode);
+ ReusablePathIterator *getReusablePath() { return new ReusablePathIterator(path); }
private:
double hDPI, vDPI; // resolution
@@ -1293,6 +1487,7 @@ private:
double strokeOpacity; // stroke opacity
GBool fillOverprint; // fill overprint
GBool strokeOverprint; // stroke overprint
+ int overprintMode; // overprint mode
Function *transfer[4]; // transfer function (entries may be: all
// NULL = identity; last three NULL =
// single function; all four non-NULL =
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState_helpers.h
index 77ac710e174..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/GfxState_helpers.h
@@ -13,13 +13,15 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2011 Albert Astals Cid <aacid@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
//
//========================================================================
+#include "GfxState.h"
+
static inline GfxColorComp clip01(GfxColorComp x) {
return (x < 0) ? 0 : (x > gfxColorComp1) ? gfxColorComp1 : x;
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.cc
index b3329a3589f..9675403c5d5 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.cc
@@ -10,9 +10,12 @@
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005, 2007-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
@@ -20,8 +23,13 @@
// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2007, 2009 Jonathan Kew <jonathan_kew@sil.org>
// Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011 William Bader <williambader@hotmail.com>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
+// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
+// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net>
+// Copyright (C) 2011 Pino Toscano <pino@kde.org>
+// Copyright (C) 2011 Koji Otani <sho@bbr.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
@@ -44,6 +52,7 @@
#endif
#ifdef _WIN32
# include <shlobj.h>
+# include <mbstring.h>
#endif
#include "goo/gmem.h"
#include "goo/GooString.h"
@@ -63,8 +72,14 @@
#include "GlobalParams.h"
#include "GfxFont.h"
+#if WITH_FONTCONFIGURATION_FONTCONFIG
+#include <fontconfig/fontconfig.h>
+#endif
+
#ifdef _WIN32
# define strcasecmp stricmp
+#else
+# include <strings.h>
#endif
#if MULTITHREADED
@@ -140,6 +155,62 @@ DisplayFontParam::~DisplayFontParam() {
}
}
+#if ENABLE_RELOCATABLE && defined(_WIN32)
+
+/* search for data relative to where we are installed */
+
+static HMODULE hmodule;
+
+extern "C" {
+BOOL WINAPI
+DllMain (HINSTANCE hinstDLL,
+ DWORD fdwReason,
+ LPVOID lpvReserved)
+{
+ switch (fdwReason)
+ {
+ case DLL_PROCESS_ATTACH:
+ hmodule = hinstDLL;
+ break;
+ }
+
+ return TRUE;
+}
+}
+
+static char *
+get_poppler_datadir (void)
+{
+ static char retval[MAX_PATH];
+ static int beenhere = 0;
+
+ unsigned char *p;
+
+ if (beenhere)
+ return retval;
+
+ if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 20))
+ return POPPLER_DATADIR;
+
+ p = _mbsrchr ((unsigned char *) retval, '\\');
+ *p = '\0';
+ p = _mbsrchr ((unsigned char *) retval, '\\');
+ if (p) {
+ if (stricmp ((const char *) (p+1), "bin") == 0)
+ *p = '\0';
+ }
+ strcat (retval, "\\share\\poppler");
+
+ beenhere = 1;
+
+ return retval;
+}
+
+#undef POPPLER_DATADIR
+#define POPPLER_DATADIR get_poppler_datadir ()
+
+#endif
+
#ifndef PDF_PARSER_ONLY
#ifdef _WIN32
@@ -559,11 +630,6 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
UnicodeMap *map;
int i;
-#if !defined(PDF_PARSER_ONLY) && !defined(_MSC_VER)
- FcInit();
- FCcfg = FcConfigGetCurrent();
-#endif
-
#if MULTITHREADED
gInitMutex(&mutex);
gInitMutex(&unicodeMapCacheMutex);
@@ -610,6 +676,7 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
psPreload = gFalse;
psOPI = gFalse;
psASCIIHex = gFalse;
+ psBinary = gFalse;
textEncoding = new GooString("UTF-8");
#if defined(_WIN32)
textEOL = eolDOS;
@@ -636,6 +703,7 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
printCommands = gFalse;
profileCommands = gFalse;
errQuiet = gFalse;
+ splashResolution = 0.0;
cidToUnicodeCache = new CharCodeToUnicodeCache(cidToUnicodeCacheSize);
unicodeToUnicodeCache =
@@ -734,6 +802,7 @@ void GlobalParams::parseNameToUnicode(GooString *name) {
char buf[256];
int line;
Unicode u;
+ char *tokptr;
if (!(f = fopen(name->getCString(), "r"))) {
error(-1, "Couldn't open 'nameToUnicode' file '%s'",
@@ -742,8 +811,8 @@ void GlobalParams::parseNameToUnicode(GooString *name) {
}
line = 1;
while (getLine(buf, sizeof(buf), f)) {
- tok1 = strtok(buf, " \t\r\n");
- tok2 = strtok(NULL, " \t\r\n");
+ tok1 = strtok_r(buf, " \t\r\n", &tokptr);
+ tok2 = strtok_r(NULL, " \t\r\n", &tokptr);
if (tok1 && tok2) {
sscanf(tok1, "%x", &u);
nameToUnicode->add(tok2, u);
@@ -950,7 +1019,7 @@ FILE *GlobalParams::findToUnicodeFile(GooString *name) {
return NULL;
}
-#if !defined(PDF_PARSER_ONLY) && !defined(_MSC_VER)
+#if WITH_FONTCONFIGURATION_FONTCONFIG
static GBool findModifier(const char *name, const char *modifier, const char **start)
{
const char *match;
@@ -969,6 +1038,42 @@ static GBool findModifier(const char *name, const char *modifier, const char **s
}
}
+static char *getFontLang(GfxFont *font)
+{
+ char *lang;
+
+ // find the language we want the font to support
+ if (font->isCIDFont())
+ {
+ GooString *collection = ((GfxCIDFont *)font)->getCollection();
+ if (collection)
+ {
+ if (strcmp(collection->getCString(), "Adobe-GB1") == 0)
+ lang = "zh-cn"; // Simplified Chinese
+ else if (strcmp(collection->getCString(), "Adobe-CNS1") == 0)
+ lang = "zh-tw"; // Traditional Chinese
+ else if (strcmp(collection->getCString(), "Adobe-Japan1") == 0)
+ lang = "ja"; // Japanese
+ else if (strcmp(collection->getCString(), "Adobe-Japan2") == 0)
+ lang = "ja"; // Japanese
+ else if (strcmp(collection->getCString(), "Adobe-Korea1") == 0)
+ lang = "ko"; // Korean
+ else if (strcmp(collection->getCString(), "Adobe-UCS") == 0)
+ lang = "xx";
+ else if (strcmp(collection->getCString(), "Adobe-Identity") == 0)
+ lang = "xx";
+ else
+ {
+ error(-1, "Unknown CID font collection, please report to poppler bugzilla.");
+ lang = "xx";
+ }
+ }
+ else lang = "xx";
+ }
+ else lang = "xx";
+ return lang;
+}
+
static FcPattern *buildFcPattern(GfxFont *font)
{
int weight = -1,
@@ -1005,6 +1110,8 @@ static FcPattern *buildFcPattern(GfxFont *font)
weight = FC_WEIGHT_BOLD;
if (findModifier(modifiers, "Light", &start))
weight = FC_WEIGHT_LIGHT;
+ if (findModifier(modifiers, "Medium", &start))
+ weight = FC_WEIGHT_MEDIUM;
if (findModifier(modifiers, "Condensed", &start))
width = FC_WIDTH_CONDENSED;
@@ -1068,35 +1175,7 @@ static FcPattern *buildFcPattern(GfxFont *font)
default: break;
}
- // find the language we want the font to support
- if (font->isCIDFont())
- {
- GooString *collection = ((GfxCIDFont *)font)->getCollection();
- if (collection)
- {
- if (strcmp(collection->getCString(), "Adobe-GB1") == 0)
- lang = "zh-cn"; // Simplified Chinese
- else if (strcmp(collection->getCString(), "Adobe-CNS1") == 0)
- lang = "zh-tw"; // Traditional Chinese
- else if (strcmp(collection->getCString(), "Adobe-Japan1") == 0)
- lang = "ja"; // Japanese
- else if (strcmp(collection->getCString(), "Adobe-Japan2") == 0)
- lang = "ja"; // Japanese
- else if (strcmp(collection->getCString(), "Adobe-Korea1") == 0)
- lang = "ko"; // Korean
- else if (strcmp(collection->getCString(), "Adobe-UCS") == 0)
- lang = "xx";
- else if (strcmp(collection->getCString(), "Adobe-Identity") == 0)
- lang = "xx";
- else
- {
- error(-1, "Unknown CID font collection, please report to poppler bugzilla.");
- lang = "xx";
- }
- }
- else lang = "xx";
- }
- else lang = "xx";
+ lang = getFontLang(font);
p = FcPatternBuild(NULL,
FC_FAMILY, FcTypeString, family,
@@ -1116,11 +1195,7 @@ static FcPattern *buildFcPattern(GfxFont *font)
/* if you can't or don't want to use Fontconfig, you need to implement
this function for your platform. For Windows, it's in GlobalParamsWin.cc
*/
-#ifdef PDF_PARSER_ONLY
-DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
- return NULL;
-}
-#elif !defined(_MSC_VER)
+#if WITH_FONTCONFIGURATION_FONTCONFIG
DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
DisplayFontParam *dfp;
FcPattern *p=0;
@@ -1137,38 +1212,70 @@ DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
FcResult res;
FcFontSet *set;
int i;
+ FcLangSet *lb = NULL;
+ char *lang;
p = buildFcPattern(font);
if (!p)
goto fin;
- FcConfigSubstitute(FCcfg, p, FcMatchPattern);
+ FcConfigSubstitute(NULL, p, FcMatchPattern);
FcDefaultSubstitute(p);
- set = FcFontSort(FCcfg, p, FcFalse, NULL, &res);
+ set = FcFontSort(NULL, p, FcFalse, NULL, &res);
if (!set)
goto fin;
- for (i = 0; i < set->nfont; ++i)
+
+ // find the language we want the font to support
+ lang = getFontLang(font);
+ if (strcmp(lang,"xx") != 0) {
+ lb = FcLangSetCreate();
+ FcLangSetAdd(lb,(FcChar8 *)lang);
+ }
+
+ /*
+ scan twice.
+ first: fonts support the language
+ second: all fonts (fall back)
+ */
+ while (dfp == NULL)
{
- res = FcPatternGetString(set->fonts[i], FC_FILE, 0, &s);
- if (res != FcResultMatch || !s)
- continue;
- ext = strrchr((char*)s,'.');
- if (!ext)
- continue;
- if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4))
+ for (i = 0; i < set->nfont; ++i)
{
- dfp = new DisplayFontParam(fontName->copy(), displayFontTT);
- dfp->tt.fileName = new GooString((char*)s);
- FcPatternGetInteger(set->fonts[i], FC_INDEX, 0, &(dfp->tt.faceIndex));
+ res = FcPatternGetString(set->fonts[i], FC_FILE, 0, &s);
+ if (res != FcResultMatch || !s)
+ continue;
+ if (lb != NULL) {
+ FcLangSet *l;
+ res = FcPatternGetLangSet(set->fonts[i], FC_LANG, 0, &l);
+ if (res != FcResultMatch || !FcLangSetContains(l,lb)) {
+ continue;
+ }
+ }
+ ext = strrchr((char*)s,'.');
+ if (!ext)
+ continue;
+ if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4))
+ {
+ dfp = new DisplayFontParam(fontName->copy(), displayFontTT);
+ dfp->tt.fileName = new GooString((char*)s);
+ FcPatternGetInteger(set->fonts[i], FC_INDEX, 0, &(dfp->tt.faceIndex));
+ }
+ else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4))
+ {
+ dfp = new DisplayFontParam(fontName->copy(), displayFontT1);
+ dfp->t1.fileName = new GooString((char*)s);
+ }
+ else
+ continue;
+ font->dfp = dfp;
+ break;
}
- else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4))
- {
- dfp = new DisplayFontParam(fontName->copy(), displayFontT1);
- dfp->t1.fileName = new GooString((char*)s);
+ if (lb != NULL) {
+ FcLangSetDestroy(lb);
+ lb = NULL;
+ } else {
+ /* scan all fonts of the list */
+ break;
}
- else
- continue;
- font->dfp = dfp;
- break;
}
FcFontSetDestroy(set);
}
@@ -1180,6 +1287,9 @@ fin:
return dfp;
}
#endif
+#if WITH_FONTCONFIGURATION_WIN32
+#include "GlobalParamsWin.cc"
+#endif
GBool GlobalParams::getPSExpandSmaller() {
GBool f;
@@ -1329,6 +1439,15 @@ GBool GlobalParams::getPSASCIIHex() {
return ah;
}
+GBool GlobalParams::getPSBinary() {
+ GBool binary;
+
+ lockGlobalParams;
+ binary = psBinary;
+ unlockGlobalParams;
+ return binary;
+}
+
GooString *GlobalParams::getTextEncodingName() {
GooString *s;
@@ -1522,6 +1641,14 @@ GBool GlobalParams::getErrQuiet() {
return errQuiet;
}
+double GlobalParams::getSplashResolution() {
+ double r;
+ lockGlobalParams;
+ r = splashResolution;
+ unlockGlobalParams;
+ return r;
+}
+
CharCodeToUnicode *GlobalParams::getCIDToUnicode(GooString *collection) {
GooString *fileName;
CharCodeToUnicode *ctu;
@@ -1686,6 +1813,12 @@ void GlobalParams::setPSASCIIHex(GBool hex) {
unlockGlobalParams;
}
+void GlobalParams::setPSBinary(GBool binary) {
+ lockGlobalParams;
+ psBinary = binary;
+ unlockGlobalParams;
+}
+
void GlobalParams::setTextEncoding(char *encodingName) {
lockGlobalParams;
delete textEncoding;
@@ -1828,6 +1961,12 @@ void GlobalParams::setErrQuiet(GBool errQuietA) {
unlockGlobalParams;
}
+void GlobalParams::setSplashResolution(double SplashResolutionA) {
+ lockGlobalParams;
+ splashResolution = SplashResolutionA;
+ unlockGlobalParams;
+}
+
void GlobalParams::addSecurityHandler(XpdfSecurityHandler *handler) {
#ifdef ENABLE_PLUGINS
lockGlobalParams;
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.h
index feec7125375..3a08a2f1a02 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParams.h
@@ -13,14 +13,16 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005, 2007-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2009 Jonathan Kew <jonathan_kew@sil.org>
// Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011 William Bader <williambader@hotmail.com>
+// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2011 Pino Toscano <pino@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -37,9 +39,6 @@
#include <assert.h>
#include "poppler-config.h"
#include <stdio.h>
-#if !defined(PDF_PARSER_ONLY) && !defined(_MSC_VER)
-#include <fontconfig/fontconfig.h>
-#endif
#include "goo/gtypes.h"
#include "CharTypes.h"
@@ -171,7 +170,7 @@ public:
void setBaseDir(char *dir);
-#if !defined(PDF_PARSER_ONLY) && !defined(_MSC_VER)
+#if WITH_FONTCONFIGURATION_WIN32
void setupBaseFonts(char *dir);
#endif
@@ -200,6 +199,7 @@ public:
GBool getPSPreload();
GBool getPSOPI();
GBool getPSASCIIHex();
+ GBool getPSBinary();
GooString *getTextEncodingName();
EndOfLineKind getTextEOL();
GBool getTextPageBreaks();
@@ -220,6 +220,7 @@ public:
GBool getPrintCommands();
GBool getProfileCommands();
GBool getErrQuiet();
+ double getSplashResolution();
CharCodeToUnicode *getCIDToUnicode(GooString *collection);
CharCodeToUnicode *getUnicodeToUnicode(GooString *fontName);
@@ -245,6 +246,7 @@ public:
void setPSPreload(GBool preload);
void setPSOPI(GBool opi);
void setPSASCIIHex(GBool hex);
+ void setPSBinary(GBool binary);
void setTextEncoding(char *encodingName);
GBool setTextEOL(char *s);
void setTextPageBreaks(GBool pageBreaks);
@@ -264,6 +266,7 @@ public:
void setPrintCommands(GBool printCommandsA);
void setProfileCommands(GBool profileCommandsA);
void setErrQuiet(GBool errQuietA);
+ void setSplashResolution(double splashResolutionA);
//----- security handlers
@@ -328,6 +331,7 @@ private:
// memory
GBool psOPI; // generate PostScript OPI comments?
GBool psASCIIHex; // use ASCIIHex instead of ASCII85?
+ GBool psBinary; // use binary instead of hex
GooString *textEncoding; // encoding (unicodeMap) to use for text
// output
EndOfLineKind textEOL; // type of EOL marker to use for text
@@ -350,16 +354,13 @@ private:
GBool printCommands; // print the drawing commands
GBool profileCommands; // profile the drawing commands
GBool errQuiet; // suppress error messages?
+ double splashResolution; // resolution when rasterizing images
CharCodeToUnicodeCache *cidToUnicodeCache;
CharCodeToUnicodeCache *unicodeToUnicodeCache;
UnicodeMapCache *unicodeMapCache;
CMapCache *cMapCache;
-#if !defined (PDF_PARSER_ONLY) && !defined(_MSC_VER)
- FcConfig *FCcfg;
-#endif
-
#ifdef ENABLE_PLUGINS
GList *plugins; // list of plugins [Plugin]
GList *securityHandlers; // list of loaded security handlers
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParamsWin.cc
index 19ea5465398..f989fb89434 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/GlobalParamsWin.cc
@@ -1,18 +1,25 @@
/* Written by Krzysztof Kowalczyk (http://blog.kowalczyk.info)
but mostly based on xpdf code.
+
+ // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
TODO: instead of a fixed mapping defined in displayFontTab, it could
scan the whole fonts directory, parse TTF files and build font
description for all fonts available in Windows. That's how MuPDF works.
*/
+#ifndef PACKAGE_NAME
#include <config.h>
+#endif
#ifdef USE_GCC_PRAGMAS
#pragma implementation
#endif
#include <windows.h>
+#if !(_WIN32_IE >= 0x0500)
+#error "_WIN32_IE must be defined >= 0x0500 for SHGFP_TYPE_CURRENT from shlobj.h"
+#endif
#include <shlobj.h>
#include <string.h>
#include <stdio.h>
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.cc
new file mode 100644
index 00000000000..7a1e4ee9968
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.cc
@@ -0,0 +1,442 @@
+//========================================================================
+//
+// Hints.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010, 2011 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010 Pino Toscano <pino@kde.org>
+//
+//========================================================================
+
+#include <config.h>
+
+#include "Hints.h"
+
+#include "Linearization.h"
+#include "Object.h"
+#include "Stream.h"
+#include "XRef.h"
+#include "Parser.h"
+#include "Lexer.h"
+#include "SecurityHandler.h"
+
+#include <limits.h>
+
+//------------------------------------------------------------------------
+// Hints
+//------------------------------------------------------------------------
+
+Hints::Hints(BaseStream *str, Linearization *linearization, XRef *xref, SecurityHandler *secHdlr)
+{
+ mainXRefEntriesOffset = linearization->getMainXRefEntriesOffset();
+ nPages = linearization->getNumPages();
+ pageFirst = linearization->getPageFirst();
+ pageEndFirst = linearization->getEndFirst();
+ pageObjectFirst = linearization->getObjectNumberFirst();
+ if (pageObjectFirst < 0 || pageObjectFirst >= xref->getNumObjects()) {
+ error(-1,
+ "Invalid reference for first page object (%d) in linearization table ",
+ pageObjectFirst);
+ pageObjectFirst = 0;
+ }
+ pageOffsetFirst = xref->getEntry(pageObjectFirst)->offset;
+
+ if (nPages >= INT_MAX / (int)sizeof(Guint)) {
+ error(-1, "Invalid number of pages (%d) for hints table", nPages);
+ nPages = 0;
+ }
+ nObjects = (Guint *) gmallocn_checkoverflow(nPages, sizeof(Guint));
+ pageObjectNum = (int *) gmallocn_checkoverflow(nPages, sizeof(int));
+ xRefOffset = (Guint *) gmallocn_checkoverflow(nPages, sizeof(Guint));
+ pageLength = (Guint *) gmallocn_checkoverflow(nPages, sizeof(Guint));
+ pageOffset = (Guint *) gmallocn_checkoverflow(nPages, sizeof(Guint));
+ numSharedObject = (Guint *) gmallocn_checkoverflow(nPages, sizeof(Guint));
+ sharedObjectId = (Guint **) gmallocn_checkoverflow(nPages, sizeof(Guint*));
+ if (!nObjects || !pageObjectNum || !xRefOffset || !pageLength || !pageOffset ||
+ !numSharedObject || !sharedObjectId) {
+ error(-1, "Failed to allocate memory for hints tabel");
+ nPages = 0;
+ }
+
+ memset(numSharedObject, 0, nPages * sizeof(Guint));
+ memset(pageObjectNum, 0, nPages * sizeof(int));
+
+ nSharedGroups = 0;
+ groupLength = NULL;
+ groupOffset = NULL;
+ groupHasSignature = NULL;
+ groupNumObjects = NULL;
+ groupXRefOffset = NULL;
+
+ readTables(str, linearization, xref, secHdlr);
+}
+
+Hints::~Hints()
+{
+ gfree(nObjects);
+ gfree(pageObjectNum);
+ gfree(xRefOffset);
+ gfree(pageLength);
+ gfree(pageOffset);
+ for (int i=0; i< nPages; i++) {
+ if (numSharedObject[i]) {
+ gfree(sharedObjectId[i]);
+ }
+ }
+ gfree(sharedObjectId);
+ gfree(numSharedObject);
+
+ gfree(groupLength);
+ gfree(groupOffset);
+ gfree(groupHasSignature);
+ gfree(groupNumObjects);
+ gfree(groupXRefOffset);
+}
+
+void Hints::readTables(BaseStream *str, Linearization *linearization, XRef *xref, SecurityHandler *secHdlr)
+{
+ hintsOffset = linearization->getHintsOffset();
+ hintsLength = linearization->getHintsLength();
+ hintsOffset2 = linearization->getHintsOffset2();
+ hintsLength2 = linearization->getHintsLength2();
+
+ Parser *parser;
+ Object obj;
+
+ int bufLength = hintsLength + hintsLength2;
+
+ std::vector<char> buf(bufLength);
+ char *p = &buf[0];
+
+ obj.initNull();
+ Stream *s = str->makeSubStream(hintsOffset, gFalse, hintsLength, &obj);
+ s->reset();
+ for (Guint i=0; i < hintsLength; i++) { *p++ = s->getChar(); }
+ delete s;
+
+ if (hintsOffset2 && hintsLength2) {
+ obj.initNull();
+ s = str->makeSubStream(hintsOffset2, gFalse, hintsLength2, &obj);
+ s->reset();
+ for (Guint i=0; i < hintsLength2; i++) { *p++ = s->getChar(); }
+ delete s;
+ }
+
+ obj.initNull();
+ MemStream *memStream = new MemStream (&buf[0], 0, bufLength, &obj);
+
+ obj.initNull();
+ parser = new Parser(xref, new Lexer(xref, memStream), gTrue);
+
+ int num, gen;
+ if (parser->getObj(&obj)->isInt() &&
+ (num = obj.getInt(), obj.free(), parser->getObj(&obj)->isInt()) &&
+ (gen = obj.getInt(), obj.free(), parser->getObj(&obj)->isCmd("obj")) &&
+ (obj.free(), parser->getObj(&obj,
+ secHdlr ? secHdlr->getFileKey() : (Guchar *)NULL,
+ secHdlr ? secHdlr->getEncAlgorithm() : cryptRC4,
+ secHdlr ? secHdlr->getFileKeyLength() : 0,
+ num, gen)->isStream())) {
+ Stream *hintsStream = obj.getStream();
+ Dict *hintsDict = obj.streamGetDict();
+
+ int sharedStreamOffset = 0;
+ if (hintsDict->lookupInt("S", NULL, &sharedStreamOffset) &&
+ sharedStreamOffset > 0) {
+
+ hintsStream->reset();
+ readPageOffsetTable(hintsStream);
+
+ hintsStream->reset();
+ for (int i=0; i<sharedStreamOffset; i++) hintsStream->getChar();
+ readSharedObjectsTable(hintsStream);
+ } else {
+ error(-1, "Invalid shared object hint table offset");
+ }
+ } else {
+ error(-1, "Failed parsing hints table object");
+ }
+ obj.free();
+
+ delete parser;
+}
+
+void Hints::readPageOffsetTable(Stream *str)
+{
+ if (nPages < 1) {
+ error(-1, "Invalid number of pages reading page offset hints table");
+ return;
+ }
+
+ inputBits = 0; // reset on byte boundary.
+
+ nObjectLeast = readBits(32, str);
+
+ objectOffsetFirst = readBits(32, str);
+ if (objectOffsetFirst >= hintsOffset) objectOffsetFirst += hintsLength;
+
+ nBitsDiffObjects = readBits(16, str);
+
+ pageLengthLeast = readBits(32, str);
+
+ nBitsDiffPageLength = readBits(16, str);
+
+ OffsetStreamLeast = readBits(32, str);
+
+ nBitsOffsetStream = readBits(16, str);
+
+ lengthStreamLeast = readBits(32, str);
+
+ nBitsLengthStream = readBits(16, str);
+
+ nBitsNumShared = readBits(16, str);
+
+ nBitsShared = readBits(16, str);
+
+ nBitsNumerator = readBits(16, str);
+
+ denominator = readBits(16, str);
+
+ for (int i=0; i<nPages; i++) {
+ nObjects[i] = nObjectLeast + readBits(nBitsDiffObjects, str);
+ }
+
+ nObjects[0] = 0;
+ xRefOffset[0] = mainXRefEntriesOffset + 20;
+ for (int i=1; i<nPages; i++) {
+ xRefOffset[i] = xRefOffset[i-1] + 20*nObjects[i-1];
+ }
+
+ pageObjectNum[0] = 1;
+ for (int i=1; i<nPages; i++) {
+ pageObjectNum[i] = pageObjectNum[i-1] + nObjects[i-1];
+ }
+ pageObjectNum[0] = pageObjectFirst;
+
+ inputBits = 0; // reset on byte boundary. Not in specs!
+ for (int i=0; i<nPages; i++) {
+ pageLength[i] = pageLengthLeast + readBits(nBitsDiffPageLength, str);
+ }
+
+ inputBits = 0; // reset on byte boundary. Not in specs!
+ numSharedObject[0] = readBits(nBitsNumShared, str);
+ numSharedObject[0] = 0; // Do not trust the read value to be 0.
+ sharedObjectId[0] = NULL;
+ for (int i=1; i<nPages; i++) {
+ numSharedObject[i] = readBits(nBitsNumShared, str);
+ if (numSharedObject[i] >= INT_MAX / (int)sizeof(Guint)) {
+ error(-1, "Invalid number of shared objects");
+ numSharedObject[i] = 0;
+ return;
+ }
+ sharedObjectId[i] = (Guint *) gmallocn_checkoverflow(numSharedObject[i], sizeof(Guint));
+ if (numSharedObject[i] && !sharedObjectId[i]) {
+ error(-1, "Failed to allocate memory for shared object IDs");
+ numSharedObject[i] = 0;
+ return;
+ }
+ }
+
+ inputBits = 0; // reset on byte boundary. Not in specs!
+ for (int i=1; i<nPages; i++) {
+ for (Guint j=0; j < numSharedObject[i]; j++) {
+ sharedObjectId[i][j] = readBits(nBitsShared, str);
+ }
+ }
+
+ pageOffset[0] = pageOffsetFirst;
+ // find pageOffsets.
+ for (int i=1; i<nPages; i++) {
+ pageOffset[i] = pageOffset[i-1] + pageLength[i-1];
+ }
+
+}
+
+void Hints::readSharedObjectsTable(Stream *str)
+{
+ inputBits = 0; // reset on byte boundary.
+
+ Guint firstSharedObjectNumber = readBits(32, str);
+
+ Guint firstSharedObjectOffset = readBits(32, str);
+ firstSharedObjectOffset += hintsLength;
+
+ Guint nSharedGroupsFirst = readBits(32, str);
+
+ Guint nSharedGroups = readBits(32, str);
+
+ Guint nBitsNumObjects = readBits(16, str);
+
+ Guint groupLengthLeast = readBits(32, str);
+
+ Guint nBitsDiffGroupLength = readBits(16, str);
+
+ if ((!nSharedGroups) || (nSharedGroups >= INT_MAX / (int)sizeof(Guint))) {
+ error(-1, "Invalid number of shared object groups");
+ nSharedGroups = 0;
+ return;
+ }
+ if ((!nSharedGroupsFirst) || (nSharedGroupsFirst > nSharedGroups)) {
+ error(-1, "Invalid number of first page shared object groups");
+ nSharedGroupsFirst = nSharedGroups;
+ }
+
+ groupLength = (Guint *) gmallocn_checkoverflow(nSharedGroups, sizeof(Guint));
+ groupOffset = (Guint *) gmallocn_checkoverflow(nSharedGroups, sizeof(Guint));
+ groupHasSignature = (Guint *) gmallocn_checkoverflow(nSharedGroups, sizeof(Guint));
+ groupNumObjects = (Guint *) gmallocn_checkoverflow(nSharedGroups, sizeof(Guint));
+ groupXRefOffset = (Guint *) gmallocn_checkoverflow(nSharedGroups, sizeof(Guint));
+ if (!groupLength || !groupOffset || !groupHasSignature ||
+ !groupNumObjects || !groupXRefOffset) {
+ error(-1, "Failed to allocate memory for shared object groups");
+ nSharedGroups = 0;
+ return;
+ }
+
+ inputBits = 0; // reset on byte boundary. Not in specs!
+ for (Guint i=0; i<nSharedGroups; i++) {
+ groupLength[i] = groupLengthLeast + readBits(nBitsDiffGroupLength, str);
+ }
+
+ groupOffset[0] = objectOffsetFirst;
+ for (Guint i=1; i<nSharedGroupsFirst; i++) {
+ groupOffset[i] = groupOffset[i-1] + groupLength[i-1];
+ }
+ if (nSharedGroups > nSharedGroupsFirst ) {
+ groupOffset[nSharedGroupsFirst] = firstSharedObjectOffset;
+ for (Guint i=nSharedGroupsFirst+1; i<nSharedGroups; i++) {
+ groupOffset[i] = groupOffset[i-1] + groupLength[i-1];
+ }
+ }
+
+ inputBits = 0; // reset on byte boundary. Not in specs!
+ for (Guint i=0; i<nSharedGroups; i++) {
+ groupHasSignature[i] = readBits(1, str);
+ }
+
+ inputBits = 0; // reset on byte boundary. Not in specs!
+ for (Guint i=0; i<nSharedGroups; i++) {
+ if (groupHasSignature[i]) {
+ readBits(128, str);
+ }
+ }
+
+ inputBits = 0; // reset on byte boundary. Not in specs!
+ for (Guint i=0; i<nSharedGroups; i++) {
+ groupNumObjects[i] =
+ nBitsNumObjects ? 1 + readBits(nBitsNumObjects, str) : 1;
+ }
+
+ for (Guint i=0; i<nSharedGroupsFirst; i++) {
+ groupNumObjects[i] = 0;
+ groupXRefOffset[i] = 0;
+ }
+ if (nSharedGroups > nSharedGroupsFirst ) {
+ groupXRefOffset[nSharedGroupsFirst] =
+ mainXRefEntriesOffset + 20*firstSharedObjectNumber;
+ for (Guint i=nSharedGroupsFirst+1; i<nSharedGroups; i++) {
+ groupXRefOffset[i] = groupXRefOffset[i-1] + 20*groupNumObjects[i-1];
+ }
+ }
+}
+
+Guint Hints::getPageOffset(int page)
+{
+ if ((page < 1) || (page > nPages)) return 0;
+
+ if (page-1 > pageFirst)
+ return pageOffset[page-1];
+ else if (page-1 < pageFirst)
+ return pageOffset[page];
+ else
+ return pageOffset[0];
+}
+
+std::vector<ByteRange>* Hints::getPageRanges(int page)
+{
+ if ((page < 1) || (page > nPages)) return NULL;
+
+ int idx;
+ if (page-1 > pageFirst)
+ idx = page-1;
+ else if (page-1 < pageFirst)
+ idx = page;
+ else
+ idx = 0;
+
+ ByteRange pageRange;
+ std::vector<ByteRange> *v = new std::vector<ByteRange>;
+
+ pageRange.offset = pageOffset[idx];
+ pageRange.length = pageLength[idx];
+ v->push_back(pageRange);
+
+ pageRange.offset = xRefOffset[idx];
+ pageRange.length = 20*nObjects[idx];
+ v->push_back(pageRange);
+
+ for (Guint j=0; j<numSharedObject[idx]; j++) {
+ Guint k = sharedObjectId[idx][j];
+
+ pageRange.offset = groupOffset[k];
+ pageRange.length = groupLength[k];
+ v->push_back(pageRange);
+
+ pageRange.offset = groupXRefOffset[k];
+ pageRange.length = 20*groupNumObjects[k];
+ v->push_back(pageRange);
+ }
+
+ return v;
+}
+
+Guint Hints::readBit(Stream *str)
+{
+ Guint bit;
+ int c;
+
+ if (inputBits == 0) {
+ if ((c = str->getChar()) == EOF) {
+ return (Guint) -1;
+ }
+ bitsBuffer = c;
+ inputBits = 8;
+ }
+ bit = (bitsBuffer >> (inputBits - 1)) & 1;
+ --inputBits;
+ return bit;
+}
+
+Guint Hints::readBits(int n, Stream *str)
+{
+ Guint bit, bits;
+
+ if (n < 0) return (Guint)-1;
+ if (n == 0) return 0;
+
+ if (n == 1)
+ return readBit(str);
+
+ bit = (readBit(str) << (n-1));
+ if (bit == (Guint) -1)
+ return (Guint)-1;
+
+ bits = readBits(n-1, str);
+ if (bits == (Guint) -1)
+ return (Guint)-1;
+
+ return bit | bits;
+}
+
+int Hints::getPageObjectNum(int page) {
+ if ((page < 1) || (page > nPages)) return 0;
+
+ if (page-1 > pageFirst)
+ return pageObjectNum[page-1];
+ else if (page-1 < pageFirst)
+ return pageObjectNum[page];
+ else
+ return pageObjectNum[0];
+}
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.h
new file mode 100644
index 00000000000..d598e796beb
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Hints.h
@@ -0,0 +1,95 @@
+//========================================================================
+//
+// Hints.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#ifndef HINTS_H
+#define HINTS_H
+
+#include <string.h>
+#include "goo/gtypes.h"
+#include <vector>
+#include "PDFDoc.h"
+
+class Stream;
+class BaseStream;
+class Linearization;
+class XRef;
+
+//------------------------------------------------------------------------
+// Hints
+//------------------------------------------------------------------------
+
+class Hints {
+public:
+
+ Hints(BaseStream *str, Linearization *linearization, XRef *xref, SecurityHandler *secHdlr);
+ ~Hints();
+
+ int getPageObjectNum(int page);
+ Guint getPageOffset(int page);
+ std::vector<ByteRange>* getPageRanges(int page);
+
+private:
+
+ void readTables(BaseStream *str, Linearization *linearization, XRef *xref, SecurityHandler *secHdlr);
+ void readPageOffsetTable(Stream *str);
+ void readSharedObjectsTable(Stream *str);
+
+ Guint readBit(Stream *str);
+ Guint readBits(int n, Stream *str);
+
+ Guint hintsOffset;
+ Guint hintsLength;
+ Guint hintsOffset2;
+ Guint hintsLength2;
+ Guint mainXRefEntriesOffset;
+
+ int nPages;
+ int pageFirst;
+ int pageObjectFirst;
+ Guint pageOffsetFirst;
+ Guint pageEndFirst;
+ int objectNumberFirst;
+
+ Guint nObjectLeast;
+ Guint objectOffsetFirst;
+ Guint nBitsDiffObjects;
+ Guint pageLengthLeast;
+ Guint nBitsDiffPageLength;
+ Guint OffsetStreamLeast;
+ Guint nBitsOffsetStream;
+ Guint lengthStreamLeast;
+ Guint nBitsLengthStream;
+ Guint nBitsNumShared;
+ Guint nBitsShared;
+ Guint nBitsNumerator;
+ Guint denominator;
+
+ Guint *nObjects;
+ int *pageObjectNum;
+ Guint *xRefOffset;
+ Guint *pageLength;
+ Guint *pageOffset;
+ Guint *numSharedObject;
+ Guint **sharedObjectId;
+
+ Guint nSharedGroups;
+ Guint *groupLength;
+ Guint *groupOffset;
+ Guint *groupHasSignature;
+ Guint *groupNumObjects;
+ Guint *groupXRefOffset;
+
+ int inputBits;
+ char bitsBuffer;
+
+};
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/JArithmeticDecoder.cc
index ec0778e64f4..ec0778e64f4 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/JArithmeticDecoder.h
index 0f091b7bd84..0f091b7bd84 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/JBIG2Stream.cc
index 97994bd2cb8..bfb1994ed9d 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/JBIG2Stream.cc
@@ -15,8 +15,9 @@
//
// Copyright (C) 2006 Raj Kumar <rkumar@archive.org>
// Copyright (C) 2006 Paul Walmsley <paul@booyaka.com>
-// Copyright (C) 2006-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 David Benjamin <davidben@mit.edu>
+// Copyright (C) 2011 Edward Jiang <ejiang@google.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
@@ -742,13 +743,18 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint x, Guint y, Guint wA, Guint hA) {
Guint xx, yy;
slice = new JBIG2Bitmap(0, wA, hA);
- slice->clearToZero();
- for (yy = 0; yy < hA; ++yy) {
- for (xx = 0; xx < wA; ++xx) {
- if (getPixel(x + xx, y + yy)) {
- slice->setPixel(xx, yy);
+ if (slice->isOk()) {
+ slice->clearToZero();
+ for (yy = 0; yy < hA; ++yy) {
+ for (xx = 0; xx < wA; ++xx) {
+ if (getPixel(x + xx, y + yy)) {
+ slice->setPixel(xx, yy);
+ }
}
}
+ } else {
+ delete slice;
+ slice = NULL;
}
return slice;
}
@@ -2283,7 +2289,7 @@ JBIG2Bitmap *JBIG2Stream::readTextRegion(GBool huff, GBool refine,
s = sFirst;
// read the instances
- while (1) {
+ while (inst < numInstances) {
// T value
if (strips == 1) {
@@ -2456,6 +2462,9 @@ void JBIG2Stream::readPatternDictSeg(Guint segNum, Guint length) {
templ, gFalse, gFalse, NULL,
atx, aty, length - 7);
+ if (!bitmap)
+ return;
+
// create the pattern dict object
patternDict = new JBIG2PatternDict(segNum, grayMax + 1);
@@ -3224,8 +3233,12 @@ void JBIG2Stream::readGenericRefinementRegionSeg(Guint segNum, GBool imm,
// store the region bitmap
} else {
- bitmap->setSegNum(segNum);
- segments->append(bitmap);
+ if (bitmap) {
+ bitmap->setSegNum(segNum);
+ segments->append(bitmap);
+ } else {
+ error(curStr->getPos(), "readGenericRefinementRegionSeg with null bitmap");
+ }
}
// delete the referenced bitmap
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/JBIG2Stream.h
index 23d3d92d961..23d3d92d961 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/JPEG2000Stream.cc
index 3b301f75222..b7a29bf2285 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/JPEG2000Stream.cc
@@ -4,7 +4,8 @@
//
// A JPX stream decoder using OpenJPEG
//
-// Copyright 2008, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright 2008-2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
//
// Licensed under GPLv2 or later
//
@@ -17,6 +18,8 @@ JPXStream::JPXStream(Stream *strA) : FilterStream(strA)
inited = gFalse;
image = NULL;
dinfo = NULL;
+ npixels = 0;
+ ncomps = 0;
}
JPXStream::~JPXStream() {
@@ -26,12 +29,14 @@ JPXStream::~JPXStream() {
void JPXStream::reset() {
counter = 0;
+ ccounter = 0;
}
void JPXStream::close() {
if (image != NULL) {
opj_image_destroy(image);
image = NULL;
+ npixels = 0;
}
if (dinfo != NULL) {
opj_destroy_decompress(dinfo);
@@ -40,48 +45,70 @@ void JPXStream::close() {
}
int JPXStream::getPos() {
- return counter;
+ return counter * ncomps + ccounter;
+}
+
+int JPXStream::getChars(int nChars, Guchar *buffer) {
+ for (int i = 0; i < nChars; ++i) {
+ const int c = doGetChar();
+ if (likely(c != EOF)) buffer[i] = c;
+ else return i;
+ }
+ return nChars;
}
int JPXStream::getChar() {
- int result = lookChar();
- ++counter;
- return result;
+ return doGetChar();
}
-#define BUFFER_INCREASE 4096
+#define BUFFER_INITIAL_SIZE 4096
void JPXStream::init()
{
Object oLen;
if (getDict()) getDict()->lookup("Length", &oLen);
- int bufSize = BUFFER_INCREASE;
+ int bufSize = BUFFER_INITIAL_SIZE;
if (oLen.isInt()) bufSize = oLen.getInt();
oLen.free();
- unsigned char *buf = (unsigned char*)gmallocn(bufSize, sizeof(unsigned char));
- int index = 0;
-
- str->reset();
- int c = str->getChar();
- while(c != EOF)
- {
- if (index >= bufSize)
- {
- bufSize += BUFFER_INCREASE;
- buf = (unsigned char*)greallocn(buf, bufSize, sizeof(unsigned char));
- }
- buf[index] = c;
- ++index;
- c = str->getChar();
- }
-
- init2(buf, index, CODEC_JP2);
-
+
+ int length = 0;
+ unsigned char *buf = str->toUnsignedChars(&length, bufSize);
+ init2(buf, length, CODEC_JP2);
free(buf);
+ if (image) {
+ npixels = image->comps[0].w * image->comps[0].h;
+ ncomps = image->numcomps;
+ for (int component = 0; component < ncomps; component++) {
+ if (image->comps[component].data == NULL) {
+ close();
+ break;
+ }
+ unsigned char *cdata = (unsigned char *)image->comps[component].data;
+ int adjust = 0;
+ if (image->comps[component].prec > 8)
+ adjust = image->comps[component].prec - 8;
+ int sgndcorr = 0;
+ if (image->comps[component].sgnd)
+ sgndcorr = 1 << (image->comps[0].prec - 1);
+ for (int i = 0; i < npixels; i++) {
+ int r = image->comps[component].data[i];
+ r += sgndcorr;
+ if (adjust) {
+ r = (r >> adjust)+((r >> (adjust-1))%2);
+ if (unlikely(r > 255))
+ r = 255;
+ }
+ *(cdata++) = r;
+ }
+ }
+ } else
+ npixels = 0;
+
counter = 0;
+ ccounter = 0;
inited = gTrue;
}
@@ -143,30 +170,7 @@ error:
}
int JPXStream::lookChar() {
- if (inited == gFalse) init();
-
- if (!image) return EOF;
-
- int w = image->comps[0].w;
- int h = image->comps[0].h;
-
- int y = (counter / image->numcomps) / w;
- int x = (counter / image->numcomps) % w;
- if (y >= h) return EOF;
-
- int component = counter % image->numcomps;
-
- int adjust = 0;
- if (image->comps[component].prec > 8) {
- adjust = image->comps[component].prec - 8;
- }
-
- int r = image->comps[component].data[y * w + x];
- r += (image->comps[component].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-
- unsigned char rc = (unsigned char) ((r >> adjust)+((r >> (adjust-1))%2));
-
- return rc;
+ return doLookChar();
}
GooString *JPXStream::getPSFilter(int psLevel, char *indent) {
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/JPEG2000Stream.h
index ea32093bfd6..bb4085a63f7 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/JPEG2000Stream.h
@@ -4,7 +4,8 @@
//
// A JPX stream decoder using OpenJPEG
//
-// Copyright 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright 2008, 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
//
// Licensed under GPLv2 or later
//
@@ -39,9 +40,32 @@ private:
void init();
void init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format);
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
+
+ inline int doGetChar() {
+ int result = doLookChar();
+ if (++ccounter == ncomps) {
+ ccounter = 0;
+ ++counter;
+ }
+ return result;
+ }
+
+ inline int doLookChar() {
+ if (unlikely(inited == gFalse)) init();
+
+ if (unlikely(counter >= npixels)) return EOF;
+
+ return ((unsigned char *)image->comps[ccounter].data)[counter];
+ }
+
opj_image_t *image;
opj_dinfo_t *dinfo;
int counter;
+ int ccounter;
+ int npixels;
+ int ncomps;
GBool inited;
};
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/JPXStream.cc
index 3b8c05d27b0..3b8c05d27b0 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/JPXStream.h
index 2e0bda32eb3..2e0bda32eb3 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Lexer.cc
index 5962185490b..bdc6d08861c 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Lexer.cc
@@ -13,8 +13,9 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+// Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -153,10 +154,11 @@ int Lexer::lookChar() {
Object *Lexer::getObj(Object *obj, int objNum) {
char *p;
int c, c2;
- GBool comment, neg, done, overflownInteger;
+ GBool comment, neg, done, overflownInteger, overflownUnsignedInteger;
int numParen;
int xi;
- double xf, scale;
+ unsigned int xui = 0;
+ double xf = 0, scale;
GooString *s;
int n, m;
@@ -182,15 +184,16 @@ Object *Lexer::getObj(Object *obj, int objNum) {
// number
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
- case '-': case '.':
+ case '+': case '-': case '.':
overflownInteger = gFalse;
+ overflownUnsignedInteger = gFalse;
neg = gFalse;
xi = 0;
if (c == '-') {
neg = gTrue;
} else if (c == '.') {
goto doReal;
- } else {
+ } else if (c != '+') {
xi = c - '0';
}
while (1) {
@@ -198,12 +201,22 @@ Object *Lexer::getObj(Object *obj, int objNum) {
if (isdigit(c)) {
getChar();
if (unlikely(overflownInteger)) {
- xf = xf * 10.0 + (c - '0');
+ if (overflownUnsignedInteger) {
+ xf = xf * 10.0 + (c - '0');
+ } else {
+ overflownUnsignedInteger = gTrue;
+ xf = xui * 10.0 + (c - '0');
+ }
} else {
if (unlikely(xi > IntegerSafeLimit) &&
(xi > (INT_MAX - (c - '0')) / 10.0)) {
overflownInteger = gTrue;
- xf = xi * 10.0 + (c - '0');
+ if (xi > (UINT_MAX - (c - '0')) / 10.0) {
+ overflownUnsignedInteger = gTrue;
+ xf = xi * 10.0 + (c - '0');
+ } else {
+ xui = (unsigned int)(xi * 10.0 + (c - '0'));
+ }
} else {
xi = xi * 10 + (c - '0');
}
@@ -218,7 +231,11 @@ Object *Lexer::getObj(Object *obj, int objNum) {
if (neg)
xi = -xi;
if (unlikely(overflownInteger)) {
- obj->initError();
+ if (overflownUnsignedInteger) {
+ obj->initError();
+ } else {
+ obj->initUint(xui);
+ }
} else {
obj->initInt(xi);
}
@@ -226,6 +243,8 @@ Object *Lexer::getObj(Object *obj, int objNum) {
doReal:
if (likely(!overflownInteger)) {
xf = xi;
+ } else if (!overflownUnsignedInteger) {
+ xf = xui;
}
scale = 0.1;
while (1) {
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Lexer.h
index a0fcc6a2d98..284479dfbfa 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Lexer.h
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006, 2007 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2007, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
//
// To see a description of the changes please see the Changelog file that
@@ -64,16 +64,16 @@ public:
// Get stream.
Stream *getStream()
- { return curStr.isNone() ? (Stream *)NULL : curStr.getStream(); }
+ { return curStr.isStream() ? curStr.getStream() : (Stream *)NULL; }
// Get current position in file. This is only used for error
// messages, so it returns an int instead of a Guint.
int getPos()
- { return curStr.isNone() ? -1 : (int)curStr.streamGetPos(); }
+ { return curStr.isStream() ? (int)curStr.streamGetPos() : -1; }
// Set position in file.
void setPos(Guint pos, int dir = 0)
- { if (!curStr.isNone()) curStr.streamSetPos(pos, dir); }
+ { if (curStr.isStream()) curStr.streamSetPos(pos, dir); }
// Returns true if <c> is a whitespace character.
static GBool isSpace(int c);
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.cc
new file mode 100644
index 00000000000..73dc5adc3b3
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.cc
@@ -0,0 +1,222 @@
+//========================================================================
+//
+// Linearization.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+//
+//========================================================================
+
+#include "Linearization.h"
+#include "Parser.h"
+#include "Lexer.h"
+
+//------------------------------------------------------------------------
+// Linearization
+//------------------------------------------------------------------------
+
+Linearization::Linearization (BaseStream *str)
+{
+ Parser *parser;
+ Object obj1, obj2, obj3, obj5;
+
+ linDict.initNull();
+
+ str->reset();
+ obj1.initNull();
+ parser = new Parser(NULL,
+ new Lexer(NULL, str->makeSubStream(str->getStart(), gFalse, 0, &obj1)),
+ gFalse);
+ parser->getObj(&obj1);
+ parser->getObj(&obj2);
+ parser->getObj(&obj3);
+ parser->getObj(&linDict);
+ if (obj1.isInt() && obj2.isInt() && obj3.isCmd("obj") && linDict.isDict()) {
+ linDict.dictLookup("Linearized", &obj5);
+ if (!(obj5.isNum() && obj5.getNum() > 0)) {
+ linDict.free();
+ linDict.initNull();
+ }
+ obj5.free();
+ }
+ obj3.free();
+ obj2.free();
+ obj1.free();
+ delete parser;
+}
+
+Linearization:: ~Linearization()
+{
+ linDict.free();
+}
+
+Guint Linearization::getLength()
+{
+ if (!linDict.isDict()) return 0;
+
+ int length;
+ if (linDict.getDict()->lookupInt("L", NULL, &length) &&
+ length > 0) {
+ return length;
+ } else {
+ error(-1, "Length in linearization table is invalid");
+ return 0;
+ }
+}
+
+Guint Linearization::getHintsOffset()
+{
+ int hintsOffset;
+
+ Object obj1, obj2;
+ if (linDict.isDict() &&
+ linDict.dictLookup("H", &obj1)->isArray() &&
+ obj1.arrayGetLength()>=2 &&
+ obj1.arrayGet(0, &obj2)->isInt() &&
+ obj2.getInt() > 0) {
+ hintsOffset = obj2.getInt();
+ } else {
+ error(-1, "Hints table offset in linearization table is invalid");
+ hintsOffset = 0;
+ }
+ obj2.free();
+ obj1.free();
+
+ return hintsOffset;
+}
+
+Guint Linearization::getHintsLength()
+{
+ int hintsLength;
+
+ Object obj1, obj2;
+ if (linDict.isDict() &&
+ linDict.dictLookup("H", &obj1)->isArray() &&
+ obj1.arrayGetLength()>=2 &&
+ obj1.arrayGet(1, &obj2)->isInt() &&
+ obj2.getInt() > 0) {
+ hintsLength = obj2.getInt();
+ } else {
+ error(-1, "Hints table length in linearization table is invalid");
+ hintsLength = 0;
+ }
+ obj2.free();
+ obj1.free();
+
+ return hintsLength;
+}
+
+Guint Linearization::getHintsOffset2()
+{
+ int hintsOffset2 = 0; // default to 0
+
+ Object obj1, obj2;
+ if (linDict.isDict() &&
+ linDict.dictLookup("H", &obj1)->isArray() &&
+ obj1.arrayGetLength()>=4) {
+ if (obj1.arrayGet(2, &obj2)->isInt() &&
+ obj2.getInt() > 0) {
+ hintsOffset2 = obj2.getInt();
+ } else {
+ error(-1, "Second hints table offset in linearization table is invalid");
+ hintsOffset2 = 0;
+ }
+ }
+ obj2.free();
+ obj1.free();
+
+ return hintsOffset2;
+}
+
+Guint Linearization::getHintsLength2()
+{
+ int hintsLength2 = 0; // default to 0
+
+ Object obj1, obj2;
+ if (linDict.isDict() &&
+ linDict.dictLookup("H", &obj1)->isArray() &&
+ obj1.arrayGetLength()>=4) {
+ if (obj1.arrayGet(3, &obj2)->isInt() &&
+ obj2.getInt() > 0) {
+ hintsLength2 = obj2.getInt();
+ } else {
+ error(-1, "Second hints table length in linearization table is invalid");
+ hintsLength2 = 0;
+ }
+ }
+ obj2.free();
+ obj1.free();
+
+ return hintsLength2;
+}
+
+int Linearization::getObjectNumberFirst()
+{
+ int objectNumberFirst = 0;
+ if (linDict.isDict() &&
+ linDict.getDict()->lookupInt("O", NULL, &objectNumberFirst) &&
+ objectNumberFirst > 0) {
+ return objectNumberFirst;
+ } else {
+ error(-1, "Object number of first page in linearization table is invalid");
+ return 0;
+ }
+}
+
+Guint Linearization::getEndFirst()
+{
+ int pageEndFirst = 0;
+ if (linDict.isDict() &&
+ linDict.getDict()->lookupInt("E", NULL, &pageEndFirst) &&
+ pageEndFirst > 0) {
+ return pageEndFirst;
+ } else {
+ error(-1, "First page end offset in linearization table is invalid");
+ return 0;
+ }
+}
+
+int Linearization::getNumPages()
+{
+ int numPages = 0;
+ if (linDict.isDict() &&
+ linDict.getDict()->lookupInt("N", NULL, &numPages) &&
+ numPages > 0) {
+ return numPages;
+ } else {
+ error(-1, "Page count in linearization table is invalid");
+ return 0;
+ }
+}
+
+Guint Linearization::getMainXRefEntriesOffset()
+{
+ int mainXRefEntriesOffset = 0;
+ if (linDict.isDict() &&
+ linDict.getDict()->lookupInt("T", NULL, &mainXRefEntriesOffset) &&
+ mainXRefEntriesOffset > 0) {
+ return mainXRefEntriesOffset;
+ } else {
+ error(-1, "Main Xref offset in linearization table is invalid");
+ return 0;
+ }
+}
+
+int Linearization::getPageFirst()
+{
+ int pageFirst = 0; // Optional, defaults to 0.
+
+ if (linDict.isDict()) {
+ linDict.getDict()->lookupInt("P", NULL, &pageFirst);
+ }
+
+ if (pageFirst < 0) {
+ error(-1, "First page in linearization table is invalid");
+ return 0;
+ }
+
+ return pageFirst;
+}
+
+
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.h
new file mode 100644
index 00000000000..6728a750aba
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Linearization.h
@@ -0,0 +1,45 @@
+//========================================================================
+//
+// Linearization.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+//
+//========================================================================
+
+#ifndef LINEARIZATION_H
+#define LINEARIZATION_H
+
+#include "goo/gtypes.h"
+#include "Object.h"
+class BaseStream;
+
+//------------------------------------------------------------------------
+// Linearization
+//------------------------------------------------------------------------
+
+class Linearization {
+public:
+
+ Linearization(BaseStream *str);
+ ~Linearization();
+
+ Guint getLength();
+ Guint getHintsOffset();
+ Guint getHintsLength();
+ Guint getHintsOffset2();
+ Guint getHintsLength2();
+ int getObjectNumberFirst();
+ Guint getEndFirst();
+ int getNumPages();
+ Guint getMainXRefEntriesOffset();
+ int getPageFirst();
+
+private:
+
+ Object linDict;
+
+};
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Link.cc
index 5f3b8bd800f..971accf2810 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Link.cc
@@ -14,9 +14,9 @@
// under GPL version 2 or later
//
// Copyright (C) 2006, 2008 Pino Toscano <pino@kde.org>
-// Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
-// Copyright (C) 2008, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
// Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
//
@@ -35,14 +35,16 @@
#include <string.h>
#include "goo/gmem.h"
#include "goo/GooString.h"
+#include "goo/GooList.h"
#include "Error.h"
#include "Object.h"
#include "Array.h"
#include "Dict.h"
#include "Link.h"
#include "Sound.h"
-#include "Movie.h"
#include "FileSpec.h"
+#include "Rendition.h"
+#include "Annot.h"
//------------------------------------------------------------------------
// LinkAction
@@ -119,6 +121,10 @@ LinkAction *LinkAction::parseAction(Object *obj, GooString *baseURI) {
action = new LinkJavaScript(&obj3);
obj3.free();
+ // Set-OCG-State action
+ } else if (obj2.isName("SetOCGState")) {
+ action = new LinkOCGState(obj);
+
// unknown action
} else if (obj2.isName()) {
action = new LinkUnknown(obj2.getName());
@@ -685,52 +691,62 @@ LinkSound::~LinkSound() {
// LinkRendition
//------------------------------------------------------------------------
-LinkRendition::LinkRendition(Object *Obj) {
+LinkRendition::LinkRendition(Object *obj) {
operation = -1;
- movie = NULL;
- screenRef.num = -1;
+ media = NULL;
+ js = NULL;
- if (Obj->isDict())
- {
+ if (obj->isDict()) {
Object tmp;
- if (Obj->dictLookup("OP", &tmp)->isNull()) {
- error(-1, "Rendition action : no /OP field defined");
- tmp.free();
- } else {
-
- operation = tmp.getInt();
- tmp.free();
-
- // screen annotation reference
- Obj->dictLookupNF("AN", &tmp);
- if (tmp.isRef()) {
- screenRef = tmp.getRef();
+ if (!obj->dictLookup("JS", &tmp)->isNull()) {
+ if (tmp.isString()) {
+ js = new GooString(tmp.getString());
+ } else if (tmp.isStream()) {
+ Stream *stream = tmp.getStream();
+ js = new GooString();
+ stream->fillGooString(js);
+ } else {
+ error(-1, "Invalid Rendition Action: JS not string or stream");
}
- tmp.free();
-
- // retrieve rendition object
- Obj->dictLookup("R", &renditionObj);
- if (renditionObj.isDict()) {
+ }
+ tmp.free();
- movie = new Movie();
- movie->parseMediaRendition(&renditionObj);
-
- if (screenRef.num == -1) {
- error(-1, "Action Rendition : Rendition without Screen Annotation !");
+ if (obj->dictLookup("OP", &tmp)->isInt()) {
+ operation = tmp.getInt();
+ if (!js && (operation < 0 || operation > 4)) {
+ error (-1, "Invalid Rendition Action: unrecognized operation valued: %d", operation);
+ } else {
+ Object obj1;
+
+ // retrieve rendition object
+ if (obj->dictLookup("R", &renditionObj)->isDict()) {
+ media = new MediaRendition(&renditionObj);
+ } else if (operation == 0 || operation == 4) {
+ error (-1, "Invalid Rendition Action: no R field with op = %d", operation);
+ renditionObj.free();
}
- }
+ if (!obj->dictLookupNF("AN", &screenRef)->isRef() && operation >= 0 && operation <= 4) {
+ error (-1, "Invalid Rendition Action: no AN field with op = %d", operation);
+ screenRef.free();
+ }
+ }
+ } else if (!js) {
+ error(-1, "Invalid Rendition action: no OP or JS field defined");
}
+ tmp.free();
}
-
}
LinkRendition::~LinkRendition() {
renditionObj.free();
+ screenRef.free();
- if (movie)
- delete movie;
+ if (js)
+ delete js;
+ if (media)
+ delete media;
}
@@ -747,11 +763,7 @@ LinkJavaScript::LinkJavaScript(Object *jsObj) {
else if (jsObj->isStream()) {
Stream *stream = jsObj->getStream();
js = new GooString();
- stream->reset();
- int i;
- while ((i = stream->getChar()) != EOF) {
- js->append((char)i);
- }
+ stream->fillGooString(js);
}
}
@@ -762,108 +774,97 @@ LinkJavaScript::~LinkJavaScript() {
}
//------------------------------------------------------------------------
-// LinkUnknown
+// LinkOCGState
//------------------------------------------------------------------------
+LinkOCGState::LinkOCGState(Object *obj) {
+ Object obj1;
-LinkUnknown::LinkUnknown(char *actionA) {
- action = new GooString(actionA);
-}
-
-LinkUnknown::~LinkUnknown() {
- delete action;
-}
-
-//------------------------------------------------------------------------
-// Link
-//------------------------------------------------------------------------
-
-Link::Link(Dict *dict, GooString *baseURI) {
- Object obj1, obj2;
- double t;
-
- action = NULL;
- ok = gFalse;
-
- // get rectangle
- if (!dict->lookup("Rect", &obj1)->isArray()) {
- error(-1, "Annotation rectangle is wrong type");
- goto err2;
- }
- if (!obj1.arrayGet(0, &obj2)->isNum()) {
- error(-1, "Bad annotation rectangle");
- goto err1;
- }
- x1 = obj2.getNum();
- obj2.free();
- if (!obj1.arrayGet(1, &obj2)->isNum()) {
- error(-1, "Bad annotation rectangle");
- goto err1;
- }
- y1 = obj2.getNum();
- obj2.free();
- if (!obj1.arrayGet(2, &obj2)->isNum()) {
- error(-1, "Bad annotation rectangle");
- goto err1;
- }
- x2 = obj2.getNum();
- obj2.free();
- if (!obj1.arrayGet(3, &obj2)->isNum()) {
- error(-1, "Bad annotation rectangle");
- goto err1;
+ stateList = new GooList();
+ preserveRB = gTrue;
+
+ if (obj->dictLookup("State", &obj1)->isArray()) {
+ StateList *stList = NULL;
+
+ for (int i = 0; i < obj1.arrayGetLength(); ++i) {
+ Object obj2;
+
+ obj1.arrayGetNF(i, &obj2);
+ if (obj2.isName()) {
+ if (stList)
+ stateList->append(stList);
+
+ char *name = obj2.getName();
+ stList = new StateList();
+ stList->list = new GooList();
+ if (!strcmp (name, "ON")) {
+ stList->st = On;
+ } else if (!strcmp (name, "OFF")) {
+ stList->st = Off;
+ } else if (!strcmp (name, "Toggle")) {
+ stList->st = Toggle;
+ } else {
+ error (-1, "Invalid name '%s' in OCG Action state array", name);
+ delete stList;
+ stList = NULL;
+ }
+ } else if (obj2.isRef()) {
+ if (stList) {
+ Ref ocgRef = obj2.getRef();
+ Ref *item = new Ref();
+ item->num = ocgRef.num;
+ item->gen = ocgRef.gen;
+ stList->list->append(item);
+ } else {
+ error (-1, "Invalid OCG Action State array, expected name instead of ref");
+ }
+ } else {
+ error (-1, "Invalid item in OCG Action State array");
+ }
+ obj2.free();
+ }
+ // Add the last group
+ if (stList)
+ stateList->append(stList);
+ } else {
+ error (-1, "Invalid OCGState action");
+ delete stateList;
+ stateList = NULL;
}
- y2 = obj2.getNum();
- obj2.free();
obj1.free();
- if (x1 > x2) {
- t = x1;
- x1 = x2;
- x2 = t;
- }
- if (y1 > y2) {
- t = y1;
- y1 = y2;
- y2 = t;
- }
-
- // look for destination
- if (!dict->lookup("Dest", &obj1)->isNull()) {
- action = LinkAction::parseDest(&obj1);
- // look for action
- } else {
- obj1.free();
- if (dict->lookup("A", &obj1)->isDict()) {
- action = LinkAction::parseAction(&obj1, baseURI);
- }
+ if (obj->dictLookup("PreserveRB", &obj1)->isBool()) {
+ preserveRB = obj1.getBool();
}
obj1.free();
+}
- // check for bad action
- if (action) {
- ok = gTrue;
- }
+LinkOCGState::~LinkOCGState() {
+ if (stateList)
+ deleteGooList(stateList, StateList);
+}
- return;
+LinkOCGState::StateList::~StateList() {
+ if (list)
+ deleteGooList(list, Ref);
+}
- err1:
- obj2.free();
- err2:
- obj1.free();
+//------------------------------------------------------------------------
+// LinkUnknown
+//------------------------------------------------------------------------
+
+LinkUnknown::LinkUnknown(char *actionA) {
+ action = new GooString(actionA);
}
-Link::~Link() {
- if (action) {
- delete action;
- }
+LinkUnknown::~LinkUnknown() {
+ delete action;
}
//------------------------------------------------------------------------
// Links
//------------------------------------------------------------------------
-Links::Links(Object *annots, GooString *baseURI) {
- Link *link;
- Object obj1, obj2;
+Links::Links(Annots *annots) {
int size;
int i;
@@ -871,25 +872,21 @@ Links::Links(Object *annots, GooString *baseURI) {
size = 0;
numLinks = 0;
- if (annots->isArray()) {
- for (i = 0; i < annots->arrayGetLength(); ++i) {
- if (annots->arrayGet(i, &obj1)->isDict()) {
- if (obj1.dictLookup("Subtype", &obj2)->isName("Link")) {
- link = new Link(obj1.getDict(), baseURI);
- if (link->isOk()) {
- if (numLinks >= size) {
- size += 16;
- links = (Link **)greallocn(links, size, sizeof(Link *));
- }
- links[numLinks++] = link;
- } else {
- delete link;
- }
- }
- obj2.free();
- }
- obj1.free();
+ if (!annots)
+ return;
+
+ for (i = 0; i < annots->getNumAnnots(); ++i) {
+ Annot *annot = annots->getAnnot(i);
+
+ if (annot->getType() != Annot::typeLink)
+ continue;
+
+ if (numLinks >= size) {
+ size += 16;
+ links = (AnnotLink **)greallocn(links, size, sizeof(AnnotLink *));
}
+ annot->incRefCnt();
+ links[numLinks++] = static_cast<AnnotLink *>(annot);
}
}
@@ -897,7 +894,8 @@ Links::~Links() {
int i;
for (i = 0; i < numLinks; ++i)
- delete links[i];
+ links[i]->decRefCnt();
+
gfree(links);
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Link.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Link.h
index af42923f72c..84e58018554 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Link.h
@@ -15,6 +15,7 @@
//
// Copyright (C) 2006, 2008 Pino Toscano <pino@kde.org>
// Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
+// Copyright (C) 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -31,10 +32,13 @@
#include "Object.h"
class GooString;
+class GooList;
class Array;
class Dict;
class Sound;
-class Movie;
+class MediaRendition;
+class AnnotLink;
+class Annots;
//------------------------------------------------------------------------
// LinkAction
@@ -50,6 +54,7 @@ enum LinkActionKind {
actionRendition,
actionSound, // sound action
actionJavaScript, // JavaScript action
+ actionOCGState, // Set-OCG-State action
actionUnknown // anything else
};
@@ -321,23 +326,27 @@ public:
virtual LinkActionKind getKind() { return actionRendition; }
- GBool hasRenditionObject() { return !renditionObj.isNull(); }
+ GBool hasRenditionObject() { return renditionObj.isDict(); }
Object* getRenditionObject() { return &renditionObj; }
- GBool hasScreenAnnot() { return screenRef.num > 0; }
- Ref* getScreenAnnot() { return &screenRef; }
+ GBool hasScreenAnnot() { return screenRef.isRef(); }
+ Ref getScreenAnnot() { return screenRef.getRef(); }
int getOperation() { return operation; }
- Movie* getMovie() { return movie; }
+ MediaRendition* getMedia() { return media; }
+
+ GooString *getScript() { return js; }
private:
- Ref screenRef;
+ Object screenRef;
Object renditionObj;
int operation;
- Movie* movie;
+ MediaRendition* media;
+
+ GooString *js;
};
//------------------------------------------------------------------------
@@ -393,63 +402,57 @@ private:
};
//------------------------------------------------------------------------
-// LinkUnknown
+// LinkOCGState
//------------------------------------------------------------------------
-
-class LinkUnknown: public LinkAction {
+class LinkOCGState: public LinkAction {
public:
+ LinkOCGState(Object *obj);
- // Build a LinkUnknown with the specified action type.
- LinkUnknown(char *actionA);
+ virtual ~LinkOCGState();
- // Destructor.
- virtual ~LinkUnknown();
+ virtual GBool isOk() { return stateList != NULL; }
- // Was the LinkUnknown create successfully?
- virtual GBool isOk() { return action != NULL; }
+ virtual LinkActionKind getKind() { return actionOCGState; }
- // Accessors.
- virtual LinkActionKind getKind() { return actionUnknown; }
- GooString *getAction() { return action; }
+ enum State { On, Off, Toggle};
+ struct StateList {
+ StateList() { list = NULL; }
+ ~StateList();
+ State st;
+ GooList *list;
+ };
-private:
+ GooList *getStateList() { return stateList; }
+ GBool getPreserveRB() { return preserveRB; }
- GooString *action; // action subtype
+private:
+ GooList *stateList;
+ GBool preserveRB;
};
//------------------------------------------------------------------------
-// Link
+// LinkUnknown
//------------------------------------------------------------------------
-class Link {
+class LinkUnknown: public LinkAction {
public:
- // Construct a link, given its dictionary.
- Link(Dict *dict, GooString *baseURI);
+ // Build a LinkUnknown with the specified action type.
+ LinkUnknown(char *actionA);
// Destructor.
- ~Link();
-
- // Was the link created successfully?
- GBool isOk() { return ok; }
-
- // Check if point is inside the link rectangle.
- GBool inRect(double x, double y)
- { return x1 <= x && x <= x2 && y1 <= y && y <= y2; }
+ virtual ~LinkUnknown();
- // Get action.
- LinkAction *getAction() { return action; }
+ // Was the LinkUnknown create successfully?
+ virtual GBool isOk() { return action != NULL; }
- // Get the link rectangle.
- void getRect(double *xa1, double *ya1, double *xa2, double *ya2)
- { *xa1 = x1; *ya1 = y1; *xa2 = x2; *ya2 = y2; }
+ // Accessors.
+ virtual LinkActionKind getKind() { return actionUnknown; }
+ GooString *getAction() { return action; }
private:
- double x1, y1; // lower left corner
- double x2, y2; // upper right corner
- LinkAction *action; // action
- GBool ok; // is link valid?
+ GooString *action; // action subtype
};
//------------------------------------------------------------------------
@@ -460,14 +463,14 @@ class Links {
public:
// Extract links from array of annotations.
- Links(Object *annots, GooString *baseURI);
+ Links(Annots *annots);
// Destructor.
~Links();
// Iterate through list of links.
int getNumLinks() const { return numLinks; }
- Link *getLink(int i) const { return links[i]; }
+ AnnotLink *getLink(int i) const { return links[i]; }
// If point <x>,<y> is in a link, return the associated action;
// else return NULL.
@@ -478,7 +481,7 @@ public:
private:
- Link **links;
+ AnnotLink **links;
int numLinks;
};
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.cc
new file mode 100644
index 00000000000..6f6f1fca9f7
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.cc
@@ -0,0 +1,46 @@
+//========================================================================
+//
+// LocalPDFDocBuilder.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#include <config.h>
+
+#include "LocalPDFDocBuilder.h"
+
+//------------------------------------------------------------------------
+// LocalPDFDocBuilder
+//------------------------------------------------------------------------
+
+PDFDoc *
+LocalPDFDocBuilder::buildPDFDoc(
+ const GooString &uri, GooString *ownerPassword, GooString
+ *userPassword, void *guiDataA)
+{
+ if (uri.cmpN("file://", 7) == 0) {
+ GooString *fileName = uri.copy();
+ fileName->del(0, 7);
+ return new PDFDoc(fileName, ownerPassword, userPassword, guiDataA);
+ } else {
+ GooString *fileName = uri.copy();
+ return new PDFDoc(fileName, ownerPassword, userPassword, guiDataA);
+ }
+}
+
+GBool LocalPDFDocBuilder::supports(const GooString &uri)
+{
+ if (uri.cmpN("file://", 7) == 0) {
+ return gTrue;
+ } else if (!strstr(uri.getCString(), "://")) {
+ return gTrue;
+ } else {
+ return gFalse;
+ }
+}
+
+
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.h
new file mode 100644
index 00000000000..c2b1d903885
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/LocalPDFDocBuilder.h
@@ -0,0 +1,33 @@
+//========================================================================
+//
+// LocalPDFDocBuilder.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#ifndef LOCALPDFDOCBUILDER_H
+#define LOCALPDFDOCBUILDER_H
+
+#include "PDFDocBuilder.h"
+
+//------------------------------------------------------------------------
+// LocalPDFDocBuilder
+//
+// The LocalPDFDocBuilder implements a PDFDocBuilder for local files.
+//------------------------------------------------------------------------
+
+class LocalPDFDocBuilder : public PDFDocBuilder {
+
+public:
+
+ PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
+ GooString *userPassword = NULL, void *guiDataA = NULL);
+ GBool supports(const GooString &uri);
+
+};
+
+#endif /* LOCALPDFDOCBUILDER_H */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.18.0/poppler/Makefile.am
index ec79e317335..37fbb1b5f18 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Makefile.am
@@ -13,6 +13,8 @@ splash_libs = \
$(SPLASH_LIBS) \
$(top_builddir)/splash/libsplash.la
+endif
+
if BUILD_POPPLER_QT4
poppler_arthur = libpoppler-arthur.la
@@ -29,8 +31,6 @@ arthur_libs = \
endif
-endif
-
if BUILD_CAIRO_OUTPUT
@@ -47,7 +47,9 @@ libpoppler_cairo_la_SOURCES = \
CairoFontEngine.cc \
CairoFontEngine.h \
CairoOutputDev.cc \
- CairoOutputDev.h
+ CairoOutputDev.h \
+ CairoRescaleBox.cc \
+ CairoRescaleBox.h
endif
@@ -66,6 +68,17 @@ if BUILD_LIBPNG
libpng_libs = \
$(LIBPNG_LIBS)
+libpng_includes = \
+ $(LIBPNG_CFLAGS)
+
+endif
+
+if BUILD_LIBTIFF
+
+libtiff_libs = \
+ $(LIBTIFF_LIBS)
+libtiff_includes = \
+ $(LIBTIFF_CFLAGS)
endif
@@ -98,17 +111,21 @@ zlib_libs = \
endif
-if BUILD_ABIWORD_OUTPUT
+if BUILD_LIBCURL
+
+libcurl_libs = \
+ $(LIBCURL_LIBS)
-abiword_sources = \
- ABWOutputDev.h \
- ABWOutputDev.cc
+libcurl_includes = \
+ $(LIBCURL_CFLAGS)
-abiword_includes = \
- $(ABIWORD_CFLAGS)
+curl_headers = \
+ CurlCachedFile.h \
+ CurlPDFDocBuilder.h
-abiword_libs = \
- $(ABIWORD_LIBS)
+curl_sources = \
+ CurlCachedFile.cc \
+ CurlPDFDocBuilder.cc
endif
@@ -124,7 +141,9 @@ INCLUDES = \
$(splash_includes) \
$(cairo_includes) \
$(arthur_includes) \
- $(abiword_includes) \
+ $(libtiff_includes) \
+ $(libpng_includes) \
+ $(libcurl_includes) \
$(FREETYPE_CFLAGS) \
$(FONTCONFIG_CFLAGS)
@@ -141,27 +160,30 @@ libpoppler_la_LIBADD = \
$(top_builddir)/fofi/libfofi.la \
$(cms_libs) \
$(splash_libs) \
+ $(libtiff_libs) \
$(libjpeg_libs) \
$(libpng_libs) \
$(zlib_libs) \
+ $(libcurl_libs) \
$(libjpeg2000_libs) \
- $(abiword_libs) \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS) \
$(PTHREAD_LIBS) \
$(win32_libs)
-libpoppler_la_LDFLAGS = -version-info 5:0:0 @create_shared_lib@
+libpoppler_la_LDFLAGS = -version-info 18:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
poppler_includedir = $(includedir)/poppler
poppler_include_HEADERS = \
$(splash_headers) \
+ $(curl_headers) \
Annot.h \
Array.h \
BuiltinFont.h \
BuiltinFontTables.h \
+ CachedFile.h \
Catalog.h \
CharCodeToUnicode.h \
CMap.h \
@@ -179,10 +201,13 @@ poppler_include_HEADERS = \
GfxState.h \
GfxState_helpers.h \
GlobalParams.h \
+ Hints.h \
JArithmeticDecoder.h \
JBIG2Stream.h \
Lexer.h \
+ Linearization.h \
Link.h \
+ LocalPDFDocBuilder.h \
Movie.h \
NameToCharCode.h \
Object.h \
@@ -193,11 +218,16 @@ poppler_include_HEADERS = \
PageTransition.h \
Parser.h \
PDFDoc.h \
+ PDFDocBuilder.h \
PDFDocEncoding.h \
+ PDFDocFactory.h \
PopplerCache.h \
ProfileData.h \
PreScanOutputDev.h \
PSTokenizer.h \
+ Rendition.h \
+ StdinCachedFile.h \
+ StdinPDFDocBuilder.h \
Stream-CCITT.h \
Stream.h \
UnicodeMap.h \
@@ -206,6 +236,7 @@ poppler_include_HEADERS = \
UnicodeCClassTables.h \
UnicodeCompTables.h \
UnicodeDecompTables.h \
+ ViewerPreferences.h \
XRef.h \
CharTypes.h \
CompactFontTables.h \
@@ -216,8 +247,8 @@ poppler_include_HEADERS = \
SecurityHandler.h \
UTF8.h \
XpdfPluginAPI.h \
- Sound.h \
- poppler-config.h
+ Sound.h
+nodist_poppler_include_HEADERS = poppler-config.h
endif
@@ -228,11 +259,12 @@ libpoppler_la_SOURCES = \
$(libjpeg_sources) \
$(zlib_sources) \
$(libjpeg2000_sources) \
- $(abiword_sources) \
+ $(curl_sources) \
Annot.cc \
Array.cc \
BuiltinFont.cc \
BuiltinFontTables.cc \
+ CachedFile.cc \
Catalog.cc \
CharCodeToUnicode.cc \
CMap.cc \
@@ -249,10 +281,13 @@ libpoppler_la_SOURCES = \
GfxFont.cc \
GfxState.cc \
GlobalParams.cc \
+ Hints.cc \
JArithmeticDecoder.cc \
JBIG2Stream.cc \
Lexer.cc \
+ Linearization.cc \
Link.cc \
+ LocalPDFDocBuilder.cc \
Movie.cc \
NameToCharCode.cc \
Object.cc \
@@ -264,13 +299,19 @@ libpoppler_la_SOURCES = \
Parser.cc \
PDFDoc.cc \
PDFDocEncoding.cc \
+ PDFDocFactory.cc \
PopplerCache.cc \
ProfileData.cc \
PreScanOutputDev.cc \
PSTokenizer.cc \
+ Rendition.cc \
+ StdinCachedFile.cc \
+ StdinPDFDocBuilder.cc \
Stream.cc \
+ strtok_r.cpp \
UnicodeMap.cc \
UnicodeTypeTable.cc \
+ ViewerPreferences.cc \
XRef.cc \
PSOutputDev.cc \
TextOutputDev.cc \
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Makefile.in b/Build/source/libs/poppler/poppler-0.18.0/poppler/Makefile.in
index 0ecd52099d2..2ef494f0aac 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42,10 +42,10 @@ DIST_COMMON = $(am__poppler_include_HEADERS_DIST) \
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
- $(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libpng.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/qt.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
+ $(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -75,74 +75,88 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(libdir)" \
+ "$(DESTDIR)$(poppler_includedir)" \
"$(DESTDIR)$(poppler_includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
libpoppler_arthur_la_LIBADD =
am__libpoppler_arthur_la_SOURCES_DIST = ArthurOutputDev.h \
ArthurOutputDev.cc
-@BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@am_libpoppler_arthur_la_OBJECTS = ArthurOutputDev.lo
+@BUILD_POPPLER_QT4_TRUE@am_libpoppler_arthur_la_OBJECTS = \
+@BUILD_POPPLER_QT4_TRUE@ ArthurOutputDev.lo
libpoppler_arthur_la_OBJECTS = $(am_libpoppler_arthur_la_OBJECTS)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
am__v_lt_0 = --silent
-@BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@am_libpoppler_arthur_la_rpath =
+@BUILD_POPPLER_QT4_TRUE@am_libpoppler_arthur_la_rpath =
libpoppler_cairo_la_LIBADD =
am__libpoppler_cairo_la_SOURCES_DIST = CairoFontEngine.cc \
- CairoFontEngine.h CairoOutputDev.cc CairoOutputDev.h
+ CairoFontEngine.h CairoOutputDev.cc CairoOutputDev.h \
+ CairoRescaleBox.cc CairoRescaleBox.h
@BUILD_CAIRO_OUTPUT_TRUE@am_libpoppler_cairo_la_OBJECTS = \
-@BUILD_CAIRO_OUTPUT_TRUE@ CairoFontEngine.lo CairoOutputDev.lo
+@BUILD_CAIRO_OUTPUT_TRUE@ CairoFontEngine.lo CairoOutputDev.lo \
+@BUILD_CAIRO_OUTPUT_TRUE@ CairoRescaleBox.lo
libpoppler_cairo_la_OBJECTS = $(am_libpoppler_cairo_la_OBJECTS)
@BUILD_CAIRO_OUTPUT_TRUE@am_libpoppler_cairo_la_rpath =
am__DEPENDENCIES_1 =
@USE_CMS_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@BUILD_SPLASH_OUTPUT_TRUE@am__DEPENDENCIES_3 = \
@BUILD_SPLASH_OUTPUT_TRUE@ $(top_builddir)/splash/libsplash.la
-@BUILD_LIBJPEG_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
-@BUILD_LIBPNG_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
-@BUILD_ZLIB_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-@BUILD_LIBOPENJPEG_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
-@BUILD_ABIWORD_OUTPUT_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
+@BUILD_LIBTIFF_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+@BUILD_LIBJPEG_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
+@BUILD_LIBPNG_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+@BUILD_ZLIB_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+@BUILD_LIBCURL_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
+@BUILD_LIBOPENJPEG_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
libpoppler_la_DEPENDENCIES = $(top_builddir)/goo/libgoo.la \
$(top_builddir)/fofi/libfofi.la $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
$(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
+ $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1)
am__libpoppler_la_SOURCES_DIST = SplashOutputDev.cc DCTStream.h \
DCTStream.cc FlateStream.h FlateStream.cc JPXStream.h \
- JPXStream.cc JPEG2000Stream.h JPEG2000Stream.cc ABWOutputDev.h \
- ABWOutputDev.cc Annot.cc Array.cc BuiltinFont.cc \
- BuiltinFontTables.cc Catalog.cc CharCodeToUnicode.cc CMap.cc \
- DateInfo.cc Decrypt.cc Dict.cc Error.cc FileSpec.cc \
- FontEncodingTables.cc Form.cc FontInfo.cc Function.cc Gfx.cc \
- GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc \
- JBIG2Stream.cc Lexer.cc Link.cc Movie.cc NameToCharCode.cc \
- Object.cc OptionalContent.cc Outline.cc OutputDev.cc Page.cc \
- PageTransition.cc Parser.cc PDFDoc.cc PDFDocEncoding.cc \
- PopplerCache.cc ProfileData.cc PreScanOutputDev.cc \
- PSTokenizer.cc Stream.cc UnicodeMap.cc UnicodeTypeTable.cc \
- XRef.cc PSOutputDev.cc TextOutputDev.cc PageLabelInfo.h \
- PageLabelInfo.cc SecurityHandler.cc Sound.cc XpdfPluginAPI.cc
+ JPXStream.cc JPEG2000Stream.h JPEG2000Stream.cc \
+ CurlCachedFile.cc CurlPDFDocBuilder.cc Annot.cc Array.cc \
+ BuiltinFont.cc BuiltinFontTables.cc CachedFile.cc Catalog.cc \
+ CharCodeToUnicode.cc CMap.cc DateInfo.cc Decrypt.cc Dict.cc \
+ Error.cc FileSpec.cc FontEncodingTables.cc Form.cc FontInfo.cc \
+ Function.cc Gfx.cc GfxFont.cc GfxState.cc GlobalParams.cc \
+ Hints.cc JArithmeticDecoder.cc JBIG2Stream.cc Lexer.cc \
+ Linearization.cc Link.cc LocalPDFDocBuilder.cc Movie.cc \
+ NameToCharCode.cc Object.cc OptionalContent.cc Outline.cc \
+ OutputDev.cc Page.cc PageTransition.cc Parser.cc PDFDoc.cc \
+ PDFDocEncoding.cc PDFDocFactory.cc PopplerCache.cc \
+ ProfileData.cc PreScanOutputDev.cc PSTokenizer.cc Rendition.cc \
+ StdinCachedFile.cc StdinPDFDocBuilder.cc Stream.cc \
+ strtok_r.cpp UnicodeMap.cc UnicodeTypeTable.cc \
+ ViewerPreferences.cc XRef.cc PSOutputDev.cc TextOutputDev.cc \
+ PageLabelInfo.h PageLabelInfo.cc SecurityHandler.cc Sound.cc \
+ XpdfPluginAPI.cc
@BUILD_SPLASH_OUTPUT_TRUE@am__objects_1 = SplashOutputDev.lo
@BUILD_LIBJPEG_TRUE@am__objects_2 = DCTStream.lo
@BUILD_ZLIB_TRUE@am__objects_3 = FlateStream.lo
@BUILD_LIBOPENJPEG_FALSE@am__objects_4 = JPXStream.lo
@BUILD_LIBOPENJPEG_TRUE@am__objects_4 = JPEG2000Stream.lo
-@BUILD_ABIWORD_OUTPUT_TRUE@am__objects_5 = ABWOutputDev.lo
+@BUILD_LIBCURL_TRUE@am__objects_5 = CurlCachedFile.lo \
+@BUILD_LIBCURL_TRUE@ CurlPDFDocBuilder.lo
am_libpoppler_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3) $(am__objects_4) $(am__objects_5) Annot.lo \
- Array.lo BuiltinFont.lo BuiltinFontTables.lo Catalog.lo \
- CharCodeToUnicode.lo CMap.lo DateInfo.lo Decrypt.lo Dict.lo \
- Error.lo FileSpec.lo FontEncodingTables.lo Form.lo FontInfo.lo \
- Function.lo Gfx.lo GfxFont.lo GfxState.lo GlobalParams.lo \
- JArithmeticDecoder.lo JBIG2Stream.lo Lexer.lo Link.lo Movie.lo \
- NameToCharCode.lo Object.lo OptionalContent.lo Outline.lo \
- OutputDev.lo Page.lo PageTransition.lo Parser.lo PDFDoc.lo \
- PDFDocEncoding.lo PopplerCache.lo ProfileData.lo \
- PreScanOutputDev.lo PSTokenizer.lo Stream.lo UnicodeMap.lo \
- UnicodeTypeTable.lo XRef.lo PSOutputDev.lo TextOutputDev.lo \
- PageLabelInfo.lo SecurityHandler.lo Sound.lo XpdfPluginAPI.lo
+ Array.lo BuiltinFont.lo BuiltinFontTables.lo CachedFile.lo \
+ Catalog.lo CharCodeToUnicode.lo CMap.lo DateInfo.lo Decrypt.lo \
+ Dict.lo Error.lo FileSpec.lo FontEncodingTables.lo Form.lo \
+ FontInfo.lo Function.lo Gfx.lo GfxFont.lo GfxState.lo \
+ GlobalParams.lo Hints.lo JArithmeticDecoder.lo JBIG2Stream.lo \
+ Lexer.lo Linearization.lo Link.lo LocalPDFDocBuilder.lo \
+ Movie.lo NameToCharCode.lo Object.lo OptionalContent.lo \
+ Outline.lo OutputDev.lo Page.lo PageTransition.lo Parser.lo \
+ PDFDoc.lo PDFDocEncoding.lo PDFDocFactory.lo PopplerCache.lo \
+ ProfileData.lo PreScanOutputDev.lo PSTokenizer.lo Rendition.lo \
+ StdinCachedFile.lo StdinPDFDocBuilder.lo Stream.lo strtok_r.lo \
+ UnicodeMap.lo UnicodeTypeTable.lo ViewerPreferences.lo XRef.lo \
+ PSOutputDev.lo TextOutputDev.lo PageLabelInfo.lo \
+ SecurityHandler.lo Sound.lo XpdfPluginAPI.lo
libpoppler_la_OBJECTS = $(am_libpoppler_la_OBJECTS)
libpoppler_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -195,28 +209,28 @@ SOURCES = $(libpoppler_arthur_la_SOURCES) \
DIST_SOURCES = $(am__libpoppler_arthur_la_SOURCES_DIST) \
$(am__libpoppler_cairo_la_SOURCES_DIST) \
$(am__libpoppler_la_SOURCES_DIST)
-am__poppler_include_HEADERS_DIST = SplashOutputDev.h Annot.h Array.h \
- BuiltinFont.h BuiltinFontTables.h Catalog.h \
- CharCodeToUnicode.h CMap.h DateInfo.h Decrypt.h Dict.h Error.h \
- FileSpec.h FontEncodingTables.h FontInfo.h Form.h Function.h \
- Gfx.h GfxFont.h GfxState.h GfxState_helpers.h GlobalParams.h \
- JArithmeticDecoder.h JBIG2Stream.h Lexer.h Link.h Movie.h \
- NameToCharCode.h Object.h OptionalContent.h Outline.h \
- OutputDev.h Page.h PageTransition.h Parser.h PDFDoc.h \
- PDFDocEncoding.h PopplerCache.h ProfileData.h \
- PreScanOutputDev.h PSTokenizer.h Stream-CCITT.h Stream.h \
- UnicodeMap.h UnicodeMapTables.h UnicodeTypeTable.h \
- UnicodeCClassTables.h UnicodeCompTables.h \
- UnicodeDecompTables.h XRef.h CharTypes.h CompactFontTables.h \
- ErrorCodes.h NameToUnicodeTable.h PSOutputDev.h \
- TextOutputDev.h SecurityHandler.h UTF8.h XpdfPluginAPI.h \
- Sound.h poppler-config.h
-HEADERS = $(poppler_include_HEADERS)
+am__poppler_include_HEADERS_DIST = SplashOutputDev.h CurlCachedFile.h \
+ CurlPDFDocBuilder.h Annot.h Array.h BuiltinFont.h \
+ BuiltinFontTables.h CachedFile.h Catalog.h CharCodeToUnicode.h \
+ CMap.h DateInfo.h Decrypt.h Dict.h Error.h FileSpec.h \
+ FontEncodingTables.h FontInfo.h Form.h Function.h Gfx.h \
+ GfxFont.h GfxState.h GfxState_helpers.h GlobalParams.h Hints.h \
+ JArithmeticDecoder.h JBIG2Stream.h Lexer.h Linearization.h \
+ Link.h LocalPDFDocBuilder.h Movie.h NameToCharCode.h Object.h \
+ OptionalContent.h Outline.h OutputDev.h Page.h \
+ PageTransition.h Parser.h PDFDoc.h PDFDocBuilder.h \
+ PDFDocEncoding.h PDFDocFactory.h PopplerCache.h ProfileData.h \
+ PreScanOutputDev.h PSTokenizer.h Rendition.h StdinCachedFile.h \
+ StdinPDFDocBuilder.h Stream-CCITT.h Stream.h UnicodeMap.h \
+ UnicodeMapTables.h UnicodeTypeTable.h UnicodeCClassTables.h \
+ UnicodeCompTables.h UnicodeDecompTables.h ViewerPreferences.h \
+ XRef.h CharTypes.h CompactFontTables.h ErrorCodes.h \
+ NameToUnicodeTable.h PSOutputDev.h TextOutputDev.h \
+ SecurityHandler.h UTF8.h XpdfPluginAPI.h Sound.h
+HEADERS = $(nodist_poppler_include_HEADERS) $(poppler_include_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ABIWORD_CFLAGS = @ABIWORD_CFLAGS@
-ABIWORD_LIBS = @ABIWORD_LIBS@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -257,12 +271,12 @@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
FREETYPE_CONFIG = @FREETYPE_CONFIG@
FREETYPE_LIBS = @FREETYPE_LIBS@
-GDK_CFLAGS = @GDK_CFLAGS@
-GDK_FEATURE = @GDK_FEATURE@
-GDK_LIBS = @GDK_LIBS@
GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQ = @GLIB_REQ@
GREP = @GREP@
GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
GTK_TEST_LIBS = @GTK_TEST_LIBS@
HTML_DIR = @HTML_DIR@
@@ -271,20 +285,35 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LCMS_CFLAGS = @LCMS_CFLAGS@
LCMS_LIBS = @LCMS_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
+LIBICONV = @LIBICONV@
LIBJPEG_LIBS = @LIBJPEG_LIBS@
LIBOBJS = @LIBOBJS@
LIBOPENJPEG_LIBS = @LIBOPENJPEG_LIBS@
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
+LIBTIFF_LIBS = @LIBTIFF_LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MOCQT4 = @MOCQT4@
NM = @NM@
@@ -304,6 +333,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PC_REQUIRES = @PC_REQUIRES@
PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POPPLER_DATADIR = @POPPLER_DATADIR@
POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
POPPLER_GLIB_DISABLE_DEPRECATED = @POPPLER_GLIB_DISABLE_DEPRECATED@
@@ -317,8 +348,7 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
-POPPLER_QT_CXXFLAGS = @POPPLER_QT_CXXFLAGS@
-POPPLER_QT_LIBS = @POPPLER_QT_LIBS@
+POPPLER_VERSION = @POPPLER_VERSION@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -338,6 +368,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -374,7 +405,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -404,16 +434,16 @@ win32_libs = @win32_libs@
@BUILD_SPLASH_OUTPUT_TRUE@ $(SPLASH_LIBS) \
@BUILD_SPLASH_OUTPUT_TRUE@ $(top_builddir)/splash/libsplash.la
-@BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@poppler_arthur = libpoppler-arthur.la
-@BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@libpoppler_arthur_la_SOURCES = \
-@BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@ ArthurOutputDev.h \
-@BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@ ArthurOutputDev.cc
+@BUILD_POPPLER_QT4_TRUE@poppler_arthur = libpoppler-arthur.la
+@BUILD_POPPLER_QT4_TRUE@libpoppler_arthur_la_SOURCES = \
+@BUILD_POPPLER_QT4_TRUE@ ArthurOutputDev.h \
+@BUILD_POPPLER_QT4_TRUE@ ArthurOutputDev.cc
-@BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@arthur_includes = \
-@BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@ $(POPPLER_QT4_CFLAGS)
+@BUILD_POPPLER_QT4_TRUE@arthur_includes = \
+@BUILD_POPPLER_QT4_TRUE@ $(POPPLER_QT4_CFLAGS)
-@BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@arthur_libs = \
-@BUILD_POPPLER_QT4_TRUE@@BUILD_SPLASH_OUTPUT_TRUE@ $(POPPLER_QT4_LIBS)
+@BUILD_POPPLER_QT4_TRUE@arthur_libs = \
+@BUILD_POPPLER_QT4_TRUE@ $(POPPLER_QT4_LIBS)
@BUILD_CAIRO_OUTPUT_TRUE@poppler_cairo = libpoppler-cairo.la
@BUILD_CAIRO_OUTPUT_TRUE@cairo_includes = \
@@ -426,7 +456,9 @@ win32_libs = @win32_libs@
@BUILD_CAIRO_OUTPUT_TRUE@ CairoFontEngine.cc \
@BUILD_CAIRO_OUTPUT_TRUE@ CairoFontEngine.h \
@BUILD_CAIRO_OUTPUT_TRUE@ CairoOutputDev.cc \
-@BUILD_CAIRO_OUTPUT_TRUE@ CairoOutputDev.h
+@BUILD_CAIRO_OUTPUT_TRUE@ CairoOutputDev.h \
+@BUILD_CAIRO_OUTPUT_TRUE@ CairoRescaleBox.cc \
+@BUILD_CAIRO_OUTPUT_TRUE@ CairoRescaleBox.h
@BUILD_LIBJPEG_TRUE@libjpeg_sources = \
@BUILD_LIBJPEG_TRUE@ DCTStream.h \
@@ -438,6 +470,15 @@ win32_libs = @win32_libs@
@BUILD_LIBPNG_TRUE@libpng_libs = \
@BUILD_LIBPNG_TRUE@ $(LIBPNG_LIBS)
+@BUILD_LIBPNG_TRUE@libpng_includes = \
+@BUILD_LIBPNG_TRUE@ $(LIBPNG_CFLAGS)
+
+@BUILD_LIBTIFF_TRUE@libtiff_libs = \
+@BUILD_LIBTIFF_TRUE@ $(LIBTIFF_LIBS)
+
+@BUILD_LIBTIFF_TRUE@libtiff_includes = \
+@BUILD_LIBTIFF_TRUE@ $(LIBTIFF_CFLAGS)
+
@BUILD_LIBOPENJPEG_FALSE@libjpeg2000_sources = \
@BUILD_LIBOPENJPEG_FALSE@ JPXStream.h \
@BUILD_LIBOPENJPEG_FALSE@ JPXStream.cc
@@ -456,15 +497,19 @@ win32_libs = @win32_libs@
@BUILD_ZLIB_TRUE@zlib_libs = \
@BUILD_ZLIB_TRUE@ $(ZLIB_LIBS)
-@BUILD_ABIWORD_OUTPUT_TRUE@abiword_sources = \
-@BUILD_ABIWORD_OUTPUT_TRUE@ ABWOutputDev.h \
-@BUILD_ABIWORD_OUTPUT_TRUE@ ABWOutputDev.cc
+@BUILD_LIBCURL_TRUE@libcurl_libs = \
+@BUILD_LIBCURL_TRUE@ $(LIBCURL_LIBS)
+
+@BUILD_LIBCURL_TRUE@libcurl_includes = \
+@BUILD_LIBCURL_TRUE@ $(LIBCURL_CFLAGS)
-@BUILD_ABIWORD_OUTPUT_TRUE@abiword_includes = \
-@BUILD_ABIWORD_OUTPUT_TRUE@ $(ABIWORD_CFLAGS)
+@BUILD_LIBCURL_TRUE@curl_headers = \
+@BUILD_LIBCURL_TRUE@ CurlCachedFile.h \
+@BUILD_LIBCURL_TRUE@ CurlPDFDocBuilder.h
-@BUILD_ABIWORD_OUTPUT_TRUE@abiword_libs = \
-@BUILD_ABIWORD_OUTPUT_TRUE@ $(ABIWORD_LIBS)
+@BUILD_LIBCURL_TRUE@curl_sources = \
+@BUILD_LIBCURL_TRUE@ CurlCachedFile.cc \
+@BUILD_LIBCURL_TRUE@ CurlPDFDocBuilder.cc
@USE_CMS_TRUE@cms_includes = $(LCMS_CFLAGS)
@USE_CMS_TRUE@cms_libs = $(LCMS_LIBS)
@@ -475,7 +520,9 @@ INCLUDES = \
$(splash_includes) \
$(cairo_includes) \
$(arthur_includes) \
- $(abiword_includes) \
+ $(libtiff_includes) \
+ $(libpng_includes) \
+ $(libcurl_includes) \
$(FREETYPE_CFLAGS) \
$(FONTCONFIG_CFLAGS)
@@ -488,24 +535,27 @@ libpoppler_la_LIBADD = \
$(top_builddir)/fofi/libfofi.la \
$(cms_libs) \
$(splash_libs) \
+ $(libtiff_libs) \
$(libjpeg_libs) \
$(libpng_libs) \
$(zlib_libs) \
+ $(libcurl_libs) \
$(libjpeg2000_libs) \
- $(abiword_libs) \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS) \
$(PTHREAD_LIBS) \
$(win32_libs)
-libpoppler_la_LDFLAGS = -version-info 5:0:0 @create_shared_lib@
+libpoppler_la_LDFLAGS = -version-info 18:0:0 @create_shared_lib@ @auto_import_flags@
@ENABLE_XPDF_HEADERS_TRUE@poppler_includedir = $(includedir)/poppler
@ENABLE_XPDF_HEADERS_TRUE@poppler_include_HEADERS = \
@ENABLE_XPDF_HEADERS_TRUE@ $(splash_headers) \
+@ENABLE_XPDF_HEADERS_TRUE@ $(curl_headers) \
@ENABLE_XPDF_HEADERS_TRUE@ Annot.h \
@ENABLE_XPDF_HEADERS_TRUE@ Array.h \
@ENABLE_XPDF_HEADERS_TRUE@ BuiltinFont.h \
@ENABLE_XPDF_HEADERS_TRUE@ BuiltinFontTables.h \
+@ENABLE_XPDF_HEADERS_TRUE@ CachedFile.h \
@ENABLE_XPDF_HEADERS_TRUE@ Catalog.h \
@ENABLE_XPDF_HEADERS_TRUE@ CharCodeToUnicode.h \
@ENABLE_XPDF_HEADERS_TRUE@ CMap.h \
@@ -523,10 +573,13 @@ libpoppler_la_LDFLAGS = -version-info 5:0:0 @create_shared_lib@
@ENABLE_XPDF_HEADERS_TRUE@ GfxState.h \
@ENABLE_XPDF_HEADERS_TRUE@ GfxState_helpers.h \
@ENABLE_XPDF_HEADERS_TRUE@ GlobalParams.h \
+@ENABLE_XPDF_HEADERS_TRUE@ Hints.h \
@ENABLE_XPDF_HEADERS_TRUE@ JArithmeticDecoder.h \
@ENABLE_XPDF_HEADERS_TRUE@ JBIG2Stream.h \
@ENABLE_XPDF_HEADERS_TRUE@ Lexer.h \
+@ENABLE_XPDF_HEADERS_TRUE@ Linearization.h \
@ENABLE_XPDF_HEADERS_TRUE@ Link.h \
+@ENABLE_XPDF_HEADERS_TRUE@ LocalPDFDocBuilder.h \
@ENABLE_XPDF_HEADERS_TRUE@ Movie.h \
@ENABLE_XPDF_HEADERS_TRUE@ NameToCharCode.h \
@ENABLE_XPDF_HEADERS_TRUE@ Object.h \
@@ -537,11 +590,16 @@ libpoppler_la_LDFLAGS = -version-info 5:0:0 @create_shared_lib@
@ENABLE_XPDF_HEADERS_TRUE@ PageTransition.h \
@ENABLE_XPDF_HEADERS_TRUE@ Parser.h \
@ENABLE_XPDF_HEADERS_TRUE@ PDFDoc.h \
+@ENABLE_XPDF_HEADERS_TRUE@ PDFDocBuilder.h \
@ENABLE_XPDF_HEADERS_TRUE@ PDFDocEncoding.h \
+@ENABLE_XPDF_HEADERS_TRUE@ PDFDocFactory.h \
@ENABLE_XPDF_HEADERS_TRUE@ PopplerCache.h \
@ENABLE_XPDF_HEADERS_TRUE@ ProfileData.h \
@ENABLE_XPDF_HEADERS_TRUE@ PreScanOutputDev.h \
@ENABLE_XPDF_HEADERS_TRUE@ PSTokenizer.h \
+@ENABLE_XPDF_HEADERS_TRUE@ Rendition.h \
+@ENABLE_XPDF_HEADERS_TRUE@ StdinCachedFile.h \
+@ENABLE_XPDF_HEADERS_TRUE@ StdinPDFDocBuilder.h \
@ENABLE_XPDF_HEADERS_TRUE@ Stream-CCITT.h \
@ENABLE_XPDF_HEADERS_TRUE@ Stream.h \
@ENABLE_XPDF_HEADERS_TRUE@ UnicodeMap.h \
@@ -550,6 +608,7 @@ libpoppler_la_LDFLAGS = -version-info 5:0:0 @create_shared_lib@
@ENABLE_XPDF_HEADERS_TRUE@ UnicodeCClassTables.h \
@ENABLE_XPDF_HEADERS_TRUE@ UnicodeCompTables.h \
@ENABLE_XPDF_HEADERS_TRUE@ UnicodeDecompTables.h \
+@ENABLE_XPDF_HEADERS_TRUE@ ViewerPreferences.h \
@ENABLE_XPDF_HEADERS_TRUE@ XRef.h \
@ENABLE_XPDF_HEADERS_TRUE@ CharTypes.h \
@ENABLE_XPDF_HEADERS_TRUE@ CompactFontTables.h \
@@ -560,9 +619,9 @@ libpoppler_la_LDFLAGS = -version-info 5:0:0 @create_shared_lib@
@ENABLE_XPDF_HEADERS_TRUE@ SecurityHandler.h \
@ENABLE_XPDF_HEADERS_TRUE@ UTF8.h \
@ENABLE_XPDF_HEADERS_TRUE@ XpdfPluginAPI.h \
-@ENABLE_XPDF_HEADERS_TRUE@ Sound.h \
-@ENABLE_XPDF_HEADERS_TRUE@ poppler-config.h
+@ENABLE_XPDF_HEADERS_TRUE@ Sound.h
+@ENABLE_XPDF_HEADERS_TRUE@nodist_poppler_include_HEADERS = poppler-config.h
libpoppler_la_SOURCES = \
$(splash_sources) \
$(cairo_sources) \
@@ -570,11 +629,12 @@ libpoppler_la_SOURCES = \
$(libjpeg_sources) \
$(zlib_sources) \
$(libjpeg2000_sources) \
- $(abiword_sources) \
+ $(curl_sources) \
Annot.cc \
Array.cc \
BuiltinFont.cc \
BuiltinFontTables.cc \
+ CachedFile.cc \
Catalog.cc \
CharCodeToUnicode.cc \
CMap.cc \
@@ -591,10 +651,13 @@ libpoppler_la_SOURCES = \
GfxFont.cc \
GfxState.cc \
GlobalParams.cc \
+ Hints.cc \
JArithmeticDecoder.cc \
JBIG2Stream.cc \
Lexer.cc \
+ Linearization.cc \
Link.cc \
+ LocalPDFDocBuilder.cc \
Movie.cc \
NameToCharCode.cc \
Object.cc \
@@ -606,13 +669,19 @@ libpoppler_la_SOURCES = \
Parser.cc \
PDFDoc.cc \
PDFDocEncoding.cc \
+ PDFDocFactory.cc \
PopplerCache.cc \
ProfileData.cc \
PreScanOutputDev.cc \
PSTokenizer.cc \
+ Rendition.cc \
+ StdinCachedFile.cc \
+ StdinPDFDocBuilder.cc \
Stream.cc \
+ strtok_r.cpp \
UnicodeMap.cc \
UnicodeTypeTable.cc \
+ ViewerPreferences.cc \
XRef.cc \
PSOutputDev.cc \
TextOutputDev.cc \
@@ -629,7 +698,7 @@ all: poppler-config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
+.SUFFIXES: .cc .cpp .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -730,17 +799,20 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ABWOutputDev.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Annot.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Array.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ArthurOutputDev.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BuiltinFont.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BuiltinFontTables.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CachedFile.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CairoFontEngine.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CairoOutputDev.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CairoRescaleBox.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Catalog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CharCodeToUnicode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CurlCachedFile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CurlPDFDocBuilder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DCTStream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DateInfo.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Decrypt.Plo@am__quote@
@@ -756,12 +828,15 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GfxFont.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GfxState.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GlobalParams.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Hints.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JArithmeticDecoder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JBIG2Stream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPEG2000Stream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPXStream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Lexer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Linearization.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Link.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LocalPDFDocBuilder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Movie.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NameToCharCode.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Object.Plo@am__quote@
@@ -770,6 +845,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OutputDev.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDFDoc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDFDocEncoding.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDFDocFactory.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSOutputDev.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PSTokenizer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Page.Plo@am__quote@
@@ -779,15 +855,20 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PopplerCache.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PreScanOutputDev.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ProfileData.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Rendition.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SecurityHandler.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sound.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SplashOutputDev.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StdinCachedFile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StdinPDFDocBuilder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Stream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextOutputDev.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnicodeMap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnicodeTypeTable.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ViewerPreferences.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XRef.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XpdfPluginAPI.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtok_r.Plo@am__quote@
.cc.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -813,11 +894,55 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+.cpp.o:
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
+install-nodist_poppler_includeHEADERS: $(nodist_poppler_include_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(poppler_includedir)" || $(MKDIR_P) "$(DESTDIR)$(poppler_includedir)"
+ @list='$(nodist_poppler_include_HEADERS)'; test -n "$(poppler_includedir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(poppler_includedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(poppler_includedir)" || exit $$?; \
+ done
+
+uninstall-nodist_poppler_includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_poppler_include_HEADERS)'; test -n "$(poppler_includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(poppler_includedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(poppler_includedir)" && rm -f $$files
install-poppler_includeHEADERS: $(poppler_include_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(poppler_includedir)" || $(MKDIR_P) "$(DESTDIR)$(poppler_includedir)"
@@ -925,7 +1050,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS) poppler-config.h
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(poppler_includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(poppler_includedir)" "$(DESTDIR)$(poppler_includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -976,7 +1101,8 @@ info: info-am
info-am:
-install-data-am: install-poppler_includeHEADERS
+install-data-am: install-nodist_poppler_includeHEADERS \
+ install-poppler_includeHEADERS
install-dvi: install-dvi-am
@@ -1023,6 +1149,7 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-libLTLIBRARIES \
+ uninstall-nodist_poppler_includeHEADERS \
uninstall-poppler_includeHEADERS
.MAKE: all install-am install-strip
@@ -1035,13 +1162,15 @@ uninstall-am: uninstall-libLTLIBRARIES \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-libLTLIBRARIES \
- install-man install-pdf install-pdf-am \
- install-poppler_includeHEADERS install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-libLTLIBRARIES uninstall-poppler_includeHEADERS
+ install-man install-nodist_poppler_includeHEADERS install-pdf \
+ install-pdf-am install-poppler_includeHEADERS install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-libLTLIBRARIES \
+ uninstall-nodist_poppler_includeHEADERS \
+ uninstall-poppler_includeHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.cc
new file mode 100644
index 00000000000..3e764ac1590
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.cc
@@ -0,0 +1,285 @@
+//*********************************************************************************
+// Movie.cc
+//---------------------------------------------------------------------------------
+//
+//---------------------------------------------------------------------------------
+// Hugo Mercier <hmercier31[at]gmail.com> (c) 2008
+// Pino Toscano <pino@kde.org> (c) 2008
+// Carlos Garcia Campos <carlosgc@gnome.org> (c) 2010
+// Albert Astals Cid <aacid@kde.org> (c) 2010
+//
+// 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//*********************************************************************************
+
+#include <math.h>
+#include "Movie.h"
+#include "FileSpec.h"
+
+MovieActivationParameters::MovieActivationParameters() {
+ // default values
+ floatingWindow = gFalse;
+ xPosition = 0.5;
+ yPosition = 0.5;
+ rate = 1.0;
+ volume = 100;
+ showControls = gFalse;
+ synchronousPlay = gFalse;
+ repeatMode = repeatModeOnce;
+ start.units = 0;
+ duration.units = 0;
+ znum = 1;
+ zdenum = 1;
+}
+
+MovieActivationParameters::~MovieActivationParameters() {
+}
+
+void MovieActivationParameters::parseMovieActivation(Object* aDict) {
+ Object obj1;
+
+ if (!aDict->dictLookup("Start", &obj1)->isNull()) {
+ if (obj1.isInt()) {
+ // If it is representable as an integer (subject to the implementation limit for
+ // integers, as described in Appendix C), it should be specified as such.
+
+ start.units = obj1.getInt();
+ } else if (obj1.isString()) {
+ // If it is not representable as an integer, it should be specified as an 8-byte
+ // string representing a 64-bit twos-complement integer, most significant
+ // byte first.
+
+ // UNSUPPORTED
+ } else if (obj1.isArray()) {
+ Array* a = obj1.getArray();
+
+ Object tmp;
+ a->get(0, &tmp);
+ if (tmp.isInt()) {
+ start.units = tmp.getInt();
+ }
+ if (tmp.isString()) {
+ // UNSUPPORTED
+ }
+ tmp.free();
+
+ a->get(1, &tmp);
+ if (tmp.isInt()) {
+ start.units_per_second = tmp.getInt();
+ }
+ tmp.free();
+ }
+ }
+ obj1.free();
+
+ if (!aDict->dictLookup("Duration", &obj1)->isNull()) {
+ if (obj1.isInt()) {
+ duration.units = obj1.getInt();
+ } else if (obj1.isString()) {
+ // UNSUPPORTED
+ } else if (obj1.isArray()) {
+ Array* a = obj1.getArray();
+
+ Object tmp;
+ a->get(0, &tmp);
+ if (tmp.isInt()) {
+ duration.units = tmp.getInt();
+ }
+ if (tmp.isString()) {
+ // UNSUPPORTED
+ }
+ tmp.free();
+
+ a->get(1, &tmp);
+ if (tmp.isInt()) {
+ duration.units_per_second = tmp.getInt();
+ }
+ tmp.free();
+ }
+ }
+ obj1.free();
+
+ if (aDict->dictLookup("Rate", &obj1)->isNum()) {
+ rate = obj1.getNum();
+ }
+ obj1.free();
+
+ if (aDict->dictLookup("Volume", &obj1)->isNum()) {
+ // convert volume to [0 100]
+ volume = int((obj1.getNum() + 1.0) * 50);
+ }
+ obj1.free();
+
+ if (aDict->dictLookup("ShowControls", &obj1)->isBool()) {
+ showControls = obj1.getBool();
+ }
+ obj1.free();
+
+ if (aDict->dictLookup("Synchronous", &obj1)->isBool()) {
+ synchronousPlay = obj1.getBool();
+ }
+ obj1.free();
+
+ if (aDict->dictLookup("Mode", &obj1)->isName()) {
+ char* name = obj1.getName();
+ if (!strcmp(name, "Once")) {
+ repeatMode = repeatModeOnce;
+ } else if (!strcmp(name, "Open")) {
+ repeatMode = repeatModeOpen;
+ } else if (!strcmp(name, "Repeat")) {
+ repeatMode = repeatModeRepeat;
+ } else if (!strcmp(name,"Palindrome")) {
+ repeatMode = repeatModePalindrome;
+ }
+ }
+ obj1.free();
+
+ if (aDict->dictLookup("FWScale", &obj1)->isArray()) {
+ // the presence of that entry implies that the movie is to be played
+ // in a floating window
+ floatingWindow = gTrue;
+
+ Array* scale = obj1.getArray();
+ if (scale->getLength() >= 2) {
+ Object tmp;
+ if (scale->get(0, &tmp)->isInt()) {
+ znum = tmp.getInt();
+ }
+ tmp.free();
+ if (scale->get(1, &tmp)->isInt()) {
+ zdenum = tmp.getInt();
+ }
+ tmp.free();
+ }
+ }
+ obj1.free();
+
+ if (aDict->dictLookup("FWPosition", &obj1)->isArray()) {
+ Array* pos = obj1.getArray();
+ if (pos->getLength() >= 2) {
+ Object tmp;
+ if (pos->get(0, &tmp)->isNum()) {
+ xPosition = tmp.getNum();
+ }
+ tmp.free();
+ if (pos->get(1, &tmp)->isNum()) {
+ yPosition = tmp.getNum();
+ }
+ tmp.free();
+ }
+ }
+ obj1.free();
+}
+
+void Movie::parseMovie (Object *movieDict) {
+ fileName = NULL;
+ rotationAngle = 0;
+ width = -1;
+ height = -1;
+ showPoster = gFalse;
+
+ Object obj1, obj2;
+ if (getFileSpecNameForPlatform(movieDict->dictLookup("F", &obj1), &obj2)) {
+ fileName = obj2.getString()->copy();
+ obj2.free();
+ } else {
+ error (-1, "Invalid Movie");
+ ok = gFalse;
+ obj1.free();
+ return;
+ }
+ obj1.free();
+
+ if (movieDict->dictLookup("Aspect", &obj1)->isArray()) {
+ Array* aspect = obj1.getArray();
+ if (aspect->getLength() >= 2) {
+ Object tmp;
+ if( aspect->get(0, &tmp)->isNum() ) {
+ width = (int)floor( aspect->get(0, &tmp)->getNum() + 0.5 );
+ }
+ tmp.free();
+ if( aspect->get(1, &tmp)->isNum() ) {
+ height = (int)floor( aspect->get(1, &tmp)->getNum() + 0.5 );
+ }
+ tmp.free();
+ }
+ }
+ obj1.free();
+
+ if (movieDict->dictLookup("Rotate", &obj1)->isInt()) {
+ // round up to 90°
+ rotationAngle = (((obj1.getInt() + 360) % 360) % 90) * 90;
+ }
+ obj1.free();
+
+ //
+ // movie poster
+ //
+ if (!movieDict->dictLookupNF("Poster", &poster)->isNull()) {
+ if (poster.isRef() || poster.isStream()) {
+ showPoster = gTrue;
+ } else if (poster.isBool()) {
+ showPoster = poster.getBool();
+ poster.free();
+ } else {
+ poster.free();
+ }
+ }
+}
+
+Movie::~Movie() {
+ if (fileName)
+ delete fileName;
+ poster.free();
+}
+
+Movie::Movie(Object *movieDict) {
+ ok = gTrue;
+
+ if (movieDict->isDict())
+ parseMovie(movieDict);
+ else
+ ok = gFalse;
+}
+
+Movie::Movie(Object *movieDict, Object *aDict) {
+ ok = gTrue;
+
+ if (movieDict->isDict()) {
+ parseMovie(movieDict);
+ if (aDict->isDict())
+ MA.parseMovieActivation(aDict);
+ } else {
+ ok = gFalse;
+ }
+}
+
+void Movie::getFloatingWindowSize(int *widthA, int *heightA)
+{
+ *widthA = int(width * double(MA.znum) / MA.zdenum);
+ *heightA = int(height * double(MA.znum) / MA.zdenum);
+}
+
+Movie* Movie::copy() {
+
+ // call default copy constructor
+ Movie* new_movie = new Movie(*this);
+
+ if (fileName)
+ new_movie->fileName = fileName->copy();
+
+ poster.copy(&new_movie->poster);
+
+ return new_movie;
+}
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.h
new file mode 100644
index 00000000000..1a162659179
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Movie.h
@@ -0,0 +1,110 @@
+//*********************************************************************************
+// Movie.h
+//---------------------------------------------------------------------------------
+//
+//---------------------------------------------------------------------------------
+// Hugo Mercier <hmercier31[at]gmail.com> (c) 2008
+// Carlos Garcia Campos <carlosgc@gnome.org> (c) 2010
+//
+// 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//*********************************************************************************
+
+#ifndef _MOVIE_H_
+#define _MOVIE_H_
+
+#include "Object.h"
+
+struct MovieActivationParameters {
+
+ MovieActivationParameters();
+ ~MovieActivationParameters();
+
+ // parse from a "Movie Activation" dictionary
+ void parseMovieActivation(Object* actObj);
+
+ enum MovieRepeatMode {
+ repeatModeOnce,
+ repeatModeOpen,
+ repeatModeRepeat,
+ repeatModePalindrome
+ };
+
+ struct MovieTime {
+ MovieTime() { units_per_second = 0; }
+ Gulong units;
+ int units_per_second; // 0 : defined by movie
+ };
+
+ MovieTime start; // 0
+ MovieTime duration; // 0
+
+ double rate; // 1.0
+
+ int volume; // 100
+
+ GBool showControls; // false
+
+ GBool synchronousPlay; // false
+ MovieRepeatMode repeatMode; // repeatModeOnce
+
+ // floating window position
+ GBool floatingWindow;
+ double xPosition; // 0.5
+ double yPosition; // 0.5
+ int znum; // 1
+ int zdenum; // 1
+};
+
+class Movie {
+ public:
+ Movie(Object *objMovie, Object *objAct);
+ Movie(Object *objMovie);
+ ~Movie();
+
+ GBool isOk() { return ok; }
+ MovieActivationParameters* getActivationParameters() { return &MA; }
+
+ GooString* getFileName() { return fileName; }
+
+ Gushort getRotationAngle() { return rotationAngle; }
+ void getAspect (int *widthA, int *heightA) { *widthA = width; *heightA = height; }
+
+ Object *getPoster(Object *obj) { return poster.copy(obj); }
+ GBool getShowPoster() { return showPoster; }
+
+ GBool getUseFloatingWindow() { return MA.floatingWindow; }
+ void getFloatingWindowSize(int *width, int *height);
+
+ Movie* copy();
+
+ private:
+ void parseMovie (Object *movieDict);
+
+ GBool ok;
+
+ Gushort rotationAngle; // 0
+ int width; // Aspect
+ int height; // Aspect
+
+ Object poster;
+ GBool showPoster;
+
+ GooString* fileName;
+
+ MovieActivationParameters MA;
+};
+
+#endif
+
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToCharCode.cc
index efe1c4de0bd..efe1c4de0bd 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToCharCode.h
index bc57c3736c1..bc57c3736c1 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToUnicodeTable.h
index 0b1812c0c48..650f62ea88d 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/NameToUnicodeTable.h
@@ -6,6 +6,24 @@
//
//========================================================================
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2011 Albert Astals Cid <aacid@kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
+#include "CharTypes.h"
+
+#include <stddef.h>
+
static struct {
Unicode u;
char *name;
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Object.cc
index 49b2d44452c..4f7da80ecac 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Object.cc
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -115,9 +115,9 @@ Object *Object::copy(Object *obj) {
return obj;
}
-Object *Object::fetch(XRef *xref, Object *obj) {
+Object *Object::fetch(XRef *xref, Object *obj, std::set<int> *fetchOriginatorNums) {
return (type == objRef && xref) ?
- xref->fetch(ref.num, ref.gen, obj) : copy(obj);
+ xref->fetch(ref.num, ref.gen, obj, fetchOriginatorNums) : copy(obj);
}
void Object::free() {
@@ -223,6 +223,9 @@ void Object::print(FILE *f) {
case objNone:
fprintf(f, "<none>");
break;
+ case objUint:
+ fprintf(f, "%u", uintg);
+ break;
}
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Object.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Object.h
index eb3fc33e2b5..72ff667858b 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Object.h
@@ -15,7 +15,7 @@
//
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2008 Kees Cook <kees@outflux.net>
-// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 Jakub Wilk <ubanus@users.sf.net>
//
// To see a description of the changes please see the Changelog file that
@@ -30,21 +30,15 @@
#pragma interface
#endif
+#include <set>
#include <stdio.h>
#include <string.h>
#include "goo/gtypes.h"
#include "goo/gmem.h"
#include "goo/GooString.h"
+#include "goo/GooLikely.h"
#include "Error.h"
-#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-# define likely(x) __builtin_expect((x), 1)
-# define unlikely(x) __builtin_expect((x), 0)
-#else
-# define likely(x) (x)
-# define unlikely(x) (x)
-#endif
-
#define OBJECT_TYPE_CHECK(wanted_type) \
if (unlikely(type != wanted_type)) { \
error(0, (char *) "Call to Object where the object was type %d, " \
@@ -96,10 +90,13 @@ enum ObjType {
objCmd, // command name
objError, // error return from Lexer
objEOF, // end of file return from Lexer
- objNone // uninitialized object
+ objNone, // uninitialized object
+
+ // poppler-only objects
+ objUint // overflown integer that still fits in a unsigned integer
};
-#define numObjTypes 14 // total number of object types
+#define numObjTypes 15 // total number of object types
//------------------------------------------------------------------------
// Object
@@ -145,6 +142,8 @@ public:
{ initObj(objError); return this; }
Object *initEOF()
{ initObj(objEOF); return this; }
+ Object *initUint(unsigned int uintgA)
+ { initObj(objUint); uintg = uintgA; return this; }
// Copy an object.
Object *copy(Object *obj);
@@ -155,7 +154,7 @@ public:
// If object is a Ref, fetch and return the referenced object.
// Otherwise, return a copy of the object.
- Object *fetch(XRef *xref, Object *obj);
+ Object *fetch(XRef *xref, Object *obj, std::set<int> *fetchOriginatorNums = NULL);
// Free object contents.
void free();
@@ -177,6 +176,7 @@ public:
GBool isError() { return type == objError; }
GBool isEOF() { return type == objEOF; }
GBool isNone() { return type == objNone; }
+ GBool isUint() { return type == objUint; }
// Special type checking.
GBool isName(char *nameA)
@@ -200,6 +200,7 @@ public:
int getRefNum() { OBJECT_TYPE_CHECK(objRef); return ref.num; }
int getRefGen() { OBJECT_TYPE_CHECK(objRef); return ref.gen; }
char *getCmd() { OBJECT_TYPE_CHECK(objCmd); return cmd; }
+ unsigned int getUint() { OBJECT_TYPE_CHECK(objUint); return uintg; }
// Array accessors.
int arrayGetLength();
@@ -212,7 +213,7 @@ public:
void dictAdd(char *key, Object *val);
void dictSet(char *key, Object *val);
GBool dictIs(char *dictType);
- Object *dictLookup(char *key, Object *obj);
+ Object *dictLookup(char *key, Object *obj, std::set<int> *fetchOriginatorNums = NULL);
Object *dictLookupNF(char *key, Object *obj);
char *dictGetKey(int i);
Object *dictGetVal(int i, Object *obj);
@@ -223,6 +224,7 @@ public:
void streamReset();
void streamClose();
int streamGetChar();
+ int streamGetChars(int nChars, Guchar *buffer);
int streamLookChar();
char *streamGetLine(char *buf, int size);
Guint streamGetPos();
@@ -242,6 +244,7 @@ private:
union { // value for each type:
GBool booln; // boolean
int intg; // integer
+ unsigned int uintg; // unsigned integer
double real; // real
GooString *string; // string
char *name; // name
@@ -297,8 +300,8 @@ inline GBool Object::dictIs(char *dictType)
inline GBool Object::isDict(char *dictType)
{ return type == objDict && dictIs(dictType); }
-inline Object *Object::dictLookup(char *key, Object *obj)
- { OBJECT_TYPE_CHECK(objDict); return dict->lookup(key, obj); }
+inline Object *Object::dictLookup(char *key, Object *obj, std::set<int> *fetchOriginatorNums)
+ { OBJECT_TYPE_CHECK(objDict); return dict->lookup(key, obj, fetchOriginatorNums); }
inline Object *Object::dictLookupNF(char *key, Object *obj)
{ OBJECT_TYPE_CHECK(objDict); return dict->lookupNF(key, obj); }
@@ -333,6 +336,9 @@ inline void Object::streamClose()
inline int Object::streamGetChar()
{ OBJECT_TYPE_CHECK(objStream); return stream->getChar(); }
+inline int Object::streamGetChars(int nChars, Guchar *buffer)
+ { OBJECT_TYPE_CHECK(objStream); return stream->doGetChars(nChars, buffer); }
+
inline int Object::streamLookChar()
{ OBJECT_TYPE_CHECK(objStream); return stream->lookChar(); }
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/OptionalContent.cc
index 95686949d49..c8b5c97222b 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/OptionalContent.cc
@@ -4,8 +4,8 @@
//
// Copyright 2007 Brad Hards <bradh@kde.org>
// Copyright 2008 Pino Toscano <pino@kde.org>
-// Copyright 2008 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright 2008, 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2008, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright 2008, 2010, 2011 Albert Astals Cid <aacid@kde.org>
// Copyright 2008 Mark Kaplan <mkaplan@finjan.com>
//
// Released under the GPL (version 2, or later, at your option)
@@ -71,15 +71,19 @@ OCGs::OCGs(Object *ocgObject, XRef *xref) :
ok = gFalse;
return;
}
-#if 0
- // this is untested - we need an example showing BaseState
+
Object baseState;
defaultOcgConfig.dictLookup("BaseState", &baseState);
- if (baseState.isString()) {
- // read the value, and set each OptionalContentGroup entry appropriately
+ if (baseState.isName("OFF")) {
+ for (int i = 0; i < optionalContentGroups->getLength(); ++i) {
+ OptionalContentGroup *group;
+
+ group = (OptionalContentGroup *)optionalContentGroups->get(i);
+ group->setState(OptionalContentGroup::Off);
+ }
}
baseState.free();
-#endif
+
Object on;
defaultOcgConfig.dictLookup("ON", &on);
if (on.isArray()) {
@@ -209,7 +213,7 @@ bool OCGs::optContentIsVisible( Object *dictRef )
policy.free();
} else if ( dictType.isName("OCG") ) {
OptionalContentGroup* oc = findOcgByRef( dictRef->getRef() );
- if ( !oc || oc->getState() == OptionalContentGroup::Off ) {
+ if ( oc && oc->getState() == OptionalContentGroup::Off ) {
result=false;
}
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/OptionalContent.h
index 7add4a3c11e..7add4a3c11e 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/OutputDev.cc
index 5adc7b87c4c..5adc7b87c4c 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/OutputDev.h
index cdc74cf6b5f..bf984fc31ab 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/OutputDev.h
@@ -16,10 +16,11 @@
// Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
// Copyright (C) 2006 Thorkild Stray <thorkild@ifi.uio.no>
// Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2007 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2009 Thomas Freitag <Thomas.Freitag@alfa.de>
-// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007, 2011 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2009-2011 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.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
@@ -47,10 +48,14 @@ class GfxColorSpace;
class GfxImageColorMap;
class GfxFunctionShading;
class GfxAxialShading;
+class GfxGouraudTriangleShading;
+class GfxPatchMeshShading;
class GfxRadialShading;
+class GfxGouraudTriangleShading;
+class GfxPatchMeshShading;
class Stream;
class Links;
-class Link;
+class AnnotLink;
class Catalog;
class Page;
class Function;
@@ -82,10 +87,9 @@ public:
// operations.
virtual GBool useTilingPatternFill() { return gFalse; }
- // Does this device use functionShadedFill(), axialShadedFill(), and
- // radialShadedFill()? If this returns false, these shaded fills
- // will be reduced to a series of other drawing operations.
- virtual GBool useShadedFills() { return gFalse; }
+ // Does this device support specific shading types?
+ // see gouraudTriangleShadedFill() and patchMeshShadedFill()
+ virtual GBool useShadedFills(int type) { return gFalse; }
// Does this device use FillColorStop()?
virtual GBool useFillColorStop() { return gFalse; }
@@ -173,6 +177,7 @@ public:
virtual void updateStrokeOpacity(GfxState * /*state*/) {}
virtual void updateFillOverprint(GfxState * /*state*/) {}
virtual void updateStrokeOverprint(GfxState * /*state*/) {}
+ virtual void updateOverprintMode(GfxState * /*state*/) {}
virtual void updateTransfer(GfxState * /*state*/) {}
virtual void updateFillColorStop(GfxState * /*state*/, double /*offset*/) {}
@@ -191,8 +196,8 @@ public:
virtual void stroke(GfxState * /*state*/) {}
virtual void fill(GfxState * /*state*/) {}
virtual void eoFill(GfxState * /*state*/) {}
- virtual GBool tilingPatternFill(GfxState * /*state*/, Object * /*str*/,
- int /*paintType*/, Dict * /*resDict*/,
+ virtual GBool tilingPatternFill(GfxState * /*state*/, Catalog * /*cat*/, Object * /*str*/,
+ double * /*pmat*/, int /*paintType*/, int /*tilingType*/, Dict * /*resDict*/,
double * /*mat*/, double * /*bbox*/,
int /*x0*/, int /*y0*/, int /*x1*/, int /*y1*/,
double /*xStep*/, double /*yStep*/)
@@ -208,6 +213,10 @@ public:
{ return gFalse; }
virtual GBool radialShadedSupportExtend(GfxState * /*state*/, GfxRadialShading * /*shading*/)
{ return gFalse; }
+ virtual GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading)
+ { return gFalse; }
+ virtual GBool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading)
+ { return gFalse; }
//----- path clipping
virtual void clip(GfxState * /*state*/) {}
@@ -296,7 +305,7 @@ public:
virtual void clearSoftMask(GfxState * /*state*/) {}
//----- links
- virtual void processLink(Link * /*link*/, Catalog * /*catalog*/) {}
+ virtual void processLink(AnnotLink * /*link*/, Catalog * /*catalog*/) {}
#if 1 //~tmp: turn off anti-aliasing temporarily
virtual GBool getVectorAntialias() { return gFalse; }
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.cc
new file mode 100644
index 00000000000..01d2759a193
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.cc
@@ -0,0 +1,1523 @@
+//========================================================================
+//
+// PDFDoc.cc
+//
+// Copyright 1996-2003 Glyph & Cog, LLC
+//
+//========================================================================
+
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
+// Copyright (C) 2005, 2007-2009, 2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008 Julien Rebetez <julienr@svn.gnome.org>
+// Copyright (C) 2008, 2010 Pino Toscano <pino@kde.org>
+// Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2009 Eric Toombs <ewtoombs@uwaterloo.ca>
+// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
+// Copyright (C) 2009, 2011 Axel Struebing <axel.struebing@freenet.de>
+// Copyright (C) 2010, 2011 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net>
+// Copyright (C) 2010 Ilya Gorenbein <igorenbein@finjan.com>
+// Copyright (C) 2010 Srinivas Adicherla <srinivas.adicherla@geodesic.com>
+// Copyright (C) 2010 Philip Lorenz <lorenzph+freedesktop@gmail.com>
+// Copyright (C) 2011 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
+//
+//========================================================================
+
+#include <config.h>
+
+#ifdef USE_GCC_PRAGMAS
+#pragma implementation
+#endif
+
+#include <ctype.h>
+#include <locale.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <time.h>
+#ifdef _WIN32
+# include <windows.h>
+#endif
+#include <sys/stat.h>
+#include "goo/gstrtod.h"
+#include "goo/GooString.h"
+#include "poppler-config.h"
+#include "GlobalParams.h"
+#include "Page.h"
+#include "Catalog.h"
+#include "Stream.h"
+#include "XRef.h"
+#include "Linearization.h"
+#include "Link.h"
+#include "OutputDev.h"
+#include "Error.h"
+#include "ErrorCodes.h"
+#include "Lexer.h"
+#include "Parser.h"
+#include "SecurityHandler.h"
+#include "Decrypt.h"
+#ifndef DISABLE_OUTLINE
+#include "Outline.h"
+#endif
+#include "PDFDoc.h"
+#include "Hints.h"
+
+//------------------------------------------------------------------------
+
+#define headerSearchSize 1024 // read this many bytes at beginning of
+ // file to look for '%PDF'
+#define pdfIdLength 32 // PDF Document IDs (PermanentId, UpdateId) length
+
+#define linearizationSearchSize 1024 // read this many bytes at beginning of
+ // file to look for linearization
+ // dictionary
+
+#define xrefSearchSize 1024 // read this many bytes at end of file
+ // to look for 'startxref'
+
+//------------------------------------------------------------------------
+// PDFDoc
+//------------------------------------------------------------------------
+
+void PDFDoc::init()
+{
+ ok = gFalse;
+ errCode = errNone;
+ fileName = NULL;
+ file = NULL;
+ str = NULL;
+ xref = NULL;
+ linearization = NULL;
+ catalog = NULL;
+ hints = NULL;
+#ifndef DISABLE_OUTLINE
+ outline = NULL;
+#endif
+ startXRefPos = ~(Guint)0;
+ secHdlr = NULL;
+ pageCache = NULL;
+}
+
+PDFDoc::PDFDoc()
+{
+ init();
+}
+
+PDFDoc::PDFDoc(GooString *fileNameA, GooString *ownerPassword,
+ GooString *userPassword, void *guiDataA) {
+ Object obj;
+ int size = 0;
+
+ init();
+
+ fileName = fileNameA;
+ guiData = guiDataA;
+
+ struct stat buf;
+ if (stat(fileName->getCString(), &buf) == 0) {
+ size = buf.st_size;
+ }
+
+ // try to open file
+#ifdef VMS
+ file = fopen(fileName->getCString(), "rb", "ctx=stm");
+#else
+ file = fopen(fileName->getCString(), "rb");
+#endif
+ if (file == NULL) {
+ // fopen() has failed.
+ // Keep a copy of the errno returned by fopen so that it can be
+ // referred to later.
+ fopenErrno = errno;
+ error(-1, "Couldn't open file '%s': %s.", fileName->getCString(),
+ strerror(errno));
+ errCode = errOpenFile;
+ return;
+ }
+
+ // create stream
+ obj.initNull();
+ str = new FileStream(file, 0, gFalse, size, &obj);
+
+ ok = setup(ownerPassword, userPassword);
+}
+
+#ifdef _WIN32
+PDFDoc::PDFDoc(wchar_t *fileNameA, int fileNameLen, GooString *ownerPassword,
+ GooString *userPassword, void *guiDataA) {
+ OSVERSIONINFO version;
+ wchar_t fileName2[MAX_PATH + 1];
+ Object obj;
+ int i;
+
+ init();
+
+ guiData = guiDataA;
+
+ //~ file name should be stored in Unicode (?)
+ fileName = new GooString();
+ for (i = 0; i < fileNameLen; ++i) {
+ fileName->append((char)fileNameA[i]);
+ }
+
+ // zero-terminate the file name string
+ for (i = 0; i < fileNameLen && i < MAX_PATH; ++i) {
+ fileName2[i] = fileNameA[i];
+ }
+ fileName2[i] = 0;
+
+ // try to open file
+ // NB: _wfopen is only available in NT
+ struct _stat buf;
+ int size;
+ version.dwOSVersionInfoSize = sizeof(version);
+ GetVersionEx(&version);
+ if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+ if (_wstat(fileName2, &buf) == 0) {
+ size = buf.st_size;
+ }
+ file = _wfopen(fileName2, L"rb");
+ } else {
+ if (_stat(fileName->getCString(), &buf) == 0) {
+ size = buf.st_size;
+ }
+ file = fopen(fileName->getCString(), "rb");
+ }
+ if (!file) {
+ error(-1, "Couldn't open file '%s'", fileName->getCString());
+ errCode = errOpenFile;
+ return;
+ }
+
+ // create stream
+ obj.initNull();
+ str = new FileStream(file, 0, gFalse, size, &obj);
+
+ ok = setup(ownerPassword, userPassword);
+}
+#endif
+
+PDFDoc::PDFDoc(BaseStream *strA, GooString *ownerPassword,
+ GooString *userPassword, void *guiDataA) {
+
+ init();
+ guiData = guiDataA;
+ if (strA->getFileName()) {
+ fileName = strA->getFileName()->copy();
+ } else {
+ fileName = NULL;
+ }
+ str = strA;
+ ok = setup(ownerPassword, userPassword);
+}
+
+GBool PDFDoc::setup(GooString *ownerPassword, GooString *userPassword) {
+ str->setPos(0, -1);
+ if (str->getPos() < 0)
+ {
+ error(-1, "Document base stream is not seekable");
+ return gFalse;
+ }
+
+ str->reset();
+
+ // check footer
+ // Adobe does not seem to enforce %%EOF, so we do the same
+// if (!checkFooter()) return gFalse;
+
+ // check header
+ checkHeader();
+
+ GBool wasReconstructed = false;
+
+ // read xref table
+ xref = new XRef(str, getStartXRef(), getMainXRefEntriesOffset(), &wasReconstructed);
+ if (!xref->isOk()) {
+ error(-1, "Couldn't read xref table");
+ errCode = xref->getErrorCode();
+ return gFalse;
+ }
+
+ // check for encryption
+ if (!checkEncryption(ownerPassword, userPassword)) {
+ errCode = errEncrypted;
+ return gFalse;
+ }
+
+ // read catalog
+ catalog = new Catalog(xref);
+ if (catalog && !catalog->isOk()) {
+ if (!wasReconstructed)
+ {
+ // try one more time to contruct the Catalog, maybe the problem is damaged XRef
+ delete catalog;
+ delete xref;
+ xref = new XRef(str, 0, 0, NULL, true);
+ catalog = new Catalog(xref);
+ }
+
+ if (catalog && !catalog->isOk()) {
+ error(-1, "Couldn't read page catalog");
+ errCode = errBadCatalog;
+ return gFalse;
+ }
+ }
+
+ // done
+ return gTrue;
+}
+
+PDFDoc::~PDFDoc() {
+ if (pageCache) {
+ for (int i = 0; i < getNumPages(); i++) {
+ if (pageCache[i]) {
+ delete pageCache[i];
+ }
+ }
+ gfree(pageCache);
+ }
+ delete secHdlr;
+#ifndef DISABLE_OUTLINE
+ if (outline) {
+ delete outline;
+ }
+#endif
+ if (catalog) {
+ delete catalog;
+ }
+ if (xref) {
+ delete xref;
+ }
+ if (hints) {
+ delete hints;
+ }
+ if (linearization) {
+ delete linearization;
+ }
+ if (str) {
+ delete str;
+ }
+ if (file) {
+ fclose(file);
+ }
+ if (fileName) {
+ delete fileName;
+ }
+}
+
+
+// Check for a %%EOF at the end of this stream
+GBool PDFDoc::checkFooter() {
+ // we look in the last 1024 chars because Adobe does the same
+ char *eof = new char[1025];
+ int pos = str->getPos();
+ str->setPos(1024, -1);
+ int i, ch;
+ for (i = 0; i < 1024; i++)
+ {
+ ch = str->getChar();
+ if (ch == EOF)
+ break;
+ eof[i] = ch;
+ }
+ eof[i] = '\0';
+
+ bool found = false;
+ for (i = i - 5; i >= 0; i--) {
+ if (strncmp (&eof[i], "%%EOF", 5) == 0) {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ error(-1, "Document has not the mandatory ending %%EOF");
+ errCode = errDamaged;
+ delete[] eof;
+ return gFalse;
+ }
+ delete[] eof;
+ str->setPos(pos);
+ return gTrue;
+}
+
+// Check for a PDF header on this stream. Skip past some garbage
+// if necessary.
+void PDFDoc::checkHeader() {
+ char hdrBuf[headerSearchSize+1];
+ char *p;
+ char *tokptr;
+ int i;
+
+ pdfMajorVersion = 0;
+ pdfMinorVersion = 0;
+ for (i = 0; i < headerSearchSize; ++i) {
+ hdrBuf[i] = str->getChar();
+ }
+ hdrBuf[headerSearchSize] = '\0';
+ for (i = 0; i < headerSearchSize - 5; ++i) {
+ if (!strncmp(&hdrBuf[i], "%PDF-", 5)) {
+ break;
+ }
+ }
+ if (i >= headerSearchSize - 5) {
+ error(-1, "May not be a PDF file (continuing anyway)");
+ return;
+ }
+ str->moveStart(i);
+ if (!(p = strtok_r(&hdrBuf[i+5], " \t\n\r", &tokptr))) {
+ error(-1, "May not be a PDF file (continuing anyway)");
+ return;
+ }
+ sscanf(p, "%d.%d", &pdfMajorVersion, &pdfMinorVersion);
+ // We don't do the version check. Don't add it back in.
+}
+
+GBool PDFDoc::checkEncryption(GooString *ownerPassword, GooString *userPassword) {
+ Object encrypt;
+ GBool encrypted;
+ GBool ret;
+
+ xref->getTrailerDict()->dictLookup("Encrypt", &encrypt);
+ if ((encrypted = encrypt.isDict())) {
+ if ((secHdlr = SecurityHandler::make(this, &encrypt))) {
+ if (secHdlr->checkEncryption(ownerPassword, userPassword)) {
+ // authorization succeeded
+ xref->setEncryption(secHdlr->getPermissionFlags(),
+ secHdlr->getOwnerPasswordOk(),
+ secHdlr->getFileKey(),
+ secHdlr->getFileKeyLength(),
+ secHdlr->getEncVersion(),
+ secHdlr->getEncRevision(),
+ secHdlr->getEncAlgorithm());
+ ret = gTrue;
+ } else {
+ // authorization failed
+ ret = gFalse;
+ }
+ } else {
+ // couldn't find the matching security handler
+ ret = gFalse;
+ }
+ } else {
+ // document is not encrypted
+ ret = gTrue;
+ }
+ encrypt.free();
+ return ret;
+}
+
+void PDFDoc::displayPage(OutputDev *out, int page,
+ double hDPI, double vDPI, int rotate,
+ GBool useMediaBox, GBool crop, GBool printing,
+ GBool (*abortCheckCbk)(void *data),
+ void *abortCheckCbkData,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
+ void *annotDisplayDecideCbkData) {
+ if (globalParams->getPrintCommands()) {
+ printf("***** page %d *****\n", page);
+ }
+
+ if (getPage(page))
+ getPage(page)->display(out, hDPI, vDPI,
+ rotate, useMediaBox, crop, printing, catalog,
+ abortCheckCbk, abortCheckCbkData,
+ annotDisplayDecideCbk, annotDisplayDecideCbkData);
+
+}
+
+void PDFDoc::displayPages(OutputDev *out, int firstPage, int lastPage,
+ double hDPI, double vDPI, int rotate,
+ GBool useMediaBox, GBool crop, GBool printing,
+ GBool (*abortCheckCbk)(void *data),
+ void *abortCheckCbkData,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
+ void *annotDisplayDecideCbkData) {
+ int page;
+
+ for (page = firstPage; page <= lastPage; ++page) {
+ displayPage(out, page, hDPI, vDPI, rotate, useMediaBox, crop, printing,
+ abortCheckCbk, abortCheckCbkData,
+ annotDisplayDecideCbk, annotDisplayDecideCbkData);
+ }
+}
+
+void PDFDoc::displayPageSlice(OutputDev *out, int page,
+ double hDPI, double vDPI, int rotate,
+ GBool useMediaBox, GBool crop, GBool printing,
+ int sliceX, int sliceY, int sliceW, int sliceH,
+ GBool (*abortCheckCbk)(void *data),
+ void *abortCheckCbkData,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
+ void *annotDisplayDecideCbkData) {
+ if (getPage(page))
+ getPage(page)->displaySlice(out, hDPI, vDPI,
+ rotate, useMediaBox, crop,
+ sliceX, sliceY, sliceW, sliceH,
+ printing, catalog,
+ abortCheckCbk, abortCheckCbkData,
+ annotDisplayDecideCbk, annotDisplayDecideCbkData);
+}
+
+Links *PDFDoc::getLinks(int page) {
+ Page *p = getPage(page);
+ if (!p) {
+ return new Links (NULL);
+ }
+ return p->getLinks(catalog);
+}
+
+void PDFDoc::processLinks(OutputDev *out, int page) {
+ if (getPage(page))
+ getPage(page)->processLinks(out, catalog);
+}
+
+Linearization *PDFDoc::getLinearization()
+{
+ if (!linearization) {
+ linearization = new Linearization(str);
+ }
+ return linearization;
+}
+
+GBool PDFDoc::isLinearized() {
+ if ((str->getLength()) &&
+ (getLinearization()->getLength() == str->getLength()))
+ return gTrue;
+ else
+ return gFalse;
+}
+
+static GBool
+get_id (GooString *encodedidstring, GooString *id) {
+ const char *encodedid = encodedidstring->getCString();
+ char pdfid[pdfIdLength + 1];
+ int n;
+
+ if (encodedidstring->getLength() != pdfIdLength / 2)
+ return gFalse;
+
+ n = sprintf(pdfid, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+ encodedid[0] & 0xff, encodedid[1] & 0xff, encodedid[2] & 0xff, encodedid[3] & 0xff,
+ encodedid[4] & 0xff, encodedid[5] & 0xff, encodedid[6] & 0xff, encodedid[7] & 0xff,
+ encodedid[8] & 0xff, encodedid[9] & 0xff, encodedid[10] & 0xff, encodedid[11] & 0xff,
+ encodedid[12] & 0xff, encodedid[13] & 0xff, encodedid[14] & 0xff, encodedid[15] & 0xff);
+ if (n != pdfIdLength)
+ return gFalse;
+
+ id->Set(pdfid, pdfIdLength);
+ return gTrue;
+}
+
+GBool PDFDoc::getID(GooString *permanent_id, GooString *update_id) {
+ Object obj;
+ xref->getTrailerDict()->dictLookup ("ID", &obj);
+
+ if (obj.isArray() && obj.arrayGetLength() == 2) {
+ Object obj2;
+
+ if (permanent_id) {
+ if (obj.arrayGet(0, &obj2)->isString()) {
+ if (!get_id (obj2.getString(), permanent_id)) {
+ obj2.free();
+ return gFalse;
+ }
+ } else {
+ error(-1, "Invalid permanent ID");
+ obj2.free();
+ return gFalse;
+ }
+ obj2.free();
+ }
+
+ if (update_id) {
+ if (obj.arrayGet(1, &obj2)->isString()) {
+ if (!get_id (obj2.getString(), update_id)) {
+ obj2.free();
+ return gFalse;
+ }
+ } else {
+ error(-1, "Invalid update ID");
+ obj2.free();
+ return gFalse;
+ }
+ obj2.free();
+ }
+
+ obj.free();
+
+ return gTrue;
+ }
+ obj.free();
+
+ return gFalse;
+}
+
+Hints *PDFDoc::getHints()
+{
+ if (!hints && isLinearized()) {
+ hints = new Hints(str, getLinearization(), getXRef(), secHdlr);
+ }
+
+ return hints;
+}
+
+int PDFDoc::savePageAs(GooString *name, int pageNo)
+{
+ FILE *f;
+ OutStream *outStr;
+ XRef *yRef, *countRef;
+ int rootNum = getXRef()->getSize() + 1;
+
+ if (pageNo < 1 || pageNo > getNumPages()) {
+ error(-1, "Illegal pageNo: %d(%d)", pageNo, getNumPages() );
+ return errOpenFile;
+ }
+ PDFRectangle *cropBox = NULL;
+ if (getCatalog()->getPage(pageNo)->isCropped()) {
+ cropBox = getCatalog()->getPage(pageNo)->getCropBox();
+ }
+ replacePageDict(pageNo,
+ getCatalog()->getPage(pageNo)->getRotate(),
+ getCatalog()->getPage(pageNo)->getMediaBox(),
+ cropBox, NULL);
+ Ref *refPage = getCatalog()->getPageRef(pageNo);
+ Object page;
+ getXRef()->fetch(refPage->num, refPage->gen, &page);
+
+ if (!(f = fopen(name->getCString(), "wb"))) {
+ error(-1, "Couldn't open file '%s'", name->getCString());
+ return errOpenFile;
+ }
+ outStr = new FileOutStream(f,0);
+
+ yRef = new XRef();
+ countRef = new XRef();
+ yRef->add(0, 65535, 0, gFalse);
+ writeHeader(outStr, getPDFMajorVersion(), getPDFMinorVersion());
+
+ // get and mark optional content groups
+ OCGs *ocgs = getCatalog()->getOptContentConfig();
+ if (ocgs != NULL) {
+ Object catDict, optContentProps;
+ getXRef()->getCatalog(&catDict);
+ catDict.dictLookup("OCProperties", &optContentProps);
+ Dict *pageDict = optContentProps.getDict();
+ markPageObjects(pageDict, yRef, countRef, 0);
+ catDict.free();
+ optContentProps.free();
+ }
+
+ Dict *pageDict = page.getDict();
+ markPageObjects(pageDict, yRef, countRef, 0);
+ Guint objectsCount = writePageObjects(outStr, yRef, 0);
+
+ yRef->add(rootNum,0,outStr->getPos(),gTrue);
+ outStr->printf("%d 0 obj\n", rootNum);
+ outStr->printf("<< /Type /Catalog /Pages %d 0 R", rootNum + 1);
+ if (ocgs != NULL) {
+ Object catDict, optContentProps;
+ getXRef()->getCatalog(&catDict);
+ catDict.dictLookup("OCProperties", &optContentProps);
+ outStr->printf(" /OCProperties <<");
+ Dict *pageDict = optContentProps.getDict();
+ for (int n = 0; n < pageDict->getLength(); n++) {
+ if (n > 0) outStr->printf(" ");
+ const char *key = pageDict->getKey(n);
+ Object value; pageDict->getValNF(n, &value);
+ outStr->printf("/%s ", key);
+ writeObject(&value, NULL, outStr, getXRef(), 0);
+ value.free();
+ }
+ outStr->printf(" >> ");
+ catDict.free();
+ optContentProps.free();
+ }
+ outStr->printf(">>\nendobj\n");
+ objectsCount++;
+
+ yRef->add(rootNum + 1,0,outStr->getPos(),gTrue);
+ outStr->printf("%d 0 obj\n", rootNum + 1);
+ outStr->printf("<< /Type /Pages /Kids [ %d 0 R ] /Count 1 >>\n", rootNum + 2);
+ outStr->printf("endobj\n");
+ objectsCount++;
+
+ yRef->add(rootNum + 2,0,outStr->getPos(),gTrue);
+ outStr->printf("%d 0 obj\n", rootNum + 2);
+ outStr->printf("<< ");
+ for (int n = 0; n < pageDict->getLength(); n++) {
+ if (n > 0) outStr->printf(" ");
+ const char *key = pageDict->getKey(n);
+ Object value; pageDict->getValNF(n, &value);
+ if (strcmp(key, "Parent") == 0) {
+ outStr->printf("/Parent %d 0 R", rootNum + 1);
+ } else {
+ outStr->printf("/%s ", key);
+ writeObject(&value, NULL, outStr, getXRef(), 0);
+ }
+ value.free();
+ }
+ outStr->printf(" >>\nendobj\n");
+ objectsCount++;
+ page.free();
+
+ Guint uxrefOffset = outStr->getPos();
+ yRef->writeToFile(outStr, gFalse /* do not write unnecessary entries */);
+
+ Ref ref;
+ ref.num = rootNum;
+ ref.gen = 0;
+ writeTrailer(uxrefOffset, objectsCount, outStr, gFalse, 0, &ref, getXRef(), name->getCString(), outStr->getPos());
+
+ outStr->close();
+ fclose(f);
+ delete yRef;
+ delete countRef;
+
+ return errNone;
+}
+
+int PDFDoc::saveAs(GooString *name, PDFWriteMode mode) {
+ FILE *f;
+ OutStream *outStr;
+ int res;
+
+ if (!(f = fopen(name->getCString(), "wb"))) {
+ error(-1, "Couldn't open file '%s'", name->getCString());
+ return errOpenFile;
+ }
+ outStr = new FileOutStream(f,0);
+ res = saveAs(outStr, mode);
+ delete outStr;
+ fclose(f);
+ return res;
+}
+
+int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
+
+ // we don't support files with Encrypt at the moment
+ Object obj;
+ xref->getTrailerDict()->getDict()->lookupNF("Encrypt", &obj);
+ if (!obj.isNull())
+ {
+ obj.free();
+ return errEncrypted;
+ }
+ obj.free();
+
+ if (mode == writeForceRewrite) {
+ saveCompleteRewrite(outStr);
+ } else if (mode == writeForceIncremental) {
+ saveIncrementalUpdate(outStr);
+ } else { // let poppler decide
+ // find if we have updated objects
+ GBool updated = gFalse;
+ for(int i=0; i<xref->getNumObjects(); i++) {
+ if (xref->getEntry(i)->updated) {
+ updated = gTrue;
+ break;
+ }
+ }
+ if(updated) {
+ saveIncrementalUpdate(outStr);
+ } else {
+ // simply copy the original file
+ saveWithoutChangesAs (outStr);
+ }
+ }
+
+ return errNone;
+}
+
+int PDFDoc::saveWithoutChangesAs(GooString *name) {
+ FILE *f;
+ OutStream *outStr;
+ int res;
+
+ if (!(f = fopen(name->getCString(), "wb"))) {
+ error(-1, "Couldn't open file '%s'", name->getCString());
+ return errOpenFile;
+ }
+
+ outStr = new FileOutStream(f,0);
+ res = saveWithoutChangesAs(outStr);
+ delete outStr;
+
+ fclose(f);
+
+ return res;
+}
+
+int PDFDoc::saveWithoutChangesAs(OutStream *outStr) {
+ int c;
+
+ str->reset();
+ while ((c = str->getChar()) != EOF) {
+ outStr->put(c);
+ }
+ str->close();
+
+ return errNone;
+}
+
+void PDFDoc::saveIncrementalUpdate (OutStream* outStr)
+{
+ XRef *uxref;
+ int c;
+ //copy the original file
+ str->reset();
+ while ((c = str->getChar()) != EOF) {
+ outStr->put(c);
+ }
+ str->close();
+
+ uxref = new XRef();
+ uxref->add(0, 65535, 0, gFalse);
+ for(int i=0; i<xref->getNumObjects(); i++) {
+ if ((xref->getEntry(i)->type == xrefEntryFree) &&
+ (xref->getEntry(i)->gen == 0)) //we skip the irrelevant free objects
+ continue;
+
+ if (xref->getEntry(i)->updated) { //we have an updated object
+ Object obj1;
+ Ref ref;
+ ref.num = i;
+ ref.gen = xref->getEntry(i)->type == xrefEntryCompressed ? 0 : xref->getEntry(i)->gen;
+ xref->fetch(ref.num, ref.gen, &obj1);
+ Guint offset = writeObject(&obj1, &ref, outStr);
+ uxref->add(ref.num, ref.gen, offset, gTrue);
+ obj1.free();
+ }
+ }
+ if (uxref->getSize() == 0) { //we have nothing to update
+ delete uxref;
+ return;
+ }
+
+ Guint uxrefOffset = outStr->getPos();
+ uxref->writeToFile(outStr, gFalse /* do not write unnecessary entries */);
+
+ writeTrailer(uxrefOffset, xref->getSize(), outStr, gTrue);
+
+ delete uxref;
+}
+
+void PDFDoc::saveCompleteRewrite (OutStream* outStr)
+{
+ outStr->printf("%%PDF-%d.%d\r\n",pdfMajorVersion,pdfMinorVersion);
+ XRef *uxref = new XRef();
+ uxref->add(0, 65535, 0, gFalse);
+ for(int i=0; i<xref->getNumObjects(); i++) {
+ Object obj1;
+ Ref ref;
+ XRefEntryType type = xref->getEntry(i)->type;
+ if (type == xrefEntryFree) {
+ ref.num = i;
+ ref.gen = xref->getEntry(i)->gen;
+ /* the XRef class adds a lot of irrelevant free entries, we only want the significant one
+ and we don't want the one with num=0 because it has already been added (gen = 65535)*/
+ if (ref.gen > 0 && ref.num > 0)
+ uxref->add(ref.num, ref.gen, 0, gFalse);
+ } else if (type == xrefEntryUncompressed){
+ ref.num = i;
+ ref.gen = xref->getEntry(i)->gen;
+ xref->fetch(ref.num, ref.gen, &obj1);
+ Guint offset = writeObject(&obj1, &ref, outStr);
+ uxref->add(ref.num, ref.gen, offset, gTrue);
+ obj1.free();
+ } else if (type == xrefEntryCompressed) {
+ ref.num = i;
+ ref.gen = 0; //compressed entries have gen == 0
+ xref->fetch(ref.num, ref.gen, &obj1);
+ Guint offset = writeObject(&obj1, &ref, outStr);
+ uxref->add(ref.num, ref.gen, offset, gTrue);
+ obj1.free();
+ }
+ }
+ Guint uxrefOffset = outStr->getPos();
+ uxref->writeToFile(outStr, gTrue /* write all entries */);
+
+ writeTrailer(uxrefOffset, uxref->getSize(), outStr, gFalse);
+
+
+ delete uxref;
+
+}
+
+void PDFDoc::writeDictionnary (Dict* dict, OutStream* outStr, XRef *xRef, Guint numOffset)
+{
+ Object obj1;
+ outStr->printf("<<");
+ for (int i=0; i<dict->getLength(); i++) {
+ GooString keyName(dict->getKey(i));
+ GooString *keyNameToPrint = keyName.sanitizedName(gFalse /* non ps mode */);
+ outStr->printf("/%s ", keyNameToPrint->getCString());
+ delete keyNameToPrint;
+ writeObject(dict->getValNF(i, &obj1), NULL, outStr, xRef, numOffset);
+ obj1.free();
+ }
+ outStr->printf(">> ");
+}
+
+void PDFDoc::writeStream (Stream* str, OutStream* outStr)
+{
+ outStr->printf("stream\r\n");
+ str->reset();
+ for (int c=str->getChar(); c!= EOF; c=str->getChar()) {
+ outStr->printf("%c", c);
+ }
+ outStr->printf("\r\nendstream\r\n");
+}
+
+void PDFDoc::writeRawStream (Stream* str, OutStream* outStr)
+{
+ Object obj1;
+ str->getDict()->lookup("Length", &obj1);
+ if (!obj1.isInt()) {
+ error (-1, "PDFDoc::writeRawStream, no Length in stream dict");
+ return;
+ }
+
+ const int length = obj1.getInt();
+ obj1.free();
+
+ outStr->printf("stream\r\n");
+ str->unfilteredReset();
+ for (int i=0; i<length; i++) {
+ int c = str->getUnfilteredChar();
+ outStr->printf("%c", c);
+ }
+ str->reset();
+ outStr->printf("\r\nendstream\r\n");
+}
+
+void PDFDoc::writeString (GooString* s, OutStream* outStr)
+{
+ if (s->hasUnicodeMarker()) {
+ //unicode string don't necessary end with \0
+ const char* c = s->getCString();
+ outStr->printf("(");
+ for(int i=0; i<s->getLength(); i++) {
+ char unescaped = *(c+i)&0x000000ff;
+ //escape if needed
+ if (unescaped == '(' || unescaped == ')' || unescaped == '\\')
+ outStr->printf("%c", '\\');
+ outStr->printf("%c", unescaped);
+ }
+ outStr->printf(") ");
+ } else {
+ const char* c = s->getCString();
+ outStr->printf("(");
+ for(int i=0; i<s->getLength(); i++) {
+ char unescaped = *(c+i)&0x000000ff;
+ //escape if needed
+ if (unescaped == '\r')
+ outStr->printf("\\r");
+ else if (unescaped == '\n')
+ outStr->printf("\\n");
+ else {
+ if (unescaped == '(' || unescaped == ')' || unescaped == '\\') {
+ outStr->printf("%c", '\\');
+ }
+ outStr->printf("%c", unescaped);
+ }
+ }
+ outStr->printf(") ");
+ }
+}
+
+Guint PDFDoc::writeObject (Object* obj, Ref* ref, OutStream* outStr, XRef *xRef, Guint numOffset)
+{
+ Array *array;
+ Object obj1;
+ Guint offset = outStr->getPos();
+ int tmp;
+
+ if(ref)
+ outStr->printf("%i %i obj ", ref->num, ref->gen);
+
+ switch (obj->getType()) {
+ case objBool:
+ outStr->printf("%s ", obj->getBool()?"true":"false");
+ break;
+ case objInt:
+ outStr->printf("%i ", obj->getInt());
+ break;
+ case objReal:
+ {
+ GooString s;
+ s.appendf("{0:.10g}", obj->getReal());
+ outStr->printf("%s ", s.getCString());
+ break;
+ }
+ case objString:
+ writeString(obj->getString(), outStr);
+ break;
+ case objName:
+ {
+ GooString name(obj->getName());
+ GooString *nameToPrint = name.sanitizedName(gFalse /* non ps mode */);
+ outStr->printf("/%s ", nameToPrint->getCString());
+ delete nameToPrint;
+ break;
+ }
+ case objNull:
+ outStr->printf( "null ");
+ break;
+ case objArray:
+ array = obj->getArray();
+ outStr->printf("[");
+ for (int i=0; i<array->getLength(); i++) {
+ writeObject(array->getNF(i, &obj1), NULL,outStr, xRef, numOffset);
+ obj1.free();
+ }
+ outStr->printf("] ");
+ break;
+ case objDict:
+ writeDictionnary (obj->getDict(),outStr, xRef, numOffset);
+ break;
+ case objStream:
+ {
+ //We can't modify stream with the current implementation (no write functions in Stream API)
+ // => the only type of streams which that have been modified are internal streams (=strWeird)
+ Stream *stream = obj->getStream();
+ if (stream->getKind() == strWeird) {
+ //we write the stream unencoded => TODO: write stream encoder
+ stream->reset();
+ //recalculate stream length
+ tmp = 0;
+ for (int c=stream->getChar(); c!=EOF; c=stream->getChar()) {
+ tmp++;
+ }
+ obj1.initInt(tmp);
+ stream->getDict()->set("Length", &obj1);
+
+ //Remove Stream encoding
+ stream->getDict()->remove("Filter");
+ stream->getDict()->remove("DecodeParms");
+
+ writeDictionnary (stream->getDict(),outStr, xRef, numOffset);
+ writeStream (stream,outStr);
+ obj1.free();
+ } else {
+ //raw stream copy
+ FilterStream *fs = dynamic_cast<FilterStream*>(stream);
+ if (fs) {
+ BaseStream *bs = fs->getBaseStream();
+ if (bs) {
+ Guint streamEnd;
+ if (xRef->getStreamEnd(bs->getStart(), &streamEnd)) {
+ Object val;
+ val.initInt(streamEnd - bs->getStart());
+ stream->getDict()->set("Length", &val);
+ }
+ }
+ }
+ writeDictionnary (stream->getDict(), outStr, xRef, numOffset);
+ writeRawStream (stream, outStr);
+ }
+ break;
+ }
+ case objRef:
+ outStr->printf("%i %i R ", obj->getRef().num + numOffset, obj->getRef().gen);
+ break;
+ case objCmd:
+ outStr->printf("%s\n", obj->getCmd());
+ break;
+ case objError:
+ outStr->printf("error\r\n");
+ break;
+ case objEOF:
+ outStr->printf("eof\r\n");
+ break;
+ case objNone:
+ outStr->printf("none\r\n");
+ break;
+ default:
+ error(-1,"Unhandled objType : %i, please report a bug with a testcase\r\n", obj->getType());
+ break;
+ }
+ if (ref)
+ outStr->printf("endobj\r\n");
+ return offset;
+}
+
+void PDFDoc::writeTrailer(Guint uxrefOffset, int uxrefSize,
+ OutStream* outStr, GBool incrUpdate,
+ Guint startxRef, Ref *root, XRef *xRef, const char *fileName,
+ Guint fileSize)
+{
+ Dict *trailerDict = new Dict(xRef);
+ Object obj1;
+ obj1.initInt(uxrefSize);
+ trailerDict->set("Size", &obj1);
+ obj1.free();
+
+
+ //build a new ID, as recommended in the reference, uses:
+ // - current time
+ // - file name
+ // - file size
+ // - values of entry in information dictionnary
+ GooString message;
+ char buffer[256];
+ sprintf(buffer, "%i", (int)time(NULL));
+ message.append(buffer);
+ message.append(fileName);
+
+ sprintf(buffer, "%i", fileSize);
+ message.append(buffer);
+
+ //info dict -- only use text string
+ if (!xRef->getTrailerDict()->isNone() && xRef->getDocInfo(&obj1)->isDict()) {
+ for(int i=0; i<obj1.getDict()->getLength(); i++) {
+ Object obj2;
+ obj1.getDict()->getVal(i, &obj2);
+ if (obj2.isString()) {
+ message.append(obj2.getString());
+ }
+ obj2.free();
+ }
+ }
+ obj1.free();
+
+ //calculate md5 digest
+ Guchar digest[16];
+ Decrypt::md5((Guchar*)message.getCString(), message.getLength(), digest);
+ obj1.initString(new GooString((const char*)digest, 16));
+
+ //create ID array
+ Object obj2,obj3,obj5;
+ obj2.initArray(xRef);
+
+ if (incrUpdate) {
+ Object obj4;
+ //only update the second part of the array
+ xRef->getTrailerDict()->getDict()->lookup("ID", &obj4);
+ if (!obj4.isArray()) {
+ error(-1, "PDFDoc::writeTrailer original file's ID entry isn't an array. Trying to continue");
+ } else {
+ //Get the first part of the ID
+ obj4.arrayGet(0,&obj3);
+
+ obj2.arrayAdd(&obj3);
+ obj2.arrayAdd(&obj1);
+ trailerDict->set("ID", &obj2);
+ }
+ obj4.free();
+ } else {
+ //new file => same values for the two identifiers
+ obj2.arrayAdd(&obj1);
+ obj1.initString(new GooString((const char*)digest, 16));
+ obj2.arrayAdd(&obj1);
+ trailerDict->set("ID", &obj2);
+ }
+
+ obj1.initRef(root->num, root->gen);
+ trailerDict->set("Root", &obj1);
+
+ if (incrUpdate) {
+ obj1.initInt(startxRef);
+ trailerDict->set("Prev", &obj1);
+ }
+
+ if (!xRef->getTrailerDict()->isNone()) {
+ xRef->getDocInfoNF(&obj5);
+ if (!obj5.isNull()) {
+ trailerDict->set("Info", &obj5);
+ }
+ }
+
+ outStr->printf( "trailer\r\n");
+ writeDictionnary(trailerDict, outStr, xRef, 0);
+ outStr->printf( "\r\nstartxref\r\n");
+ outStr->printf( "%i\r\n", uxrefOffset);
+ outStr->printf( "%%%%EOF\r\n");
+
+ delete trailerDict;
+}
+
+void PDFDoc::writeTrailer(Guint uxrefOffset, int uxrefSize, OutStream* outStr, GBool incrUpdate)
+{
+ char *fileNameA;
+ if (fileName)
+ fileNameA = fileName->getCString();
+ else
+ fileNameA = "streamwithoutfilename.pdf";
+ // file size
+ unsigned int fileSize = 0;
+ int c;
+ str->reset();
+ while ((c = str->getChar()) != EOF) {
+ fileSize++;
+ }
+ str->close();
+ Ref ref;
+ ref.num = getXRef()->getRootNum();
+ ref.gen = getXRef()->getRootGen();
+ writeTrailer(uxrefOffset, uxrefSize, outStr, incrUpdate, getStartXRef(), &ref, getXRef(), fileNameA, fileSize);
+}
+
+void PDFDoc::writeHeader(OutStream *outStr, int major, int minor)
+{
+ outStr->printf("%%PDF-%d.%d\n", major, minor);
+ outStr->printf("%%\xE2\xE3\xCF\xD3\n");
+}
+
+void PDFDoc::markDictionnary (Dict* dict, XRef * xRef, XRef *countRef, Guint numOffset)
+{
+ Object obj1;
+ for (int i=0; i<dict->getLength(); i++) {
+ markObject(dict->getValNF(i, &obj1), xRef, countRef, numOffset);
+ obj1.free();
+ }
+}
+
+void PDFDoc::markObject (Object* obj, XRef *xRef, XRef *countRef, Guint numOffset)
+{
+ Array *array;
+ Object obj1;
+
+ switch (obj->getType()) {
+ case objArray:
+ array = obj->getArray();
+ for (int i=0; i<array->getLength(); i++) {
+ markObject(array->getNF(i, &obj1), xRef, countRef, numOffset);
+ obj1.free();
+ }
+ break;
+ case objDict:
+ markDictionnary (obj->getDict(), xRef, countRef, numOffset);
+ break;
+ case objStream:
+ {
+ Stream *stream = obj->getStream();
+ markDictionnary (stream->getDict(), xRef, countRef, numOffset);
+ }
+ break;
+ case objRef:
+ {
+ if (obj->getRef().num + (int) numOffset >= xRef->getNumObjects() || xRef->getEntry(obj->getRef().num + numOffset)->type == xrefEntryFree) {
+ if (getXRef()->getEntry(obj->getRef().num)->type == xrefEntryFree) {
+ return; // already marked as free => should be replaced
+ }
+ xRef->add(obj->getRef().num + numOffset, obj->getRef().gen, 0, gTrue);
+ if (getXRef()->getEntry(obj->getRef().num)->type == xrefEntryCompressed) {
+ xRef->getEntry(obj->getRef().num + numOffset)->type = xrefEntryCompressed;
+ }
+ }
+ if (obj->getRef().num + (int) numOffset >= countRef->getNumObjects() ||
+ countRef->getEntry(obj->getRef().num + numOffset)->type == xrefEntryFree)
+ {
+ countRef->add(obj->getRef().num + numOffset, 1, 0, gTrue);
+ } else {
+ XRefEntry *entry = countRef->getEntry(obj->getRef().num + numOffset);
+ entry->gen++;
+ }
+ Object obj1;
+ getXRef()->fetch(obj->getRef().num, obj->getRef().gen, &obj1);
+ markObject(&obj1, xRef, countRef, numOffset);
+ obj1.free();
+ }
+ break;
+ default:
+ break;
+ }
+}
+
+void PDFDoc::replacePageDict(int pageNo, int rotate,
+ PDFRectangle *mediaBox,
+ PDFRectangle *cropBox, Object *pageCTM)
+{
+ Ref *refPage = getCatalog()->getPageRef(pageNo);
+ Object page;
+ getXRef()->fetch(refPage->num, refPage->gen, &page);
+ Dict *pageDict = page.getDict();
+ pageDict->remove("MediaBox");
+ pageDict->remove("CropBox");
+ pageDict->remove("ArtBox");
+ pageDict->remove("BleedBox");
+ pageDict->remove("TrimBox");
+ pageDict->remove("Rotate");
+ Object *mediaBoxObj = new Object();
+ mediaBoxObj->initArray(getXRef());
+ Object *murx = new Object();
+ murx->initReal(mediaBox->x1);
+ Object *mury = new Object();
+ mury->initReal(mediaBox->y1);
+ Object *mllx = new Object();
+ mllx->initReal(mediaBox->x2);
+ Object *mlly = new Object();
+ mlly->initReal(mediaBox->y2);
+ mediaBoxObj->arrayAdd(murx);
+ mediaBoxObj->arrayAdd(mury);
+ mediaBoxObj->arrayAdd(mllx);
+ mediaBoxObj->arrayAdd(mlly);
+ pageDict->add(copyString("MediaBox"), mediaBoxObj);
+ if (cropBox != NULL) {
+ Object *cropBoxObj = new Object();
+ cropBoxObj->initArray(getXRef());
+ Object *curx = new Object();
+ curx->initReal(cropBox->x1);
+ Object *cury = new Object();
+ cury->initReal(cropBox->y1);
+ Object *cllx = new Object();
+ cllx->initReal(cropBox->x2);
+ Object *clly = new Object();
+ clly->initReal(cropBox->y2);
+ cropBoxObj->arrayAdd(curx);
+ cropBoxObj->arrayAdd(cury);
+ cropBoxObj->arrayAdd(cllx);
+ cropBoxObj->arrayAdd(clly);
+ pageDict->add(copyString("CropBox"), cropBoxObj);
+ }
+ Object *rotateObj = new Object();
+ rotateObj->initInt(rotate);
+ pageDict->add(copyString("Rotate"), rotateObj);
+ if (pageCTM != NULL) {
+ Object *contents = new Object();
+ Ref cmRef = getXRef()->addIndirectObject(pageCTM);
+ Object *ref = new Object();
+ ref->initRef(cmRef.num, cmRef.gen);
+ pageDict->lookupNF("Contents", contents);
+ Object *newContents = new Object();
+ newContents->initArray(getXRef());
+ if (contents->getType() == objRef) {
+ newContents->arrayAdd(ref);
+ newContents->arrayAdd(contents);
+ } else {
+ newContents->arrayAdd(ref);
+ for (int i = 0; i < contents->arrayGetLength(); i++) {
+ Object *contentEle = new Object();
+ contents->arrayGetNF(i, contentEle);
+ newContents->arrayAdd(contentEle);
+ }
+ }
+ pageDict->remove("Contents");
+ pageDict->add(copyString("Contents"), newContents);
+ }
+ getXRef()->setModifiedObject(&page, *refPage);
+ page.free();
+}
+
+void PDFDoc::markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset)
+{
+ for (int n = 0; n < pageDict->getLength(); n++) {
+ const char *key = pageDict->getKey(n);
+ Object value; pageDict->getValNF(n, &value);
+ if (strcmp(key, "Parent") != 0) {
+ markObject(&value, xRef, countRef, numOffset);
+ }
+ value.free();
+ }
+}
+
+Guint PDFDoc::writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset)
+{
+ Guint objectsCount = 0; //count the number of objects in the XRef(s)
+
+ for (int n = numOffset; n < xRef->getNumObjects(); n++) {
+ if (xRef->getEntry(n)->type != xrefEntryFree) {
+ Object obj;
+ Ref ref;
+ ref.num = n;
+ ref.gen = xRef->getEntry(n)->gen;
+ objectsCount++;
+ getXRef()->fetch(ref.num - numOffset, ref.gen, &obj);
+ Guint offset = writeObject(&obj, &ref, outStr, xRef, numOffset);
+ xRef->add(ref.num, ref.gen, offset, gTrue);
+ obj.free();
+ }
+ }
+ return objectsCount;
+}
+
+#ifndef DISABLE_OUTLINE
+Outline *PDFDoc::getOutline()
+{
+ if (!outline) {
+ // read outline
+ outline = new Outline(catalog->getOutline(), xref);
+ }
+
+ return outline;
+}
+#endif
+
+PDFDoc *PDFDoc::ErrorPDFDoc(int errorCode, GooString *fileNameA)
+{
+ PDFDoc *doc = new PDFDoc();
+ doc->errCode = errorCode;
+ doc->fileName = fileNameA;
+
+ return doc;
+}
+
+Guint PDFDoc::strToUnsigned(char *s) {
+ Guint x;
+ char *p;
+ int i;
+
+ x = 0;
+ for (p = s, i = 0; *p && isdigit(*p) && i < 10; ++p, ++i) {
+ x = 10 * x + (*p - '0');
+ }
+ return x;
+}
+
+// Read the 'startxref' position.
+Guint PDFDoc::getStartXRef()
+{
+ if (startXRefPos == ~(Guint)0) {
+
+ if (isLinearized()) {
+ char buf[linearizationSearchSize+1];
+ int c, n, i;
+
+ str->setPos(0);
+ for (n = 0; n < linearizationSearchSize; ++n) {
+ if ((c = str->getChar()) == EOF) {
+ break;
+ }
+ buf[n] = c;
+ }
+ buf[n] = '\0';
+
+ // find end of first obj (linearization dictionary)
+ startXRefPos = 0;
+ for (i = 0; i < n; i++) {
+ if (!strncmp("endobj", &buf[i], 6)) {
+ i += 6;
+ //skip whitespace
+ while (buf[i] && Lexer::isSpace(buf[i])) ++i;
+ startXRefPos = i;
+ break;
+ }
+ }
+ } else {
+ char buf[xrefSearchSize+1];
+ char *p;
+ int c, n, i;
+
+ // read last xrefSearchSize bytes
+ str->setPos(xrefSearchSize, -1);
+ for (n = 0; n < xrefSearchSize; ++n) {
+ if ((c = str->getChar()) == EOF) {
+ break;
+ }
+ buf[n] = c;
+ }
+ buf[n] = '\0';
+
+ // find startxref
+ for (i = n - 9; i >= 0; --i) {
+ if (!strncmp(&buf[i], "startxref", 9)) {
+ break;
+ }
+ }
+ if (i < 0) {
+ startXRefPos = 0;
+ } else {
+ for (p = &buf[i+9]; isspace(*p); ++p) ;
+ startXRefPos = strToUnsigned(p);
+ }
+ }
+
+ }
+
+ return startXRefPos;
+}
+
+Guint PDFDoc::getMainXRefEntriesOffset()
+{
+ Guint mainXRefEntriesOffset = 0;
+
+ if (isLinearized()) {
+ mainXRefEntriesOffset = getLinearization()->getMainXRefEntriesOffset();
+ }
+
+ return mainXRefEntriesOffset;
+}
+
+int PDFDoc::getNumPages()
+{
+ if (isLinearized()) {
+ int n;
+ if ((n = getLinearization()->getNumPages())) {
+ return n;
+ }
+ }
+
+ return catalog->getNumPages();
+}
+
+Page *PDFDoc::parsePage(int page)
+{
+ Page *p = NULL;
+ Object obj;
+ Ref pageRef;
+ Dict *pageDict;
+
+ pageRef.num = getHints()->getPageObjectNum(page);
+ if (!pageRef.num) {
+ error(-1, "Failed to get object num from hint tables for page %d", page);
+ return NULL;
+ }
+
+ // check for bogus ref - this can happen in corrupted PDF files
+ if (pageRef.num < 0 || pageRef.num >= xref->getNumObjects()) {
+ error(-1, "Invalid object num (%d) for page %d", pageRef.num, page);
+ return NULL;
+ }
+
+ pageRef.gen = xref->getEntry(pageRef.num)->gen;
+ xref->fetch(pageRef.num, pageRef.gen, &obj);
+ if (!obj.isDict("Page")) {
+ obj.free();
+ error(-1, "Object (%d %d) is not a pageDict", pageRef.num, pageRef.gen);
+ return NULL;
+ }
+ pageDict = obj.getDict();
+
+ p = new Page(xref, page, pageDict, pageRef,
+ new PageAttrs(NULL, pageDict), catalog->getForm());
+ obj.free();
+
+ return p;
+}
+
+Page *PDFDoc::getPage(int page)
+{
+ if ((page < 1) || page > getNumPages()) return NULL;
+
+ if (isLinearized()) {
+ if (!pageCache) {
+ pageCache = (Page **) gmallocn(getNumPages(), sizeof(Page *));
+ for (int i = 0; i < getNumPages(); i++) {
+ pageCache[i] = NULL;
+ }
+ }
+ if (!pageCache[page-1]) {
+ pageCache[page-1] = parsePage(page);
+ }
+ if (pageCache[page-1]) {
+ return pageCache[page-1];
+ } else {
+ error(-1, "Failed parsing page %d using hint tables", page);
+ }
+ }
+
+ return catalog->getPage(page);
+}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.h
index 3db4b917bcd..92cee78c5f2 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDoc.h
@@ -20,6 +20,9 @@
// Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2009 Eric Toombs <ewtoombs@uwaterloo.ca>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
+// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2010 Srinivas Adicherla <srinivas.adicherla@geodesic.com>
+// Copyright (C) 2011 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
@@ -47,6 +50,9 @@ class Links;
class LinkAction;
class LinkDest;
class Outline;
+class Linearization;
+class SecurityHandler;
+class Hints;
enum PDFWriteMode {
writeStandard,
@@ -73,6 +79,8 @@ public:
GooString *userPassword = NULL, void *guiDataA = NULL);
~PDFDoc();
+ static PDFDoc *ErrorPDFDoc(int errorCode, GooString *fileNameA = NULL);
+
// Was PDF document successfully opened?
GBool isOk() { return ok; }
@@ -86,6 +94,9 @@ public:
// Get file name.
GooString *getFileName() { return fileName; }
+ // Get the linearization table.
+ Linearization *getLinearization();
+
// Get the xref table.
XRef *getXRef() { return xref; }
@@ -100,18 +111,18 @@ public:
// Get page parameters.
double getPageMediaWidth(int page)
- { return catalog->getPage(page)->getMediaWidth(); }
+ { return getPage(page) ? getPage(page)->getMediaWidth() : 0.0 ; }
double getPageMediaHeight(int page)
- { return catalog->getPage(page)->getMediaHeight(); }
+ { return getPage(page) ? getPage(page)->getMediaHeight() : 0.0 ; }
double getPageCropWidth(int page)
- { return catalog->getPage(page)->getCropWidth(); }
+ { return getPage(page) ? getPage(page)->getCropWidth() : 0.0 ; }
double getPageCropHeight(int page)
- { return catalog->getPage(page)->getCropHeight(); }
+ { return getPage(page) ? getPage(page)->getCropHeight() : 0.0 ; }
int getPageRotate(int page)
- { return catalog->getPage(page)->getRotate(); }
+ { return getPage(page) ? getPage(page)->getRotate() : 0 ; }
// Get number of pages.
- int getNumPages() { return catalog->getNumPages(); }
+ int getNumPages();
// Return the contents of the metadata stream, or NULL if there is
// no metadata.
@@ -120,6 +131,9 @@ public:
// Return the structure tree root object.
Object *getStructTreeRoot() { return catalog->getStructTreeRoot(); }
+ // Get page.
+ Page *getPage(int page);
+
// Display a page.
void displayPage(OutputDev *out, int page,
double hDPI, double vDPI, int rotate,
@@ -167,7 +181,7 @@ public:
#ifndef DISABLE_OUTLINE
// Return the outline object.
- Outline *getOutline() { return outline; }
+ Outline *getOutline();
#endif
// Is the file encrypted?
@@ -203,6 +217,11 @@ public:
int getPDFMajorVersion() { return pdfMajorVersion; }
int getPDFMinorVersion() { return pdfMinorVersion; }
+ //Return the PDF ID in the trailer dictionary (if any).
+ GBool getID(GooString *permanent_id, GooString *update_id);
+
+ // Save one page with another name.
+ int savePageAs(GooString *name, int pageNo);
// Save this file with another name.
int saveAs(GooString *name, PDFWriteMode mode=writeStandard);
// Save this file in the given output stream.
@@ -215,22 +234,51 @@ public:
// Return a pointer to the GUI (XPDFCore or WinPDFCore object).
void *getGUIData() { return guiData; }
+ // rewrite pageDict with MediaBox, CropBox and new page CTM
+ void replacePageDict(int pageNo, int rotate, PDFRectangle *mediaBox, PDFRectangle *cropBox, Object *pageCTM);
+ void markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset);
+ // write all objects used by pageDict to outStr
+ Guint writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset);
+ static Guint writeObject (Object *obj, Ref *ref, OutStream* outStr, XRef *xref, Guint numOffset);
+ static void writeHeader(OutStream *outStr, int major, int minor);
+ static void writeTrailer (Guint uxrefOffset, int uxrefSize, OutStream* outStr, GBool incrUpdate,
+ Guint startxRef, Ref *root, XRef *xRef, const char *fileName, Guint fileSize);
+
private:
+ // insert referenced objects in XRef
+ void markDictionnary (Dict* dict, XRef *xRef, XRef *countRef, Guint numOffset);
+ void markObject (Object *obj, XRef *xRef, XRef *countRef, Guint numOffset);
+ static void writeDictionnary (Dict* dict, OutStream* outStr, XRef *xRef, Guint numOffset);
+
// Add object to current file stream and return the offset of the beginning of the object
- Guint writeObject (Object *obj, Ref *ref, OutStream* outStr);
- void writeDictionnary (Dict* dict, OutStream* outStr);
- void writeStream (Stream* str, OutStream* outStr);
- void writeRawStream (Stream* str, OutStream* outStr);
+ Guint writeObject (Object *obj, Ref *ref, OutStream* outStr)
+ { return writeObject(obj, ref, outStr, getXRef(), 0); }
+ void writeDictionnary (Dict* dict, OutStream* outStr)
+ { writeDictionnary(dict, outStr, getXRef(), 0); }
+ static void writeStream (Stream* str, OutStream* outStr);
+ static void writeRawStream (Stream* str, OutStream* outStr);
void writeTrailer (Guint uxrefOffset, int uxrefSize, OutStream* outStr, GBool incrUpdate);
- void writeString (GooString* s, OutStream* outStr);
+ static void writeString (GooString* s, OutStream* outStr);
void saveIncrementalUpdate (OutStream* outStr);
void saveCompleteRewrite (OutStream* outStr);
+ Page *parsePage(int page);
+ // Get hints.
+ Hints *getHints();
+
+ PDFDoc();
+ void init();
GBool setup(GooString *ownerPassword, GooString *userPassword);
GBool checkFooter();
void checkHeader();
GBool checkEncryption(GooString *ownerPassword, GooString *userPassword);
+ // Get the offset of the start xref table.
+ Guint getStartXRef();
+ // Get the offset of the entries in the main XRef table of a
+ // linearized document (0 for non linearized documents).
+ Guint getMainXRefEntriesOffset();
+ Guint strToUnsigned(char *s);
GooString *fileName;
FILE *file;
@@ -238,17 +286,23 @@ private:
void *guiData;
int pdfMajorVersion;
int pdfMinorVersion;
+ Linearization *linearization;
XRef *xref;
+ SecurityHandler *secHdlr;
Catalog *catalog;
+ Hints *hints;
#ifndef DISABLE_OUTLINE
Outline *outline;
#endif
+ Page **pageCache;
GBool ok;
int errCode;
//If there is an error opening the PDF file with fopen() in the constructor,
//then the POSIX errno will be here.
int fopenErrno;
+
+ Guint startXRefPos; // offset of last xref table
};
#endif
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocBuilder.h
new file mode 100644
index 00000000000..d6eccf5487a
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocBuilder.h
@@ -0,0 +1,42 @@
+//========================================================================
+//
+// PDFDocBuilder.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#ifndef PDFDOCBUILDER_H
+#define PDFDOCBUILDER_H
+
+#include "PDFDoc.h"
+class GooString;
+
+//------------------------------------------------------------------------
+// PDFDocBuilder
+//
+// PDFDocBuilder is an abstract class that specifies the interface for
+// constructing PDFDocs.
+//------------------------------------------------------------------------
+
+class PDFDocBuilder {
+
+public:
+
+ virtual ~PDFDocBuilder() {};
+
+ // Builds a new PDFDoc. Returns a PDFDoc. You should check this PDFDoc
+ // with PDFDoc::isOk() for failures.
+ // The caller is responsible for deleting ownerPassword, userPassWord and guiData.
+ virtual PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
+ GooString *userPassword = NULL, void *guiDataA = NULL) = 0;
+
+ // Returns gTrue if the builder supports building a PDFDoc from the URI.
+ virtual GBool supports(const GooString &uri) = 0;
+
+};
+
+#endif /* PDFDOCBUILDER_H */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocEncoding.cc
index 628d3666d09..628d3666d09 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.cc
new file mode 100644
index 00000000000..7829b3e9958
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.cc
@@ -0,0 +1,72 @@
+//========================================================================
+//
+// PDFDocFactory.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#include <config.h>
+
+#include "PDFDocFactory.h"
+
+#include "goo/GooList.h"
+#include "goo/GooString.h"
+#include "PDFDoc.h"
+#include "LocalPDFDocBuilder.h"
+#include "StdinPDFDocBuilder.h"
+#if ENABLE_LIBCURL
+#include "CurlPDFDocBuilder.h"
+#endif
+#include "ErrorCodes.h"
+
+//------------------------------------------------------------------------
+// PDFDocFactory
+//------------------------------------------------------------------------
+
+PDFDocFactory::PDFDocFactory(GooList *pdfDocBuilders)
+{
+ if (pdfDocBuilders) {
+ builders = pdfDocBuilders;
+ } else {
+ builders = new GooList();
+ }
+#if ENABLE_LIBCURL
+ builders->insert(0, new CurlPDFDocBuilder());
+#endif
+ builders->insert(0, new StdinPDFDocBuilder());
+ builders->insert(0, new LocalPDFDocBuilder());
+}
+
+PDFDocFactory::~PDFDocFactory()
+{
+ if (builders) {
+ deleteGooList(builders, PDFDocBuilder);
+ }
+}
+
+PDFDoc *
+PDFDocFactory::createPDFDoc(const GooString &uri, GooString *ownerPassword,
+ GooString *userPassword, void *guiDataA)
+{
+ for (int i = builders->getLength() - 1; i >= 0 ; i--) {
+ PDFDocBuilder *builder = (PDFDocBuilder *) builders->get(i);
+ if (builder->supports(uri)) {
+ return builder->buildPDFDoc(uri, ownerPassword, userPassword, guiDataA);
+ }
+ }
+
+ error(-1, "Cannot handle URI '%s'.", uri.getCString());
+ GooString *fileName = uri.copy();
+ return PDFDoc::ErrorPDFDoc(errOpenFile, fileName);
+}
+
+void PDFDocFactory::registerPDFDocBuilder(PDFDocBuilder *pdfDocBuilder)
+{
+ builders->append(pdfDocBuilder);
+}
+
+
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.h
new file mode 100644
index 00000000000..dbceaa567ee
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PDFDocFactory.h
@@ -0,0 +1,55 @@
+//========================================================================
+//
+// PDFDocFactory.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#ifndef PDFDOCFACTORY_H
+#define PDFDOCFACTORY_H
+
+#include "PDFDoc.h"
+
+class GooList;
+class GooString;
+class PDFDocBuilder;
+
+//------------------------------------------------------------------------
+// PDFDocFactory
+//
+// PDFDocFactory allows the construction of PDFDocs from different URIs.
+//
+// By default, it supports local files, 'file://' and 'fd:0' (stdin). When
+// compiled with libcurl, it also supports 'http://' and 'https://'.
+//
+// You can extend the supported URIs by giving a list of PDFDocBuilders to
+// the constructor, or by registering a new PDFDocBuilder afterwards.
+//------------------------------------------------------------------------
+
+class PDFDocFactory {
+
+public:
+
+ PDFDocFactory(GooList *pdfDocBuilders = NULL);
+ ~PDFDocFactory();
+
+ // Create a PDFDoc. Returns a PDFDoc. You should check this PDFDoc
+ // with PDFDoc::isOk() for failures.
+ // The caller is responsible for deleting ownerPassword, userPassWord and guiData.
+ PDFDoc *createPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
+ GooString *userPassword = NULL, void *guiDataA = NULL);
+
+ // Extend supported URIs with the ones from the PDFDocBuilder.
+ void registerPDFDocBuilder(PDFDocBuilder *pdfDocBuilder);
+
+private:
+
+ GooList *builders;
+
+};
+
+#endif /* PDFDOCFACTORY_H */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/PSOutputDev.cc
index 1cf2eea4876..3e5cf081934 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PSOutputDev.cc
@@ -19,12 +19,13 @@
// Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2007, 2008 Brad Hards <bradh@kde.org>
// Copyright (C) 2008, 2009 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2008 Hib Eris <hib@hiberis.nl>
-// Copyright (C) 2009 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2008, 2010 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2009-2011 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011 William Bader <williambader@hotmail.com>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
+// Copyright (C) 2009-2011 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -69,6 +70,7 @@
# include "SplashOutputDev.h"
#endif
#include "PSOutputDev.h"
+#include "PDFDoc.h"
#ifdef MACOS
// needed for setting type/creator of MacOS files
@@ -83,7 +85,7 @@
//------------------------------------------------------------------------
// Resolution at which pages with transparency will be rasterized.
-#define splashDPI 300
+#define defaultSplashDPI 300
//------------------------------------------------------------------------
// PostScript prolog and setup
@@ -124,7 +126,7 @@ static char *prolog[] = {
"~1sn",
"/pdfOpNames [",
" /pdfFill /pdfStroke /pdfLastFill /pdfLastStroke",
- " /pdfTextMat /pdfFontSize /pdfCharSpacing /pdfTextRender",
+ " /pdfTextMat /pdfFontSize /pdfCharSpacing /pdfTextRender /pdfPatternCS",
" /pdfTextRise /pdfWordSpacing /pdfHorizScaling /pdfTextClipPath",
"] def",
"~123sn",
@@ -156,6 +158,7 @@ static char *prolog[] = {
" /pdfFontSize 0 def",
" /pdfCharSpacing 0 def",
" /pdfTextRender 0 def",
+ " /pdfPatternCS false def",
" /pdfTextRise 0 def",
" /pdfWordSpacing 0 def",
" /pdfHorizScaling 1 def",
@@ -397,6 +400,7 @@ static char *prolog[] = {
" pdfTextMat matrix concatmatrix dup 4 0 put dup 5 0 put",
" exch findfont exch makefont setfont } def",
"/Tr { /pdfTextRender exch def } def",
+ "/Tp { /pdfPatternCS exch def } def",
"/Ts { /pdfTextRise exch def } def",
"/Tw { /pdfWordSpacing exch def } def",
"/Tz { /pdfHorizScaling exch def } def",
@@ -468,7 +472,7 @@ static char *prolog[] = {
"/Tj1 {",
" 0 pdfTextRise pdfTextMat dtransform rmoveto",
" currentpoint 8 2 roll",
- " pdfTextRender 1 and 0 eq {",
+ " pdfTextRender 1 and 0 eq pdfPatternCS not and {",
" 6 copy awidthshow",
" } if",
" pdfTextRender 3 and dup 1 eq exch 2 eq or {",
@@ -477,7 +481,7 @@ static char *prolog[] = {
" currentfont /FontType get 3 eq { fCol } { sCol } ifelse",
" false awcp currentpoint stroke moveto",
" } if",
- " pdfTextRender 4 and 0 ne {",
+ " pdfTextRender 4 and 0 ne pdfPatternCS or {",
" 8 6 roll moveto",
" false awcp",
" /pdfTextClipPath [ pdfTextClipPath aload pop",
@@ -502,11 +506,14 @@ static char *prolog[] = {
" /pdfTextClipPath [] def } def",
"~1ns",
"% Level 1 image operators",
- "~1n",
"/pdfIm1 {",
" /pdfImBuf1 4 index string def",
" { currentfile pdfImBuf1 readhexstring pop } image",
"} def",
+ "/pdfIm1Bin {",
+ " /pdfImBuf1 4 index string def",
+ " { currentfile pdfImBuf1 readstring pop } image",
+ "} def",
"~1s",
"/pdfIm1Sep {",
" /pdfImBuf1 4 index string def",
@@ -519,11 +526,26 @@ static char *prolog[] = {
" { currentfile pdfImBuf4 readhexstring pop }",
" true 4 colorimage",
"} def",
+ "/pdfIm1SepBin {",
+ " /pdfImBuf1 4 index string def",
+ " /pdfImBuf2 4 index string def",
+ " /pdfImBuf3 4 index string def",
+ " /pdfImBuf4 4 index string def",
+ " { currentfile pdfImBuf1 readstring pop }",
+ " { currentfile pdfImBuf2 readstring pop }",
+ " { currentfile pdfImBuf3 readstring pop }",
+ " { currentfile pdfImBuf4 readstring pop }",
+ " true 4 colorimage",
+ "} def",
"~1ns",
"/pdfImM1 {",
" fCol /pdfImBuf1 4 index 7 add 8 idiv string def",
" { currentfile pdfImBuf1 readhexstring pop } imagemask",
"} def",
+ "/pdfImM1Bin {",
+ " fCol /pdfImBuf1 4 index 7 add 8 idiv string def",
+ " { currentfile pdfImBuf1 readstring pop } imagemask",
+ "} def",
"/pdfImM1a {",
" { 2 copy get exch 1 add exch } imagemask",
" pop pop",
@@ -563,6 +585,7 @@ static char *prolog[] = {
" not { pop exit } if",
" (%-EOD-) eq { exit } if } loop",
"} def",
+ "~123sn",
"/pr { 2 index 2 index 3 2 roll putinterval 4 add } def",
"/pdfImClip {",
" gsave",
@@ -971,7 +994,7 @@ static void outputToFile(void *stream, char *data, int len) {
fwrite(data, 1, len, (FILE *)stream);
}
-PSOutputDev::PSOutputDev(const char *fileName, XRef *xrefA, Catalog *catalog,
+PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc, XRef *xrefA, Catalog *catalog,
char *psTitle,
int firstPage, int lastPage, PSOutMode modeA,
int paperWidthA, int paperHeightA, GBool duplexA,
@@ -1032,13 +1055,14 @@ PSOutputDev::PSOutputDev(const char *fileName, XRef *xrefA, Catalog *catalog,
}
init(outputToFile, f, fileTypeA, psTitle,
- xrefA, catalog, firstPage, lastPage, modeA,
+ doc, xrefA, catalog, firstPage, lastPage, modeA,
imgLLXA, imgLLYA, imgURXA, imgURYA, manualCtrlA,
paperWidthA, paperHeightA, duplexA);
}
PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
char *psTitle,
+ PDFDoc *doc,
XRef *xrefA, Catalog *catalog,
int firstPage, int lastPage, PSOutMode modeA,
int paperWidthA, int paperHeightA, GBool duplexA,
@@ -1067,18 +1091,17 @@ PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
forceRasterize = forceRasterizeA;
init(outputFuncA, outputStreamA, psGeneric, psTitle,
- xrefA, catalog, firstPage, lastPage, modeA,
+ doc, xrefA, catalog, firstPage, lastPage, modeA,
imgLLXA, imgLLYA, imgURXA, imgURYA, manualCtrlA,
paperWidthA, paperHeightA, duplexA);
}
void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
- PSFileType fileTypeA, char *pstitle, XRef *xrefA, Catalog *catalog,
+ PSFileType fileTypeA, char *pstitle, PDFDoc *doc, XRef *xrefA, Catalog *catalog,
int firstPage, int lastPage, PSOutMode modeA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
GBool manualCtrlA, int paperWidthA, int paperHeightA,
GBool duplexA) {
- Page *page;
PDFRectangle *box;
// initialize
@@ -1098,12 +1121,12 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
imgURX = imgURXA;
imgURY = imgURYA;
if (paperWidth < 0 || paperHeight < 0) {
- // this check is needed in case the document has zero pages
- if (firstPage > 0 && firstPage <= catalog->getNumPages()) {
- page = catalog->getPage(firstPage);
+ Page *page;
+ if ((page = doc->getPage(firstPage))) {
paperWidth = (int)ceil(page->getMediaWidth());
paperHeight = (int)ceil(page->getMediaHeight());
} else {
+ error(-1, "Invalid page %d", firstPage);
paperWidth = 1;
paperHeight = 1;
}
@@ -1169,14 +1192,16 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
embFontList = new GooString();
if (!manualCtrl) {
+ Page *page;
// this check is needed in case the document has zero pages
- if (firstPage > 0 && firstPage <= catalog->getNumPages()) {
+ if ((page = doc->getPage(firstPage))) {
writeHeader(firstPage, lastPage,
- catalog->getPage(firstPage)->getMediaBox(),
- catalog->getPage(firstPage)->getCropBox(),
- catalog->getPage(firstPage)->getRotate(),
+ page->getMediaBox(),
+ page->getCropBox(),
+ page->getRotate(),
pstitle);
} else {
+ error(-1, "Invalid page %d", firstPage);
box = new PDFRectangle(0, 0, 1, 1);
writeHeader(firstPage, lastPage, box, box, 0, pstitle);
delete box;
@@ -1189,7 +1214,7 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
writePS("%%EndProlog\n");
writePS("%%BeginSetup\n");
}
- writeDocSetup(catalog, firstPage, lastPage, duplexA);
+ writeDocSetup(doc, catalog, firstPage, lastPage, duplexA);
if (mode != psModeForm) {
writePS("%%EndSetup\n");
}
@@ -1290,6 +1315,7 @@ void PSOutputDev::writeHeader(int firstPage, int lastPage,
writePS("%!PS-Adobe-3.0 Resource-Form\n");
break;
}
+ writePSFmt("% Produced by poppler pdftops version: {0:s} (http://poppler.freedesktop.org)\n", PACKAGE_VERSION);
xref->getDocInfo(&info);
if (info.isDict() && info.dictLookup("Creator", &obj1)->isString()) {
writePS("%%Creator: ");
@@ -1308,6 +1334,9 @@ void PSOutputDev::writeHeader(int firstPage, int lastPage,
writePS("%%DocumentCustomColors: (atend)\n");
}
writePS("%%DocumentSuppliedResources: (atend)\n");
+ if ((level == psLevel1 || level == psLevel1Sep) && globalParams->getPSBinary()) {
+ writePS("%%DocumentData: Binary\n");
+ }
switch (mode) {
case psModePSOrigPageSizes:
@@ -1343,7 +1372,7 @@ void PSOutputDev::writeHeader(int firstPage, int lastPage,
(int)floor(x1), (int)floor(y1), (int)ceil(x2), (int)ceil(y2));
if (floor(x1) != ceil(x1) || floor(y1) != ceil(y1) ||
floor(x2) != ceil(x2) || floor(y2) != ceil(y2)) {
- writePSFmt("%%HiResBoundingBox: {0:.4g} {1:.4g} {2:.4g} {3:.4g}\n",
+ writePSFmt("%%HiResBoundingBox: {0:.6g} {1:.6g} {2:.6g} {3:.6g}\n",
x1, y1, x2, y2);
}
writePS("%%DocumentSuppliedResources: (atend)\n");
@@ -1399,7 +1428,7 @@ void PSOutputDev::writeXpdfProcset() {
}
}
-void PSOutputDev::writeDocSetup(Catalog *catalog,
+void PSOutputDev::writeDocSetup(PDFDoc *doc, Catalog *catalog,
int firstPage, int lastPage,
GBool duplexA) {
Page *page;
@@ -1415,7 +1444,11 @@ void PSOutputDev::writeDocSetup(Catalog *catalog,
writePS("xpdf begin\n");
}
for (pg = firstPage; pg <= lastPage; ++pg) {
- page = catalog->getPage(pg);
+ page = doc->getPage(pg);
+ if (!page) {
+ error(-1, "Failed writing resources for page %d", pg);
+ continue;
+ }
if ((resDict = page->getResourceDict())) {
setupResources(resDict);
}
@@ -1864,7 +1897,7 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
font->getWMode());
}
} else {
- writePSFmt("/F{0:d}_{1:d} /{2:t} {3:.4g} {4:.4g}\n",
+ writePSFmt("/F{0:d}_{1:d} /{2:t} {3:.6g} {4:.6g}\n",
font->getID()->num, font->getID()->gen, psName, xs, ys);
for (i = 0; i < 256; i += 8) {
writePS((char *)((i == 0) ? "[ " : " "));
@@ -2030,12 +2063,19 @@ void PSOutputDev::setupEmbeddedType1Font(Ref *id, GooString *psName) {
if (writePadding)
{
- // write padding and "cleartomark"
- for (i = 0; i < 8; ++i) {
- writePS("00000000000000000000000000000000"
- "00000000000000000000000000000000\n");
+ if (length3 > 0) {
+ // write fixed-content portion
+ while ((c = strObj.streamGetChar()) != EOF) {
+ writePSChar(c);
+ }
+ } else {
+ // write padding and "cleartomark"
+ for (i = 0; i < 8; ++i) {
+ writePS("00000000000000000000000000000000"
+ "00000000000000000000000000000000\n");
+ }
+ writePS("cleartomark\n");
}
- writePS("cleartomark\n");
}
// ending comment
@@ -2555,10 +2595,10 @@ void PSOutputDev::setupType3Font(GfxFont *font, GooString *psName,
writePS("8 dict begin\n");
writePS("/FontType 3 def\n");
m = font->getFontMatrix();
- writePSFmt("/FontMatrix [{0:.4g} {1:.4g} {2:.4g} {3:.4g} {4:.4g} {5:.4g}] def\n",
+ writePSFmt("/FontMatrix [{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}] def\n",
m[0], m[1], m[2], m[3], m[4], m[5]);
m = font->getFontBBox();
- writePSFmt("/FontBBox [{0:.4g} {1:.4g} {2:.4g} {3:.4g}] def\n",
+ writePSFmt("/FontBBox [{0:.6g} {1:.6g} {2:.6g} {3:.6g}] def\n",
m[0], m[1], m[2], m[3]);
writePS("/Encoding 256 array def\n");
writePS(" 0 1 255 { Encoding exch /.notdef put } for\n");
@@ -2590,10 +2630,10 @@ void PSOutputDev::setupType3Font(GfxFont *font, GooString *psName,
charProc.free();
if (t3String) {
if (t3Cacheable) {
- buf = GooString::format("{0:.4g} {1:.4g} {2:.4g} {3:.4g} {4:.4g} {5:.4g} setcachedevice\n",
+ buf = GooString::format("{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g} setcachedevice\n",
t3WX, t3WY, t3LLX, t3LLY, t3URX, t3URY);
} else {
- buf = GooString::format("{0:.4g} {1:.4g} setcharwidth\n", t3WX, t3WY);
+ buf = GooString::format("{0:.6g} {1:.6g} setcharwidth\n", t3WX, t3WY);
}
(*outputFunc)(outputStream, buf->getCString(), buf->getLength());
delete buf;
@@ -2913,7 +2953,7 @@ void PSOutputDev::setupForm(Ref id, Object *strObj) {
writePSFmt("/f_{0:d}_{1:d} {{\n", id.num, id.gen);
writePS("q\n");
- writePSFmt("[{0:.4gs} {1:.4gs} {2:.4gs} {3:.4gs} {4:.4gs} {5:.4gs}] cm\n",
+ writePSFmt("[{0:.6gs} {1:.6gs} {2:.6gs} {3:.6gs} {4:.6gs} {5:.6gs}] cm\n",
m[0], m[1], m[2], m[3], m[4], m[5]);
box.x1 = bbox[0];
@@ -2951,13 +2991,19 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
Guchar col[4];
double m0, m1, m2, m3, m4, m5;
int c, w, h, x, y, comp, i;
+ double splashDPI;
+ char hexBuf[32*2 + 2]; // 32 values X 2 chars/value + line ending + null
+ Guchar digit;
+ GBool useBinary;
+ GBool isGray;
+ int compCyan;
if (!forceRasterize) {
- scan = new PreScanOutputDev();
+ scan = new PreScanOutputDev(xref);
page->displaySlice(scan, 72, 72, rotateA, useMediaBox, crop,
sliceX, sliceY, sliceW, sliceH,
printing, catalog, abortCheckCbk, abortCheckCbkData);
- rasterize = scan->usesTransparency();
+ rasterize = scan->usesTransparency() || scan->hasLevel1PSBug();
delete scan;
} else {
rasterize = gTrue;
@@ -2972,13 +3018,13 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
splashOut = new SplashOutputDev(splashModeMono8, 1, gFalse,
paperColor, gTrue, gFalse);
#if SPLASH_CMYK
- } else if (level == psLevel1Sep) {
+ } else if (level == psLevel1Sep || level == psLevel2Sep || level == psLevel3Sep) {
paperColor[0] = paperColor[1] = paperColor[2] = paperColor[3] = 0;
splashOut = new SplashOutputDev(splashModeCMYK8, 1, gFalse,
paperColor, gTrue, gFalse);
#else
- } else if (level == psLevel1Sep) {
- error(-1, "pdftops was built without CMYK support, level1sep needs it to work in this file");
+ } else if (level == psLevel1Sep || level == psLevel2Sep || level == psLevel3Sep) {
+ error(-1, "pdftops was built without CMYK support, levelnsep needs it to work in this file");
return gFalse;
#endif
} else {
@@ -2987,6 +3033,10 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
paperColor, gTrue, gFalse);
}
splashOut->startDoc(xref);
+ splashDPI = globalParams->getSplashResolution();
+ if (splashDPI < 1.0) {
+ splashDPI = defaultSplashDPI;
+ }
page->displaySlice(splashOut, splashDPI, splashDPI, rotateA,
useMediaBox, crop,
sliceX, sliceY, sliceW, sliceH,
@@ -3047,48 +3097,176 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
w = bitmap->getWidth();
h = bitmap->getHeight();
writePS("gsave\n");
- writePSFmt("[{0:.4g} {1:.4g} {2:.4g} {3:.4g} {4:.4g} {5:.4g}] concat\n",
+ writePSFmt("[{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}] concat\n",
m0, m1, m2, m3, m4, m5);
switch (level) {
case psLevel1:
- writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1\n",
- w, h, w, -h, h);
+ useBinary = globalParams->getPSBinary();
+ writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1{5:s}\n",
+ w, h, w, -h, h,
+ useBinary ? "Bin" : "");
p = bitmap->getDataPtr();
i = 0;
- for (y = 0; y < h; ++y) {
- for (x = 0; x < w; ++x) {
- writePSFmt("{0:02x}", *p++);
- if (++i == 32) {
- writePSChar('\n');
- i = 0;
+ if (useBinary) {
+ for (y = 0; y < h; ++y) {
+ for (x = 0; x < w; ++x) {
+ hexBuf[i++] = *p++;
+ if (i >= 64) {
+ writePSBuf(hexBuf, i);
+ i = 0;
+ }
+ }
+ }
+ } else {
+ for (y = 0; y < h; ++y) {
+ for (x = 0; x < w; ++x) {
+ digit = *p / 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ digit = *p++ % 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ if (i >= 64) {
+ hexBuf[i++] = '\n';
+ writePSBuf(hexBuf, i);
+ i = 0;
+ }
}
}
}
if (i != 0) {
- writePSChar('\n');
+ if (!useBinary) {
+ hexBuf[i++] = '\n';
+ }
+ writePSBuf(hexBuf, i);
}
break;
case psLevel1Sep:
- writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1Sep\n",
- w, h, w, -h, h);
+ useBinary = globalParams->getPSBinary();
+ p = bitmap->getDataPtr();
+ isGray = gTrue;
+ for (y = 0; y < h; ++y) {
+ for (x = 0; x < w; ++x) {
+ if (p[4*x] != p[4*x + 1] || p[4*x] != p[4*x + 2]) {
+ isGray = gFalse;
+ y = h;
+ break;
+ }
+ }
+ p += bitmap->getRowSize();
+ }
+ writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1{5:s}{6:s}\n",
+ w, h, w, -h, h,
+ isGray ? "" : "Sep",
+ useBinary ? "Bin" : "");
p = bitmap->getDataPtr();
i = 0;
col[0] = col[1] = col[2] = col[3] = 0;
- for (y = 0; y < h; ++y) {
- for (comp = 0; comp < 4; ++comp) {
- for (x = 0; x < w; ++x) {
- writePSFmt("{0:02x}", p[4*x + comp]);
- col[comp] |= p[4*x + comp];
- if (++i == 32) {
- writePSChar('\n');
- i = 0;
+ if (isGray) {
+ int g;
+ if ((psProcessBlack & processColors) == 0) {
+ for (y = 0; y < h; ++y) {
+ for (x = 0; x < w; ++x) {
+ if (p[4*x] > 0 || p[4*x + 3] > 0) {
+ col[3] = 1;
+ y = h;
+ break;
+ }
}
+ p += bitmap->getRowSize();
}
+ p = bitmap->getDataPtr();
+ }
+ for (y = 0; y < h; ++y) {
+ if (useBinary) {
+ for (x = 0; x < w; ++x) {
+ g = p[4*x] + p[4*x + 3];
+ g = 255 - g;
+ if (g < 0) g = 0;
+ hexBuf[i++] = (Guchar) g;
+ if (i >= 64) {
+ writePSBuf(hexBuf, i);
+ i = 0;
+ }
+ }
+ } else {
+ for (x = 0; x < w; ++x) {
+ g = p[4*x] + p[4*x + 3];
+ g = 255 - g;
+ if (g < 0) g = 0;
+ digit = g / 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ digit = g % 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ if (i >= 64) {
+ hexBuf[i++] = '\n';
+ writePSBuf(hexBuf, i);
+ i = 0;
+ }
+ }
+ }
+ p += bitmap->getRowSize();
+ }
+ } else if (((psProcessCyan | psProcessMagenta | psProcessYellow | psProcessBlack) & ~processColors) != 0) {
+ for (y = 0; y < h; ++y) {
+ for (comp = 0; comp < 4; ++comp) {
+ if (useBinary) {
+ for (x = 0; x < w; ++x) {
+ col[comp] |= p[4*x + comp];
+ hexBuf[i++] = p[4*x + comp];
+ if (i >= 64) {
+ writePSBuf(hexBuf, i);
+ i = 0;
+ }
+ }
+ } else {
+ for (x = 0; x < w; ++x) {
+ col[comp] |= p[4*x + comp];
+ digit = p[4*x + comp] / 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ digit = p[4*x + comp] % 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ if (i >= 64) {
+ hexBuf[i++] = '\n';
+ writePSBuf(hexBuf, i);
+ i = 0;
+ }
+ }
+ }
+ }
+ p += bitmap->getRowSize();
+ }
+ } else {
+ for (y = 0; y < h; ++y) {
+ for (comp = 0; comp < 4; ++comp) {
+ if (useBinary) {
+ for (x = 0; x < w; ++x) {
+ hexBuf[i++] = p[4*x + comp];
+ if (i >= 64) {
+ writePSBuf(hexBuf, i);
+ i = 0;
+ }
+ }
+ } else {
+ for (x = 0; x < w; ++x) {
+ digit = p[4*x + comp] / 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ digit = p[4*x + comp] % 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ if (i >= 64) {
+ hexBuf[i++] = '\n';
+ writePSBuf(hexBuf, i);
+ i = 0;
+ }
+ }
+ }
+ }
+ p += bitmap->getRowSize();
}
- p += bitmap->getRowSize();
}
if (i != 0) {
- writePSChar('\n');
+ if (!useBinary) {
+ hexBuf[i++] = '\n';
+ }
+ writePSBuf(hexBuf, i);
}
if (col[0]) {
processColors |= psProcessCyan;
@@ -3103,10 +3281,80 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
processColors |= psProcessBlack;
}
break;
- case psLevel2:
case psLevel2Sep:
- case psLevel3:
case psLevel3Sep:
+ obj.initNull();
+ str0 = new MemStream((char *)bitmap->getDataPtr(), 0, w * h * 4, &obj);
+ isGray = gTrue;
+ while ((compCyan = str0->getChar()) != EOF) {
+ if (str0->getChar() != compCyan ||
+ str0->getChar() != compCyan) {
+ isGray = gFalse;
+ break;
+ }
+ str0->getChar();
+ }
+ str0->reset();
+ if (isGray) {
+ writePS("/DeviceGray setcolorspace\n");
+ str = new RunLengthEncoder(new CMKYGrayEncoder(str0));
+ } else {
+ processColors |= psProcessCMYK;
+ writePS("/DeviceCMYK setcolorspace\n");
+ str = new RunLengthEncoder(str0);
+ }
+ writePS("<<\n /ImageType 1\n");
+ writePSFmt(" /Width {0:d}\n", bitmap->getWidth());
+ writePSFmt(" /Height {0:d}\n", bitmap->getHeight());
+ writePSFmt(" /ImageMatrix [{0:d} 0 0 {1:d} 0 {2:d}]\n", w, -h, h);
+ writePS(" /BitsPerComponent 8\n");
+ if (isGray) {
+ writePS(" /Decode [1 0]\n");
+ } else {
+ writePS(" /Decode [0 1 0 1 0 1 0 1]\n");
+ }
+ writePS(" /DataSource currentfile\n");
+ useBinary = globalParams->getPSBinary();
+ if (useBinary) {
+ /* nothing to do */;
+ } else if (globalParams->getPSASCIIHex()) {
+ writePS(" /ASCIIHexDecode filter\n");
+ } else {
+ writePS(" /ASCII85Decode filter\n");
+ }
+ writePS(" /RunLengthDecode filter\n");
+ writePS(">>\n");
+ if (useBinary) {
+ /* nothing to do */;
+ } else if (globalParams->getPSASCIIHex()) {
+ str = new ASCIIHexEncoder(str);
+ } else {
+ str = new ASCII85Encoder(str);
+ }
+ str->reset();
+ if (useBinary) {
+ int len = 0;
+ while (str->getChar() != EOF) {
+ len++;
+ }
+ str->reset();
+ writePSFmt("%%BeginData: {0:d} Binary Bytes\n", len+6+1);
+ }
+ writePS("image\n");
+ while ((c = str->getChar()) != EOF) {
+ writePSChar(c);
+ }
+ if (useBinary) {
+ writePS("\n%%EndData\n");
+ } else if (isGray) {
+ writePSChar('\n');
+ }
+ str->close();
+ delete str;
+ delete str0;
+ break;
+ case psLevel2:
+ case psLevel3:
writePS("/DeviceRGB setcolorspace\n");
writePS("<<\n /ImageType 1\n");
writePSFmt(" /Width {0:d}\n", bitmap->getWidth());
@@ -3316,13 +3564,13 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) {
tx += rotate == 0 ? imgLLX : imgLLY;
ty += rotate == 0 ? imgLLY : -imgLLX;
if (tx != 0 || ty != 0) {
- writePSFmt("{0:.4g} {1:.4g} translate\n", tx, ty);
+ writePSFmt("{0:.6g} {1:.6g} translate\n", tx, ty);
}
if (xScale != 1 || yScale != 1) {
- writePSFmt("{0:.4f} {1:.4f} scale\n", xScale, yScale);
+ writePSFmt("{0:.6f} {1:.6f} scale\n", xScale, yScale);
}
if (clipLLX0 < clipURX0 && clipLLY0 < clipURY0) {
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} re W\n",
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} {3:.6g} re W\n",
clipLLX0, clipLLY0, clipURX0 - clipLLX0, clipURY0 - clipLLY0);
} else {
writePSFmt("{0:d} {1:d} {2:d} {3:d} re W\n", x1, y1, x2 - x1, y2 - y1);
@@ -3351,7 +3599,7 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) {
ty = -epsY1;
}
if (tx != 0 || ty != 0) {
- writePSFmt("{0:.4g} {1:.4g} translate\n", tx, ty);
+ writePSFmt("{0:.6g} {1:.6g} translate\n", tx, ty);
}
xScale = yScale = 1;
break;
@@ -3400,7 +3648,7 @@ void PSOutputDev::restoreState(GfxState *state) {
void PSOutputDev::updateCTM(GfxState *state, double m11, double m12,
double m21, double m22, double m31, double m32) {
- writePSFmt("[{0:.4gs} {1:.4gs} {2:.4gs} {3:.4gs} {4:.4gs} {5:.4gs}] cm\n",
+ writePSFmt("[{0:.6gs} {1:.6gs} {2:.6gs} {3:.6gs} {4:.6gs} {5:.6gs}] cm\n",
m11, m12, m21, m22, m31, m32);
}
@@ -3412,11 +3660,11 @@ void PSOutputDev::updateLineDash(GfxState *state) {
state->getLineDash(&dash, &length, &start);
writePS("[");
for (i = 0; i < length; ++i) {
- writePSFmt("{0:.4g}{1:w}",
+ writePSFmt("{0:.6g}{1:w}",
dash[i] < 0 ? 0 : dash[i],
(i == length-1) ? 0 : 1);
}
- writePSFmt("] {0:.4g} d\n", start);
+ writePSFmt("] {0:.6g} d\n", start);
}
void PSOutputDev::updateFlatness(GfxState *state) {
@@ -3432,11 +3680,11 @@ void PSOutputDev::updateLineCap(GfxState *state) {
}
void PSOutputDev::updateMiterLimit(GfxState *state) {
- writePSFmt("{0:.4g} M\n", state->getMiterLimit());
+ writePSFmt("{0:.6g} M\n", state->getMiterLimit());
}
void PSOutputDev::updateLineWidth(GfxState *state) {
- writePSFmt("{0:.4g} w\n", state->getLineWidth());
+ writePSFmt("{0:.6g} w\n", state->getLineWidth());
}
void PSOutputDev::updateFillColorSpace(GfxState *state) {
@@ -3672,7 +3920,7 @@ void PSOutputDev::updateTransfer(GfxState *state) {
void PSOutputDev::updateFont(GfxState *state) {
if (state->getFont()) {
- writePSFmt("/F{0:d}_{1:d} {2:.4g} Tf\n",
+ writePSFmt("/F{0:d}_{1:d} {2:.6g} Tf\n",
state->getFont()->getID()->num, state->getFont()->getID()->gen,
fabs(state->getFontSize()) < 0.00001 ? 0.00001
: state->getFontSize());
@@ -3685,25 +3933,21 @@ void PSOutputDev::updateTextMat(GfxState *state) {
mat = state->getTextMat();
if (fabs(mat[0] * mat[3] - mat[1] * mat[2]) < 0.00001) {
// avoid a singular (or close-to-singular) matrix
- writePSFmt("[0.00001 0 0 0.00001 {0:.4g} {1:.4g}] Tm\n", mat[4], mat[5]);
+ writePSFmt("[0.00001 0 0 0.00001 {0:.6g} {1:.6g}] Tm\n", mat[4], mat[5]);
} else {
- writePSFmt("[{0:.4g} {1:.4g} {2:.4g} {3:.4g} {4:.4g} {5:.4g}] Tm\n",
+ writePSFmt("[{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}] Tm\n",
mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
}
}
void PSOutputDev::updateCharSpace(GfxState *state) {
- writePSFmt("{0:.4g} Tc\n", state->getCharSpace());
+ writePSFmt("{0:.6g} Tc\n", state->getCharSpace());
}
void PSOutputDev::updateRender(GfxState *state) {
int rm;
rm = state->getRender();
- if (rm == 7 && haveCSPattern) {
- haveCSPattern = gFalse;
- restoreState(state);
- }
writePSFmt("{0:d} Tr\n", rm);
rm &= 3;
if (rm != 0 && rm != 3) {
@@ -3712,11 +3956,11 @@ void PSOutputDev::updateRender(GfxState *state) {
}
void PSOutputDev::updateRise(GfxState *state) {
- writePSFmt("{0:.4g} Ts\n", state->getRise());
+ writePSFmt("{0:.6g} Ts\n", state->getRise());
}
void PSOutputDev::updateWordSpace(GfxState *state) {
- writePSFmt("{0:.4g} Tw\n", state->getWordSpace());
+ writePSFmt("{0:.6g} Tw\n", state->getWordSpace());
}
void PSOutputDev::updateHorizScaling(GfxState *state) {
@@ -3726,18 +3970,18 @@ void PSOutputDev::updateHorizScaling(GfxState *state) {
if (fabs(h) < 0.01) {
h = 0.01;
}
- writePSFmt("{0:.4g} Tz\n", h);
+ writePSFmt("{0:.6g} Tz\n", h);
}
void PSOutputDev::updateTextPos(GfxState *state) {
- writePSFmt("{0:.4g} {1:.4g} Td\n", state->getLineX(), state->getLineY());
+ writePSFmt("{0:.6g} {1:.6g} Td\n", state->getLineX(), state->getLineY());
}
void PSOutputDev::updateTextShift(GfxState *state, double shift) {
if (state->getFont()->getWMode()) {
- writePSFmt("{0:.4g} TJmV\n", shift);
+ writePSFmt("{0:.6g} TJmV\n", shift);
} else {
- writePSFmt("{0:.4g} TJm\n", shift);
+ writePSFmt("{0:.6g} TJm\n", shift);
}
}
@@ -3762,11 +4006,11 @@ void PSOutputDev::eoFill(GfxState *state) {
writePS("f*\n");
}
-GBool PSOutputDev::tilingPatternFill(GfxState *state, Object *str,
- int paintType, Dict *resDict,
- double *mat, double *bbox,
- int x0, int y0, int x1, int y1,
- double xStep, double yStep) {
+GBool PSOutputDev::tilingPatternFillL1(GfxState *state, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep) {
PDFRectangle box;
Gfx *gfx;
@@ -3774,7 +4018,7 @@ GBool PSOutputDev::tilingPatternFill(GfxState *state, Object *str,
writePS("8 dict begin\n");
writePS("/FontType 3 def\n");
writePS("/FontMatrix [1 0 0 1 0 0] def\n");
- writePSFmt("/FontBBox [{0:.4g} {1:.4g} {2:.4g} {3:.4g}] def\n",
+ writePSFmt("/FontBBox [{0:.6g} {1:.6g} {2:.6g} {3:.6g}] def\n",
bbox[0], bbox[1], bbox[2], bbox[3]);
writePS("/Encoding 256 array def\n");
writePS(" 0 1 255 { Encoding exch /.notdef put } for\n");
@@ -3797,13 +4041,14 @@ GBool PSOutputDev::tilingPatternFill(GfxState *state, Object *str,
gfx = new Gfx(xref, this, resDict, m_catalog, &box, NULL);
writePS("/x {\n");
if (paintType == 2) {
- writePSFmt("{0:.4g} 0 {1:.4g} {2:.4g} {3:.4g} {4:.4g} setcachedevice\n",
+ writePSFmt("{0:.6g} 0 {1:.6g} {2:.6g} {3:.6g} {4:.6g} setcachedevice\n",
xStep, bbox[0], bbox[1], bbox[2], bbox[3]);
- } else {
+ } else
+ {
if (x1 - 1 <= x0) {
writePS("1 0 setcharwidth\n");
} else {
- writePSFmt("{0:.4g} 0 setcharwidth\n", xStep);
+ writePSFmt("{0:.6g} 0 setcharwidth\n", xStep);
}
}
inType3Char = gTrue;
@@ -3819,15 +4064,67 @@ GBool PSOutputDev::tilingPatternFill(GfxState *state, Object *str,
// draw the tiles
writePSFmt("/xpdfTile{0:d} findfont setfont\n", numTilingPatterns);
- writePSFmt("gsave [{0:.4g} {1:.4g} {2:.4g} {3:.4g} {4:.4g} {5:.4g}] concat\n",
+ writePSFmt("gsave [{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}] concat\n",
mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
- writePSFmt("{0:d} 1 {1:d} {{ {2:.4g} exch {3:.4g} mul m {4:d} 1 {5:d} {{ pop (x) show }} for }} for\n",
+ writePSFmt("{0:d} 1 {1:d} {{ {2:.6g} exch {3:.6g} mul m {4:d} 1 {5:d} {{ pop (x) show }} for }} for\n",
y0, y1 - 1, x0 * xStep, yStep, x0, x1 - 1);
writePS("grestore\n");
return gTrue;
}
+GBool PSOutputDev::tilingPatternFillL2(GfxState *state, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep) {
+ PDFRectangle box;
+ Gfx *gfx;
+ double cxMin, cyMin, cxMax, cyMax;
+
+ writePS("<<\n /PatternType 1\n");
+ writePSFmt(" /PaintType {0:d}\n", paintType);
+ writePSFmt(" /TilingType {0:d}\n", tilingType);
+ writePSFmt(" /BBox [{0:.6g} {1:.6g} {2:.6g} {3:.6g}]\n", bbox[0], bbox[1], bbox[2], bbox[3]);
+ writePSFmt(" /XStep {0:.6g}\n", xStep);
+ writePSFmt(" /YStep {0:.6g}\n", yStep);
+ writePS(" /PaintProc { \n");
+ box.x1 = bbox[0];
+ box.y1 = bbox[1];
+ box.x2 = bbox[2];
+ box.y2 = bbox[3];
+ gfx = new Gfx(xref, this, resDict, m_catalog, &box, NULL);
+ inType3Char = gTrue;
+ gfx->display(str);
+ inType3Char = gFalse;
+ delete gfx;
+ writePS(" }\n");
+ writePS(">>\n");
+ writePSFmt("[{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}]\n", pmat[0], pmat[1], pmat[2], pmat[3], pmat[4], pmat[5]);
+ writePS("makepattern setpattern\n");
+ state->getClipBBox(&cxMin, &cyMin, &cxMax, &cyMax);
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} {3:.6g} rectfill\n", cxMin, cyMin, cxMax - cxMin, cyMax - cyMin);
+
+ return gTrue;
+}
+
+GBool PSOutputDev::tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep) {
+ if (x1 - x0 == 1 && y1 - y0 == 1)
+ return gFalse; // Don't need to use patterns if only one instance of the pattern is used
+
+ if (level == psLevel1 || level == psLevel1Sep) {
+ return tilingPatternFillL1(state, cat, str, pmat, paintType, tilingType, resDict,
+ mat, bbox, x0, y0, x1, y1, xStep, yStep);
+ } else {
+ return tilingPatternFillL2(state, cat, str, pmat, paintType, tilingType, resDict,
+ mat, bbox, x0, y0, x1, y1, xStep, yStep);
+ }
+}
+
GBool PSOutputDev::functionShadedFill(GfxState *state,
GfxFunctionShading *shading) {
double x0, y0, x1, y1;
@@ -3843,7 +4140,7 @@ GBool PSOutputDev::functionShadedFill(GfxState *state,
shading->getDomain(&x0, &y0, &x1, &y1);
mat = shading->getMatrix();
- writePSFmt("/mat [{0:.4g} {1:.4g} {2:.4g} {3:.4g} {4:.4g} {5:.4g}] def\n",
+ writePSFmt("/mat [{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}] def\n",
mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
writePSFmt("/n {0:d} def\n", shading->getColorSpace()->getNComps());
if (shading->getNFuncs() == 1) {
@@ -3864,7 +4161,7 @@ GBool PSOutputDev::functionShadedFill(GfxState *state,
}
writePS("} def\n");
}
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} 0 funcSH\n", x0, y0, x1, y1);
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} {3:.6g} 0 funcSH\n", x0, y0, x1, y1);
return gTrue;
}
@@ -3926,19 +4223,19 @@ GBool PSOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do
t1 = shading->getDomain1();
// generate the PS code
- writePSFmt("/t0 {0:.4g} def\n", t0);
- writePSFmt("/t1 {0:.4g} def\n", t1);
- writePSFmt("/dt {0:.4g} def\n", t1 - t0);
- writePSFmt("/x0 {0:.4g} def\n", x0);
- writePSFmt("/y0 {0:.4g} def\n", y0);
- writePSFmt("/dx {0:.4g} def\n", x1 - x0);
- writePSFmt("/x1 {0:.4g} def\n", x1);
- writePSFmt("/y1 {0:.4g} def\n", y1);
- writePSFmt("/dy {0:.4g} def\n", y1 - y0);
- writePSFmt("/xMin {0:.4g} def\n", xMin);
- writePSFmt("/yMin {0:.4g} def\n", yMin);
- writePSFmt("/xMax {0:.4g} def\n", xMax);
- writePSFmt("/yMax {0:.4g} def\n", yMax);
+ writePSFmt("/t0 {0:.6g} def\n", t0);
+ writePSFmt("/t1 {0:.6g} def\n", t1);
+ writePSFmt("/dt {0:.6g} def\n", t1 - t0);
+ writePSFmt("/x0 {0:.6g} def\n", x0);
+ writePSFmt("/y0 {0:.6g} def\n", y0);
+ writePSFmt("/dx {0:.6g} def\n", x1 - x0);
+ writePSFmt("/x1 {0:.6g} def\n", x1);
+ writePSFmt("/y1 {0:.6g} def\n", y1);
+ writePSFmt("/dy {0:.6g} def\n", y1 - y0);
+ writePSFmt("/xMin {0:.6g} def\n", xMin);
+ writePSFmt("/yMin {0:.6g} def\n", yMin);
+ writePSFmt("/xMax {0:.6g} def\n", xMax);
+ writePSFmt("/yMax {0:.6g} def\n", yMax);
writePSFmt("/n {0:d} def\n", shading->getColorSpace()->getNComps());
if (shading->getNFuncs() == 1) {
writePS("/func ");
@@ -3958,7 +4255,7 @@ GBool PSOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do
}
writePS("} def\n");
}
- writePSFmt("{0:.4g} {1:.4g} 0 axialSH\n", tMin, tMax);
+ writePSFmt("{0:.6g} {1:.6g} 0 axialSH\n", tMin, tMax);
return gTrue;
}
@@ -4076,22 +4373,22 @@ GBool PSOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading,
}
// generate the PS code
- writePSFmt("/x0 {0:.4g} def\n", x0);
- writePSFmt("/x1 {0:.4g} def\n", x1);
- writePSFmt("/dx {0:.4g} def\n", x1 - x0);
- writePSFmt("/y0 {0:.4g} def\n", y0);
- writePSFmt("/y1 {0:.4g} def\n", y1);
- writePSFmt("/dy {0:.4g} def\n", y1 - y0);
- writePSFmt("/r0 {0:.4g} def\n", r0);
- writePSFmt("/r1 {0:.4g} def\n", r1);
- writePSFmt("/dr {0:.4g} def\n", r1 - r0);
- writePSFmt("/t0 {0:.4g} def\n", t0);
- writePSFmt("/t1 {0:.4g} def\n", t1);
- writePSFmt("/dt {0:.4g} def\n", t1 - t0);
+ writePSFmt("/x0 {0:.6g} def\n", x0);
+ writePSFmt("/x1 {0:.6g} def\n", x1);
+ writePSFmt("/dx {0:.6g} def\n", x1 - x0);
+ writePSFmt("/y0 {0:.6g} def\n", y0);
+ writePSFmt("/y1 {0:.6g} def\n", y1);
+ writePSFmt("/dy {0:.6g} def\n", y1 - y0);
+ writePSFmt("/r0 {0:.6g} def\n", r0);
+ writePSFmt("/r1 {0:.6g} def\n", r1);
+ writePSFmt("/dr {0:.6g} def\n", r1 - r0);
+ writePSFmt("/t0 {0:.6g} def\n", t0);
+ writePSFmt("/t1 {0:.6g} def\n", t1);
+ writePSFmt("/dt {0:.6g} def\n", t1 - t0);
writePSFmt("/n {0:d} def\n", shading->getColorSpace()->getNComps());
writePSFmt("/encl {0:s} def\n", enclosed ? "true" : "false");
- writePSFmt("/a1 {0:.4g} def\n", a1);
- writePSFmt("/a2 {0:.4g} def\n", a2);
+ writePSFmt("/a1 {0:.6g} def\n", a1);
+ writePSFmt("/a2 {0:.6g} def\n", a2);
if (shading->getNFuncs() == 1) {
writePS("/func ");
cvtFunction(shading->getFunc(0));
@@ -4110,7 +4407,7 @@ GBool PSOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading,
}
writePS("} def\n");
}
- writePSFmt("{0:.4g} {1:.4g} 0 radialSH\n", sMin, sMax);
+ writePSFmt("{0:.6g} {1:.6g} 0 radialSH\n", sMin, sMax);
// extend the 'enclosed' case
if (enclosed) {
@@ -4129,11 +4426,11 @@ GBool PSOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading,
ya = y1;
}
if (level == psLevel2Sep || level == psLevel3Sep) {
- writePSFmt("{0:.4g} radialCol aload pop k\n", ta);
+ writePSFmt("{0:.6g} radialCol aload pop k\n", ta);
} else {
- writePSFmt("{0:.4g} radialCol sc\n", ta);
+ writePSFmt("{0:.6g} radialCol sc\n", ta);
}
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} 0 360 arc h f*\n", xa, ya, ra);
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} 0 360 arc h f*\n", xa, ya, ra);
}
// extend the larger circle
@@ -4151,12 +4448,12 @@ GBool PSOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading,
ya = y1;
}
if (level == psLevel2Sep || level == psLevel3Sep) {
- writePSFmt("{0:.4g} radialCol aload pop k\n", ta);
+ writePSFmt("{0:.6g} radialCol aload pop k\n", ta);
} else {
- writePSFmt("{0:.4g} radialCol sc\n", ta);
+ writePSFmt("{0:.6g} radialCol sc\n", ta);
}
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} 0 360 arc h\n", xa, ya, ra);
- writePSFmt("{0:.4g} {1:.4g} m {2:.4g} {3:.4g} l {4:.4g} {5:.4g} l {6:.4g} {7:.4g} l h f*\n",
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} 0 360 arc h\n", xa, ya, ra);
+ writePSFmt("{0:.6g} {1:.6g} m {2:.6g} {3:.6g} l {4:.6g} {5:.6g} l {6:.6g} {7:.6g} l h f*\n",
xMin, yMin, xMin, yMax, xMax, yMax, xMax, yMin);
}
}
@@ -4200,12 +4497,12 @@ void PSOutputDev::doPath(GfxPath *path) {
x3 = subpath->getX(3);
y3 = subpath->getY(3);
if (x0 == x1 && x2 == x3 && y0 == y3 && y1 == y2) {
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} re\n",
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} {3:.6g} re\n",
x0 < x2 ? x0 : x2, y0 < y1 ? y0 : y1,
fabs(x2 - x0), fabs(y1 - y0));
return;
} else if (x0 == x3 && x1 == x2 && y0 == y1 && y2 == y3) {
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} re\n",
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} {3:.6g} re\n",
x0 < x1 ? x0 : x1, y0 < y2 ? y0 : y2,
fabs(x1 - x0), fabs(y2 - y0));
return;
@@ -4216,17 +4513,17 @@ void PSOutputDev::doPath(GfxPath *path) {
for (i = 0; i < n; ++i) {
subpath = path->getSubpath(i);
m = subpath->getNumPoints();
- writePSFmt("{0:.4g} {1:.4g} m\n", subpath->getX(0), subpath->getY(0));
+ writePSFmt("{0:.6g} {1:.6g} m\n", subpath->getX(0), subpath->getY(0));
j = 1;
while (j < m) {
if (subpath->getCurve(j)) {
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} {4:.4g} {5:.4g} c\n",
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g} c\n",
subpath->getX(j), subpath->getY(j),
subpath->getX(j+1), subpath->getY(j+1),
subpath->getX(j+2), subpath->getY(j+2));
j += 3;
} else {
- writePSFmt("{0:.4g} {1:.4g} l\n", subpath->getX(j), subpath->getY(j));
+ writePSFmt("{0:.6g} {1:.6g} l\n", subpath->getX(j), subpath->getY(j));
++j;
}
}
@@ -4341,17 +4638,17 @@ void PSOutputDev::drawString(GfxState *state, GooString *s) {
writePSString(s2);
if (font->isCIDFont()) {
if (wMode) {
- writePSFmt(" {0:d} {1:.4g} Tj16V\n", nChars, dy);
+ writePSFmt(" {0:d} {1:.6g} Tj16V\n", nChars, dy);
} else {
- writePSFmt(" {0:d} {1:.4g} Tj16\n", nChars, dx);
+ writePSFmt(" {0:d} {1:.6g} Tj16\n", nChars, dx);
}
} else {
- writePSFmt(" {0:.4g} Tj\n", dx);
+ writePSFmt(" {0:.6g} Tj\n", dx);
}
}
delete s2;
- if (state->getRender() & 4) {
+ if (state->getRender() & 4 || haveCSPattern) {
haveTextClip = gTrue;
}
}
@@ -4360,9 +4657,7 @@ void PSOutputDev::beginTextObject(GfxState *state) {
if (state->getFillColorSpace()->getMode() == csPattern) {
saveState(state);
haveCSPattern = gTrue;
- savedRender = state->getRender();
- state->setRender(7);
- writePSFmt("{0:d} Tr\n", 7);
+ writePS("true Tp\n");
}
}
@@ -4371,19 +4666,16 @@ void PSOutputDev::endTextObject(GfxState *state) {
if (haveTextClip) {
writePS("Tclip*\n");
haveTextClip = gFalse;
- state->setRender(savedRender);
if (state->getFillColorSpace()->getMode() != csPattern) {
double cxMin, cyMin, cxMax, cyMax;
state->getClipBBox(&cxMin, &cyMin, &cxMax, &cyMax);
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} re\n",
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} {3:.6g} re\n",
cxMin, cyMin,
cxMax, cyMax);
writePS("f*\n");
restoreState(state);
updateFillColor(state);
}
- } else {
- state->setRender(savedRender);
}
haveCSPattern = gFalse;
} else if (haveTextClip) {
@@ -4408,7 +4700,8 @@ void PSOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
switch (level) {
case psLevel1:
case psLevel1Sep:
- doImageL1(ref, NULL, invert, inlineImg, str, width, height, len);
+ doImageL1(ref, NULL, invert, inlineImg, str, width, height, len,
+ NULL, NULL, 0, 0, gFalse);
break;
case psLevel2:
case psLevel2Sep:
@@ -4433,11 +4726,13 @@ void PSOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
colorMap->getBits() + 7) / 8);
switch (level) {
case psLevel1:
- doImageL1(ref, colorMap, gFalse, inlineImg, str, width, height, len);
+ doImageL1(ref, colorMap, gFalse, inlineImg, str,
+ width, height, len, maskColors, NULL, 0, 0, gFalse);
break;
case psLevel1Sep:
//~ handle indexed, separation, ... color spaces
- doImageL1Sep(colorMap, gFalse, inlineImg, str, width, height, len);
+ doImageL1Sep(ref, colorMap, gFalse, inlineImg, str,
+ width, height, len, maskColors, NULL, 0, 0, gFalse);
break;
case psLevel2:
case psLevel2Sep:
@@ -4466,11 +4761,13 @@ void PSOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
colorMap->getBits() + 7) / 8);
switch (level) {
case psLevel1:
- doImageL1(ref, colorMap, gFalse, gFalse, str, width, height, len);
+ doImageL1(ref, colorMap, gFalse, gFalse, str, width, height, len,
+ NULL, maskStr, maskWidth, maskHeight, maskInvert);
break;
case psLevel1Sep:
//~ handle indexed, separation, ... color spaces
- doImageL1Sep(colorMap, gFalse, gFalse, str, width, height, len);
+ doImageL1Sep(ref, colorMap, gFalse, gFalse, str, width, height, len,
+ NULL, maskStr, maskWidth, maskHeight, maskInvert);
break;
case psLevel2:
case psLevel2Sep:
@@ -4488,11 +4785,21 @@ void PSOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
GBool invert, GBool inlineImg,
- Stream *str, int width, int height, int len) {
+ Stream *str, int width, int height, int len,
+ int *maskColors, Stream *maskStr,
+ int maskWidth, int maskHeight, GBool maskInvert) {
ImageStream *imgStr;
Guchar pixBuf[gfxColorMaxComps];
GfxGray gray;
int col, x, y, c, i;
+ char hexBuf[32*2 + 2]; // 32 values X 2 chars/value + line ending + null
+ Guchar digit, grayValue;
+ const GBool useBinary = globalParams->getPSBinary();
+
+ // explicit masking
+ if (maskStr && !(maskColors && colorMap)) {
+ maskToClippingPath(maskStr, maskWidth, maskHeight, maskInvert);
+ }
if ((inType3Char || preload) && !colorMap) {
if (inlineImg) {
@@ -4538,13 +4845,15 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
width, height, invert ? "true" : "false",
width, -height, height);
} else if (colorMap) {
- writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1\n",
+ writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1{5:s}\n",
width, height,
- width, -height, height);
+ width, -height, height,
+ useBinary ? "Bin" : "");
} else {
- writePSFmt("{0:d} {1:d} {2:s} [{3:d} 0 0 {4:d} 0 {5:d}] pdfImM1\n",
+ writePSFmt("{0:d} {1:d} {2:s} [{3:d} 0 0 {4:d} 0 {5:d}] pdfImM1{6:s}\n",
width, height, invert ? "true" : "false",
- width, -height, height);
+ width, -height, height,
+ useBinary ? "Bin" : "");
}
// image data
@@ -4565,15 +4874,29 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
for (x = 0; x < width; ++x) {
imgStr->getPixel(pixBuf);
colorMap->getGray(pixBuf, &gray);
- writePSFmt("{0:02x}", colToByte(gray));
- if (++i == 32) {
- writePSChar('\n');
+ grayValue = colToByte(gray);
+ if (useBinary) {
+ hexBuf[i++] = grayValue;
+ } else {
+ digit = grayValue / 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ digit = grayValue % 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ }
+ if (i >= 64) {
+ if (!useBinary) {
+ hexBuf[i++] = '\n';
+ }
+ writePSBuf(hexBuf, i);
i = 0;
}
}
}
if (i != 0) {
- writePSChar('\n');
+ if (!useBinary) {
+ hexBuf[i++] = '\n';
+ }
+ writePSBuf(hexBuf, i);
}
str->close();
delete imgStr;
@@ -4584,34 +4907,64 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
i = 0;
for (y = 0; y < height; ++y) {
for (x = 0; x < width; x += 8) {
- writePSFmt("{0:02x}", str->getChar() & 0xff);
- if (++i == 32) {
- writePSChar('\n');
+ grayValue = str->getChar();
+ if (useBinary) {
+ hexBuf[i++] = grayValue;
+ } else {
+ digit = grayValue / 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ digit = grayValue % 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
+ }
+ if (i >= 64) {
+ if (!useBinary) {
+ hexBuf[i++] = '\n';
+ }
+ writePSBuf(hexBuf, i);
i = 0;
}
}
}
if (i != 0) {
- writePSChar('\n');
+ if (!useBinary) {
+ hexBuf[i++] = '\n';
+ }
+ writePSBuf(hexBuf, i);
}
str->close();
}
}
+
+ if (maskStr && !(maskColors && colorMap)) {
+ writePS("pdfImClipEnd\n");
+ }
}
-void PSOutputDev::doImageL1Sep(GfxImageColorMap *colorMap,
+void PSOutputDev::doImageL1Sep(Object *ref, GfxImageColorMap *colorMap,
GBool invert, GBool inlineImg,
- Stream *str, int width, int height, int len) {
+ Stream *str, int width, int height, int len,
+ int *maskColors, Stream *maskStr,
+ int maskWidth, int maskHeight, GBool maskInvert) {
ImageStream *imgStr;
Guchar *lineBuf;
Guchar pixBuf[gfxColorMaxComps];
GfxCMYK cmyk;
int x, y, i, comp;
+ GBool checkProcessColor;
+ char hexBuf[32*2 + 2]; // 32 values X 2 chars/value + line ending + null
+ Guchar digit;
+ const GBool useBinary = globalParams->getPSBinary();
+
+ // explicit masking
+ if (maskStr && !(maskColors && colorMap)) {
+ maskToClippingPath(maskStr, maskWidth, maskHeight, maskInvert);
+ }
// width, height, matrix, bits per component
- writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1Sep\n",
+ writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1Sep{5:s}\n",
width, height,
- width, -height, height);
+ width, -height, height,
+ useBinary ? "Bin" : "");
// allocate a line buffer
lineBuf = (Guchar *)gmallocn(width, 4);
@@ -4622,40 +4975,78 @@ void PSOutputDev::doImageL1Sep(GfxImageColorMap *colorMap,
imgStr->reset();
// process the data stream
+ checkProcessColor = gTrue;
i = 0;
for (y = 0; y < height; ++y) {
// read the line
- for (x = 0; x < width; ++x) {
- imgStr->getPixel(pixBuf);
- colorMap->getCMYK(pixBuf, &cmyk);
- lineBuf[4*x+0] = colToByte(cmyk.c);
- lineBuf[4*x+1] = colToByte(cmyk.m);
- lineBuf[4*x+2] = colToByte(cmyk.y);
- lineBuf[4*x+3] = colToByte(cmyk.k);
- addProcessColor(colToDbl(cmyk.c), colToDbl(cmyk.m),
- colToDbl(cmyk.y), colToDbl(cmyk.k));
+ if (checkProcessColor) {
+ checkProcessColor = (((psProcessCyan | psProcessMagenta | psProcessYellow | psProcessBlack) & ~processColors) != 0);
+ }
+ if (checkProcessColor) {
+ for (x = 0; x < width; ++x) {
+ imgStr->getPixel(pixBuf);
+ colorMap->getCMYK(pixBuf, &cmyk);
+ lineBuf[4*x+0] = colToByte(cmyk.c);
+ lineBuf[4*x+1] = colToByte(cmyk.m);
+ lineBuf[4*x+2] = colToByte(cmyk.y);
+ lineBuf[4*x+3] = colToByte(cmyk.k);
+ addProcessColor(colToDbl(cmyk.c), colToDbl(cmyk.m),
+ colToDbl(cmyk.y), colToDbl(cmyk.k));
+ }
+ } else {
+ for (x = 0; x < width; ++x) {
+ imgStr->getPixel(pixBuf);
+ colorMap->getCMYK(pixBuf, &cmyk);
+ lineBuf[4*x+0] = colToByte(cmyk.c);
+ lineBuf[4*x+1] = colToByte(cmyk.m);
+ lineBuf[4*x+2] = colToByte(cmyk.y);
+ lineBuf[4*x+3] = colToByte(cmyk.k);
+ }
}
// write one line of each color component
- for (comp = 0; comp < 4; ++comp) {
- for (x = 0; x < width; ++x) {
- writePSFmt("{0:02x}", lineBuf[4*x + comp]);
- if (++i == 32) {
- writePSChar('\n');
- i = 0;
+ if (useBinary) {
+ for (comp = 0; comp < 4; ++comp) {
+ for (x = 0; x < width; ++x) {
+ hexBuf[i++] = lineBuf[4*x + comp];
+ if (i >= 64) {
+ writePSBuf(hexBuf, i);
+ i = 0;
+ }
+ }
+ }
+ } else {
+ for (comp = 0; comp < 4; ++comp) {
+ for (x = 0; x < width; ++x) {
+ digit = lineBuf[4*x + comp] / 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a'-10: '0');
+ digit = lineBuf[4*x + comp] % 16;
+ hexBuf[i++] = digit + ((digit >= 10)? 'a'-10: '0');
+ if (i >= 64) {
+ hexBuf[i++] = '\n';
+ writePSBuf(hexBuf, i);
+ i = 0;
+ }
}
}
}
}
if (i != 0) {
- writePSChar('\n');
+ if (!useBinary) {
+ hexBuf[i++] = '\n';
+ }
+ writePSBuf(hexBuf, i);
}
str->close();
delete imgStr;
gfree(lineBuf);
+
+ if (maskStr && !(maskColors && colorMap)) {
+ writePS("pdfImClipEnd\n");
+ }
}
void PSOutputDev::maskToClippingPath(Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert) {
@@ -4761,7 +5152,7 @@ void PSOutputDev::maskToClippingPath(Stream *maskStr, int maskWidth, int maskHei
// make each rectangle path and clip.
writePS("gsave newpath\n");
for (i = 0; i < rectsOutLen; ++i) {
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} re\n",
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} {3:.6g} re\n",
((double)rectsOut[i].x0)/maskWidth,
((double)rectsOut[i].y0)/maskHeight,
((double)(rectsOut[i].x1 - rectsOut[i].x0))/maskWidth,
@@ -4795,6 +5186,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
GfxCMYK cmyk;
int c;
int col, i, j, x0, x1, y;
+ char dataBuf[4096];
rectsOutLen = 0;
@@ -4942,7 +5334,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
// make each rectangle path and clip.
writePS("gsave newpath\n");
for (i = 0; i < rectsOutLen; ++i) {
- writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} re\n",
+ writePSFmt("{0:.6g} {1:.6g} {2:.6g} {3:.6g} re\n",
((double)rectsOut[i].x0)/width,
((double)rectsOut[i].y0)/height,
((double)(rectsOut[i].x1 - rectsOut[i].x0))/width,
@@ -5193,8 +5585,16 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
// copy the stream data
str->reset();
+ i = 0;
while ((c = str->getChar()) != EOF) {
- writePSChar(c);
+ dataBuf[i++] = c;
+ if (i >= (int)sizeof(dataBuf)) {
+ writePSBuf(dataBuf, i);
+ i = 0;
+ }
+ }
+ if (i > 0) {
+ writePSBuf(dataBuf, i);
}
str->close();
@@ -5875,7 +6275,7 @@ void PSOutputDev::opiBegin20(GfxState *state, Dict *dict) {
obj1.arrayGet(1, &obj2);
height = obj2.getNum();
obj2.free();
- writePSFmt("%%ImageDimensions: {0:.4g} {1:.4g}\n", width, height);
+ writePSFmt("%%ImageDimensions: {0:.6g} {1:.6g}\n", width, height);
}
obj1.free();
@@ -5893,7 +6293,7 @@ void PSOutputDev::opiBegin20(GfxState *state, Dict *dict) {
obj1.arrayGet(3, &obj2);
bottom = obj2.getNum();
obj2.free();
- writePSFmt("%%ImageCropRect: {0:.4g} {1:.4g} {2:.4g} {3:.4g}\n",
+ writePSFmt("%%ImageCropRect: {0:.6g} {1:.6g} {2:.6g} {3:.6g}\n",
left, top, right, bottom);
}
obj1.free();
@@ -5918,7 +6318,7 @@ void PSOutputDev::opiBegin20(GfxState *state, Dict *dict) {
if (obj3.isString() && obj4.isNum()) {
writePS(" ");
writePSString(obj3.getString());
- writePSFmt(" {0:.4g}", obj4.getNum());
+ writePSFmt(" {0:.6g}", obj4.getNum());
}
obj3.free();
obj4.free();
@@ -5947,7 +6347,7 @@ void PSOutputDev::opiBegin20(GfxState *state, Dict *dict) {
dict->lookup("IncludedImageQuality", &obj1);
if (obj1.isNum()) {
- writePSFmt("%%IncludedImageQuality: {0:.4g}\n", obj1.getNum());
+ writePSFmt("%%IncludedImageQuality: {0:.6g}\n", obj1.getNum());
}
obj1.free();
@@ -6041,7 +6441,7 @@ void PSOutputDev::opiBegin13(GfxState *state, Dict *dict) {
obj1.arrayGet(3, &obj2);
lry = obj2.getNum();
obj2.free();
- writePSFmt("%ALDImageCropFixed: {0:.4g} {1:.4g} {2:.4g} {3:.4g}\n",
+ writePSFmt("%ALDImageCropFixed: {0:.6g} {1:.6g} {2:.6g} {3:.6g}\n",
ulx, uly, lrx, lry);
}
obj1.free();
@@ -6118,7 +6518,7 @@ void PSOutputDev::opiBegin13(GfxState *state, Dict *dict) {
opiTransform(state, ulx, uly, &tulx, &tuly);
opiTransform(state, urx, ury, &turx, &tury);
opiTransform(state, lrx, lry, &tlrx, &tlry);
- writePSFmt("%ALDImagePosition: {0:.4g} {1:.4g} {2:.4g} {3:.4g} {4:.4g} {5:.4g} {6:.4g} {7:.4g}\n",
+ writePSFmt("%ALDImagePosition: {0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g} {6:.6g} {7:.6g}\n",
tllx, tlly, tulx, tuly, turx, tury, tlrx, tlry);
obj2.free();
}
@@ -6132,7 +6532,7 @@ void PSOutputDev::opiBegin13(GfxState *state, Dict *dict) {
obj1.arrayGet(1, &obj2);
vert = obj2.getNum();
obj2.free();
- writePSFmt("%ALDImageResoution: {0:.4g} {1:.4g}\n", horiz, vert);
+ writePSFmt("%ALDImageResoution: {0:.6g} {1:.6g}\n", horiz, vert);
obj2.free();
}
obj1.free();
@@ -6154,7 +6554,7 @@ void PSOutputDev::opiBegin13(GfxState *state, Dict *dict) {
dict->lookup("Tint", &obj1);
if (obj1.isNum()) {
- writePSFmt("%ALDImageTint: {0:.4g}\n", obj1.getNum());
+ writePSFmt("%ALDImageTint: {0:.6g}\n", obj1.getNum());
}
obj1.free();
@@ -6222,7 +6622,7 @@ void PSOutputDev::opiEnd(GfxState *state, Dict *opiDict) {
#endif // OPI_SUPPORT
void PSOutputDev::type3D0(GfxState *state, double wx, double wy) {
- writePSFmt("{0:.4g} {1:.4g} setcharwidth\n", wx, wy);
+ writePSFmt("{0:.6g} {1:.6g} setcharwidth\n", wx, wy);
writePS("q\n");
t3NeedsRestore = gTrue;
}
@@ -6287,14 +6687,14 @@ void PSOutputDev::cvtFunction(Function *func) {
}
writePSFmt("/xpdfSamples{0:d} [\n", thisFunc);
for (i = 0; i < nSamples; ++i) {
- writePSFmt("{0:.4g}\n", func0->getSamples()[i]);
+ writePSFmt("{0:.6g}\n", func0->getSamples()[i]);
}
writePS("] def\n");
writePSFmt("{{ {0:d} array {1:d} array {2:d} 2 roll\n", 2*m, m, m+2);
// [e01] [efrac] x0 x1 ... xm-1
for (i = m-1; i >= 0; --i) {
// [e01] [efrac] x0 x1 ... xi
- writePSFmt("{0:.4g} sub {1:.4g} mul {2:.4g} add\n",
+ writePSFmt("{0:.6g} sub {1:.6g} mul {2:.6g} add\n",
func0->getDomainMin(i),
(func0->getEncodeMax(i) - func0->getEncodeMin(i)) /
(func0->getDomainMax(i) - func0->getDomainMin(i)),
@@ -6344,10 +6744,10 @@ void PSOutputDev::cvtFunction(Function *func) {
// [e01] [efrac] s'(0) s'(1) ... s(2^(m-j-1)-1)
}
// [e01] [efrac] y(0) ... y(i-1) s
- writePSFmt("{0:.4g} mul {1:.4g} add\n",
+ writePSFmt("{0:.6g} mul {1:.6g} add\n",
func0->getDecodeMax(i) - func0->getDecodeMin(i),
func0->getDecodeMin(i));
- writePSFmt("dup {0:.4g} lt {{ pop {1:.4g} }} {{ dup {2:.4g} gt {{ pop {3:.4g} }} if }} ifelse\n",
+ writePSFmt("dup {0:.6g} lt {{ pop {1:.6g} }} {{ dup {2:.6g} gt {{ pop {3:.6g} }} if }} ifelse\n",
func0->getRangeMin(i), func0->getRangeMin(i),
func0->getRangeMax(i), func0->getRangeMax(i));
// [e01] [efrac] y(0) ... y(i-1) y(i)
@@ -6359,17 +6759,17 @@ void PSOutputDev::cvtFunction(Function *func) {
case 2: // exponential
func2 = (ExponentialFunction *)func;
n = func2->getOutputSize();
- writePSFmt("{{ dup {0:.4g} lt {{ pop {1:.4g} }} {{ dup {2:.4g} gt {{ pop {3:.4g} }} if }} ifelse\n",
+ writePSFmt("{{ dup {0:.6g} lt {{ pop {1:.6g} }} {{ dup {2:.6g} gt {{ pop {3:.6g} }} if }} ifelse\n",
func2->getDomainMin(0), func2->getDomainMin(0),
func2->getDomainMax(0), func2->getDomainMax(0));
// x
for (i = 0; i < n; ++i) {
// x y(0) .. y(i-1)
- writePSFmt("{0:d} index {1:.4g} exp {2:.4g} mul {3:.4g} add\n",
+ writePSFmt("{0:d} index {1:.6g} exp {2:.6g} mul {3:.6g} add\n",
i, func2->getE(), func2->getC1()[i] - func2->getC0()[i],
func2->getC0()[i]);
if (func2->getHasRange()) {
- writePSFmt("dup {0:.4g} lt {{ pop {1:.4g} }} {{ dup {2:.4g} gt {{ pop {3:.4g} }} if }} ifelse\n",
+ writePSFmt("dup {0:.6g} lt {{ pop {1:.6g} }} {{ dup {2:.6g} gt {{ pop {3:.6g} }} if }} ifelse\n",
func2->getRangeMin(i), func2->getRangeMin(i),
func2->getRangeMax(i), func2->getRangeMax(i));
}
@@ -6385,18 +6785,18 @@ void PSOutputDev::cvtFunction(Function *func) {
cvtFunction(func3->getFunc(i));
writePSFmt("/xpdfFunc{0:d}_{1:d} exch def\n", thisFunc, i);
}
- writePSFmt("{{ dup {0:.4g} lt {{ pop {1:.4g} }} {{ dup {2:.4g} gt {{ pop {3:.4g} }} if }} ifelse\n",
+ writePSFmt("{{ dup {0:.6g} lt {{ pop {1:.6g} }} {{ dup {2:.6g} gt {{ pop {3:.6g} }} if }} ifelse\n",
func3->getDomainMin(0), func3->getDomainMin(0),
func3->getDomainMax(0), func3->getDomainMax(0));
for (i = 0; i < func3->getNumFuncs() - 1; ++i) {
- writePSFmt("dup {0:.4g} lt {{ {1:.4g} sub {2:.4g} mul {3:.4g} add xpdfFunc{4:d}_{5:d} }} {{\n",
+ writePSFmt("dup {0:.6g} lt {{ {1:.6g} sub {2:.6g} mul {3:.6g} add xpdfFunc{4:d}_{5:d} }} {{\n",
func3->getBounds()[i+1],
func3->getBounds()[i],
func3->getScale()[i],
func3->getEncode()[2*i],
thisFunc, i);
}
- writePSFmt("{0:.4g} sub {1:.4g} mul {2:.4g} add xpdfFunc{3:d}_{4:d}\n",
+ writePSFmt("{0:.6g} sub {1:.6g} mul {2:.6g} add xpdfFunc{3:d}_{4:d}\n",
func3->getBounds()[i],
func3->getScale()[i],
func3->getEncode()[2*i],
@@ -6431,6 +6831,16 @@ void PSOutputDev::writePS(char *s) {
}
}
+void PSOutputDev::writePSBuf(char *s, int len) {
+ if (t3String) {
+ for (int i = 0; i < len; i++) {
+ t3String->append(s[i]);
+ }
+ } else {
+ (*outputFunc)(outputStream, s, len);
+ }
+}
+
void PSOutputDev::writePSFmt(const char *fmt, ...) {
va_list args;
GooString *buf;
@@ -6484,7 +6894,7 @@ void PSOutputDev::writePSName(char *s) {
if (c <= (char)0x20 || c >= (char)0x7f ||
c == '(' || c == ')' || c == '<' || c == '>' ||
c == '[' || c == ']' || c == '{' || c == '}' ||
- c == '/' || c == '%') {
+ c == '/' || c == '%' || c == '\\') {
writePSFmt("#{0:02x}", c & 0xff);
} else {
writePSChar(c);
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/PSOutputDev.h
index 38c838c0d57..a1e0a2957cb 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PSOutputDev.h
@@ -17,10 +17,12 @@
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006-2008 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007 Brad Hards <bradh@kde.org>
-// Copyright (C) 2009 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2011 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011 William Bader <williambader@hotmail.com>
+// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -50,6 +52,7 @@ struct PSFont8Info;
struct PSFont16Enc;
class PSOutCustomColor;
class Function;
+class PDFDoc;
//------------------------------------------------------------------------
// PSOutputDev
@@ -75,7 +78,7 @@ class PSOutputDev: public OutputDev {
public:
// Open a PostScript output file, and write the prolog.
- PSOutputDev(const char *fileName, XRef *xrefA, Catalog *catalog,
+ PSOutputDev(const char *fileName, PDFDoc *doc, XRef *xrefA, Catalog *catalog,
char *psTitle,
int firstPage, int lastPage, PSOutMode modeA,
int paperWidthA = -1, int paperHeightA = -1,
@@ -88,6 +91,7 @@ public:
// Open a PSOutputDev that will write to a generic stream.
PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
char *psTitle,
+ PDFDoc *doc,
XRef *xrefA, Catalog *catalog,
int firstPage, int lastPage, PSOutMode modeA,
int paperWidthA = -1, int paperHeightA = -1,
@@ -120,8 +124,8 @@ public:
// Does this device use functionShadedFill(), axialShadedFill(), and
// radialShadedFill()? If this returns false, these shaded fills
// will be reduced to a series of other drawing operations.
- virtual GBool useShadedFills()
- { return level >= psLevel2; }
+ virtual GBool useShadedFills(int type)
+ { return type < 4 && level >= psLevel2; }
// Does this device use drawForm()? If this returns false,
// form-type XObjects will be interpreted (i.e., unrolled).
@@ -145,9 +149,6 @@ public:
// Write the Xpdf procset.
void writeXpdfProcset();
- // Write the document-level setup.
- void writeDocSetup(Catalog *catalog, int firstPage, int lastPage, GBool duplexA);
-
// Write the trailer for the current page.
void writePageTrailer();
@@ -209,8 +210,8 @@ public:
virtual void stroke(GfxState *state);
virtual void fill(GfxState *state);
virtual void eoFill(GfxState *state);
- virtual GBool tilingPatternFill(GfxState *state, Object *str,
- int paintType, Dict *resDict,
+ virtual GBool tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
double *mat, double *bbox,
int x0, int y0, int x1, int y1,
double xStep, double yStep);
@@ -287,7 +288,7 @@ public:
private:
void init(PSOutputFunc outputFuncA, void *outputStreamA,
- PSFileType fileTypeA, char *pstitle, XRef *xrefA, Catalog *catalog,
+ PSFileType fileTypeA, char *pstitle, PDFDoc *doc, XRef *xrefA, Catalog *catalog,
int firstPage, int lastPage, PSOutMode modeA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
GBool manualCtrlA, int paperWidthA, int paperHeightA,
@@ -317,10 +318,14 @@ private:
void maskToClippingPath(Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert);
void doImageL1(Object *ref, GfxImageColorMap *colorMap,
GBool invert, GBool inlineImg,
- Stream *str, int width, int height, int len);
- void doImageL1Sep(GfxImageColorMap *colorMap,
+ Stream *str, int width, int height, int len,
+ int *maskColors, Stream *maskStr,
+ int maskWidth, int maskHeight, GBool maskInvert);
+ void doImageL1Sep(Object *ref, GfxImageColorMap *colorMap,
GBool invert, GBool inlineImg,
- Stream *str, int width, int height, int len);
+ Stream *str, int width, int height, int len,
+ int *maskColors, Stream *maskStr,
+ int maskWidth, int maskHeight, GBool maskInvert);
void doImageL2(Object *ref, GfxImageColorMap *colorMap,
GBool invert, GBool inlineImg,
Stream *str, int width, int height, int len,
@@ -334,6 +339,17 @@ private:
void dumpColorSpaceL2(GfxColorSpace *colorSpace,
GBool genXform, GBool updateColors,
GBool map01);
+ GBool tilingPatternFillL1(GfxState *state, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep);
+ GBool tilingPatternFillL2(GfxState *state, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep);
+
#if OPI_SUPPORT
void opiBegin20(GfxState *state, Dict *dict);
void opiBegin13(GfxState *state, Dict *dict);
@@ -341,8 +357,13 @@ private:
double *x1, double *y1);
#endif
void cvtFunction(Function *func);
+
+ // Write the document-level setup.
+ void writeDocSetup(PDFDoc *doc, Catalog *catalog, int firstPage, int lastPage, GBool duplexA);
+
void writePSChar(char c);
void writePS(char *s);
+ void writePSBuf(char *s, int len);
void writePSFmt(const char *fmt, ...);
void writePSString(GooString *s);
void writePSName(char *s);
@@ -427,7 +448,6 @@ private:
// clipping render mode
GBool haveCSPattern; // set if text has been drawn with a
// clipping render mode because of pattern colorspace
- int savedRender; // use if pattern colorspace
GBool inType3Char; // inside a Type 3 CharProc
GooString *t3String; // Type 3 content string
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Page.cc
index e63975d9cc0..04d307bd213 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Page.cc
@@ -15,11 +15,11 @@
//
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2005-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006-2008 Pino Toscano <pino@kde.org>
// Copyright (C) 2006 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
// Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
-// Copyright (C) 2006-2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2008 Iñigo Martínez <inigomartinez@gmail.com>
// Copyright (C) 2008 Brad Hards <bradh@kde.org>
@@ -89,6 +89,7 @@ void PDFRectangle::clipTo(PDFRectangle *rect) {
PageAttrs::PageAttrs(PageAttrs *attrs, Dict *dict) {
Object obj1;
PDFRectangle mBox;
+ const GBool isPage = dict->is("Page");
// get old/default values
if (attrs) {
@@ -122,8 +123,8 @@ PageAttrs::PageAttrs(PageAttrs *attrs, Dict *dict) {
if (!haveCropBox) {
cropBox = mediaBox;
}
- else
- {
+
+ if (isPage) {
// cropBox can not be bigger than mediaBox
if (cropBox.x2 - cropBox.x1 > mediaBox.x2 - mediaBox.x1)
{
@@ -145,11 +146,13 @@ PageAttrs::PageAttrs(PageAttrs *attrs, Dict *dict) {
artBox = cropBox;
readBox(dict, "ArtBox", &artBox);
- // clip all other boxes to the media box
- cropBox.clipTo(&mediaBox);
- bleedBox.clipTo(&mediaBox);
- trimBox.clipTo(&mediaBox);
- artBox.clipTo(&mediaBox);
+ if (isPage) {
+ // clip all other boxes to the media box
+ cropBox.clipTo(&mediaBox);
+ bleedBox.clipTo(&mediaBox);
+ trimBox.clipTo(&mediaBox);
+ artBox.clipTo(&mediaBox);
+ }
// rotate
dict->lookup("Rotate", &obj1);
@@ -257,7 +260,7 @@ Page::Page(XRef *xrefA, int numA, Dict *pageDict, Ref pageRefA, PageAttrs *attrs
xref = xrefA;
num = numA;
duration = -1;
- pageWidgets = NULL;
+ annots = NULL;
pageObj.initDict(pageDict);
pageRef = pageRefA;
@@ -284,18 +287,14 @@ Page::Page(XRef *xrefA, int numA, Dict *pageDict, Ref pageRefA, PageAttrs *attrs
tmp.free();
// annotations
- pageDict->lookupNF("Annots", &annots);
- if (!(annots.isRef() || annots.isArray() || annots.isNull())) {
+ pageDict->lookupNF("Annots", &annotsObj);
+ if (!(annotsObj.isRef() || annotsObj.isArray() || annotsObj.isNull())) {
error(-1, "Page annotations object (page %d) is wrong type (%s)",
- num, annots.getTypeName());
- annots.free();
+ num, annotsObj.getTypeName());
+ annotsObj.free();
goto err2;
}
- // forms
- pageWidgets = new FormPageWidgets(xrefA, this->getAnnots(&tmp),num,form);
- tmp.free();
-
// contents
pageDict->lookupNF("Contents", &contents);
if (!(contents.isRef() || contents.isArray() ||
@@ -326,17 +325,17 @@ Page::Page(XRef *xrefA, int numA, Dict *pageDict, Ref pageRefA, PageAttrs *attrs
trans.initNull();
err2:
- annots.initNull();
+ annotsObj.initNull();
err1:
contents.initNull();
ok = gFalse;
}
Page::~Page() {
- delete pageWidgets;
delete attrs;
+ delete annots;
pageObj.free();
- annots.free();
+ annotsObj.free();
contents.free();
trans.free();
thumb.free();
@@ -344,20 +343,26 @@ Page::~Page() {
}
Annots *Page::getAnnots(Catalog *catalog) {
- Annots *annots;
- Object obj;
+ if (!annots) {
+ Object obj;
+ annots = new Annots(xref, catalog, getAnnots(&obj));
+ obj.free();
+ }
- annots = new Annots(xref, catalog, getAnnots(&obj));
- obj.free();
return annots;
}
-void Page::addAnnot(Annot *annot) {
+void Page::addAnnot(Annot *annot, Catalog *catalog) {
Object obj1;
Object tmp;
Ref annotRef = annot->getRef ();
- if (annots.isNull()) {
+ // Make sure we have annots before adding the new one
+ // even if it's an empty list so that we can safely
+ // call annots->appendAnnot(annot)
+ getAnnots(catalog);
+
+ if (annotsObj.isNull()) {
Ref annotsRef;
// page doesn't have annots array,
// we have to create it
@@ -367,26 +372,32 @@ void Page::addAnnot(Annot *annot) {
tmp.free();
annotsRef = xref->addIndirectObject (&obj1);
- annots.initRef(annotsRef.num, annotsRef.gen);
- pageObj.dictSet ("Annots", &annots);
+ annotsObj.initRef(annotsRef.num, annotsRef.gen);
+ pageObj.dictSet ("Annots", &annotsObj);
xref->setModifiedObject (&pageObj, pageRef);
} else {
getAnnots(&obj1);
if (obj1.isArray()) {
obj1.arrayAdd (tmp.initRef (annotRef.num, annotRef.gen));
- xref->setModifiedObject (&obj1, annots.getRef());
+ if (annotsObj.isRef())
+ xref->setModifiedObject (&obj1, annotsObj.getRef());
+ else
+ xref->setModifiedObject (&pageObj, pageRef);
}
obj1.free();
}
+
+ annots->appendAnnot(annot);
+
+ annot->setPage(&pageRef, num);
}
Links *Page::getLinks(Catalog *catalog) {
- Links *links;
- Object obj;
+ return new Links(getAnnots(catalog));
+}
- links = new Links(getAnnots(&obj), catalog->getBaseURI());
- obj.free();
- return links;
+FormPageWidgets *Page::getFormWidgets(Catalog *catalog) {
+ return new FormPageWidgets(getAnnots(catalog), num, catalog->getForm());
}
void Page::display(OutputDev *out, double hDPI, double vDPI,
@@ -475,9 +486,8 @@ void Page::displaySlice(OutputDev *out, double hDPI, double vDPI,
obj.free();
// draw annotations
- annotList = new Annots(xref, catalog, getAnnots(&obj));
- obj.free();
-
+ annotList = getAnnots(catalog);
+
if (annotList->getNumAnnots() > 0) {
if (globalParams->getPrintCommands()) {
printf("***** Annotations\n");
@@ -492,7 +502,6 @@ void Page::displaySlice(OutputDev *out, double hDPI, double vDPI,
}
out->dump();
}
- delete annotList;
delete gfx;
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Page.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Page.h
index 9d892b17597..1ab69f396f0 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Page.h
@@ -16,7 +16,7 @@
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2006 Pino Toscano <pino@kde.org>
-// Copyright (C) 2006 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2008 Iñigo Martínez <inigomartinez@gmail.com>
//
@@ -55,6 +55,7 @@ public:
PDFRectangle(double x1A, double y1A, double x2A, double y2A)
{ x1 = x1A; y1 = y1A; x2 = x2A; y2 = y2A; }
GBool isValid() { return x1 != 0 || y1 != 0 || x2 != 0 || y2 != 0; }
+ GBool contains(double x, double y) { return x1 <= x && x <= x2 && y1 <= y && y <= y2; }
void clipTo(PDFRectangle *rect);
};
@@ -162,9 +163,9 @@ public:
Dict *getResourceDict() { return attrs->getResourceDict(); }
// Get annotations array.
- Object *getAnnots(Object *obj) { return annots.fetch(xref, obj); }
+ Object *getAnnots(Object *obj) { return annotsObj.fetch(xref, obj); }
// Add a new annotation to the page
- void addAnnot(Annot *annot);
+ void addAnnot(Annot *annot, Catalog *catalog);
// Return a list of links.
Links *getLinks(Catalog *catalog);
@@ -183,7 +184,7 @@ public:
Object *getTrans(Object *obj) { return trans.fetch(xref, obj); }
// Get form.
- FormPageWidgets *getPageWidgets() { return pageWidgets; }
+ FormPageWidgets *getFormWidgets(Catalog *catalog);
// Get duration, the maximum length of time, in seconds,
// that the page is displayed before the presentation automatically
@@ -241,9 +242,9 @@ private:
Ref pageRef; // page reference
int num; // page number
PageAttrs *attrs; // page attributes
- Object annots; // annotations array
+ Annots *annots; // annotations
+ Object annotsObj; // annotations array
Object contents; // page contents
- FormPageWidgets *pageWidgets; // the form for that page
Object thumb; // page thumbnail
Object trans; // page transition
Object actions; // page addiction actions
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/PageLabelInfo.cc
index 84cb50fceb2..1330988ccf0 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PageLabelInfo.cc
@@ -4,6 +4,7 @@
//
// Copyright (C) 2005-2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2011 Simon Kellner <kellner@kit.edu>
//
// 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
@@ -258,11 +259,11 @@ GBool PageLabelInfo::labelToIndex(GooString *label, int *index)
Interval *interval;
char *str = label->getCString(), *end;
int prefixLength;
- int i, base, number;
+ int i, number;
- base = 0;
for (i = 0; i < intervals.getLength(); i++) {
interval = (Interval *) intervals.get(i);
+ const int base = interval->base;
prefixLength = interval->prefix->getLength();
if (label->cmpN(interval->prefix, prefixLength) != 0)
continue;
@@ -294,8 +295,6 @@ GBool PageLabelInfo::labelToIndex(GooString *label, int *index)
case Interval::None:
break;
}
-
- base += interval->length;
}
return gFalse;
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/PageTransition.cc
index 3fbd0de2802..3fbd0de2802 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Parser.cc
index 05fba86907b..34a828653e8 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Parser.cc
@@ -13,8 +13,9 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2009, 201, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+// Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.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
@@ -52,8 +53,20 @@ Parser::~Parser() {
}
Object *Parser::getObj(Object *obj, Guchar *fileKey,
+ CryptAlgorithm encAlgorithm, int keyLength,
+ int objNum, int objGen) {
+ std::set<int> fetchOriginatorNums;
+ return getObj(obj, fileKey, encAlgorithm, keyLength, objNum, objGen, &fetchOriginatorNums);
+}
+
+Object *Parser::getObj(Object *obj, std::set<int> *fetchOriginatorNums)
+{
+ return getObj(obj, NULL, cryptRC4, 0, 0, 0, fetchOriginatorNums);
+}
+
+Object *Parser::getObj(Object *obj, Guchar *fileKey,
CryptAlgorithm encAlgorithm, int keyLength,
- int objNum, int objGen) {
+ int objNum, int objGen, std::set<int> *fetchOriginatorNums) {
char *key;
Stream *str;
Object obj2;
@@ -77,7 +90,7 @@ Object *Parser::getObj(Object *obj, Guchar *fileKey,
obj->initArray(xref);
while (!buf1.isCmd("]") && !buf1.isEOF())
obj->arrayAdd(getObj(&obj2, fileKey, encAlgorithm, keyLength,
- objNum, objGen));
+ objNum, objGen, fetchOriginatorNums));
if (buf1.isEOF())
error(getPos(), "End of file inside array");
shift();
@@ -98,7 +111,7 @@ Object *Parser::getObj(Object *obj, Guchar *fileKey,
gfree(key);
break;
}
- obj->dictAdd(key, getObj(&obj2, fileKey, encAlgorithm, keyLength, objNum, objGen));
+ obj->dictAdd(key, getObj(&obj2, fileKey, encAlgorithm, keyLength, objNum, objGen, fetchOriginatorNums));
}
}
if (buf1.isEOF())
@@ -107,7 +120,7 @@ Object *Parser::getObj(Object *obj, Guchar *fileKey,
// object streams
if (allowStreams && buf2.isCmd("stream")) {
if ((str = makeStream(obj, fileKey, encAlgorithm, keyLength,
- objNum, objGen))) {
+ objNum, objGen, fetchOriginatorNums))) {
obj->initStream(str);
} else {
obj->free();
@@ -161,7 +174,7 @@ Object *Parser::getObj(Object *obj, Guchar *fileKey,
Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
CryptAlgorithm encAlgorithm, int keyLength,
- int objNum, int objGen) {
+ int objNum, int objGen, std::set<int> *fetchOriginatorNums) {
Object obj;
BaseStream *baseStr;
Stream *str;
@@ -172,14 +185,14 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
pos = lexer->getPos();
// get length
- dict->dictLookup("Length", &obj);
+ dict->dictLookup("Length", &obj, fetchOriginatorNums);
if (obj.isInt()) {
length = (Guint)obj.getInt();
obj.free();
} else {
error(getPos(), "Bad 'Length' attribute in stream");
obj.free();
- return NULL;
+ length = 0;
}
// check for length in damaged file
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Parser.h
index d09b23b4a01..3d8a831f9d2 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Parser.h
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2010 Albert Astals Cid <aacid@kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -46,6 +46,12 @@ public:
Object *getObj(Object *obj, Guchar *fileKey = NULL,
CryptAlgorithm encAlgorithm = cryptRC4, int keyLength = 0,
int objNum = 0, int objGen = 0);
+
+ Object *getObj(Object *obj, Guchar *fileKey,
+ CryptAlgorithm encAlgorithm, int keyLength,
+ int objNum, int objGen, std::set<int> *fetchOriginatorNums);
+
+ Object *getObj(Object *obj, std::set<int> *fetchOriginatorNums);
// Get stream.
Stream *getStream() { return lexer->getStream(); }
@@ -63,7 +69,7 @@ private:
Stream *makeStream(Object *dict, Guchar *fileKey,
CryptAlgorithm encAlgorithm, int keyLength,
- int objNum, int objGen);
+ int objNum, int objGen, std::set<int> *fetchOriginatorNums);
void shift(int objNum = -1);
};
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/PopplerCache.cc
index b0859aa383f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PopplerCache.cc
@@ -5,12 +5,15 @@
// This file is licensed under the GPLv2 or later
//
// Copyright (C) 2009 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org>
//
//========================================================================
#include "PopplerCache.h"
+#include "XRef.h"
+
PopplerCacheKey::~PopplerCacheKey()
{
}
@@ -100,3 +103,61 @@ PopplerCacheKey *PopplerCache::key(int index)
{
return keys[index];
}
+
+class ObjectKey : public PopplerCacheKey {
+ public:
+ ObjectKey(int numA, int genA) : num(numA), gen(genA)
+ {
+ }
+
+ bool operator==(const PopplerCacheKey &key) const
+ {
+ const ObjectKey *k = static_cast<const ObjectKey*>(&key);
+ return k->num == num && k->gen == gen;
+ }
+
+ int num, gen;
+};
+
+class ObjectItem : public PopplerCacheItem {
+ public:
+ ObjectItem(Object *obj)
+ {
+ obj->copy(&item);
+ }
+
+ ~ObjectItem()
+ {
+ item.free();
+ }
+
+ Object item;
+};
+
+PopplerObjectCache::PopplerObjectCache(int cacheSize, XRef *xrefA) {
+ cache = new PopplerCache (cacheSize);
+ xref = xrefA;
+}
+
+PopplerObjectCache::~PopplerObjectCache() {
+ delete cache;
+}
+
+Object *PopplerObjectCache::put(const Ref &ref) {
+ Object obj;
+ xref->fetch(ref.num, ref.gen, &obj);
+
+ ObjectKey *key = new ObjectKey(ref.num, ref.gen);
+ ObjectItem *item = new ObjectItem(&obj);
+ cache->put(key, item);
+ obj.free();
+
+ return &item->item;
+}
+
+Object *PopplerObjectCache::lookup(const Ref &ref, Object *obj) {
+ ObjectKey key(ref.num, ref.gen);
+ ObjectItem *item = static_cast<ObjectItem *>(cache->lookup(key));
+
+ return item ? item->item.copy(obj) : obj->initNull();
+}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/PopplerCache.h
index 5f22409bbc6..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PopplerCache.h
@@ -5,13 +5,16 @@
// This file is licensed under the GPLv2 or later
//
// Copyright (C) 2009 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org>
//
//========================================================================
#ifndef POPPLER_CACHE_H
#define POPPLER_CACHE_H
+#include "Object.h"
+
class PopplerCacheItem
{
public:
@@ -58,4 +61,18 @@ class PopplerCache
int cacheSize;
};
+class PopplerObjectCache
+{
+ public:
+ PopplerObjectCache (int cacheSizeA, XRef *xrefA);
+ ~PopplerObjectCache();
+
+ Object *put(const Ref &ref);
+ Object *lookup(const Ref &ref, Object *obj);
+
+ private:
+ XRef *xref;
+ PopplerCache *cache;
+};
+
#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/PreScanOutputDev.cc
index 7c3f522a153..f8df6a1d34a 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PreScanOutputDev.cc
@@ -14,27 +14,38 @@
// under GPL version 2 or later
//
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2010, 2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2011 William Bader <williambader@hotmail.com>
+// Copyright (C) 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
//
//========================================================================
+#include <config.h>
+
#ifdef USE_GCC_PRAGMAS
#pragma implementation
#endif
#include <math.h>
#include "GlobalParams.h"
+#include "Gfx.h"
#include "GfxFont.h"
#include "Link.h"
+#include "Catalog.h"
+#include "Page.h"
#include "PreScanOutputDev.h"
//------------------------------------------------------------------------
// PreScanOutputDev
//------------------------------------------------------------------------
-PreScanOutputDev::PreScanOutputDev() {
+PreScanOutputDev::PreScanOutputDev(XRef *xrefA) {
+ level = globalParams->getPSLevel();
+ xref = xrefA;
clearStats();
}
@@ -70,6 +81,21 @@ void PreScanOutputDev::eoFill(GfxState *state) {
state->getFillOpacity(), state->getBlendMode());
}
+GBool PreScanOutputDev::tilingPatternFill(GfxState *state, Catalog *catalog, Object *str,
+ double *pmat, int paintType, int /*tilingType*/, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep) {
+ PDFRectangle box;
+ Gfx *gfx;
+ box.x1 = bbox[0]; box.y1 = bbox[1];
+ box.x2 = bbox[2]; box.y2 = bbox[3];
+ gfx = new Gfx(xref, this, resDict, catalog, &box, NULL);
+ gfx->display(str);
+ delete gfx;
+ return gTrue;
+}
+
void PreScanOutputDev::clip(GfxState * /*state*/) {
//~ check for a rectangle "near" the edge of the page;
//~ else set gdi to false
@@ -140,6 +166,10 @@ void PreScanOutputDev::drawImageMask(GfxState *state, Object * /*ref*/, Stream *
check(state->getFillColorSpace(), state->getFillColor(),
state->getFillOpacity(), state->getBlendMode());
gdi = gFalse;
+ if ((level == psLevel1 || level == psLevel1Sep) &&
+ state->getFillColorSpace()->getMode() == csPattern) {
+ level1PSBug = gTrue;
+ }
if (inlineImg) {
str->reset();
@@ -235,10 +265,21 @@ void PreScanOutputDev::beginTransparencyGroup(
GfxColorSpace * /*blendingColorSpace*/,
GBool /*isolated*/, GBool /*knockout*/,
GBool /*forSoftMask*/) {
- transparency = gTrue;
gdi = gFalse;
}
+void PreScanOutputDev::paintTransparencyGroup(GfxState *state, double * /*bbox*/)
+{
+ check(state->getFillColorSpace(), state->getFillColor(),
+ state->getFillOpacity(), state->getBlendMode());
+}
+
+void PreScanOutputDev::setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/,
+ Function * /*transferFunc*/, GfxColor * /*backdropColor*/)
+{
+ transparency = gTrue;
+}
+
void PreScanOutputDev::check(GfxColorSpace *colorSpace, GfxColor *color,
double opacity, GfxBlendMode blendMode) {
GfxRGB rgb;
@@ -269,4 +310,5 @@ void PreScanOutputDev::clearStats() {
gray = gTrue;
transparency = gFalse;
gdi = gTrue;
+ level1PSBug = gFalse;
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/PreScanOutputDev.h
index 39c78197d76..464fbbf26a2 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/PreScanOutputDev.h
@@ -14,6 +14,10 @@
// under GPL version 2 or later
//
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2011 William Bader <williambader@hotmail.com>
+// Copyright (C) 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -28,7 +32,9 @@
#endif
#include "goo/gtypes.h"
+#include "Object.h"
#include "GfxState.h"
+#include "GlobalParams.h"
#include "OutputDev.h"
//------------------------------------------------------------------------
@@ -39,7 +45,7 @@ class PreScanOutputDev: public OutputDev {
public:
// Constructor.
- PreScanOutputDev();
+ PreScanOutputDev(XRef *xrefA);
// Destructor.
virtual ~PreScanOutputDev();
@@ -53,6 +59,11 @@ public:
// Does this device use drawChar() or drawString()?
virtual GBool useDrawChar() { return gTrue; }
+ // Does this device use tilingPatternFill()? If this returns false,
+ // tiling pattern fills will be reduced to a series of other drawing
+ // operations.
+ virtual GBool useTilingPatternFill() { return gTrue; }
+
// Does this device use beginType3Char/endType3Char? Otherwise,
// text in Type 3 fonts will be drawn with drawChar/drawString.
virtual GBool interpretType3Chars() { return gTrue; }
@@ -69,6 +80,11 @@ public:
virtual void stroke(GfxState *state);
virtual void fill(GfxState *state);
virtual void eoFill(GfxState *state);
+ virtual GBool tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep);
//----- path clipping
virtual void clip(GfxState *state);
@@ -109,6 +125,9 @@ public:
GfxColorSpace *blendingColorSpace,
GBool isolated, GBool knockout,
GBool forSoftMask);
+ virtual void paintTransparencyGroup(GfxState *state, double *bbox);
+ virtual void setSoftMask(GfxState *state, double *bbox, GBool alpha,
+ Function *transferFunc, GfxColor *backdropColor);
//----- special access
@@ -128,6 +147,10 @@ public:
// clearStats() are all rasterizable by GDI calls in GDIOutputDev.
GBool isAllGDI() { return gdi; }
+ // Returns true if the operations performed since the last call to
+ // clearStats() processed a feature that PSOutputDev does not implement.
+ GBool hasLevel1PSBug() { return level1PSBug; }
+
// Clear the stats used by the above functions.
void clearStats();
@@ -136,10 +159,13 @@ private:
void check(GfxColorSpace *colorSpace, GfxColor *color,
double opacity, GfxBlendMode blendMode);
+ XRef *xref;
GBool mono;
GBool gray;
GBool transparency;
GBool gdi;
+ PSLevel level; // PostScript level (1, 2, separation)
+ GBool level1PSBug; // gTrue if it uses a feature not supported in PSOutputDev
};
#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Rendition.cc
index 92d4d322274..b81e169ea21 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Rendition.cc
@@ -1,10 +1,11 @@
//*********************************************************************************
-// Movie.cc
+// Rendition.cc
//---------------------------------------------------------------------------------
//
//---------------------------------------------------------------------------------
// Hugo Mercier <hmercier31[at]gmail.com> (c) 2008
// Pino Toscano <pino@kde.org> (c) 2008
+// Carlos Garcia Campos <carlosgc@gnome.org> (c) 2010
//
// 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
@@ -21,13 +22,13 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//*********************************************************************************
-#include "Movie.h"
+#include <math.h>
+#include "Rendition.h"
+#include "FileSpec.h"
-#include <GooList.h>
-
-MovieWindowParameters::MovieWindowParameters() {
+MediaWindowParameters::MediaWindowParameters() {
// default values
- type = movieWindowEmbedded;
+ type = windowEmbedded;
width = -1;
height = -1;
relativeTo = windowRelativeToDocument;
@@ -38,10 +39,10 @@ MovieWindowParameters::MovieWindowParameters() {
isResizeable = gTrue;
}
-MovieWindowParameters::~MovieWindowParameters() {
+MediaWindowParameters::~MediaWindowParameters() {
}
-void MovieWindowParameters::parseFWParams(Object* obj) {
+void MediaWindowParameters::parseFWParams(Object* obj) {
Object tmp;
if (obj->dictLookup("D", &tmp)->isArray()) {
@@ -130,69 +131,22 @@ void MovieWindowParameters::parseFWParams(Object* obj) {
}
-MovieParameters::MovieParameters() {
+MediaParameters::MediaParameters() {
// instanciate to default values
- rotationAngle = 0;
- rate = 1.0;
volume = 100;
fittingPolicy = fittingUndefined;
autoPlay = gTrue;
repeatCount = 1.0;
opacity = 1.0;
showControls = gFalse;
-
-
- start.units = 0;
- duration.units = 0;
+ duration = 0;
}
-MovieParameters::~MovieParameters() {
+MediaParameters::~MediaParameters() {
}
-void MovieParameters::parseAnnotMovie(AnnotMovie* annot) {
- windowParams.relativeTo = MovieWindowParameters::windowRelativeToDesktop;
-
- if (annot->needFloatingWindow()) {
- windowParams.type = MovieWindowParameters::movieWindowFloating;
- }
- if (annot->needFullscreen()) {
- windowParams.type = MovieWindowParameters::movieWindowFullscreen;
- }
-
- int w, h;
- int znum, zdenum;
- annot->getMovieSize(w, h);
- annot->getZoomFactor(znum, zdenum);
- windowParams.width = int(w * double(znum) / zdenum);
- windowParams.height = int(h * double(znum) / zdenum);
-
- double x,y;
- annot->getWindowPosition(x,y);
- windowParams.XPosition = x;
- windowParams.YPosition = y;
-
- rate = annot->getRate();
- // convert volume to [0 100]
- volume = int((annot->getVolume() + 1.0) * 50);
-
- AnnotMovie::RepeatMode mode = annot->getRepeatMode();
- if (mode == AnnotMovie::repeatModeRepeat)
- repeatCount = 0.0;
-
- showControls = annot->getShowControls();
-
- AnnotMovie::Time tStart = annot->getStart();
- AnnotMovie::Time tDuration = annot->getDuration();
-
- start.units = tStart.units;
- start.units_per_second = tStart.units_per_second;
-
- duration.units = tDuration.units;
- duration.units_per_second = tDuration.units_per_second;
-}
-
-void MovieParameters::parseMediaPlayParameters(Object* obj) {
+void MediaParameters::parseMediaPlayParameters(Object* obj) {
Object tmp;
@@ -227,11 +181,11 @@ void MovieParameters::parseMediaPlayParameters(Object* obj) {
if (tmp.dictLookup("S", &oname)->isName()) {
char* name = oname.getName();
if (!strcmp(name, "F"))
- duration.units = (Gulong)(-1); // infinity
+ duration = -1; // infinity
else if (!strcmp(name, "T")) {
if (tmp.dictLookup("T", &ddict)->isDict()) {
if (ddict.dictLookup("V", &tmp2)->isNum()) {
- duration.units = Gulong(tmp2.getNum());
+ duration = Gulong(tmp2.getNum());
}
tmp2.free();
}
@@ -255,17 +209,17 @@ void MovieParameters::parseMediaPlayParameters(Object* obj) {
}
-void MovieParameters::parseMediaScreenParameters(Object* obj) {
+void MediaParameters::parseMediaScreenParameters(Object* obj) {
Object tmp;
if (obj->dictLookup("W", &tmp)->isInt()) {
int t = tmp.getInt();
switch(t) {
- case 0: windowParams.type = MovieWindowParameters::movieWindowFloating; break;
- case 1: windowParams.type = MovieWindowParameters::movieWindowFullscreen; break;
- case 2: windowParams.type = MovieWindowParameters::movieWindowHidden; break;
- case 3: windowParams.type = MovieWindowParameters::movieWindowEmbedded; break;
+ case 0: windowParams.type = MediaWindowParameters::windowFloating; break;
+ case 1: windowParams.type = MediaWindowParameters::windowFullscreen; break;
+ case 2: windowParams.type = MediaWindowParameters::windowHidden; break;
+ case 3: windowParams.type = MediaWindowParameters::windowEmbedded; break;
}
}
tmp.free();
@@ -297,23 +251,16 @@ void MovieParameters::parseMediaScreenParameters(Object* obj) {
}
tmp.free();
- if (windowParams.type == MovieWindowParameters::movieWindowFloating) {
+ if (windowParams.type == MediaWindowParameters::windowFloating) {
Object winDict;
if (obj->dictLookup("F",&winDict)->isDict()) {
windowParams.parseFWParams(&winDict);
}
+ winDict.free();
}
}
-Movie::Movie() {
- fileName = NULL;
- contentType = NULL;
- isEmbedded = gFalse;
- embeddedStream = NULL;
- posterStream = NULL;
-}
-
-Movie::~Movie() {
+MediaRendition::~MediaRendition() {
if (fileName)
delete fileName;
if (contentType)
@@ -322,113 +269,107 @@ Movie::~Movie() {
if (embeddedStream && (!embeddedStream->decRef())) {
delete embeddedStream;
}
- if (posterStream && (!posterStream->decRef())) {
- delete posterStream;
- }
}
-void Movie::parseAnnotMovie(AnnotMovie* annot) {
- // AnnotMovie is not embedded
- isEmbedded = gFalse;
-
- fileName = annot->getFileName()->copy();
-
- if (annot->getPosterStream()) {
- posterStream = annot->getPosterStream();
- posterStream->incRef();
- }
-
- MH.parseAnnotMovie(annot);
- // deep copy of MH to BE
- // (no distinction is made with AnnotMovie)
- memcpy(&BE, &MH, sizeof(MH));
-}
+MediaRendition::MediaRendition(Object* obj) {
+ Object tmp, tmp2;
+ GBool hasClip = gFalse;
-void Movie::parseMediaRendition(Object* obj) {
+ ok = gTrue;
+ fileName = NULL;
+ contentType = NULL;
+ isEmbedded = gFalse;
+ embeddedStream = NULL;
- Object tmp, tmp2;
- if (obj->dictLookup("S", &tmp)->isName()) {
- if (!strcmp(tmp.getName(), "MR")) { // it's a media rendition
-
- //
- // parse Media Play Parameters
- if (obj->dictLookup("P", &tmp2)->isDict()) { // media play parameters
- Object params;
- if (tmp2.dictLookup("MH", &params)->isDict()) {
- MH.parseMediaPlayParameters(&params);
- }
- params.free();
- if (tmp2.dictLookup("BE", &params)->isDict()) {
- BE.parseMediaPlayParameters(&params);
- }
- params.free();
- }
- tmp2.free();
- //
- // parse Media Screen Parameters
- if (obj->dictLookup("SP", &tmp2)->isDict()) { // media screen parameters
- Object params;
- if (tmp2.dictLookup("MH", &params)->isDict()) {
- MH.parseMediaScreenParameters(&params);
- }
- params.free();
- if (tmp2.dictLookup("BE", &params)->isDict()) {
- BE.parseMediaScreenParameters(&params);
- }
- params.free();
- }
- tmp2.free();
-
- //
- // Parse media clip data
- //
- if (obj->dictLookup("C", &tmp2)->isDict()) { // media clip
-
- tmp.free();
- if (tmp2.dictLookup("S", &tmp)->isName()) {
- if (!strcmp(tmp.getName(), "MCD")) { // media clip data
- Object obj1, obj2;
- if (tmp2.dictLookup("D", &obj1)->isDict()) {
- if (obj1.dictLookup("F", &obj2)->isString()) {
- fileName = obj2.getString()->copy();
- }
- obj2.free();
-
- if (!obj1.dictLookup("EF", &obj2)->isNull()) {
- tmp.free();
- Object mref;
- if (!obj2.dictLookupNF("F", &mref)->isNull()) {
- isEmbedded = gTrue;
- Object embedded;
- obj2.dictLookup("F", &embedded);
- if (embedded.isStream()) {
- embeddedStream = embedded.getStream();
- // "copy" stream
- embeddedStream->incRef();
- }
- embedded.free();
- }
- mref.free();
- }
- obj2.free();
- }
- obj1.free();
-
- if (tmp2.dictLookup("CT", &obj1)->isString()) {
- contentType = obj1.getString()->copy();
+ //
+ // Parse media clip data
+ //
+ if (obj->dictLookup("C", &tmp2)->isDict()) { // media clip
+ hasClip = gTrue;
+ if (tmp2.dictLookup("S", &tmp)->isName()) {
+ if (!strcmp(tmp.getName(), "MCD")) { // media clip data
+ Object obj1, obj2;
+ if (tmp2.dictLookup("D", &obj1)->isDict()) {
+ if (obj1.dictLookup("F", &obj2)->isString()) {
+ fileName = obj2.getString()->copy();
+ }
+ obj2.free();
+ if (obj1.dictLookup("EF", &obj2)->isDict()) {
+ Object embedded;
+ if (obj2.dictLookup("F", &embedded)->isStream()) {
+ isEmbedded = gTrue;
+ embeddedStream = embedded.getStream();
+ // "copy" stream
+ embeddedStream->incRef();
}
- obj1.free();
+ embedded.free();
}
+ obj2.free();
+
+ // TODO: D might be a form XObject too
+ } else {
+ error (-1, "Invalid Media Clip Data");
+ ok = gFalse;
+ }
+ obj1.free();
+
+ // FIXME: ignore CT if D is a form XObject
+ if (tmp2.dictLookup("CT", &obj1)->isString()) {
+ contentType = obj1.getString()->copy();
}
- tmp.free();
+ obj1.free();
+ } else if (!strcmp(tmp.getName(), "MCS")) { // media clip data
+ // TODO
}
- tmp2.free();
+ } else {
+ error (-1, "Invalid Media Clip");
+ ok = gFalse;
+ }
+ tmp.free();
+ }
+ tmp2.free();
+
+ if (!ok)
+ return;
+
+ //
+ // parse Media Play Parameters
+ if (obj->dictLookup("P", &tmp2)->isDict()) { // media play parameters
+ Object params;
+ if (tmp2.dictLookup("MH", &params)->isDict()) {
+ MH.parseMediaPlayParameters(&params);
}
+ params.free();
+ if (tmp2.dictLookup("BE", &params)->isDict()) {
+ BE.parseMediaPlayParameters(&params);
+ }
+ params.free();
+ } else if (hasClip) {
+ error (-1, "Invalid Media Rendition");
+ ok = gFalse;
+ }
+ tmp2.free();
+
+ //
+ // parse Media Screen Parameters
+ if (obj->dictLookup("SP", &tmp2)->isDict()) { // media screen parameters
+ Object params;
+ if (tmp2.dictLookup("MH", &params)->isDict()) {
+ MH.parseMediaScreenParameters(&params);
+ }
+ params.free();
+ if (tmp2.dictLookup("BE", &params)->isDict()) {
+ BE.parseMediaScreenParameters(&params);
+ }
+ params.free();
}
+ tmp2.free();
}
+void MediaRendition::outputToFile(FILE* fp) {
+ if (!isEmbedded)
+ return;
-void Movie::outputToFile(FILE* fp) {
embeddedStream->reset();
while (1) {
@@ -441,21 +382,19 @@ void Movie::outputToFile(FILE* fp) {
}
-Movie* Movie::copy() {
-
+MediaRendition *MediaRendition::copy() {
// call default copy constructor
- Movie* new_movie = new Movie(*this);
+ MediaRendition* new_media = new MediaRendition(*this);
if (contentType)
- new_movie->contentType = contentType->copy();
+ new_media->contentType = contentType->copy();
if (fileName)
- new_movie->fileName = fileName->copy();
+ new_media->fileName = fileName->copy();
- if (new_movie->embeddedStream)
- new_movie->embeddedStream->incRef();
-
- if (new_movie->posterStream)
- new_movie->posterStream->incRef();
+ if (new_media->embeddedStream)
+ new_media->embeddedStream->incRef();
- return new_movie;
+ return new_media;
}
+
+// TODO: SelectorRendition
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Rendition.h
index 16584ad28dc..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Rendition.h
@@ -1,9 +1,10 @@
//*********************************************************************************
-// Movie.h
+// Rendition.h
//---------------------------------------------------------------------------------
//
//---------------------------------------------------------------------------------
// Hugo Mercier <hmercier31[at]gmail.com> (c) 2008
+// Carlos Garcia Campos <carlosgc@gnome.org> (c) 2010
//
// 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
@@ -20,31 +21,27 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//*********************************************************************************
-#ifndef _MOVIE_H_
-#define _MOVIE_H_
+#ifndef _RENDITION_H_
+#define _RENDITION_H_
#include "Object.h"
-#include "Annot.h"
-class GooList;
+struct MediaWindowParameters {
-
-struct MovieWindowParameters {
-
- MovieWindowParameters();
- ~MovieWindowParameters();
+ MediaWindowParameters();
+ ~MediaWindowParameters();
// parse from a floating window parameters dictionary
void parseFWParams(Object* obj);
- enum MovieWindowType {
- movieWindowFloating = 0,
- movieWindowFullscreen,
- movieWindowHidden, // ?
- movieWindowEmbedded
+ enum MediaWindowType {
+ windowFloating = 0,
+ windowFullscreen,
+ windowHidden,
+ windowEmbedded
};
- enum MovieWindowRelativeTo {
+ enum MediaWindowRelativeTo {
windowRelativeToDocument = 0,
windowRelativeToApplication,
windowRelativeToDesktop
@@ -53,14 +50,14 @@ struct MovieWindowParameters {
// DEFAULT VALUE
- MovieWindowType type; // movieWindowEmbedded
+ MediaWindowType type; // movieWindowEmbedded
int width; // -1
int height; // -1
// floating window position
- MovieWindowRelativeTo relativeTo; // windowRelativeToDocument (or to desktop)
+ MediaWindowRelativeTo relativeTo; // windowRelativeToDocument (or to desktop)
double XPosition; // 0.5
double YPosition; // 0.5
@@ -70,19 +67,17 @@ struct MovieWindowParameters {
};
-struct MovieParameters {
+struct MediaParameters {
- MovieParameters();
- ~MovieParameters();
+ MediaParameters();
+ ~MediaParameters();
// parse from a "Media Play Parameters" dictionary
void parseMediaPlayParameters(Object* playObj);
// parse from a "Media Screen Parameters" dictionary
void parseMediaScreenParameters(Object* screenObj);
- // parse from a AnnotMovie object
- void parseAnnotMovie(AnnotMovie* annot);
- enum MovieFittingPolicy {
+ enum MediaFittingPolicy {
fittingMeet = 0,
fittingSlice,
fittingFill,
@@ -91,28 +86,17 @@ struct MovieParameters {
fittingUndefined
};
- struct MovieTime {
- MovieTime() { units_per_second = 0; }
- Gulong units;
- int units_per_second; // 0 : defined by movie
- };
-
struct Color {
double r, g, b;
};
- Gushort rotationAngle; // 0
-
- MovieTime start; // 0
- MovieTime duration; // 0
-
- double rate; // 1.0
+ int duration; // 0
int volume; // 100
// defined in media play parameters, p 770
// correspond to 'fit' SMIL's attribute
- MovieFittingPolicy fittingPolicy; // fittingUndefined
+ MediaFittingPolicy fittingPolicy; // fittingUndefined
GBool autoPlay; // true
@@ -128,19 +112,18 @@ struct MovieParameters {
GBool showControls; // false
- MovieWindowParameters windowParams;
+ MediaWindowParameters windowParams;
};
-class Movie {
+class MediaRendition {
public:
- Movie();
- ~Movie();
+ MediaRendition(Object *obj);
+ ~MediaRendition();
- void parseAnnotMovie(AnnotMovie* annot);
- void parseMediaRendition(Object* obj);
+ GBool isOk () { return ok; }
- MovieParameters* getMHParameters() { return &MH; }
- MovieParameters* getBEParameters() { return &BE; }
+ MediaParameters* getMHParameters() { return &MH; }
+ MediaParameters* getBEParameters() { return &BE; }
GooString* getContentType() { return contentType; }
GooString* getFileName() { return fileName; }
@@ -150,17 +133,15 @@ class Movie {
// write embedded stream to file
void outputToFile(FILE*);
- Stream* getPosterStream() { return posterStream; }
-
- Movie* copy();
+ MediaRendition* copy();
private:
+ GBool ok;
+
// "Must Honor" parameters
- MovieParameters MH;
+ MediaParameters MH;
// "Best Effort" parameters
- MovieParameters BE;
-
- Stream* posterStream;
+ MediaParameters BE;
GBool isEmbedded;
@@ -173,5 +154,4 @@ class Movie {
GooString* fileName;
};
-#endif
-
+#endif /* _RENDITION_H_ */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/SecurityHandler.cc
index ea91e2131c2..630c753691c 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/SecurityHandler.cc
@@ -6,6 +6,20 @@
//
//========================================================================
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
#include <config.h>
#ifdef USE_GCC_PRAGMAS
@@ -27,6 +41,8 @@
#endif
#include "SecurityHandler.h"
+#include <limits.h>
+
//------------------------------------------------------------------------
// SecurityHandler
//------------------------------------------------------------------------
@@ -145,6 +161,12 @@ StandardSecurityHandler::StandardSecurityHandler(PDFDoc *docA,
encryptDictA->dictLookup("O", &ownerKeyObj);
encryptDictA->dictLookup("U", &userKeyObj);
encryptDictA->dictLookup("P", &permObj);
+ if (permObj.isUint()) {
+ unsigned int permUint = permObj.getUint();
+ int perms = permUint - UINT_MAX - 1;
+ permObj.free();
+ permObj.initInt(perms);
+ }
doc->getXRef()->getTrailerDict()->dictLookup("ID", &fileIDObj);
if (versionObj.isInt() &&
revisionObj.isInt() &&
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/SecurityHandler.h
index 5278a6cf10d..5278a6cf10d 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/SplashOutputDev.cc
index 4d51a423932..7bacdba7ed9 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/SplashOutputDev.cc
@@ -15,14 +15,21 @@
//
// Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2006 Stefan Schweizer <genstef@gentoo.org>
-// Copyright (C) 2006-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2011 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
// Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2011 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2009 William Bader <williambader@hotmail.com>
+// Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
+// Copyright (C) 2010 Brian Cameron <brian.cameron@oracle.com>
+// Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
+// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
+// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
+// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
+// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -41,7 +48,9 @@
#include "GlobalParams.h"
#include "Error.h"
#include "Object.h"
+#include "Gfx.h"
#include "GfxFont.h"
+#include "Page.h"
#include "Link.h"
#include "CharCodeToUnicode.h"
#include "FontEncodingTables.h"
@@ -66,6 +75,497 @@ extern "C" int unlink(char *filename);
#endif
#endif
+#ifdef _MSC_VER
+#include <float.h>
+#define isfinite(x) _finite(x)
+#endif
+
+#ifdef __sun
+#include <ieeefp.h>
+#define isfinite(x) finite(x)
+#endif
+
+static inline void convertGfxColor(SplashColorPtr dest,
+ SplashColorMode colorMode,
+ GfxColorSpace *colorSpace,
+ GfxColor *src) {
+ SplashColor color;
+ GfxGray gray;
+ GfxRGB rgb;
+#if SPLASH_CMYK
+ GfxCMYK cmyk;
+#endif
+
+ // make gcc happy
+ color[0] = color[1] = color[2] = 0;
+#if SPLASH_CMYK
+ color[3] = 0;
+#endif
+ switch (colorMode) {
+ case splashModeMono1:
+ case splashModeMono8:
+ colorSpace->getGray(src, &gray);
+ color[0] = colToByte(gray);
+ break;
+ case splashModeXBGR8:
+ color[3] = 255;
+ case splashModeBGR8:
+ case splashModeRGB8:
+ colorSpace->getRGB(src, &rgb);
+ color[0] = colToByte(rgb.r);
+ color[1] = colToByte(rgb.g);
+ color[2] = colToByte(rgb.b);
+ break;
+#if SPLASH_CMYK
+ case splashModeCMYK8:
+ colorSpace->getCMYK(src, &cmyk);
+ color[0] = colToByte(cmyk.c);
+ color[1] = colToByte(cmyk.m);
+ color[2] = colToByte(cmyk.y);
+ color[3] = colToByte(cmyk.k);
+ break;
+#endif
+ }
+ splashColorCopy(dest, color);
+}
+
+static inline SplashPattern *createOverprintPattern(GfxColorSpace *colorSpace, SplashColorPtr color, GBool image, Guchar tolerance = 0x01) {
+ switch (colorSpace->getMode()) {
+ case csDeviceCMYK:
+ if (image) {
+ return new SplashSolidColor(color);
+ }
+ case csSeparation:
+ case csDeviceN:
+ if (image && colorSpace->getMode() == csDeviceN) {
+ GfxDeviceNColorSpace *deviceNSpace = (GfxDeviceNColorSpace *) colorSpace;
+ GBool hasSpot = gFalse;
+ GBool hasProcess = gFalse;
+ for (int i = 0; i < deviceNSpace->getNComps(); i++) {
+ GooString *name = deviceNSpace->getColorantName(i)->upperCase();
+ if (name->cmp("CYAN") != 0 &&
+ name->cmp("MAGENTA") != 0 &&
+ name->cmp("YELLOW") != 0 &&
+ name->cmp("BLACK") != 0 &&
+ name->cmp("NONE") != 0) {
+ hasSpot = gTrue;
+ } else {
+ hasProcess = gTrue;
+ }
+ }
+ if (hasSpot && hasProcess)
+ return new SplashSolidColor(color);
+ }
+ return new SplashOverprintColor(colorSpace, color, tolerance);
+ case csIndexed:
+ return createOverprintPattern(((GfxIndexedColorSpace *) colorSpace)->getBase(), color, image);
+ case csICCBased:
+ if (image) {
+ return createOverprintPattern(((GfxICCBasedColorSpace *) colorSpace)->getAlt(), color, gFalse, 0x05);
+ }
+ case csDeviceGray:
+ if (image) {
+ return new SplashOverprintColor(colorSpace, color, tolerance);
+ }
+ default: // knockout
+ return new SplashSolidColor(color);
+ }
+}
+
+
+//------------------------------------------------------------------------
+// SplashOverprintColor
+//------------------------------------------------------------------------
+
+SplashOverprintColor::SplashOverprintColor(GfxColorSpace *colorSpaceA, SplashColorPtr colorA, Guchar toleranceA) {
+ splashColorCopy(color, colorA);
+ colorSpace = colorSpaceA;
+ tolerance = toleranceA;
+}
+
+SplashOverprintColor::~SplashOverprintColor() {
+}
+
+GBool SplashOverprintColor::getColor(int x, int y, SplashColorPtr c) {
+ splashColorCopy(c, color);
+ return gTrue;
+}
+
+void SplashOverprintColor::overprint(GBool op, Guchar aSrc, SplashColorPtr cSrc,
+ Guchar aDest, SplashColorPtr cDest,
+ SplashColorPtr colorResult) {
+ switch(colorSpace->getMode()) {
+ case csDeviceGray: // only in case of grayscale images
+ colorResult[0] = cDest[0];
+ colorResult[1] = cDest[1];
+ colorResult[2] = cDest[2];
+ colorResult[3] = (Guchar)(((aDest - aSrc) * cDest[3] +
+ aSrc * cSrc[3]) / aDest);
+ break;
+ case csDeviceCMYK:
+ colorResult[0] = (cSrc[0] < tolerance && op) ?
+ cDest[0] :
+ (Guchar)(((aDest - aSrc) * cDest[0] + aSrc * cSrc[0]) / aDest);
+ colorResult[1] = (cSrc[1] < tolerance && op) ?
+ cDest[1] :
+ (Guchar)(((aDest - aSrc) * cDest[1] + aSrc * cSrc[1]) / aDest);
+ colorResult[2] = (cSrc[2] < tolerance && op) ?
+ cDest[2] :
+ (Guchar)(((aDest - aSrc) * cDest[2] + aSrc * cSrc[2]) / aDest);
+ colorResult[3] = (cSrc[3] < tolerance && op) ?
+ cDest[3] :
+ (Guchar)(((aDest - aSrc) * cDest[3] + aSrc * cSrc[3]) / aDest);
+ break;
+
+ case csSeparation:
+ {
+ GfxSeparationColorSpace *sepSpace = (GfxSeparationColorSpace *) colorSpace;
+ GooString *name = sepSpace->getName()->upperCase();
+ if (name->cmp("CYAN") == 0) {
+ colorResult[0] = (Guchar)(((aDest - aSrc) * cDest[0] +
+ aSrc * cSrc[0]) / aDest);
+ colorResult[1] = cDest[1];
+ colorResult[2] = cDest[2];
+ colorResult[3] = cDest[3];
+ } else if (name->cmp("MAGENTA") == 0) {
+ colorResult[0] = cDest[0];
+ colorResult[1] = (Guchar)(((aDest - aSrc) * cDest[1] +
+ aSrc * cSrc[1]) / aDest);
+ colorResult[2] = cDest[2];
+ colorResult[3] = cDest[3];
+ } else if (name->cmp("YELLOW") == 0) {
+ colorResult[0] = cDest[0];
+ colorResult[1] = cDest[1];
+ colorResult[2] = (Guchar)(((aDest - aSrc) * cDest[2] +
+ aSrc * cSrc[2]) / aDest);
+ colorResult[3] = cDest[3];
+ } else if (name->cmp("BLACK") == 0) {
+ colorResult[0] = cDest[0];
+ colorResult[1] = cDest[1];
+ colorResult[2] = cDest[2];
+ colorResult[3] = (Guchar)(((aDest - aSrc) * cDest[3] +
+ aSrc * cSrc[3]) / aDest);
+ } else {
+ colorResult[0] = ((int) cDest[0] + cSrc[0]) > 0xff ? 0xff : cDest[0] + cSrc[0];
+ colorResult[1] = ((int) cDest[1] + cSrc[1]) > 0xff ? 0xff : cDest[1] + cSrc[1];
+ colorResult[2] = ((int) cDest[2] + cSrc[2]) > 0xff ? 0xff : cDest[2] + cSrc[2];
+ colorResult[3] = ((int) cDest[3] + cSrc[3]) > 0xff ? 0xff : cDest[3] + cSrc[3];
+ }
+ }
+ break;
+ case csDeviceN:
+ {
+ GfxDeviceNColorSpace *deviceNSpace = (GfxDeviceNColorSpace *) colorSpace;
+ colorResult[0] = cDest[0];
+ colorResult[1] = cDest[1];
+ colorResult[2] = cDest[2];
+ colorResult[3] = cDest[3];
+ for (int i = 0; i < deviceNSpace->getNComps(); i++) {
+ GooString *name = deviceNSpace->getColorantName(i)->upperCase();
+ if (name->cmp("CYAN") == 0) {
+ colorResult[0] = (Guchar)(((aDest - aSrc) * cDest[0] +
+ aSrc * cSrc[0]) / aDest);
+ } else if (name->cmp("MAGENTA") == 0) {
+ colorResult[1] = (Guchar)(((aDest - aSrc) * cDest[1] +
+ aSrc * cSrc[1]) / aDest);
+ } else if (name->cmp("YELLOW") == 0) {
+ colorResult[2] = (Guchar)(((aDest - aSrc) * cDest[2] +
+ aSrc * cSrc[2]) / aDest);
+ } else if (name->cmp("BLACK") == 0) {
+ colorResult[3] = (Guchar)(((aDest - aSrc) * cDest[3] +
+ aSrc * cSrc[3]) / aDest);
+ } else if (name->cmp("NONE") != 0) {
+ colorResult[0] = (cSrc[0] < tolerance && op) ?
+ cDest[0] :
+ (Guchar)(((aDest - aSrc) * cDest[0] + aSrc * cSrc[0]) / aDest);
+ colorResult[1] = (cSrc[1] < tolerance && op) ?
+ cDest[1] :
+ (Guchar)(((aDest - aSrc) * cDest[1] + aSrc * cSrc[1]) / aDest);
+ colorResult[2] = (cSrc[2] < tolerance && op) ?
+ cDest[2] :
+ (Guchar)(((aDest - aSrc) * cDest[2] + aSrc * cSrc[2]) / aDest);
+ colorResult[3] = (cSrc[3] < tolerance && op) ?
+ cDest[3] :
+ (Guchar)(((aDest - aSrc) * cDest[3] + aSrc * cSrc[3]) / aDest);
+ break;
+ }
+ }
+ }
+ break;
+ default:
+ // default for overprint is knockout:
+ colorResult[0] = (Guchar)(((aDest - aSrc) * cDest[0] +
+ aSrc * cSrc[0]) / aDest);
+ colorResult[1] = (Guchar)(((aDest - aSrc) * cDest[1] +
+ aSrc * cSrc[1]) / aDest);
+ colorResult[2] = (Guchar)(((aDest - aSrc) * cDest[2] +
+ aSrc * cSrc[2]) / aDest);
+ colorResult[3] = (Guchar)(((aDest - aSrc) * cDest[3] +
+ aSrc * cSrc[3]) / aDest);
+ }
+}
+
+//------------------------------------------------------------------------
+// SplashGouraudPattern
+//------------------------------------------------------------------------
+SplashGouraudPattern::SplashGouraudPattern(GBool bDirectColorTranslationA,
+ GfxState *stateA, GfxGouraudTriangleShading *shadingA, SplashColorMode modeA) {
+ SplashColor defaultColor;
+ GfxColor srcColor;
+ state = stateA;
+ shading = shadingA;
+ mode = modeA;
+ bDirectColorTranslation = bDirectColorTranslationA;
+ shadingA->getColorSpace()->getDefaultColor(&srcColor);
+ convertGfxColor(defaultColor, mode, shadingA->getColorSpace(), &srcColor);
+ opPattern = new SplashOverprintColor(shadingA->getColorSpace(), defaultColor, 0x01);
+}
+
+SplashGouraudPattern::~SplashGouraudPattern() {
+ delete opPattern;
+}
+
+void SplashGouraudPattern::getParameterizedColor(double colorinterp, SplashColorMode mode, SplashColorPtr dest) {
+ GfxColor src;
+ GfxColorSpace* srcColorSpace = shading->getColorSpace();
+ int colorComps = 3;
+#if SPLASH_CMYK
+ if (mode == splashModeCMYK8)
+ colorComps=4;
+#endif
+
+ shading->getParameterizedColor(colorinterp, &src);
+
+ if (bDirectColorTranslation) {
+ for (int m = 0; m < colorComps; ++m)
+ dest[m] = colToByte(src.c[m]);
+ } else {
+ convertGfxColor(dest, mode, srcColorSpace, &src);
+ }
+}
+
+void SplashGouraudPattern::overprint(GBool op, Guchar aSrc, SplashColorPtr cSrc,
+ Guchar aDest, SplashColorPtr cDest,
+ SplashColorPtr colorResult) {
+ opPattern->overprint(op, aSrc, cSrc, aDest, cDest, colorResult);
+}
+//------------------------------------------------------------------------
+// SplashUnivariatePattern
+//------------------------------------------------------------------------
+
+SplashUnivariatePattern::SplashUnivariatePattern(SplashColorMode colorModeA, GfxState *stateA, GfxUnivariateShading *shadingA) {
+ Matrix ctm;
+ double xMin, yMin, xMax, yMax;
+
+ shading = shadingA;
+ state = stateA;
+ colorMode = colorModeA;
+
+ state->getCTM(&ctm);
+ ctm.invertTo(&ictm);
+
+ // get the function domain
+ t0 = shading->getDomain0();
+ t1 = shading->getDomain1();
+ dt = t1 - t0;
+
+ stateA->getUserClipBBox(&xMin, &yMin, &xMax, &yMax);
+ shadingA->setupCache(&ctm, xMin, yMin, xMax, yMax);
+}
+
+SplashUnivariatePattern::~SplashUnivariatePattern() {
+}
+
+GBool SplashUnivariatePattern::getColor(int x, int y, SplashColorPtr c) {
+ GfxColor gfxColor;
+ double xc, yc, t;
+
+ ictm.transform(x, y, &xc, &yc);
+ if (! getParameter (xc, yc, &t))
+ return gFalse;
+
+ shading->getColor(t, &gfxColor);
+ convertGfxColor(c, colorMode, shading->getColorSpace(), &gfxColor);
+ return gTrue;
+}
+
+GBool SplashUnivariatePattern::testPosition(int x, int y) {
+ double xc, yc, t;
+
+ ictm.transform(x, y, &xc, &yc);
+ if (! getParameter (xc, yc, &t))
+ return gFalse;
+ return (t0 < t1) ? (t > t0 && t < t1) : (t > t1 && t < t0);
+}
+
+
+//------------------------------------------------------------------------
+// SplashRadialPattern
+//------------------------------------------------------------------------
+#define RADIAL_EPSILON (1. / 1024 / 1024)
+
+SplashRadialPattern::SplashRadialPattern(SplashColorMode colorModeA, GfxState *stateA, GfxRadialShading *shadingA):
+ SplashUnivariatePattern(colorModeA, stateA, shadingA)
+{
+ SplashColor defaultColor;
+ GfxColor srcColor;
+
+ shadingA->getCoords(&x0, &y0, &r0, &dx, &dy, &dr);
+ dx -= x0;
+ dy -= y0;
+ dr -= r0;
+ a = dx*dx + dy*dy - dr*dr;
+ if (fabs(a) > RADIAL_EPSILON)
+ inva = 1.0 / a;
+ shadingA->getColorSpace()->getDefaultColor(&srcColor);
+ convertGfxColor(defaultColor, colorModeA, shadingA->getColorSpace(), &srcColor);
+ opPattern = new SplashOverprintColor(shadingA->getColorSpace(), defaultColor, 0x01);
+}
+
+SplashRadialPattern::~SplashRadialPattern() {
+ delete opPattern;
+}
+
+GBool SplashRadialPattern::getParameter(double xs, double ys, double *t) {
+ double b, c, s0, s1;
+
+ // We want to solve this system of equations:
+ //
+ // 1. (x - xc(s))^2 + (y -yc(s))^2 = rc(s)^2
+ // 2. xc(s) = x0 + s * (x1 - xo)
+ // 3. yc(s) = y0 + s * (y1 - yo)
+ // 4. rc(s) = r0 + s * (r1 - ro)
+ //
+ // To simplify the system a little, we translate
+ // our coordinates to have the origin in (x0,y0)
+
+ xs -= x0;
+ ys -= y0;
+
+ // Then we have to solve the equation:
+ // A*s^2 - 2*B*s + C = 0
+ // where
+ // A = dx^2 + dy^2 - dr^2
+ // B = xs*dx + ys*dy + r0*dr
+ // C = xs^2 + ys^2 - r0^2
+
+ b = xs*dx + ys*dy + r0*dr;
+ c = xs*xs + ys*ys - r0*r0;
+
+ if (fabs(a) <= RADIAL_EPSILON) {
+ // A is 0, thus the equation simplifies to:
+ // -2*B*s + C = 0
+ // If B is 0, we can either have no solution or an indeterminate
+ // equation, thus we behave as if we had an invalid solution
+ if (fabs(b) <= RADIAL_EPSILON)
+ return gFalse;
+
+ s0 = s1 = 0.5 * c / b;
+ } else {
+ double d;
+
+ d = b*b - a*c;
+ if (d < 0)
+ return gFalse;
+
+ d = sqrt (d);
+ s0 = b + d;
+ s1 = b - d;
+
+ // If A < 0, one of the two solutions will have negative radius,
+ // thus it will be ignored. Otherwise we know that s1 <= s0
+ // (because d >=0 implies b - d <= b + d), so if both are valid it
+ // will be the true solution.
+ s0 *= inva;
+ s1 *= inva;
+ }
+
+ if (r0 + s0 * dr >= 0) {
+ if (0 <= s0 && s0 <= 1) {
+ *t = t0 + dt * s0;
+ return gTrue;
+ } else if (s0 < 0 && shading->getExtend0()) {
+ *t = t0;
+ return gTrue;
+ } else if (s0 > 1 && shading->getExtend1()) {
+ *t = t1;
+ return gTrue;
+ }
+ }
+
+ if (r0 + s1 * dr >= 0) {
+ if (0 <= s1 && s1 <= 1) {
+ *t = t0 + dt * s1;
+ return gTrue;
+ } else if (s1 < 0 && shading->getExtend0()) {
+ *t = t0;
+ return gTrue;
+ } else if (s1 > 1 && shading->getExtend1()) {
+ *t = t1;
+ return gTrue;
+ }
+ }
+
+ return gFalse;
+}
+
+void SplashRadialPattern::overprint(GBool op, Guchar aSrc, SplashColorPtr cSrc,
+ Guchar aDest, SplashColorPtr cDest,
+ SplashColorPtr colorResult) {
+ opPattern->overprint(op, aSrc, cSrc, aDest, cDest, colorResult);
+}
+
+#undef RADIAL_EPSILON
+
+//------------------------------------------------------------------------
+// SplashAxialPattern
+//------------------------------------------------------------------------
+
+SplashAxialPattern::SplashAxialPattern(SplashColorMode colorModeA, GfxState *stateA, GfxAxialShading *shadingA):
+ SplashUnivariatePattern(colorModeA, stateA, shadingA)
+{
+ SplashColor defaultColor;
+ GfxColor srcColor;
+
+ shadingA->getCoords(&x0, &y0, &x1, &y1);
+ dx = x1 - x0;
+ dy = y1 - y0;
+ mul = 1 / (dx * dx + dy * dy);
+ shadingA->getColorSpace()->getDefaultColor(&srcColor);
+ convertGfxColor(defaultColor, colorModeA, shadingA->getColorSpace(), &srcColor);
+ opPattern = new SplashOverprintColor(shadingA->getColorSpace(), defaultColor, 0x01);
+}
+
+SplashAxialPattern::~SplashAxialPattern() {
+ delete opPattern;
+}
+
+GBool SplashAxialPattern::getParameter(double xc, double yc, double *t) {
+ double s;
+
+ xc -= x0;
+ yc -= y0;
+
+ s = (xc * dx + yc * dy) * mul;
+ if (0 <= s && s <= 1) {
+ *t = t0 + dt * s;
+ } else if (s < 0 && shading->getExtend0()) {
+ *t = t0;
+ } else if (s > 1 && shading->getExtend1()) {
+ *t = t1;
+ } else {
+ return gFalse;
+ }
+
+ return gTrue;
+}
+
+void SplashAxialPattern::overprint(GBool op, Guchar aSrc, SplashColorPtr cSrc,
+ Guchar aDest, SplashColorPtr cDest,
+ SplashColorPtr colorResult) {
+ opPattern->overprint(op, aSrc, cSrc, aDest, cDest, colorResult);
+}
+
//------------------------------------------------------------------------
// Divide a 16-bit value (in [0, 255*255]) by 255, returning an 8-bit result.
@@ -129,7 +629,7 @@ static void splashOutBlendMultiply(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend, SplashColorMode cm) {
int i;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8) {
SplashColor rgbSrc;
SplashColor rgbDest;
@@ -153,7 +653,7 @@ static void splashOutBlendScreen(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend, SplashColorMode cm) {
int i;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8) {
SplashColor rgbSrc;
SplashColor rgbDest;
@@ -177,7 +677,7 @@ static void splashOutBlendOverlay(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend, SplashColorMode cm) {
int i;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8) {
SplashColor rgbSrc;
SplashColor rgbDest;
@@ -205,7 +705,7 @@ static void splashOutBlendDarken(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend, SplashColorMode cm) {
int i;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8) {
SplashColor rgbSrc;
SplashColor rgbDest;
@@ -229,7 +729,7 @@ static void splashOutBlendLighten(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend, SplashColorMode cm) {
int i;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8) {
SplashColor rgbSrc;
SplashColor rgbDest;
@@ -254,7 +754,7 @@ static void splashOutBlendColorDodge(SplashColorPtr src, SplashColorPtr dest,
SplashColorMode cm) {
int i, x;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8) {
SplashColor rgbSrc;
SplashColor rgbDest;
@@ -288,7 +788,7 @@ static void splashOutBlendColorBurn(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend, SplashColorMode cm) {
int i, x;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8) {
SplashColor rgbSrc;
SplashColor rgbDest;
@@ -322,7 +822,7 @@ static void splashOutBlendHardLight(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend, SplashColorMode cm) {
int i;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8) {
SplashColor rgbSrc;
SplashColor rgbDest;
@@ -350,7 +850,7 @@ static void splashOutBlendSoftLight(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend, SplashColorMode cm) {
int i, x;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8) {
SplashColor rgbSrc;
SplashColor rgbDest;
@@ -394,7 +894,7 @@ static void splashOutBlendDifference(SplashColorPtr src, SplashColorPtr dest,
int i;
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8)
{
blend[i] = dest[i] < src[i] ? 255 - (src[i] - dest[i]) : 255 - (dest[i] - src[i]);
@@ -411,7 +911,7 @@ static void splashOutBlendExclusion(SplashColorPtr src, SplashColorPtr dest,
SplashColorPtr blend, SplashColorMode cm) {
int i;
-#ifdef SPLASH_CMYK
+#if SPLASH_CMYK
if (cm == splashModeCMYK8) {
SplashColor rgbSrc;
SplashColor rgbDest;
@@ -830,6 +1330,7 @@ SplashOutputDev::SplashOutputDev(SplashColorMode colorModeA,
globalParams->getVectorAntialias() &&
colorMode != splashModeMono1;
enableFreeTypeHinting = gFalse;
+ enableSlightHinting = gFalse;
setupScreenParams(72.0, 72.0);
reverseVideo = reverseVideoA;
if (paperColorA != NULL) {
@@ -940,6 +1441,7 @@ void SplashOutputDev::startDoc(XRef *xrefA) {
#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
globalParams->getEnableFreeType(),
enableFreeTypeHinting,
+ enableSlightHinting,
#endif
allowAntialias &&
globalParams->getAntialias() &&
@@ -1122,7 +1624,7 @@ void SplashOutputDev::updateFillColor(GfxState *state) {
state->getFillRGB(&rgb);
#if SPLASH_CMYK
state->getFillCMYK(&cmyk);
- splash->setFillPattern(getColor(gray, &rgb, &cmyk));
+ splash->setFillPattern(getColor(state->getFillColorSpace(), gray, &rgb, &cmyk));
#else
splash->setFillPattern(getColor(gray, &rgb));
#endif
@@ -1139,14 +1641,14 @@ void SplashOutputDev::updateStrokeColor(GfxState *state) {
state->getStrokeRGB(&rgb);
#if SPLASH_CMYK
state->getStrokeCMYK(&cmyk);
- splash->setStrokePattern(getColor(gray, &rgb, &cmyk));
+ splash->setStrokePattern(getColor(state->getStrokeColorSpace(), gray, &rgb, &cmyk));
#else
splash->setStrokePattern(getColor(gray, &rgb));
#endif
}
#if SPLASH_CMYK
-SplashPattern *SplashOutputDev::getColor(GfxGray gray, GfxRGB *rgb,
+SplashPattern *SplashOutputDev::getColor(GfxColorSpace *colorSpace, GfxGray gray, GfxRGB *rgb,
GfxCMYK *cmyk) {
#else
SplashPattern *SplashOutputDev::getColor(GfxGray gray, GfxRGB *rgb) {
@@ -1188,7 +1690,7 @@ SplashPattern *SplashOutputDev::getColor(GfxGray gray, GfxRGB *rgb) {
color[1] = colToByte(cmyk->m);
color[2] = colToByte(cmyk->y);
color[3] = colToByte(cmyk->k);
- pattern = new SplashSolidColor(color);
+ pattern = createOverprintPattern(colorSpace, color, gFalse);
break;
#endif
}
@@ -1208,17 +1710,20 @@ void SplashOutputDev::updateStrokeOpacity(GfxState *state) {
splash->setStrokeAlpha((SplashCoord)state->getStrokeOpacity());
}
-void SplashOutputDev::updateFont(GfxState * /*state*/) {
- needFontUpdate = gTrue;
+void SplashOutputDev::updateFillOverprint(GfxState *state) {
+ splash->setFillOverprint(state->getFillOverprint());
}
-void SplashOutputDev::updateRender(GfxState *state) {
- int rm;
- rm = state->getRender();
- if (rm == 7 && haveCSPattern) {
- haveCSPattern = gFalse;
- restoreState(state);
- }
+void SplashOutputDev::updateStrokeOverprint(GfxState *state) {
+ splash->setStrokeOverprint(state->getStrokeOverprint());
+}
+
+void SplashOutputDev::updateOverprintMode(GfxState *state) {
+ splash->setOverprintMode(state->getOverprintMode());
+}
+
+void SplashOutputDev::updateFont(GfxState * /*state*/) {
+ needFontUpdate = gTrue;
}
void SplashOutputDev::doUpdateFont(GfxState *state) {
@@ -1238,7 +1743,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
double *textMat;
double m11, m12, m21, m22, fontSize;
SplashCoord mat[4];
- int substIdx, n;
+ int n;
int faceIndex = 0;
GBool recreateFont = gFalse;
GBool doAdjustFontMatrix = gFalse;
@@ -1247,7 +1752,6 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
font = NULL;
fileName = NULL;
tmpBuf = NULL;
- substIdx = -1;
dfp = NULL;
if (!(gfxFont = state->getFont())) {
@@ -1608,7 +2112,7 @@ void SplashOutputDev::drawChar(GfxState *state, double x, double y,
// fill
if (!(render & 1)) {
- if (!state->getFillColorSpace()->isNonMarking()) {
+ if (!haveCSPattern && !state->getFillColorSpace()->isNonMarking()) {
splash->fillChar((SplashCoord)x, (SplashCoord)y, code, font);
}
}
@@ -1625,7 +2129,7 @@ void SplashOutputDev::drawChar(GfxState *state, double x, double y,
}
// clip
- if (render & 4) {
+ if (haveCSPattern || (render & 4)) {
if ((path = font->getGlyphPath(code))) {
path->offset((SplashCoord)x, (SplashCoord)y);
if (textClipPath) {
@@ -1800,6 +2304,21 @@ void SplashOutputDev::type3D1(GfxState *state, double wx, double wy,
double xt, yt, xMin, xMax, yMin, yMax, x1, y1;
int i, j;
+ if (unlikely(t3GlyphStack == NULL)) {
+ error(-1, "t3GlyphStack was null in SplashOutputDev::type3D1");
+ return;
+ }
+
+ if (unlikely(t3GlyphStack->origBitmap != NULL)) {
+ error(-1, "t3GlyphStack origBitmap was not null in SplashOutputDev::type3D1");
+ return;
+ }
+
+ if (unlikely(t3GlyphStack->origSplash != NULL)) {
+ error(-1, "t3GlyphStack origSplash was not null in SplashOutputDev::type3D1");
+ return;
+ }
+
t3Font = t3GlyphStack->cache;
// check for a valid bbox
@@ -1914,17 +2433,14 @@ void SplashOutputDev::drawType3Glyph(T3FontCache *t3Font,
}
void SplashOutputDev::beginTextObject(GfxState *state) {
- if (state->getFillColorSpace()->getMode() == csPattern) {
+ if (!(state->getRender() & 4) && state->getFillColorSpace()->getMode() == csPattern) {
haveCSPattern = gTrue;
saveState(state);
- savedRender = state->getRender();
- state->setRender(7);
}
}
void SplashOutputDev::endTextObject(GfxState *state) {
if (haveCSPattern) {
- state->setRender(savedRender);
haveCSPattern = gFalse;
if (state->getFillColorSpace()->getMode() != csPattern) {
if (textClipPath) {
@@ -1968,7 +2484,20 @@ GBool SplashOutputDev::imageMaskSrc(void *data, SplashColorPtr line) {
}
void SplashOutputDev::endMaskClip(GfxState * state) {
- splash->setSoftMask(NULL);
+ double bbox[4] = {0,0,1,1}; // dummy
+ /* transfer mask to alpha channel! */
+ // memcpy(maskBitmap->getAlphaPtr(), maskBitmap->getDataPtr(), bitmap->getRowSize() * bitmap->getHeight());
+ // memset(maskBitmap->getDataPtr(), 0, bitmap->getRowSize() * bitmap->getHeight());
+ int c;
+ Guchar *dest = bitmap->getAlphaPtr();
+ Guchar *src = maskBitmap->getDataPtr();
+ for (c= 0; c < maskBitmap->getRowSize() * maskBitmap->getHeight(); c++) {
+ dest[c] = src[c];
+ }
+ delete maskBitmap;
+ maskBitmap = NULL;
+ endTransparencyGroup(state);
+ paintTransparencyGroup(state, bbox);
}
void SplashOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
@@ -1983,6 +2512,9 @@ void SplashOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
}
ctm = state->getCTM();
+ for (int i = 0; i < 6; ++i) {
+ if (!isfinite(ctm[i])) return;
+ }
mat[0] = ctm[0];
mat[1] = ctm[1];
mat[2] = -ctm[2];
@@ -1998,10 +2530,31 @@ void SplashOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
imgMaskData.y = 0;
if (state->getFillColorSpace()->getMode() == csPattern) {
- SplashBitmap *maskBitmap;
Splash *maskSplash;
SplashColor maskColor;
-
+
+ /* from beginTransparencyGroup: */
+ // push a new stack entry
+ SplashTransparencyGroup *transpGroup = new SplashTransparencyGroup();
+ transpGroup->tx = 0;
+ transpGroup->ty = 0;
+ transpGroup->blendingColorSpace = NULL;
+ transpGroup->isolated = gFalse;
+ transpGroup->next = transpGroupStack;
+ transpGroupStack = transpGroup;
+ // save state
+ transpGroup->origBitmap = bitmap;
+ transpGroup->origSplash = splash;
+ //~ this ignores the blendingColorSpace arg
+ // create the temporary bitmap
+ bitmap = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(), bitmapRowPad, colorMode, gTrue,
+ bitmapTopDown);
+ splash = new Splash(bitmap, vectorAntialias,
+ transpGroup->origSplash->getScreen());
+ splash->blitTransparent(transpGroup->origBitmap, 0, 0, 0, 0, bitmap->getWidth(), bitmap->getHeight());
+ splash->setInNonIsolatedGroup(transpGroup->origBitmap, 0, 0);
+ transpGroup->tBitmap = bitmap;
+
maskBitmap = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(), 1, splashModeMono8, gFalse);
maskSplash = new Splash(maskBitmap, vectorAntialias);
maskColor[0] = 0;
@@ -2010,7 +2563,6 @@ void SplashOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
maskSplash->setFillPattern(new SplashSolidColor(maskColor));
maskSplash->fillImageMask(&imageMaskSrc, &imgMaskData, width, height, mat, t3GlyphStack != NULL);
delete maskSplash;
- splash->setSoftMask(maskBitmap);
} else {
splash->fillImageMask(&imageMaskSrc, &imgMaskData, width, height, mat, t3GlyphStack != NULL);
if (inlineImg) {
@@ -2039,7 +2591,6 @@ GBool SplashOutputDev::imageSrc(void *data, SplashColorPtr colorLine,
SplashOutImageData *imgData = (SplashOutImageData *)data;
Guchar *p;
SplashColorPtr q, col;
- GfxRGB rgb;
GfxGray gray;
#if SPLASH_CMYK
GfxCMYK cmyk;
@@ -2108,19 +2659,19 @@ GBool SplashOutputDev::imageSrc(void *data, SplashColorPtr colorLine,
imgData->colorMap->getGray(p, &gray);
*q++ = colToByte(gray);
}
- break;
- case splashModeXBGR8:
+ break;
case splashModeRGB8:
case splashModeBGR8:
- for (x = 0, p = imgData->imgStr->getLine(), q = colorLine;
- x < imgData->width;
- ++x, p += nComps) {
- imgData->colorMap->getRGB(p, &rgb);
- *q++ = colToByte(rgb.r);
- *q++ = colToByte(rgb.g);
- *q++ = colToByte(rgb.b);
- if (imgData->colorMode == splashModeXBGR8) *q++ = 255;
- }
+ p = imgData->imgStr->getLine();
+ q = colorLine;
+
+ imgData->colorMap->getRGBLine(p, colorLine, imgData->width);
+ break;
+ case splashModeXBGR8:
+ p = imgData->imgStr->getLine();
+ q = colorLine;
+
+ imgData->colorMap->getRGBXLine(p, colorLine, imgData->width);
break;
#if SPLASH_CMYK
case splashModeCMYK8:
@@ -2242,6 +2793,98 @@ GBool SplashOutputDev::alphaImageSrc(void *data, SplashColorPtr colorLine,
return gTrue;
}
+struct TilingSplashOutBitmap {
+ SplashBitmap *bitmap;
+ SplashPattern *pattern;
+ SplashColorMode colorMode;
+ int paintType;
+ int repeatX;
+ int repeatY;
+ int y;
+};
+
+GBool SplashOutputDev::tilingBitmapSrc(void *data, SplashColorPtr colorLine,
+ Guchar *alphaLine) {
+ TilingSplashOutBitmap *imgData = (TilingSplashOutBitmap *)data;
+
+ if (imgData->y == imgData->bitmap->getHeight()) {
+ imgData->repeatY--;
+ if (imgData->repeatY == 0)
+ return gFalse;
+ imgData->y = 0;
+ }
+
+ if (imgData->paintType == 1) {
+ const SplashColorMode cMode = imgData->bitmap->getMode();
+ SplashColorPtr q = colorLine;
+ // For splashModeBGR8 and splashModeXBGR8 we need to use getPixel
+ // for the others we can use raw access
+ if (cMode == splashModeBGR8 || cMode == splashModeXBGR8) {
+ for (int m = 0; m < imgData->repeatX; m++) {
+ for (int x = 0; x < imgData->bitmap->getWidth(); x++) {
+ imgData->bitmap->getPixel(x, imgData->y, q);
+ q += splashColorModeNComps[cMode];
+ }
+ }
+ } else {
+ const int n = imgData->bitmap->getRowSize();
+ SplashColorPtr p;
+ for (int m = 0; m < imgData->repeatX; m++) {
+ p = imgData->bitmap->getDataPtr() + imgData->y * imgData->bitmap->getRowSize();
+ for (int x = 0; x < n; ++x) {
+ *q++ = *p++;
+ }
+ }
+ }
+ if (alphaLine != NULL) {
+ SplashColorPtr aq = alphaLine;
+ SplashColorPtr p;
+ const int n = imgData->bitmap->getWidth() - 1;
+ for (int m = 0; m < imgData->repeatX; m++) {
+ p = imgData->bitmap->getAlphaPtr() + imgData->y * imgData->bitmap->getWidth();
+ for (int x = 0; x < n; ++x) {
+ *aq++ = *p++;
+ }
+ // This is a hack, because of how Splash antialias works if we overwrite the
+ // last alpha pixel of the tile most/all of the files look much better
+ *aq++ = (n == 0) ? *p : *(p - 1);
+ }
+ }
+ } else {
+ SplashColor col, pat;
+ SplashColorPtr dest = colorLine;
+ for (int m = 0; m < imgData->repeatX; m++) {
+ for (int x = 0; x < imgData->bitmap->getWidth(); x++) {
+ imgData->bitmap->getPixel(x, imgData->y, col);
+ imgData->pattern->getColor(x, imgData->y, pat);
+ for (int i = 0; i < splashColorModeNComps[imgData->colorMode]; ++i) {
+#if SPLASH_CMYK
+ if (imgData->colorMode == splashModeCMYK8)
+ dest[i] = div255(pat[i] * (255 - col[0]));
+ else
+#endif
+ dest[i] = 255 - div255((255 - pat[i]) * (255 - col[0]));
+ }
+ dest += splashColorModeNComps[imgData->colorMode];
+ }
+ }
+ if (alphaLine != NULL) {
+ const int y = (imgData->y == imgData->bitmap->getHeight() - 1 && imgData->y > 50) ? imgData->y - 1 : imgData->y;
+ SplashColorPtr aq = alphaLine;
+ SplashColorPtr p;
+ const int n = imgData->bitmap->getWidth();
+ for (int m = 0; m < imgData->repeatX; m++) {
+ p = imgData->bitmap->getAlphaPtr() + y * imgData->bitmap->getWidth();
+ for (int x = 0; x < n; ++x) {
+ *aq++ = *p++;
+ }
+ }
+ }
+ }
+ ++imgData->y;
+ return gTrue;
+}
+
void SplashOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
@@ -2251,16 +2894,22 @@ void SplashOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
SplashCoord mat[6];
SplashOutImageData imgData;
SplashColorMode srcMode;
+ SplashColor defaultColor;
+ GfxColor srcColor;
SplashImageSource src;
GfxGray gray;
GfxRGB rgb;
#if SPLASH_CMYK
GfxCMYK cmyk;
#endif
+ GBool grayIndexed = gFalse;
Guchar pix;
int n, i;
ctm = state->getCTM();
+ for (i = 0; i < 6; ++i) {
+ if (!isfinite(ctm[i])) return;
+ }
mat[0] = ctm[0];
mat[1] = ctm[1];
mat[2] = -ctm[2];
@@ -2318,15 +2967,25 @@ void SplashOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
break;
#if SPLASH_CMYK
case splashModeCMYK8:
+ grayIndexed = colorMap->getColorSpace()->getMode() != csDeviceGray;
imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
for (i = 0; i < n; ++i) {
pix = (Guchar)i;
colorMap->getCMYK(&pix, &cmyk);
+ if (cmyk.c != 0 || cmyk.m != 0 || cmyk.y != 0) {
+ grayIndexed = gFalse;
+ }
imgData.lookup[4*i] = colToByte(cmyk.c);
imgData.lookup[4*i+1] = colToByte(cmyk.m);
imgData.lookup[4*i+2] = colToByte(cmyk.y);
imgData.lookup[4*i+3] = colToByte(cmyk.k);
}
+#ifndef USE_CMS
+ if (colorMap->getColorSpace()->getMode() == csIndexed) {
+ if (((GfxIndexedColorSpace *) colorMap->getColorSpace())->getBase()->getMode() == csICCBased)
+ grayIndexed = gFalse;
+ }
+#endif
break;
#endif
break;
@@ -2339,8 +2998,12 @@ void SplashOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
srcMode = colorMode;
}
src = maskColors ? &alphaImageSrc : &imageSrc;
+ colorMap->getColorSpace()->getDefaultColor(&srcColor);
+ convertGfxColor(defaultColor, srcMode, colorMap->getColorSpace(), &srcColor);
+ SplashPattern *pattern = createOverprintPattern(colorMap->getColorSpace(), defaultColor, !grayIndexed);
splash->drawImage(src, &imgData, srcMode, maskColors ? gTrue : gFalse,
- width, height, mat);
+ width, height, mat, pattern);
+ delete pattern;
if (inlineImg) {
while (imgData.y < height) {
imgData.imgStr->getLine();
@@ -2498,6 +3161,8 @@ void SplashOutputDev::drawMaskedImage(GfxState *state, Object *ref,
delete maskColorMap;
} else {
+ SplashColor defaultColor;
+ GfxColor srcColor;
//----- scale the mask image to the same size as the source image
@@ -2528,6 +3193,12 @@ void SplashOutputDev::drawMaskedImage(GfxState *state, Object *ref,
//----- draw the source image
ctm = state->getCTM();
+ for (i = 0; i < 6; ++i) {
+ if (!isfinite(ctm[i])) {
+ delete maskBitmap;
+ return;
+ }
+ }
mat[0] = ctm[0];
mat[1] = ctm[1];
mat[2] = -ctm[2];
@@ -2604,9 +3275,12 @@ void SplashOutputDev::drawMaskedImage(GfxState *state, Object *ref,
} else {
srcMode = colorMode;
}
+ colorMap->getColorSpace()->getDefaultColor(&srcColor);
+ convertGfxColor(defaultColor, srcMode, colorMap->getColorSpace(), &srcColor);
+ SplashPattern *pattern = createOverprintPattern(colorMap->getColorSpace(), defaultColor, gTrue);
splash->drawImage(&maskedImageSrc, &imgData, srcMode, gTrue,
- width, height, mat);
-
+ width, height, mat, pattern);
+ delete pattern;
delete maskBitmap;
gfree(imgData.lookup);
delete imgData.imgStr;
@@ -2630,6 +3304,8 @@ void SplashOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref,
SplashBitmap *maskBitmap;
Splash *maskSplash;
SplashColor maskColor;
+ SplashColor defaultColor;
+ GfxColor srcColor;
GfxGray gray;
GfxRGB rgb;
#if SPLASH_CMYK
@@ -2639,6 +3315,9 @@ void SplashOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref,
int n, i;
ctm = state->getCTM();
+ for (i = 0; i < 6; ++i) {
+ if (!isfinite(ctm[i])) return;
+ }
mat[0] = ctm[0];
mat[1] = ctm[1];
mat[2] = -ctm[2];
@@ -2749,8 +3428,12 @@ void SplashOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref,
} else {
srcMode = colorMode;
}
- splash->drawImage(&imageSrc, &imgData, srcMode, gFalse, width, height, mat);
+ colorMap->getColorSpace()->getDefaultColor(&srcColor);
+ convertGfxColor(defaultColor, srcMode, colorMap->getColorSpace(), &srcColor);
+ SplashPattern *pattern = createOverprintPattern(colorMap->getColorSpace(), defaultColor, gTrue);
+ splash->drawImage(&imageSrc, &imgData, srcMode, gFalse, width, height, mat, pattern);
+ delete pattern;
splash->setSoftMask(NULL);
gfree(imgData.lookup);
delete imgData.imgStr;
@@ -2806,14 +3489,14 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
tx = (int)floor(xMin);
if (tx < 0) {
tx = 0;
- } else if (tx > bitmap->getWidth()) {
- tx = bitmap->getWidth();
+ } else if (tx >= bitmap->getWidth()) {
+ tx = bitmap->getWidth() - 1;
}
ty = (int)floor(yMin);
if (ty < 0) {
ty = 0;
- } else if (ty > bitmap->getHeight()) {
- ty = bitmap->getHeight();
+ } else if (ty >= bitmap->getHeight()) {
+ ty = bitmap->getHeight() - 1;
}
w = (int)ceil(xMax) - tx + 1;
if (tx + w > bitmap->getWidth()) {
@@ -2847,7 +3530,7 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
// create the temporary bitmap
bitmap = new SplashBitmap(w, h, bitmapRowPad, colorMode, gTrue,
- bitmapTopDown);
+ bitmapTopDown);
splash = new Splash(bitmap, vectorAntialias,
transpGroup->origSplash->getScreen());
if (isolated) {
@@ -2882,13 +3565,10 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
}
void SplashOutputDev::endTransparencyGroup(GfxState *state) {
- double *ctm;
-
// restore state
delete splash;
bitmap = transpGroupStack->origBitmap;
splash = transpGroupStack->origSplash;
- ctm = state->getCTM();
state->shiftCTM(transpGroupStack->tx, transpGroupStack->ty);
updateCTM(state, 0, 0, 0, 0, 0, 0);
}
@@ -2981,7 +3661,12 @@ void SplashOutputDev::setSoftMask(GfxState * /*state*/, double * /*bbox*/,
softMask = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(),
1, splashModeMono8, gFalse);
- memset(softMask->getDataPtr(), 0,
+ unsigned char fill = 0;
+ if (transpGroupStack->blendingColorSpace) {
+ transpGroupStack->blendingColorSpace->getGray(backdropColor, &gray);
+ fill = colToByte(gray);
+ }
+ memset(softMask->getDataPtr(), fill,
softMask->getRowSize() * softMask->getHeight());
p = softMask->getDataPtr() + ty * softMask->getRowSize() + tx;
int xMax = tBitmap->getWidth();
@@ -3073,42 +3758,291 @@ void SplashOutputDev::clearModRegion() {
splash->clearModRegion();
}
-void SplashOutputDev::setFillColor(int r, int g, int b) {
- GfxRGB rgb;
- GfxGray gray;
-#if SPLASH_CMYK
- GfxCMYK cmyk;
-#endif
-
- rgb.r = byteToCol(r);
- rgb.g = byteToCol(g);
- rgb.b = byteToCol(b);
- gray = (GfxColorComp)(0.299 * rgb.r + 0.587 * rgb.g + 0.114 * rgb.b + 0.5);
- if (gray > gfxColorComp1) {
- gray = gfxColorComp1;
- }
-#if SPLASH_CMYK
- cmyk.c = gfxColorComp1 - rgb.r;
- cmyk.m = gfxColorComp1 - rgb.g;
- cmyk.y = gfxColorComp1 - rgb.b;
- cmyk.k = 0;
- splash->setFillPattern(getColor(gray, &rgb, &cmyk));
-#else
- splash->setFillPattern(getColor(gray, &rgb));
-#endif
-}
-
#if 1 //~tmp: turn off anti-aliasing temporarily
GBool SplashOutputDev::getVectorAntialias() {
return splash->getVectorAntialias();
}
void SplashOutputDev::setVectorAntialias(GBool vaa) {
+ vectorAntialias = vaa;
splash->setVectorAntialias(vaa);
}
#endif
-void SplashOutputDev::setFreeTypeHinting(GBool enable)
+void SplashOutputDev::setFreeTypeHinting(GBool enable, GBool enableSlightHintingA)
{
enableFreeTypeHinting = enable;
+ enableSlightHinting = enableSlightHintingA;
+}
+
+GBool SplashOutputDev::tilingPatternFill(GfxState *state, Catalog *catalog, Object *str,
+ double *ptm, int paintType, int /*tilingType*/, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep)
+{
+ PDFRectangle box;
+ Gfx *gfx;
+ Splash *formerSplash = splash;
+ SplashBitmap *formerBitmap = bitmap;
+ double width, height;
+ int surface_width, surface_height, result_width, result_height, i;
+ int repeatX, repeatY;
+ SplashCoord matc[6];
+ Matrix m1;
+ double *ctm, savedCTM[6];
+ double kx, ky, sx, sy;
+
+ width = bbox[2] - bbox[0];
+ height = bbox[3] - bbox[1];
+
+ if (xStep != width || yStep != height)
+ return gFalse;
+
+ // calculate offsets
+ ctm = state->getCTM();
+ for (i = 0; i < 6; ++i) {
+ savedCTM[i] = ctm[i];
+ }
+ state->concatCTM(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
+ state->concatCTM(1, 0, 0, 1, bbox[0], bbox[1]);
+ ctm = state->getCTM();
+ for (i = 0; i < 6; ++i) {
+ if (!isfinite(ctm[i]))
+ return gFalse;
+ }
+ matc[4] = x0 * xStep * ctm[0] + y0 * yStep * ctm[2] + ctm[4];
+ matc[5] = x0 * xStep * ctm[1] + y0 * yStep * ctm[3] + ctm[5];
+ if (splashAbs(ctm[1]) > splashAbs(ctm[0])) {
+ kx = -ctm[1];
+ ky = ctm[2] - (ctm[0] * ctm[3]) / ctm[1];
+ } else {
+ kx = ctm[0];
+ ky = ctm[3] - (ctm[1] * ctm[2]) / ctm[0];
+ }
+ result_width = (int) ceil(fabs(kx * width * (x1 - x0)));
+ result_height = (int) ceil(fabs(ky * height * (y1 - y0)));
+ kx = state->getHDPI() / 72.0;
+ ky = state->getVDPI() / 72.0;
+ m1.m[0] = (ptm[0] == 0) ? fabs(ptm[2]) * kx : fabs(ptm[0]) * kx;
+ m1.m[1] = 0;
+ m1.m[2] = 0;
+ m1.m[3] = (ptm[3] == 0) ? fabs(ptm[1]) * ky : fabs(ptm[3]) * ky;
+ m1.m[4] = 0;
+ m1.m[5] = 0;
+ m1.transform(width, height, &kx, &ky);
+ surface_width = (int) ceil (fabs(kx));
+ surface_height = (int) ceil (fabs(ky));
+
+ sx = (double) result_width / (surface_width * (x1 - x0));
+ sy = (double) result_height / (surface_height * (y1 - y0));
+ m1.m[0] *= sx;
+ m1.m[3] *= sy;
+ m1.transform(width, height, &kx, &ky);
+
+ if(fabs(kx) < 1 && fabs(ky) < 1) {
+ kx = std::min<double>(kx, ky);
+ ky = 2 / kx;
+ m1.m[0] *= ky;
+ m1.m[3] *= ky;
+ m1.transform(width, height, &kx, &ky);
+ surface_width = (int) ceil (fabs(kx));
+ surface_height = (int) ceil (fabs(ky));
+ repeatX = x1 - x0;
+ repeatY = y1 - y0;
+ } else {
+ while(fabs(kx) > 16384 || fabs(ky) > 16384) {
+ // limit pattern bitmap size
+ m1.m[0] /= 2;
+ m1.m[3] /= 2;
+ m1.transform(width, height, &kx, &ky);
+ }
+ surface_width = (int) ceil (fabs(kx));
+ surface_height = (int) ceil (fabs(ky));
+ // adjust repeat values to completely fill region
+ repeatX = result_width / surface_width;
+ repeatY = result_height / surface_height;
+ if (surface_width * repeatX < result_width)
+ repeatX++;
+ if (surface_height * repeatY < result_height)
+ repeatY++;
+ if (x1 - x0 > repeatX)
+ repeatX = x1 - x0;
+ if (y1 - y0 > repeatY)
+ repeatY = y1 - y0;
+ }
+ // restore CTM and calculate rotate and scale with rounded matric
+ state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
+ state->concatCTM(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
+ state->concatCTM(width * repeatX, 0, 0, height * repeatY, bbox[0], bbox[1]);
+ ctm = state->getCTM();
+ matc[0] = ctm[0];
+ matc[1] = ctm[1];
+ matc[2] = ctm[2];
+ matc[3] = ctm[3];
+
+ if (surface_width == 0 || surface_height == 0)
+ return gFalse;
+ m1.transform(bbox[0], bbox[1], &kx, &ky);
+ m1.m[4] = -kx;
+ m1.m[5] = -ky;
+
+ bitmap = new SplashBitmap(surface_width, surface_height, colorMode != splashModeMono1,
+ (paintType == 1) ? colorMode : splashModeMono8, gTrue);
+ memset(bitmap->getAlphaPtr(), 0, bitmap->getWidth() * bitmap->getHeight());
+ if (paintType == 2) {
+#if SPLASH_CMYK
+ memset(bitmap->getDataPtr(), (colorMode == splashModeCMYK8) ? 0x00 : 0xFF, bitmap->getRowSize() * bitmap->getHeight());
+#else
+ memset(bitmap->getDataPtr(), 0xFF, bitmap->getRowSize() * bitmap->getHeight());
+#endif
+ }
+ splash = new Splash(bitmap, gTrue);
+
+ box.x1 = bbox[0]; box.y1 = bbox[1];
+ box.x2 = bbox[2]; box.y2 = bbox[3];
+ gfx = new Gfx(xref, this, resDict, catalog, &box, NULL);
+ // set pattern transformation matrix
+ gfx->getState()->setCTM(m1.m[0], m1.m[1], m1.m[2], m1.m[3], m1.m[4], m1.m[5]);
+ updateCTM(gfx->getState(), m1.m[0], m1.m[1], m1.m[2], m1.m[3], m1.m[4], m1.m[5]);
+ gfx->display(str);
+ splash = formerSplash;
+ TilingSplashOutBitmap imgData;
+ imgData.bitmap = bitmap;
+ imgData.paintType = paintType;
+ imgData.pattern = splash->getFillPattern();
+ imgData.colorMode = colorMode;
+ imgData.y = 0;
+ imgData.repeatX = repeatX;
+ imgData.repeatY = repeatY;
+ SplashBitmap *tBitmap = bitmap;
+ bitmap = formerBitmap;
+ result_width = tBitmap->getWidth() * imgData.repeatX;
+ result_height = tBitmap->getHeight() * imgData.repeatY;
+
+ if (splashAbs(matc[1]) > splashAbs(matc[0])) {
+ kx = -matc[1];
+ ky = matc[2] - (matc[0] * matc[3]) / matc[1];
+ } else {
+ kx = matc[0];
+ ky = matc[3] - (matc[1] * matc[2]) / matc[0];
+ }
+ kx = result_width / (fabs(kx) + 1);
+ ky = result_height / (fabs(ky) + 1);
+ state->concatCTM(kx, 0, 0, ky, 0, 0);
+ ctm = state->getCTM();
+ matc[0] = ctm[0];
+ matc[1] = ctm[1];
+ matc[2] = ctm[2];
+ matc[3] = ctm[3];
+ splash->drawImage(&tilingBitmapSrc, &imgData, colorMode, gTrue, result_width, result_height, matc);
+ delete tBitmap;
+ delete gfx;
+ return gTrue;
+}
+
+GBool SplashOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading)
+{
+ GfxColorSpaceMode shadingMode = shading->getColorSpace()->getMode();
+ GBool bDirectColorTranslation = gFalse; // triggers an optimization.
+ switch (colorMode) {
+ case splashModeRGB8:
+ bDirectColorTranslation = (shadingMode == csDeviceRGB);
+ break;
+#if SPLASH_CMYK
+ case splashModeCMYK8:
+ bDirectColorTranslation = (shadingMode == csDeviceCMYK);
+ break;
+#endif
+ default:
+ break;
+ }
+ SplashGouraudColor *splashShading = new SplashGouraudPattern(bDirectColorTranslation, state, shading, colorMode);
+ // restore vector antialias because we support it here
+ if (shading->isParameterized()) {
+ GBool vaa = getVectorAntialias();
+ GBool retVal = gFalse;
+ setVectorAntialias(gTrue);
+ retVal = splash->gouraudTriangleShadedFill(splashShading);
+ setVectorAntialias(vaa);
+ return retVal;
+ }
+ return gFalse;
+}
+
+GBool SplashOutputDev::univariateShadedFill(GfxState *state, SplashUnivariatePattern *pattern, double tMin, double tMax) {
+ double xMin, yMin, xMax, yMax;
+ SplashPath *path;
+ GBool vaa = getVectorAntialias();
+ // restore vector antialias because we support it here
+ setVectorAntialias(gTrue);
+
+ GBool retVal = gFalse;
+ // get the clip region bbox
+ if (pattern->getShading()->getHasBBox()) {
+ pattern->getShading()->getBBox(&xMin, &yMin, &xMax, &yMax);
+ } else {
+ state->getClipBBox(&xMin, &yMin, &xMax, &yMax);
+
+ xMin = floor (xMin);
+ yMin = floor (yMin);
+ xMax = ceil (xMax);
+ yMax = ceil (yMax);
+
+ {
+ Matrix ctm, ictm;
+ double x[4], y[4];
+ int i;
+
+ state->getCTM(&ctm);
+ ctm.invertTo(&ictm);
+
+ ictm.transform(xMin, yMin, &x[0], &y[0]);
+ ictm.transform(xMax, yMin, &x[1], &y[1]);
+ ictm.transform(xMin, yMax, &x[2], &y[2]);
+ ictm.transform(xMax, yMax, &x[3], &y[3]);
+
+ xMin = xMax = x[0];
+ yMin = yMax = y[0];
+ for (i = 1; i < 4; i++) {
+ xMin = std::min<double>(xMin, x[i]);
+ yMin = std::min<double>(yMin, y[i]);
+ xMax = std::max<double>(xMax, x[i]);
+ yMax = std::max<double>(yMax, y[i]);
+ }
+ }
+ }
+
+ // fill the region
+ state->moveTo(xMin, yMin);
+ state->lineTo(xMax, yMin);
+ state->lineTo(xMax, yMax);
+ state->lineTo(xMin, yMax);
+ state->closePath();
+ path = convertPath(state, state->getPath());
+
+ retVal = (splash->shadedFill(path, pattern->getShading()->getHasBBox(), pattern) == splashOk);
+ state->clearPath();
+ setVectorAntialias(vaa);
+ delete path;
+
+ return retVal;
+}
+
+GBool SplashOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) {
+ SplashAxialPattern *pattern = new SplashAxialPattern(colorMode, state, shading);
+ GBool retVal = univariateShadedFill(state, pattern, tMin, tMax);
+
+ delete pattern;
+
+ return retVal;
+}
+
+GBool SplashOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, double tMin, double tMax) {
+ SplashRadialPattern *pattern = new SplashRadialPattern(colorMode, state, shading);
+ GBool retVal = univariateShadedFill(state, pattern, tMin, tMax);
+
+ delete pattern;
+
+ return retVal;
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/SplashOutputDev.h
index df33850ed3c..f19c5425874 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/SplashOutputDev.h
@@ -14,8 +14,12 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
-// Copyright (C) 2009 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2011 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
+// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
+// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
+// Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -31,6 +35,7 @@
#include "goo/gtypes.h"
#include "splash/SplashTypes.h"
+#include "splash/SplashPattern.h"
#include "poppler-config.h"
#include "OutputDev.h"
#include "GfxState.h"
@@ -39,7 +44,6 @@ class Gfx8BitFont;
class SplashBitmap;
class Splash;
class SplashPath;
-class SplashPattern;
class SplashFontEngine;
class SplashFont;
class T3FontCache;
@@ -48,6 +52,138 @@ struct T3GlyphStack;
struct SplashTransparencyGroup;
//------------------------------------------------------------------------
+// SplashOverprintColor
+//------------------------------------------------------------------------
+
+class SplashOverprintColor: public SplashPattern {
+public:
+ SplashOverprintColor(GfxColorSpace *colorSpace, SplashColorPtr colorA, Guchar tolerance);
+
+ virtual SplashPattern *copy() { return new SplashOverprintColor(colorSpace, color, tolerance); }
+
+ virtual ~SplashOverprintColor();
+
+ virtual GBool getColor(int x, int y, SplashColorPtr c);
+
+ virtual GBool testPosition(int x, int y) { return gFalse; }
+
+ virtual GBool isStatic() { return gTrue; }
+
+ virtual void overprint(GBool op, Guchar alphaSrc, SplashColorPtr colorSrc,
+ Guchar alphaDest, SplashColorPtr colorDest, SplashColorPtr colorResult);
+
+private:
+ GfxColorSpace *colorSpace;
+ SplashColor color;
+ Guchar tolerance;
+};
+
+//------------------------------------------------------------------------
+// Splash dynamic pattern
+//------------------------------------------------------------------------
+
+class SplashUnivariatePattern: public SplashPattern {
+public:
+
+ SplashUnivariatePattern(SplashColorMode colorMode, GfxState *state, GfxUnivariateShading *shading);
+
+ virtual ~SplashUnivariatePattern();
+
+ virtual GBool getColor(int x, int y, SplashColorPtr c);
+
+ virtual GBool testPosition(int x, int y);
+
+ virtual GBool isStatic() { return gFalse; }
+
+ virtual GBool getParameter(double xs, double ys, double *t) = 0;
+
+ virtual GfxUnivariateShading *getShading() { return shading; }
+
+protected:
+ Matrix ictm;
+ double t0, t1, dt;
+ GfxUnivariateShading *shading;
+ GfxState *state;
+ SplashColorMode colorMode;
+};
+
+class SplashAxialPattern: public SplashUnivariatePattern {
+public:
+
+ SplashAxialPattern(SplashColorMode colorMode, GfxState *state, GfxAxialShading *shading);
+
+ virtual SplashPattern *copy() { return new SplashAxialPattern(colorMode, state, (GfxAxialShading *) shading); }
+
+ virtual ~SplashAxialPattern();
+
+ virtual GBool getParameter(double xs, double ys, double *t);
+
+ virtual void overprint(GBool op, Guchar alphaSrc, SplashColorPtr colorSrc,
+ Guchar alphaDest, SplashColorPtr colorDest, SplashColorPtr colorResult);
+
+private:
+ double x0, y0, x1, y1;
+ double dx, dy, mul;
+ SplashOverprintColor *opPattern;
+};
+
+// see GfxState.h, GfxGouraudTriangleShading
+class SplashGouraudPattern: public SplashGouraudColor {
+public:
+
+ SplashGouraudPattern(GBool bDirectColorTranslation, GfxState *state, GfxGouraudTriangleShading *shading, SplashColorMode mode);
+
+ virtual SplashPattern *copy() { return new SplashGouraudPattern(bDirectColorTranslation, state, shading, mode); }
+
+ virtual ~SplashGouraudPattern();
+
+ virtual GBool getColor(int x, int y, SplashColorPtr c) { return gFalse; }
+
+ virtual GBool testPosition(int x, int y) { return gFalse; }
+
+ virtual GBool isStatic() { return gFalse; }
+
+ virtual GBool isParameterized() { return shading->isParameterized(); }
+ virtual int getNTriangles() { return shading->getNTriangles(); }
+ virtual void getTriangle(int i, double *x0, double *y0, double *color0,
+ double *x1, double *y1, double *color1,
+ double *x2, double *y2, double *color2)
+ { return shading->getTriangle(i, x0, y0, color0, x1, y1, color1, x2, y2, color2); }
+
+ virtual void getParameterizedColor(double t, SplashColorMode mode, SplashColorPtr c);
+
+ virtual void overprint(GBool op, Guchar alphaSrc, SplashColorPtr colorSrc,
+ Guchar alphaDest, SplashColorPtr colorDest, SplashColorPtr colorResult);
+private:
+ GfxGouraudTriangleShading *shading;
+ GfxState *state;
+ GBool bDirectColorTranslation;
+ SplashOverprintColor *opPattern;
+ SplashColorMode mode;
+};
+
+// see GfxState.h, GfxRadialShading
+class SplashRadialPattern: public SplashUnivariatePattern {
+public:
+
+ SplashRadialPattern(SplashColorMode colorMode, GfxState *state, GfxRadialShading *shading);
+
+ virtual SplashPattern *copy() { return new SplashRadialPattern(colorMode, state, (GfxRadialShading *) shading); }
+
+ virtual ~SplashRadialPattern();
+
+ virtual GBool getParameter(double xs, double ys, double *t);
+
+ virtual void overprint(GBool op, Guchar alphaSrc, SplashColorPtr colorSrc,
+ Guchar alphaDest, SplashColorPtr colorDest, SplashColorPtr colorResult);
+
+private:
+ double x0, y0, r0, dx, dy, dr;
+ double a, inva;
+ SplashOverprintColor *opPattern;
+};
+
+//------------------------------------------------------------------------
// number of Type 3 fonts to cache
#define splashOutT3FontCacheSize 8
@@ -70,6 +206,17 @@ public:
//----- get info about output device
+ // Does this device use tilingPatternFill()? If this returns false,
+ // tiling pattern fills will be reduced to a series of other drawing
+ // operations.
+ virtual GBool useTilingPatternFill() { return gTrue; }
+
+ // Does this device use functionShadedFill(), axialShadedFill(), and
+ // radialShadedFill()? If this returns false, these shaded fills
+ // will be reduced to a series of other drawing operations.
+ virtual GBool useShadedFills(int type)
+ { return (type >= 2 && type <= 5) ? gTrue : gFalse; }
+
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
virtual GBool upsideDown() { return gTrue; }
@@ -113,15 +260,25 @@ public:
virtual void updateBlendMode(GfxState *state);
virtual void updateFillOpacity(GfxState *state);
virtual void updateStrokeOpacity(GfxState *state);
+ virtual void updateFillOverprint(GfxState *state);
+ virtual void updateStrokeOverprint(GfxState *state);
+ virtual void updateOverprintMode(GfxState *state);
//----- update text state
virtual void updateFont(GfxState *state);
- virtual void updateRender(GfxState *state);
//----- path painting
virtual void stroke(GfxState *state);
virtual void fill(GfxState *state);
virtual void eoFill(GfxState *state);
+ virtual GBool tilingPatternFill(GfxState *state, Catalog *catalog, Object *str,
+ double *pmat, int paintType, int tilingType, Dict *resDict,
+ double *mat, double *bbox,
+ int x0, int y0, int x1, int y1,
+ double xStep, double yStep);
+ virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax);
+ virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double tMin, double tMax);
+ virtual GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading);
//----- path clipping
virtual void clip(GfxState *state);
@@ -213,9 +370,6 @@ public:
// Clear the modified region.
void clearModRegion();
- // Set the Splash fill color.
- void setFillColor(int r, int g, int b);
-
SplashFont *getCurrentFont() { return font; }
#if 1 //~tmp: turn off anti-aliasing temporarily
@@ -223,13 +377,14 @@ public:
virtual void setVectorAntialias(GBool vaa);
#endif
- void setFreeTypeHinting(GBool enable);
+ void setFreeTypeHinting(GBool enable, GBool enableSlightHinting);
private:
+ GBool univariateShadedFill(GfxState *state, SplashUnivariatePattern *pattern, double tMin, double tMax);
void setupScreenParams(double hDPI, double vDPI);
#if SPLASH_CMYK
- SplashPattern *getColor(GfxGray gray, GfxRGB *rgb, GfxCMYK *cmyk);
+ SplashPattern *getColor(GfxColorSpace *colorSpace, GfxGray gray, GfxRGB *rgb, GfxCMYK *cmyk);
#else
SplashPattern *getColor(GfxGray gray, GfxRGB *rgb);
#endif
@@ -244,10 +399,11 @@ private:
Guchar *alphaLine);
static GBool maskedImageSrc(void *data, SplashColorPtr line,
Guchar *alphaLine);
+ static GBool tilingBitmapSrc(void *data, SplashColorPtr line,
+ Guchar *alphaLine);
GBool haveCSPattern; // set if text has been drawn with a
- // clipping render mode because of pattern colorspace
- int savedRender; // use if pattern colorspace
+ // clipping render mode because of pattern colorspace
GBool keepAlphaChannel; // don't fill with paper color, keep alpha channel
SplashColorMode colorMode;
@@ -256,6 +412,7 @@ private:
GBool allowAntialias;
GBool vectorAntialias;
GBool enableFreeTypeHinting;
+ GBool enableSlightHinting;
GBool reverseVideo; // reverse video mode
SplashColor paperColor; // paper color
SplashScreenParams screenParams;
@@ -277,6 +434,7 @@ private:
SplashTransparencyGroup * // transparency group stack
transpGroupStack;
+ SplashBitmap *maskBitmap; // for image masks in pattern colorspace
};
#endif
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.cc
new file mode 100644
index 00000000000..db966377bb0
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.cc
@@ -0,0 +1,47 @@
+//========================================================================
+//
+// StdinCachedFile.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010 Jonathan Liu <net147@gmail.com>
+//
+//========================================================================
+
+#include <config.h>
+
+#include "StdinCachedFile.h"
+
+#ifdef _WIN32
+#include <fcntl.h> // for O_BINARY
+#include <io.h> // for setmode
+#endif
+#include <stdio.h>
+
+size_t StdinCacheLoader::init(GooString *dummy, CachedFile *cachedFile)
+{
+ size_t read, size = 0;
+ char buf[CachedFileChunkSize];
+
+#ifdef _WIN32
+ setmode(fileno(stdin), O_BINARY);
+#endif
+
+ CachedFileWriter writer = CachedFileWriter (cachedFile, NULL);
+ do {
+ read = fread(buf, 1, CachedFileChunkSize, stdin);
+ (writer.write) (buf, CachedFileChunkSize);
+ size += read;
+ }
+ while (read == CachedFileChunkSize);
+
+ return size;
+}
+
+int StdinCacheLoader::load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer)
+{
+ return 0;
+}
+
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.h
new file mode 100644
index 00000000000..5be6fa841a3
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinCachedFile.h
@@ -0,0 +1,27 @@
+//========================================================================
+//
+// StdinCachedFile.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#ifndef STDINCACHELOADER_H
+#define STDINCACHELOADER_H
+
+#include "CachedFile.h"
+
+class StdinCacheLoader : public CachedFileLoader {
+
+public:
+
+ size_t init(GooString *dummy, CachedFile* cachedFile);
+ int load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer);
+
+};
+
+#endif
+
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.cc
new file mode 100644
index 00000000000..571ee46d7f6
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.cc
@@ -0,0 +1,43 @@
+//========================================================================
+//
+// StdinPDFDocBuilder.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#include <config.h>
+
+#include "StdinPDFDocBuilder.h"
+#include "CachedFile.h"
+#include "StdinCachedFile.h"
+
+//------------------------------------------------------------------------
+// StdinPDFDocBuilder
+//------------------------------------------------------------------------
+
+PDFDoc *
+StdinPDFDocBuilder::buildPDFDoc(const GooString &uri, GooString *ownerPassword,
+ GooString *userPassword, void *guiDataA)
+{
+ Object obj;
+
+ obj.initNull();
+ CachedFile *cachedFile = new CachedFile(new StdinCacheLoader(), NULL);
+ return new PDFDoc(new CachedFileStream(cachedFile, 0, gFalse,
+ cachedFile->getLength(), &obj),
+ ownerPassword, userPassword);
+}
+
+GBool StdinPDFDocBuilder::supports(const GooString &uri)
+{
+ if (uri.cmpN("fd://0", 6) == 0) {
+ return gTrue;
+ } else {
+ return gFalse;
+ }
+}
+
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.h
new file mode 100644
index 00000000000..e9b2f47f636
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/StdinPDFDocBuilder.h
@@ -0,0 +1,33 @@
+//========================================================================
+//
+// StdinPDFDocBuilder.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010 Albert Astals Cid <aacid@kde.org>
+//
+//========================================================================
+
+#ifndef STDINPDFDOCBUILDER_H
+#define STDINPDFDOCBUILDER_H
+
+#include "PDFDocBuilder.h"
+
+//------------------------------------------------------------------------
+// StdinPDFDocBuilder
+//
+// The StdinPDFDocBuilder implements a PDFDocBuilder that read from stdin.
+//------------------------------------------------------------------------
+
+class StdinPDFDocBuilder : public PDFDocBuilder {
+
+public:
+
+ PDFDoc *buildPDFDoc(const GooString &uri, GooString *ownerPassword = NULL,
+ GooString *userPassword = NULL, void *guiDataA = NULL);
+ GBool supports(const GooString &uri);
+
+};
+
+#endif /* STDINPDFDOCBUILDER_H */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream-CCITT.h
index 43405b67751..43405b67751 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream.cc
index 6634317ad11..376f617a597 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream.cc
@@ -14,11 +14,15 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2006-2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
// Copyright (C) 2008 Julien Rebetez <julien@fhtagn.net>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2009 Glenn Ganz <glenn.ganz@uptime.ch>
+// Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
+// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2010 Tomas Hoger <thoger@redhat.com>
+// Copyright (C) 2011 William Bader <williambader@hotmail.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
@@ -50,6 +54,7 @@
#include "Stream.h"
#include "JBIG2Stream.h"
#include "Stream-CCITT.h"
+#include "CachedFile.h"
#ifdef ENABLE_LIBJPEG
#include "DCTStream.h"
@@ -96,6 +101,15 @@ int Stream::getRawChar() {
return EOF;
}
+int Stream::getChars(int nChars, Guchar *buffer) {
+ error(-1, "Internal: called getChars() on non-predictor stream");
+ return 0;
+}
+
+void Stream::getRawChars(int nChars, int *buffer) {
+ error(-1, "Internal: called getRawChars() on non-predictor stream");
+}
+
char *Stream::getLine(char *buf, int size) {
int i;
int c;
@@ -360,8 +374,9 @@ void FileOutStream::printf(const char *format, ...)
// BaseStream
//------------------------------------------------------------------------
-BaseStream::BaseStream(Object *dictA) {
+BaseStream::BaseStream(Object *dictA, Guint lengthA) {
dict = *dictA;
+ length = lengthA;
}
BaseStream::~BaseStream() {
@@ -458,9 +473,8 @@ Guchar *ImageStream::getLine() {
}
} else if (nBits == 8) {
Guchar *line = imgLine;
- for (i = 0; i < nVals; ++i) {
- *line++ = str->getChar();
- }
+ int readChars = str->doGetChars(nVals, line);
+ for ( ; readChars < nVals; readChars++) line[readChars] = (Guchar)EOF;
} else if (nBits == 16) {
// this is a hack to support 16 bits images, everywhere
// we assume a component fits in 8 bits, with this hack
@@ -540,12 +554,17 @@ int StreamPredictor::lookChar() {
}
int StreamPredictor::getChar() {
- if (predIdx >= rowBytes) {
- if (!getNextLine()) {
- return EOF;
- }
+ return doGetChar();
+}
+
+int StreamPredictor::getChars(int nChars, Guchar *buffer)
+{
+ for (int i = 0; i < nChars; ++i) {
+ const int c = doGetChar();
+ if (likely(c != EOF)) buffer[i] = c;
+ else return i;
}
- return predLine[predIdx++];
+ return nChars;
}
GBool StreamPredictor::getNextLine() {
@@ -568,19 +587,22 @@ GBool StreamPredictor::getNextLine() {
}
// read the raw line, apply PNG (byte) predictor
+ int *rawCharLine = new int[rowBytes - pixBytes];
+ str->getRawChars(rowBytes - pixBytes, rawCharLine);
memset(upLeftBuf, 0, pixBytes + 1);
for (i = pixBytes; i < rowBytes; ++i) {
for (j = pixBytes; j > 0; --j) {
upLeftBuf[j] = upLeftBuf[j-1];
}
upLeftBuf[0] = predLine[i];
- if ((c = str->getRawChar()) == EOF) {
+ if ((c = rawCharLine[i - pixBytes]) == EOF) {
if (i > pixBytes) {
// this ought to return false, but some (broken) PDF files
// contain truncated image data, and Adobe apparently reads the
// last partial line
break;
}
+ delete[] rawCharLine;
return gFalse;
}
switch (curPred) {
@@ -618,6 +640,7 @@ GBool StreamPredictor::getNextLine() {
break;
}
}
+ delete[] rawCharLine;
// apply TIFF (component) predictor
if (predictor == 2) {
@@ -674,7 +697,7 @@ GBool StreamPredictor::getNextLine() {
FileStream::FileStream(FILE *fA, Guint startA, GBool limitedA,
Guint lengthA, Object *dictA):
- BaseStream(dictA) {
+ BaseStream(dictA, lengthA) {
f = fA;
start = startA;
limited = limitedA;
@@ -794,11 +817,110 @@ void FileStream::moveStart(int delta) {
}
//------------------------------------------------------------------------
+// CachedFileStream
+//------------------------------------------------------------------------
+
+CachedFileStream::CachedFileStream(CachedFile *ccA, Guint startA,
+ GBool limitedA, Guint lengthA, Object *dictA)
+ : BaseStream(dictA, lengthA)
+{
+ cc = ccA;
+ start = startA;
+ limited = limitedA;
+ length = lengthA;
+ bufPtr = bufEnd = buf;
+ bufPos = start;
+ savePos = 0;
+ saved = gFalse;
+}
+
+CachedFileStream::~CachedFileStream()
+{
+ close();
+ cc->decRefCnt();
+}
+
+Stream *CachedFileStream::makeSubStream(Guint startA, GBool limitedA,
+ Guint lengthA, Object *dictA)
+{
+ cc->incRefCnt();
+ return new CachedFileStream(cc, startA, limitedA, lengthA, dictA);
+}
+
+void CachedFileStream::reset()
+{
+ savePos = (Guint)cc->tell();
+ cc->seek(start, SEEK_SET);
+
+ saved = gTrue;
+ bufPtr = bufEnd = buf;
+ bufPos = start;
+}
+
+void CachedFileStream::close()
+{
+ if (saved) {
+ cc->seek(savePos, SEEK_SET);
+ saved = gFalse;
+ }
+}
+
+GBool CachedFileStream::fillBuf()
+{
+ int n;
+
+ bufPos += bufEnd - buf;
+ bufPtr = bufEnd = buf;
+ if (limited && bufPos >= start + length) {
+ return gFalse;
+ }
+ if (limited && bufPos + cachedStreamBufSize > start + length) {
+ n = start + length - bufPos;
+ } else {
+ n = cachedStreamBufSize - (bufPos % cachedStreamBufSize);
+ }
+ cc->read(buf, 1, n);
+ bufEnd = buf + n;
+ if (bufPtr >= bufEnd) {
+ return gFalse;
+ }
+ return gTrue;
+}
+
+void CachedFileStream::setPos(Guint pos, int dir)
+{
+ Guint size;
+
+ if (dir >= 0) {
+ cc->seek(pos, SEEK_SET);
+ bufPos = pos;
+ } else {
+ cc->seek(0, SEEK_END);
+ size = (Guint)cc->tell();
+
+ if (pos > size)
+ pos = (Guint)size;
+
+ cc->seek(-(int)pos, SEEK_END);
+ bufPos = (Guint)cc->tell();
+ }
+
+ bufPtr = bufEnd = buf;
+}
+
+void CachedFileStream::moveStart(int delta)
+{
+ start += delta;
+ bufPtr = bufEnd = buf;
+ bufPos = start;
+}
+
+//------------------------------------------------------------------------
// MemStream
//------------------------------------------------------------------------
MemStream::MemStream(char *bufA, Guint startA, Guint lengthA, Object *dictA):
- BaseStream(dictA) {
+ BaseStream(dictA, lengthA) {
buf = bufA;
start = startA;
length = lengthA;
@@ -862,7 +984,7 @@ void MemStream::moveStart(int delta) {
EmbedStream::EmbedStream(Stream *strA, Object *dictA,
GBool limitedA, Guint lengthA):
- BaseStream(dictA) {
+ BaseStream(dictA, lengthA) {
str = strA;
limited = limitedA;
length = lengthA;
@@ -1135,16 +1257,13 @@ int LZWStream::lookChar() {
return seqBuf[seqIndex];
}
+void LZWStream::getRawChars(int nChars, int *buffer) {
+ for (int i = 0; i < nChars; ++i)
+ buffer[i] = doGetRawChar();
+}
+
int LZWStream::getRawChar() {
- if (eof) {
- return EOF;
- }
- if (seqIndex >= seqLength) {
- if (!processNextCode()) {
- return EOF;
- }
- }
- return seqBuf[seqIndex++];
+ return doGetRawChar();
}
void LZWStream::reset() {
@@ -3182,6 +3301,8 @@ GBool DCTStream::readScanInfo() {
interleaved = scanInfo.numComps == numComps;
for (j = 0; j < numComps; ++j) {
scanInfo.comp[j] = gFalse;
+ scanInfo.dcHuffTable[j] = 0;
+ scanInfo.acHuffTable[j] = 0;
}
for (i = 0; i < scanInfo.numComps; ++i) {
id = str->getChar();
@@ -4129,20 +4250,20 @@ void FlateStream::reset() {
}
int FlateStream::getChar() {
- int c;
+ return doGetChar();
+}
+int FlateStream::getChars(int nChars, Guchar *buffer) {
if (pred) {
- return pred->getChar();
- }
- while (remain == 0) {
- if (endOfBlock && eof)
- return EOF;
- readSome();
+ return pred->getChars(nChars, buffer);
+ } else {
+ for (int i = 0; i < nChars; ++i) {
+ const int c = doGetChar();
+ if (likely(c != EOF)) buffer[i] = c;
+ else return i;
+ }
+ return nChars;
}
- c = buf[index];
- index = (index + 1) & flateMask;
- --remain;
- return c;
}
int FlateStream::lookChar() {
@@ -4160,18 +4281,13 @@ int FlateStream::lookChar() {
return c;
}
-int FlateStream::getRawChar() {
- int c;
+void FlateStream::getRawChars(int nChars, int *buffer) {
+ for (int i = 0; i < nChars; ++i)
+ buffer[i] = doGetRawChar();
+}
- while (remain == 0) {
- if (endOfBlock && eof)
- return EOF;
- readSome();
- }
- c = buf[index];
- index = (index + 1) & flateMask;
- --remain;
- return c;
+int FlateStream::getRawChar() {
+ return doGetRawChar();
}
GooString *FlateStream::getPSFilter(int psLevel, char *indent) {
@@ -4808,3 +4924,46 @@ GBool RunLengthEncoder::fillBuf() {
bufPtr = buf;
return gTrue;
}
+
+//------------------------------------------------------------------------
+// CMKYGrayEncoder
+//------------------------------------------------------------------------
+
+CMKYGrayEncoder::CMKYGrayEncoder(Stream *strA):
+ FilterStream(strA) {
+ bufPtr = bufEnd = buf;
+ eof = gFalse;
+}
+
+CMKYGrayEncoder::~CMKYGrayEncoder() {
+ if (str->isEncoder())
+ delete str;
+}
+
+void CMKYGrayEncoder::reset() {
+ str->reset();
+ bufPtr = bufEnd = buf;
+ eof = gFalse;
+}
+
+GBool CMKYGrayEncoder::fillBuf() {
+ int c0, c1, c2, c3;
+ int i;
+
+ if (eof) {
+ return gFalse;
+ }
+ c0 = str->getChar();
+ c1 = str->getChar();
+ c2 = str->getChar();
+ c3 = str->getChar();
+ if (c3 == EOF) {
+ eof = gTrue;
+ return gFalse;
+ }
+ i = (3 * c0 + 6 * c1 + c2) / 10 + c3;
+ if (i > 255) i = 255;
+ bufPtr = bufEnd = buf;
+ *bufEnd++ = (char) i;
+ return gTrue;
+}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream.h
index 9c0068e47f5..cb08e3ad3fc 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/Stream.h
@@ -15,8 +15,11 @@
//
// Copyright (C) 2005 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2008 Julien Rebetez <julien@fhtagn.net>
-// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010, 2011 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
+// Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2011 William Bader <williambader@hotmail.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
@@ -30,16 +33,19 @@
#pragma interface
#endif
+#include "poppler-config.h"
#include <stdio.h>
#include "goo/gtypes.h"
#include "Object.h"
class BaseStream;
+class CachedFile;
//------------------------------------------------------------------------
enum StreamKind {
strFile,
+ strCachedFile,
strASCIIHex,
strASCII85,
strLZW,
@@ -69,6 +75,13 @@ enum CryptAlgorithm {
};
//------------------------------------------------------------------------
+
+typedef struct _ByteRange {
+ Guint offset;
+ Guint length;
+} ByteRange;
+
+//------------------------------------------------------------------------
// Stream (base class)
//------------------------------------------------------------------------
@@ -94,6 +107,56 @@ public:
// Close down the stream.
virtual void close();
+ inline int doGetChars(int nChars, Guchar *buffer)
+ {
+ if (hasGetChars()) {
+ return getChars(nChars, buffer);
+ } else {
+ for (int i = 0; i < nChars; ++i) {
+ const int c = getChar();
+ if (likely(c != EOF)) buffer[i] = c;
+ else return i;
+ }
+ return nChars;
+ }
+ }
+
+ inline void fillGooString(GooString *s)
+ {
+ Guchar readBuf[4096];
+ int readChars;
+ reset();
+ while ((readChars = doGetChars(4096, readBuf)) != 0) {
+ s->append((const char *)readBuf, readChars);
+ }
+ }
+
+ inline Guchar *toUnsignedChars(int *length, int initialSize = 4096, int sizeIncrement = 4096)
+ {
+ int readChars;
+ Guchar *buf = (Guchar *)gmalloc(initialSize);
+ int size = initialSize;
+ *length = 0;
+ int charsToRead = initialSize;
+ bool continueReading = true;
+ reset();
+ while (continueReading && (readChars = doGetChars(charsToRead, &buf[*length])) != 0) {
+ *length += readChars;
+ if (readChars == charsToRead) {
+ if (lookChar() != EOF) {
+ size += sizeIncrement;
+ charsToRead = sizeIncrement;
+ buf = (Guchar *)grealloc(buf, size);
+ } else {
+ continueReading = false;
+ }
+ } else {
+ continueReading = false;
+ }
+ }
+ return buf;
+ }
+
// Get next char from stream.
virtual int getChar() = 0;
@@ -103,6 +166,7 @@ public:
// Get next char from stream without using the predictor.
// This is only used by StreamPredictor.
virtual int getRawChar();
+ virtual void getRawChars(int nChars, int *buffer);
// Get next char directly from stream source, without filtering it
virtual int getUnfilteredChar () = 0;
@@ -154,6 +218,8 @@ public:
Stream *addFilters(Object *dict);
private:
+ virtual GBool hasGetChars() { return false; }
+ virtual int getChars(int nChars, Guchar *buffer);
Stream *makeFilter(char *name, Stream *str, Object *params);
@@ -228,7 +294,7 @@ private:
class BaseStream: public Stream {
public:
- BaseStream(Object *dictA);
+ BaseStream(Object *dictA, Guint lengthA);
virtual ~BaseStream();
virtual Stream *makeSubStream(Guint start, GBool limited,
Guint length, Object *dict) = 0;
@@ -238,11 +304,16 @@ public:
virtual Stream *getUndecodedStream() { return this; }
virtual Dict *getDict() { return dict.getDict(); }
virtual GooString *getFileName() { return NULL; }
+ virtual Guint getLength() { return length; }
// Get/set position of first byte of stream within the file.
virtual Guint getStart() = 0;
virtual void moveStart(int delta) = 0;
+protected:
+
+ Guint length;
+
private:
Object dict;
@@ -335,11 +406,21 @@ public:
int lookChar();
int getChar();
+ int getChars(int nChars, Guchar *buffer);
private:
GBool getNextLine();
+ inline int doGetChar() {
+ if (predIdx >= rowBytes) {
+ if (!getNextLine()) {
+ return EOF;
+ }
+ }
+ return predLine[predIdx++];
+ }
+
Stream *str; // base stream
int predictor; // predictor
int width; // pixels per line
@@ -371,7 +452,7 @@ public:
virtual void reset();
virtual void close();
virtual int getChar()
- { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
+ { return doGetChar(); }
virtual int lookChar()
{ return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
virtual int getPos() { return bufPos + (bufPtr - buf); }
@@ -385,11 +466,24 @@ public:
private:
GBool fillBuf();
+
+ inline int doGetChar()
+ { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
+
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer)
+ {
+ for (int i = 0; i < nChars; ++i) {
+ const int c = doGetChar();
+ if (likely(c != EOF)) buffer[i] = c;
+ else return i;
+ }
+ return nChars;
+ }
FILE *f;
Guint start;
GBool limited;
- Guint length;
char buf[fileStreamBufSize];
char *bufPtr;
char *bufEnd;
@@ -399,6 +493,51 @@ private:
};
//------------------------------------------------------------------------
+// CachedFileStream
+//------------------------------------------------------------------------
+
+#define cachedStreamBufSize 1024
+
+class CachedFileStream: public BaseStream {
+public:
+
+ CachedFileStream(CachedFile *ccA, Guint startA, GBool limitedA,
+ Guint lengthA, Object *dictA);
+ virtual ~CachedFileStream();
+ virtual Stream *makeSubStream(Guint startA, GBool limitedA,
+ Guint lengthA, Object *dictA);
+ virtual StreamKind getKind() { return strCachedFile; }
+ virtual void reset();
+ virtual void close();
+ virtual int getChar()
+ { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
+ virtual int lookChar()
+ { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
+ virtual int getPos() { return bufPos + (bufPtr - buf); }
+ virtual void setPos(Guint pos, int dir = 0);
+ virtual Guint getStart() { return start; }
+ virtual void moveStart(int delta);
+
+ virtual int getUnfilteredChar () { return getChar(); }
+ virtual void unfilteredReset () { reset(); }
+
+private:
+
+ GBool fillBuf();
+
+ CachedFile *cc;
+ Guint start;
+ GBool limited;
+ char buf[cachedStreamBufSize];
+ char *bufPtr;
+ char *bufEnd;
+ Guint bufPos;
+ int savePos;
+ GBool saved;
+};
+
+
+//------------------------------------------------------------------------
// MemStream
//------------------------------------------------------------------------
@@ -432,7 +571,6 @@ private:
char *buf;
Guint start;
- Guint length;
char *bufEnd;
char *bufPtr;
GBool needFree;
@@ -472,7 +610,6 @@ private:
Stream *str;
GBool limited;
- Guint length;
};
//------------------------------------------------------------------------
@@ -538,11 +675,24 @@ public:
virtual int getChar();
virtual int lookChar();
virtual int getRawChar();
+ virtual void getRawChars(int nChars, int *buffer);
virtual GooString *getPSFilter(int psLevel, char *indent);
virtual GBool isBinary(GBool last = gTrue);
private:
+ inline int doGetRawChar() {
+ if (eof) {
+ return EOF;
+ }
+ if (seqIndex >= seqLength) {
+ if (!processNextCode()) {
+ return EOF;
+ }
+ }
+ return seqBuf[seqIndex++];
+ }
+
StreamPredictor *pred; // predictor
int early; // early parameter
GBool eof; // true if at eof
@@ -691,7 +841,6 @@ public:
virtual int lookChar();
virtual GooString *getPSFilter(int psLevel, char *indent);
virtual GBool isBinary(GBool last = gTrue);
- Stream *getRawStream() { return str; }
virtual void unfilteredReset();
@@ -797,11 +946,35 @@ public:
virtual int getChar();
virtual int lookChar();
virtual int getRawChar();
+ virtual void getRawChars(int nChars, int *buffer);
virtual GooString *getPSFilter(int psLevel, char *indent);
virtual GBool isBinary(GBool last = gTrue);
virtual void unfilteredReset ();
private:
+ inline int doGetRawChar() {
+ int c;
+
+ while (remain == 0) {
+ if (endOfBlock && eof)
+ return EOF;
+ readSome();
+ }
+ c = buf[index];
+ index = (index + 1) & flateMask;
+ --remain;
+ return c;
+ }
+
+ inline int doGetChar() {
+ if (pred) {
+ return pred->getChar();
+ }
+ return doGetRawChar();
+ }
+
+ virtual GBool hasGetChars() { return true; }
+ virtual int getChars(int nChars, Guchar *buffer);
StreamPredictor *pred; // predictor
Guchar buf[flateWindow]; // output data buffer
@@ -969,4 +1142,33 @@ private:
GBool fillBuf();
};
+//------------------------------------------------------------------------
+// CMKYGrayEncoder
+//------------------------------------------------------------------------
+
+class CMKYGrayEncoder: public FilterStream {
+public:
+
+ CMKYGrayEncoder(Stream *strA);
+ virtual ~CMKYGrayEncoder();
+ virtual StreamKind getKind() { return strWeird; }
+ virtual void reset();
+ virtual int getChar()
+ { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
+ virtual int lookChar()
+ { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
+ virtual GooString *getPSFilter(int /*psLevel*/, char * /*indent*/) { return NULL; }
+ virtual GBool isBinary(GBool /*last = gTrue*/) { return gFalse; }
+ virtual GBool isEncoder() { return gTrue; }
+
+private:
+
+ char buf[2];
+ char *bufPtr;
+ char *bufEnd;
+ GBool eof;
+
+ GBool fillBuf();
+};
+
#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/TextOutputDev.cc
index 442ace2dbad..3d7ba6de0c1 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/TextOutputDev.cc
@@ -10,18 +10,24 @@
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
// Copyright (C) 2005-2007 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-// Copyright (C) 2006-2008 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006-2008, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2006, 2007 Ed Catmur <ed@catmur.co.uk>
// Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2007, 2008 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2008 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010, 2011 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2008 Pino Toscano <pino@kde.org>
-// Copyright (C) 2008 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2008, 2010 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2009 Ross Moore <ross@maths.mq.edu.au>
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
+// Copyright (C) 2010 Brian Ewins <brian.ewins@gmail.com>
+// Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
+// Copyright (C) 2011 Sam Liao <phyomh@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -38,6 +44,7 @@
#include <stdlib.h>
#include <stddef.h>
#include <math.h>
+#include <float.h>
#include <ctype.h>
#ifdef _WIN32
#include <fcntl.h> // for O_BINARY
@@ -54,6 +61,7 @@
#include "Link.h"
#include "TextOutputDev.h"
#include "Page.h"
+#include "Annot.h"
#include "PDFDocEncoding.h"
#ifdef MACOS
@@ -180,12 +188,12 @@ public:
class TextLink {
public:
- TextLink(int xMinA, int yMinA, int xMaxA, int yMaxA, Link *linkA)
+ TextLink(int xMinA, int yMinA, int xMaxA, int yMaxA, AnnotLink *linkA)
{ xMin = xMinA; yMin = yMinA; xMax = xMaxA; yMax = yMaxA; link = linkA; }
~TextLink() {}
int xMin, yMin, xMax, yMax;
- Link *link;
+ AnnotLink *link;
};
//------------------------------------------------------------------------
@@ -218,6 +226,10 @@ GBool TextFontInfo::matches(GfxState *state) {
return state->getFont() == gfxFont;
}
+GBool TextFontInfo::matches(TextFontInfo *fontInfo) {
+ return gfxFont == fontInfo->gfxFont;
+}
+
//------------------------------------------------------------------------
// TextWord
//------------------------------------------------------------------------
@@ -1154,6 +1166,8 @@ TextBlock::TextBlock(TextPage *pageA, int rotA) {
curLine = NULL;
next = NULL;
stackNext = NULL;
+ tableId = -1;
+ tableEnd = gFalse;
}
TextBlock::~TextBlock() {
@@ -1615,6 +1629,163 @@ GBool TextBlock::isBelow(TextBlock *blk) {
return below;
}
+GBool TextBlock::isBeforeByRule1(TextBlock *blk1) {
+ GBool before = gFalse;
+ GBool overlap = gFalse;
+
+ switch (this->page->primaryRot) {
+ case 0:
+ case 2:
+ overlap = ((this->ExMin <= blk1->ExMin) &&
+ (blk1->ExMin <= this->ExMax)) ||
+ ((blk1->ExMin <= this->ExMin) &&
+ (this->ExMin <= blk1->ExMax));
+ break;
+ case 1:
+ case 3:
+ overlap = ((this->EyMin <= blk1->EyMin) &&
+ (blk1->EyMin <= this->EyMax)) ||
+ ((blk1->EyMin <= this->EyMin) &&
+ (this->EyMin <= blk1->EyMax));
+ break;
+ }
+ switch (this->page->primaryRot) {
+ case 0:
+ before = overlap && this->EyMin < blk1->EyMin;
+ break;
+ case 1:
+ before = overlap && this->ExMax > blk1->ExMax;
+ break;
+ case 2:
+ before = overlap && this->EyMax > blk1->EyMax;
+ break;
+ case 3:
+ before = overlap && this->ExMin < blk1->ExMin;
+ break;
+ }
+ return before;
+}
+
+GBool TextBlock::isBeforeByRule2(TextBlock *blk1) {
+ double cmp = 0;
+ int rotLR = rot;
+
+ if (!page->primaryLR) {
+ rotLR = (rotLR + 2) % 4;
+ }
+
+ switch (rotLR) {
+ case 0:
+ cmp = ExMax - blk1->ExMin;
+ break;
+ case 1:
+ cmp = EyMin - blk1->EyMax;
+ break;
+ case 2:
+ cmp = blk1->ExMax - ExMin;
+ break;
+ case 3:
+ cmp = blk1->EyMin - EyMax;
+ break;
+ }
+ return cmp <= 0;
+}
+
+// Sort into reading order by performing a topological sort using the rules
+// given in "High Performance Document Layout Analysis", T.M. Breuel, 2003.
+// See http://pubs.iupr.org/#2003-breuel-sdiut
+// Topological sort is done by depth first search, see
+// http://en.wikipedia.org/wiki/Topological_sorting
+int TextBlock::visitDepthFirst(TextBlock *blkList, int pos1,
+ TextBlock **sorted, int sortPos,
+ GBool* visited) {
+ int pos2;
+ TextBlock *blk1, *blk2, *blk3;
+ GBool before;
+
+ if (visited[pos1]) {
+ return sortPos;
+ }
+
+ blk1 = this;
+
+#if 0 // for debugging
+ printf("visited: %d %.2f..%.2f %.2f..%.2f\n",
+ sortPos, blk1->ExMin, blk1->ExMax, blk1->EyMin, blk1->EyMax);
+#endif
+ visited[pos1] = gTrue;
+ pos2 = -1;
+ for (blk2 = blkList; blk2; blk2 = blk2->next) {
+ pos2++;
+ if (visited[pos2]) {
+ // skip visited nodes
+ continue;
+ }
+ before = gFalse;
+
+ // is blk2 before blk1? (for table entries)
+ if (blk1->tableId >= 0 && blk1->tableId == blk2->tableId) {
+ if (page->primaryLR) {
+ if (blk2->xMax <= blk1->xMin &&
+ blk2->yMin <= blk1->yMax &&
+ blk2->yMax >= blk1->yMin)
+ before = gTrue;
+ } else {
+ if (blk2->xMin >= blk1->xMax &&
+ blk2->yMin <= blk1->yMax &&
+ blk2->yMax >= blk1->yMin)
+ before = gTrue;
+ }
+
+ if (blk2->yMax <= blk1->yMin)
+ before = gTrue;
+ } else {
+ if (blk2->isBeforeByRule1(blk1)) {
+ // Rule (1) blk1 and blk2 overlap, and blk2 is above blk1.
+ before = gTrue;
+#if 0 // for debugging
+ printf("rule1: %.2f..%.2f %.2f..%.2f %.2f..%.2f %.2f..%.2f\n",
+ blk2->ExMin, blk2->ExMax, blk2->EyMin, blk2->EyMax,
+ blk1->ExMin, blk1->ExMax, blk1->EyMin, blk1->EyMax);
+#endif
+ } else if (blk2->isBeforeByRule2(blk1)) {
+ // Rule (2) blk2 left of blk1, and no intervening blk3
+ // such that blk1 is before blk3 by rule 1,
+ // and blk3 is before blk2 by rule 1.
+ before = gTrue;
+ for (blk3 = blkList; blk3; blk3 = blk3->next) {
+ if (blk3 == blk2 || blk3 == blk1) {
+ continue;
+ }
+ if (blk1->isBeforeByRule1(blk3) &&
+ blk3->isBeforeByRule1(blk2)) {
+ before = gFalse;
+ break;
+ }
+ }
+#if 0 // for debugging
+ if (before) {
+ printf("rule2: %.2f..%.2f %.2f..%.2f %.2f..%.2f %.2f..%.2f\n",
+ blk1->ExMin, blk1->ExMax, blk1->EyMin, blk1->EyMax,
+ blk2->ExMin, blk2->ExMax, blk2->EyMin, blk2->EyMax);
+ }
+#endif
+ }
+ }
+ if (before) {
+ // blk2 is before blk1, so it needs to be visited
+ // before we can add blk1 to the sorted list.
+ sortPos = blk2->visitDepthFirst(blkList, pos2, sorted, sortPos, visited);
+ }
+ }
+#if 0 // for debugging
+ printf("sorted: %d %.2f..%.2f %.2f..%.2f\n",
+ sortPos, blk1->ExMin, blk1->ExMax, blk1->EyMin, blk1->EyMax);
+#endif
+ sorted[sortPos++] = blk1;
+ return sortPos;
+}
+
//------------------------------------------------------------------------
// TextFlow
//------------------------------------------------------------------------
@@ -2090,25 +2261,25 @@ void TextPage::addChar(GfxState *state, double x, double y,
beginWord(state, x, y);
}
- // page rotation and/or transform matrices can cause text to be
- // drawn in reverse order -- in this case, swap the begin/end
- // coordinates and break text into individual chars
- if ((curWord->rot == 0 && w1 < 0) ||
- (curWord->rot == 1 && h1 < 0) ||
- (curWord->rot == 2 && w1 > 0) ||
- (curWord->rot == 3 && h1 > 0)) {
- endWord();
- beginWord(state, x + dx, y + dy);
- x1 += w1;
- y1 += h1;
- w1 = -w1;
- h1 = -h1;
- }
+ // page rotation and/or transform matrices can cause text to be
+ // drawn in reverse order -- in this case, swap the begin/end
+ // coordinates and break text into individual chars
+ if ((curWord->rot == 0 && w1 < 0) ||
+ (curWord->rot == 1 && h1 < 0) ||
+ (curWord->rot == 2 && w1 > 0) ||
+ (curWord->rot == 3 && h1 > 0)) {
+ endWord();
+ beginWord(state, x + dx, y + dy);
+ x1 += w1;
+ y1 += h1;
+ w1 = -w1;
+ h1 = -h1;
+ }
- // add the characters to the current word
+ // add the characters to the current word
w1 /= uLen;
h1 /= uLen;
- for (i = 0; i < uLen; ++i) {
+ for (i = 0; i < uLen; ++i) {
if (u[i] >= 0xd800 && u[i] < 0xdc00) { /* surrogate pair */
if (i + 1 < uLen && u[i+1] >= 0xdc00 && u[i+1] < 0xe000) {
/* next code is a low surrogate */
@@ -2127,7 +2298,7 @@ void TextPage::addChar(GfxState *state, double x, double y,
} else {
curWord->addChar(state, x1 + i*w1, y1 + i*h1, w1, h1, c, u[i]);
}
- }
+ }
}
if (curWord) {
curWord->charLen += nBytes;
@@ -2174,7 +2345,7 @@ void TextPage::addUnderline(double x0, double y0, double x1, double y1) {
underlines->append(new TextUnderline(x0, y0, x1, y1));
}
-void TextPage::addLink(int xMin, int yMin, int xMax, int yMax, Link *link) {
+void TextPage::addLink(int xMin, int yMin, int xMax, int yMax, AnnotLink *link) {
links->append(new TextLink(xMin, yMin, xMax, yMax, link));
}
@@ -2183,8 +2354,7 @@ void TextPage::coalesce(GBool physLayout, GBool doHTML) {
TextPool *pool;
TextWord *word0, *word1, *word2;
TextLine *line;
- TextBlock *blkList, *blkStack, *blk, *lastBlk, *blk0, *blk1;
- TextBlock **blkArray;
+ TextBlock *blkList, *blk, *lastBlk, *blk0, *blk1, *blk2;
TextFlow *flow, *lastFlow;
TextUnderline *underline;
TextLink *link;
@@ -2194,7 +2364,6 @@ void TextPage::coalesce(GBool physLayout, GBool doHTML) {
GBool found;
int count[4];
int lrCount;
- int firstBlkIdx, nBlocksLeft;
int col1, col2;
int i, j, n;
@@ -2687,7 +2856,7 @@ void TextPage::coalesce(GBool physLayout, GBool doHTML) {
}
}
-#if 0 // for debugging
+#if 0 // for debugging
printf("*** rotation ***\n");
for (rot = 0; rot < 4; ++rot) {
printf(" %d: %6d\n", rot, count[rot]);
@@ -2841,9 +3010,6 @@ void TextPage::coalesce(GBool physLayout, GBool doHTML) {
//----- reading order sort
- // sort blocks into yx order (in preparation for reading order sort)
- qsort(blocks, nBlocks, sizeof(TextBlock *), &TextBlock::cmpYXPrimaryRot);
-
// compute space on left and right sides of each block
for (i = 0; i < nBlocks; ++i) {
blk0 = blocks[i];
@@ -2856,7 +3022,285 @@ void TextPage::coalesce(GBool physLayout, GBool doHTML) {
}
#if 0 // for debugging
- printf("*** blocks, after yx sort ***\n");
+ printf("PAGE\n");
+#endif
+
+ int sortPos = 0;
+ GBool *visited = (GBool *)gmallocn(nBlocks, sizeof(GBool));
+ for (i = 0; i < nBlocks; i++) {
+ visited[i] = gFalse;
+ }
+
+ double bxMin0, byMin0, bxMin1, byMin1;
+ int numTables = 0;
+ int tableId = -1;
+ int correspondenceX, correspondenceY;
+ double xCentre1, yCentre1, xCentre2, yCentre2;
+ double xCentre3, yCentre3, xCentre4, yCentre4;
+ double deltaX, deltaY;
+ TextBlock *fblk2 = NULL, *fblk3 = NULL, *fblk4 = NULL;
+
+ for (blk1 = blkList; blk1; blk1 = blk1->next) {
+ blk1->ExMin = blk1->xMin;
+ blk1->ExMax = blk1->xMax;
+ blk1->EyMin = blk1->yMin;
+ blk1->EyMax = blk1->yMax;
+
+ bxMin0 = DBL_MAX;
+ byMin0 = DBL_MAX;
+ bxMin1 = DBL_MAX;
+ byMin1 = DBL_MAX;
+
+ fblk2 = NULL;
+ fblk3 = NULL;
+ fblk4 = NULL;
+
+ /* find fblk2, fblk3 and fblk4 so that
+ * fblk2 is on the right of blk1 and overlap with blk1 in y axis
+ * fblk3 is under blk1 and overlap with blk1 in x axis
+ * fblk4 is under blk1 and on the right of blk1
+ * and they are closest to blk1
+ */
+ for (blk2 = blkList; blk2; blk2 = blk2->next) {
+ if (blk2 != blk1) {
+ if (blk2->yMin <= blk1->yMax &&
+ blk2->yMax >= blk1->yMin &&
+ blk2->xMin > blk1->xMax &&
+ blk2->xMin < bxMin0) {
+ bxMin0 = blk2->xMin;
+ fblk2 = blk2;
+ } else if (blk2->xMin <= blk1->xMax &&
+ blk2->xMax >= blk1->xMin &&
+ blk2->yMin > blk1->yMax &&
+ blk2->yMin < byMin0) {
+ byMin0 = blk2->yMin;
+ fblk3 = blk2;
+ } else if (blk2->xMin > blk1->xMax &&
+ blk2->xMin < bxMin1 &&
+ blk2->yMin > blk1->yMax &&
+ blk2->yMin < byMin1) {
+ bxMin1 = blk2->xMin;
+ byMin1 = blk2->yMin;
+ fblk4 = blk2;
+ }
+ }
+ }
+
+ /* fblk4 can not overlap with fblk3 in x and with fblk2 in y
+ * fblk2 can not overlap with fblk3 in x and y
+ * fblk4 has to overlap with fblk3 in y and with fblk2 in x
+ */
+ if (fblk2 != NULL &&
+ fblk3 != NULL &&
+ fblk4 != NULL) {
+ if (((fblk3->xMin <= fblk4->xMax && fblk3->xMax >= fblk4->xMin) ||
+ (fblk2->yMin <= fblk4->yMax && fblk2->yMax >= fblk4->yMin) ||
+ (fblk2->xMin <= fblk3->xMax && fblk2->xMax >= fblk3->xMin) ||
+ (fblk2->yMin <= fblk3->yMax && fblk2->yMax >= fblk3->yMin)) ||
+ !(fblk4->xMin <= fblk2->xMax && fblk4->xMax >= fblk2->xMin &&
+ fblk4->yMin <= fblk3->yMax && fblk4->yMax >= fblk3->yMin)) {
+ fblk2 = NULL;
+ fblk3 = NULL;
+ fblk4 = NULL;
+ }
+ }
+
+ // if we found any then look whether they form a table
+ if (fblk2 != NULL &&
+ fblk3 != NULL &&
+ fblk4 != NULL) {
+ tableId = -1;
+ correspondenceX = 0;
+ correspondenceY = 0;
+ deltaX = 0.0;
+ deltaY = 0.0;
+
+ if (blk1->lines && blk1->lines->words)
+ deltaX = blk1->lines->words->getFontSize();
+ if (fblk2->lines && fblk2->lines->words)
+ deltaX = deltaX < fblk2->lines->words->getFontSize() ?
+ deltaX : fblk2->lines->words->getFontSize();
+ if (fblk3->lines && fblk3->lines->words)
+ deltaX = deltaX < fblk3->lines->words->getFontSize() ?
+ deltaX : fblk3->lines->words->getFontSize();
+ if (fblk4->lines && fblk4->lines->words)
+ deltaX = deltaX < fblk4->lines->words->getFontSize() ?
+ deltaX : fblk4->lines->words->getFontSize();
+
+ deltaY = deltaX;
+
+ deltaX *= minColSpacing1;
+ deltaY *= maxIntraLineDelta;
+
+ xCentre1 = (blk1->xMax + blk1->xMin) / 2.0;
+ yCentre1 = (blk1->yMax + blk1->yMin) / 2.0;
+ xCentre2 = (fblk2->xMax + fblk2->xMin) / 2.0;
+ yCentre2 = (fblk2->yMax + fblk2->yMin) / 2.0;
+ xCentre3 = (fblk3->xMax + fblk3->xMin) / 2.0;
+ yCentre3 = (fblk3->yMax + fblk3->yMin) / 2.0;
+ xCentre4 = (fblk4->xMax + fblk4->xMin) / 2.0;
+ yCentre4 = (fblk4->yMax + fblk4->yMin) / 2.0;
+
+ // are blocks centrally aligned in x ?
+ if (fabs (xCentre1 - xCentre3) <= deltaX &&
+ fabs (xCentre2 - xCentre4) <= deltaX)
+ correspondenceX++;
+
+ // are blocks centrally aligned in y ?
+ if (fabs (yCentre1 - yCentre2) <= deltaY &&
+ fabs (yCentre3 - yCentre4) <= deltaY)
+ correspondenceY++;
+
+ // are blocks aligned to the left ?
+ if (fabs (blk1->xMin - fblk3->xMin) <= deltaX &&
+ fabs (fblk2->xMin - fblk4->xMin) <= deltaX)
+ correspondenceX++;
+
+ // are blocks aligned to the right ?
+ if (fabs (blk1->xMax - fblk3->xMax) <= deltaX &&
+ fabs (fblk2->xMax - fblk4->xMax) <= deltaX)
+ correspondenceX++;
+
+ // are blocks aligned to the top ?
+ if (fabs (blk1->yMin - fblk2->yMin) <= deltaY &&
+ fabs (fblk3->yMin - fblk4->yMin) <= deltaY)
+ correspondenceY++;
+
+ // are blocks aligned to the bottom ?
+ if (fabs (blk1->yMax - fblk2->yMax) <= deltaY &&
+ fabs (fblk3->yMax - fblk4->yMax) <= deltaY)
+ correspondenceY++;
+
+ // are blocks aligned in x and y ?
+ if (correspondenceX > 0 &&
+ correspondenceY > 0) {
+
+ // find maximal tableId
+ tableId = tableId < fblk4->tableId ? fblk4->tableId : tableId;
+ tableId = tableId < fblk3->tableId ? fblk3->tableId : tableId;
+ tableId = tableId < fblk2->tableId ? fblk2->tableId : tableId;
+ tableId = tableId < blk1->tableId ? blk1->tableId : tableId;
+
+ // if the tableId is -1, then we found new table
+ if (tableId < 0) {
+ tableId = numTables;
+ numTables++;
+ }
+
+ blk1->tableId = tableId;
+ fblk2->tableId = tableId;
+ fblk3->tableId = tableId;
+ fblk4->tableId = tableId;
+ }
+ }
+ }
+
+ /* set extended bounding boxes of all table entries
+ * so that they contain whole table
+ * (we need to process whole table size when comparing it
+ * with regular text blocks)
+ */
+ PDFRectangle *envelopes = new PDFRectangle [numTables];
+ TextBlock **ending_blocks = new TextBlock* [numTables];
+
+ for (i = 0; i < numTables; i++) {
+ envelopes[i].x1 = DBL_MAX;
+ envelopes[i].x2 = DBL_MIN;
+ envelopes[i].y1 = DBL_MAX;
+ envelopes[i].y2 = DBL_MIN;
+ }
+
+ for (blk1 = blkList; blk1; blk1 = blk1->next) {
+ if (blk1->tableId >= 0) {
+ if (blk1->ExMin < envelopes[blk1->tableId].x1) {
+ envelopes[blk1->tableId].x1 = blk1->ExMin;
+ if (!blk1->page->primaryLR)
+ ending_blocks[blk1->tableId] = blk1;
+ }
+
+ if (blk1->ExMax > envelopes[blk1->tableId].x2) {
+ envelopes[blk1->tableId].x2 = blk1->ExMax;
+ if (blk1->page->primaryLR)
+ ending_blocks[blk1->tableId] = blk1;
+ }
+
+ envelopes[blk1->tableId].y1 = blk1->EyMin < envelopes[blk1->tableId].y1 ?
+ blk1->EyMin : envelopes[blk1->tableId].y1;
+ envelopes[blk1->tableId].y2 = blk1->EyMax > envelopes[blk1->tableId].y2 ?
+ blk1->EyMax : envelopes[blk1->tableId].y2;
+ }
+ }
+
+ for (blk1 = blkList; blk1; blk1 = blk1->next) {
+ if (blk1->tableId >= 0 &&
+ blk1->xMin <= ending_blocks[blk1->tableId]->xMax &&
+ blk1->xMax >= ending_blocks[blk1->tableId]->xMin) {
+ blk1->tableEnd = gTrue;
+ }
+ }
+
+ for (blk1 = blkList; blk1; blk1 = blk1->next) {
+ if (blk1->tableId >= 0) {
+ blk1->ExMin = envelopes[blk1->tableId].x1;
+ blk1->ExMax = envelopes[blk1->tableId].x2;
+ blk1->EyMin = envelopes[blk1->tableId].y1;
+ blk1->EyMax = envelopes[blk1->tableId].y2;
+ }
+ }
+ delete[] envelopes;
+ delete[] ending_blocks;
+
+
+ /* set extended bounding boxes of all other blocks
+ * so that they extend in x without hitting neighbours
+ */
+ for (blk1 = blkList; blk1; blk1 = blk1->next) {
+ if (!blk1->tableId >= 0) {
+ double xMax = DBL_MAX;
+ double xMin = DBL_MIN;
+
+ for (blk2 = blkList; blk2; blk2 = blk2->next) {
+ if (blk2 == blk1)
+ continue;
+
+ if (blk1->yMin <= blk2->yMax && blk1->yMax >= blk2->yMin) {
+ if (blk2->xMin < xMax && blk2->xMin > blk1->xMax)
+ xMax = blk2->xMin;
+
+ if (blk2->xMax > xMin && blk2->xMax < blk1->xMin)
+ xMin = blk2->xMax;
+ }
+ }
+
+ for (blk2 = blkList; blk2; blk2 = blk2->next) {
+ if (blk2 == blk1)
+ continue;
+
+ if (blk2->xMax > blk1->ExMax &&
+ blk2->xMax <= xMax &&
+ blk2->yMin >= blk1->yMax) {
+ blk1->ExMax = blk2->xMax;
+ }
+
+ if (blk2->xMin < blk1->ExMin &&
+ blk2->xMin >= xMin &&
+ blk2->yMin >= blk1->yMax)
+ blk1->ExMin = blk2->xMin;
+ }
+ }
+ }
+
+ i = -1;
+ for (blk1 = blkList; blk1; blk1 = blk1->next) {
+ i++;
+ sortPos = blk1->visitDepthFirst(blkList, i, blocks, sortPos, visited);
+ }
+ if (visited) {
+ gfree(visited);
+ }
+
+#if 0 // for debugging
+ printf("*** blocks, after ro sort ***\n");
for (i = 0; i < nBlocks; ++i) {
blk = blocks[i];
printf("block: rot=%d x=%.2f..%.2f y=%.2f..%.2f space=%.2f..%.2f\n",
@@ -2876,44 +3320,34 @@ void TextPage::coalesce(GBool physLayout, GBool doHTML) {
}
}
printf("\n");
+ fflush(stdout);
#endif
// build the flows
//~ this needs to be adjusted for writing mode (vertical text)
//~ this also needs to account for right-to-left column ordering
- blkArray = (TextBlock **)gmallocn(nBlocks, sizeof(TextBlock *));
- memcpy(blkArray, blocks, nBlocks * sizeof(TextBlock *));
+ flow = NULL;
while (flows) {
flow = flows;
flows = flows->next;
delete flow;
}
flows = lastFlow = NULL;
- firstBlkIdx = 0;
- nBlocksLeft = nBlocks;
- while (nBlocksLeft > 0) {
-
- // find the upper-left-most block
- for (; !blkArray[firstBlkIdx]; ++firstBlkIdx) ;
- i = firstBlkIdx;
- blk = blkArray[i];
- for (j = firstBlkIdx + 1; j < nBlocks; ++j) {
- blk1 = blkArray[j];
- if (blk1) {
- if (blk && blk->secondaryDelta(blk1) > 0) {
- break;
- }
- if (blk1->primaryCmp(blk) < 0) {
- i = j;
- blk = blk1;
- }
+ // assume blocks are already in reading order,
+ // and construct flows accordingly.
+ for (i = 0; i < nBlocks; i++) {
+ blk = blocks[i];
+ blk->next = NULL;
+ if (flow) {
+ blk1 = blocks[i - 1];
+ blkSpace = maxBlockSpacing * blk1->lines->words->fontSize;
+ if (blk1->secondaryDelta(blk) <= blkSpace &&
+ blk->isBelow(blk1) &&
+ flow->blockFits(blk, blk1)) {
+ flow->addBlock(blk);
+ continue;
}
}
- blkArray[i] = NULL;
- --nBlocksLeft;
- blk->next = NULL;
-
- // create a new flow, starting with the upper-left-most block
flow = new TextFlow(this, blk);
if (lastFlow) {
lastFlow->next = flow;
@@ -2921,56 +3355,7 @@ void TextPage::coalesce(GBool physLayout, GBool doHTML) {
flows = flow;
}
lastFlow = flow;
- fontSize = blk->lines->words->fontSize;
-
- // push the upper-left-most block on the stack
- blk->stackNext = NULL;
- blkStack = blk;
-
- // find the other blocks in this flow
- while (blkStack) {
-
- // find the upper-left-most block under (but within
- // maxBlockSpacing of) the top block on the stack
- blkSpace = maxBlockSpacing * blkStack->lines->words->fontSize;
- blk = NULL;
- i = -1;
- for (j = firstBlkIdx; j < nBlocks; ++j) {
- blk1 = blkArray[j];
- if (blk1) {
- if (blkStack->secondaryDelta(blk1) > blkSpace) {
- break;
- }
- if (blk && blk->secondaryDelta(blk1) > 0) {
- break;
- }
- if (blk1->isBelow(blkStack) &&
- (!blk || blk1->primaryCmp(blk) < 0)) {
- i = j;
- blk = blk1;
- }
- }
- }
-
- // if a suitable block was found, add it to the flow and push it
- // onto the stack
- if (blk && flow->blockFits(blk, blkStack)) {
- blkArray[i] = NULL;
- --nBlocksLeft;
- blk->next = NULL;
- flow->addBlock(blk);
- fontSize = blk->lines->words->fontSize;
- blk->stackNext = blkStack;
- blkStack = blk;
-
- // otherwise (if there is no block under the top block or the
- // block is not suitable), pop the stack
- } else {
- blkStack = blkStack->stackNext;
- }
- }
}
- gfree(blkArray);
#if 0 // for debugging
printf("*** flows ***\n");
@@ -2980,7 +3365,7 @@ void TextPage::coalesce(GBool physLayout, GBool doHTML) {
flow->priMin, flow->priMax);
for (blk = flow->blocks; blk; blk = blk->next) {
printf(" block: rot=%d x=%.2f..%.2f y=%.2f..%.2f pri=%.2f..%.2f\n",
- blk->rot, blk->xMin, blk->xMax, blk->yMin, blk->yMax,
+ blk->rot, blk->ExMin, blk->ExMax, blk->EyMin, blk->EyMax,
blk->priMin, blk->priMax);
for (line = blk->lines; line; line = line->next) {
printf(" line:\n");
@@ -3215,7 +3600,6 @@ GooString *TextPage::getText(double xMin, double yMin,
double xMax, double yMax) {
GooString *s;
UnicodeMap *uMap;
- GBool isUnicode;
TextBlock *blk;
TextLine *line;
TextLineFrag *frags;
@@ -3230,15 +3614,30 @@ GooString *TextPage::getText(double xMin, double yMin,
s = new GooString();
- if (rawOrder) {
+ // get the output encoding
+ if (!(uMap = globalParams->getTextEncoding())) {
return s;
}
- // get the output encoding
- if (!(uMap = globalParams->getTextEncoding())) {
+ if (rawOrder) {
+ TextWord* word;
+ char mbc[16];
+ int mbc_len;
+
+ for (word = rawWords; word && word <= rawLastWord; word = word->next) {
+ for (j = 0; j < word->getLength(); ++j) {
+ double gXMin, gXMax, gYMin, gYMax;
+ word->getCharBBox(j, &gXMin, &gYMin, &gXMax, &gYMax);
+ if (xMin <= gXMin && gXMax <= xMax && yMin <= gYMin && gYMax <= yMax)
+ {
+ mbc_len = uMap->mapUnicode( *(word->getChar(j)), mbc, sizeof(mbc) );
+ s->append(mbc, mbc_len);
+ }
+ }
+ }
return s;
}
- isUnicode = uMap->isUnicode();
+
spaceLen = uMap->mapUnicode(0x20, space, sizeof(space));
eolLen = 0; // make gcc happy
switch (globalParams->getTextEOL()) {
@@ -3521,14 +3920,17 @@ void TextSelectionDumper::visitLine (TextLine *line,
GooString *TextSelectionDumper::getText (void)
{
- GBool oneRot = gTrue;
GooString *s;
TextLineFrag *frag;
- int i, col;
- GBool multiLine;
+ int i, j;
UnicodeMap *uMap;
char space[8], eol[16];
int spaceLen, eolLen;
+ GooList *strings = NULL;
+ int actual_table = -1;
+ int actual_line = -1;
+ int last_length = 0;
+ TextBlock *actual_block = NULL;
s = new GooString();
@@ -3542,45 +3944,86 @@ GooString *TextSelectionDumper::getText (void)
if (nFrags > 0) {
for (i = 0; i < nFrags; ++i) {
- frags[i].computeCoords(oneRot);
- }
- page->assignColumns(frags, nFrags, oneRot);
-
- // if all lines in the region have the same rotation, use it;
- // otherwise, use the page's primary rotation
- if (oneRot) {
- qsort(frags, nFrags, sizeof(TextLineFrag),
- &TextLineFrag::cmpYXLineRot);
- } else {
- qsort(frags, nFrags, sizeof(TextLineFrag),
- &TextLineFrag::cmpYXPrimaryRot);
- }
-
- col = 0;
- multiLine = gFalse;
- for (i = 0; i < nFrags; ++i) {
frag = &frags[i];
- // insert a return
- if (frag->col < col ||
- (i > 0 && fabs(frag->base - frags[i-1].base) >
- maxIntraLineDelta * frags[i-1].line->words->fontSize)) {
- s->append(eol, eolLen);
- col = 0;
- multiLine = gTrue;
+ if (actual_table >= 0 && frag->line->blk->tableId < 0) {
+ for (j = 0; j < strings->getLength (); j++) {
+ s->append ((GooString*) strings->get (j));
+ s->append (eol, eolLen);
+ delete ((GooString*) strings->get (j));
+ }
+ delete strings;
+ strings = NULL;
+ actual_table = -1;
+ actual_line = -1;
+ actual_block = NULL;
}
- // column alignment
- for (; col < frag->col; ++col) {
- s->append(space, spaceLen);
+ // a table
+ if (frag->line->blk->tableId >= 0) {
+ if (actual_table == -1) {
+ strings = new GooList();
+ actual_table = frag->line->blk->tableId;
+ actual_block = frag->line->blk;
+ actual_line = -1;
+ }
+
+ // the same block
+ if (actual_block == frag->line->blk) {
+ actual_line++;
+ if (actual_line >= strings->getLength ()) {
+ GooString *t = new GooString ();
+ // add some spaces to have this block correctly aligned
+ if (actual_line > 0)
+ for (j = 0; j < ((GooString*) (strings->get (actual_line - 1)))->getLength() - last_length - 1; j++)
+ t->append (space, spaceLen);
+ strings->append (t);
+ }
+ }
+ // another block
+ else {
+ // previous block ended its row
+ if (actual_block->tableEnd) {
+ for (j = 0; j < strings->getLength (); j++) {
+ s->append ((GooString*) strings->get (j));
+ s->append (eol, eolLen);
+ delete ((GooString*) strings->get (j));
+ }
+ delete strings;
+
+ strings = new GooList();
+ GooString *t = new GooString ();
+ strings->append (t);
+ }
+ actual_block = frag->line->blk;
+ actual_line = 0;
+ }
+
+ page->dumpFragment(frag->line->text + frag->start, frag->len, uMap, ((GooString*) strings->get (actual_line)));
+ last_length = frag->len;
+
+ if (!frag->line->blk->tableEnd) {
+ ((GooString*) strings->get (actual_line))->append (space, spaceLen);
+ }
+ }
+ // not a table
+ else {
+ page->dumpFragment (frag->line->text + frag->start, frag->len, uMap, s);
+ s->append (eol, eolLen);
}
-
- // get the fragment text
- col += page->dumpFragment(frag->line->text + frag->start, frag->len, uMap, s);
}
- if (multiLine) {
- s->append(eol, eolLen);
+ if (strings != NULL) {
+ for (j = 0; j < strings->getLength (); j++) {
+ s->append((GooString*) strings->get (j));
+ s->append(eol, eolLen);
+ delete ((GooString*) strings->get (j));
+ }
+ delete strings;
+ strings = NULL;
+ actual_table = -1;
+ actual_line = -1;
+ actual_block = NULL;
}
}
@@ -3810,14 +4253,28 @@ void TextLine::visitSelection(TextSelectionVisitor *visitor,
end = NULL;
current = NULL;
for (p = words; p != NULL; p = p->next) {
- if ((selection->x1 < p->xMax && selection->y1 < p->yMax) ||
- (selection->x2 < p->xMax && selection->y2 < p->yMax))
- if (begin == NULL)
- begin = p;
- if (((selection->x1 > p->xMin && selection->y1 > p->yMin) ||
- (selection->x2 > p->xMin && selection->y2 > p->yMin)) && (begin != NULL)) {
- end = p->next;
- current = p;
+ if (blk->page->primaryLR) {
+ if ((selection->x1 < p->xMax) ||
+ (selection->x2 < p->xMax))
+ if (begin == NULL)
+ begin = p;
+
+ if (((selection->x1 > p->xMin) ||
+ (selection->x2 > p->xMin)) && (begin != NULL)) {
+ end = p->next;
+ current = p;
+ }
+ } else {
+ if ((selection->x1 > p->xMin) ||
+ (selection->x2 > p->xMin))
+ if (begin == NULL)
+ begin = p;
+
+ if (((selection->x1 < p->xMax) ||
+ (selection->x2 < p->xMax)) && (begin != NULL)) {
+ end = p->next;
+ current = p;
+ }
}
}
@@ -3859,75 +4316,112 @@ void TextLine::visitSelection(TextSelectionVisitor *visitor,
void TextBlock::visitSelection(TextSelectionVisitor *visitor,
PDFRectangle *selection,
SelectionStyle style) {
- TextLine *p, *begin, *end;
PDFRectangle child_selection;
- double start_x, start_y, stop_x, stop_y;
-
- begin = NULL;
- end = NULL;
- start_x = selection->x1;
- start_y = selection->y1;
- stop_x = selection->x2;
- stop_y = selection->y2;
-
- for (p = lines; p != NULL; p = p->next) {
- if (selection->x1 < p->xMax && selection->y1 < p->yMax &&
- selection->x2 < p->xMax && selection->y2 < p->yMax && begin == NULL) {
- begin = p;
- if (selection->x1 < selection->x2) {
- start_x = selection->x1;
- start_y = selection->y1;
- stop_x = selection->x2;
- stop_y = selection->y2;
+ double x[2], y[2], d, best_d[2];
+ TextLine *p, *best_line[2];
+ int i, count = 0, best_count[2], start, stop;
+ GBool all[2];
+
+ x[0] = selection->x1;
+ y[0] = selection->y1;
+ x[1] = selection->x2;
+ y[1] = selection->y2;
+
+ for (i = 0; i < 2; i++) {
+ // the first/last lines are often not nearest
+ // the corners, so we have to force them to be
+ // selected when the selection runs outside this
+ // block.
+ if (page->primaryLR) {
+ all[i] = x[i] >= this->xMax && y[i] >= this->yMax;
+ if (x[i] <= this->xMin && y[i] <= this->yMin) {
+ best_line[i] = this->lines;
+ best_count[i] = 1;
+ } else {
+ best_line[i] = NULL;
+ best_count[i] = 0;
+ }
+ } else {
+ all[i] = x[i] <= this->xMin && y[i] >= this->yMax;
+ if (x[i] >= this->xMax && y[i] <= this->yMin) {
+ best_line[i] = this->lines;
+ best_count[i] = 1;
} else {
- start_x = selection->x2;
- start_y = selection->y2;
- stop_x = selection->x1;
- stop_y = selection->y1;
+ best_line[i] = NULL;
+ best_count[i] = 0;
}
- } else if (selection->x1 < p->xMax && selection->y1 < p->yMax && begin == NULL) {
- begin = p;
- start_x = selection->x1;
- start_y = selection->y1;
- stop_x = selection->x2;
- stop_y = selection->y2;
- } else if (selection->x2 < p->xMax && selection->y2 < p->yMax && begin == NULL) {
- begin = p;
- start_x = selection->x2;
- start_y = selection->y2;
- stop_x = selection->x1;
- stop_y = selection->y1;
- }
-
- if (((selection->x1 > p->xMin && selection->y1 > p->yMin) ||
- (selection->x2 > p->xMin && selection->y2 > p->yMin))
- && (begin != NULL))
- end = p->next;
+ }
+ best_d[i] = 0;
+ }
+
+ // find the nearest line to the selection points
+ // using the manhattan distance.
+ for (p = this->lines; p; p = p->next) {
+ count++;
+ for (i = 0; i < 2; i++) {
+ d = fmax(p->xMin - x[i], 0.0) +
+ fmax(x[i] - p->xMax, 0.0) +
+ fmax(p->yMin - y[i], 0.0) +
+ fmax(y[i] - p->yMax, 0.0);
+ if (!best_line[i] || all[i] ||
+ d < best_d[i]) {
+ best_line[i] = p;
+ best_count[i] = count;
+ best_d[i] = d;
+ }
+ }
}
-
- /* Skip empty selection. */
- if (end == begin)
+ // assert: best is always set.
+ if (!best_line[0] || !best_line[1]) {
return;
+ }
- visitor->visitBlock (this, begin, end, selection);
+ // Now decide which point was first.
+ if (best_count[0] < best_count[1] ||
+ (best_count[0] == best_count[1] &&
+ y[0] < y[1])) {
+ start = 0;
+ stop = 1;
+ } else {
+ start = 1;
+ stop = 0;
+ }
- for (p = begin; p != end; p = p->next) {
- if (p == begin && style != selectionStyleLine) {
- child_selection.x1 = start_x;
- child_selection.y1 = start_y;
+ visitor->visitBlock(this, best_line[start], best_line[stop], selection);
+
+ for (p = best_line[start]; p; p = p->next) {
+ if (page->primaryLR) {
+ child_selection.x1 = p->xMin;
+ child_selection.x2 = p->xMax;
} else {
- child_selection.x1 = 0;
- child_selection.y1 = 0;
- }
- if (p->next == end && style != selectionStyleLine) {
- child_selection.x2 = stop_x;
- child_selection.y2 = stop_y;
+ child_selection.x1 = p->xMax;
+ child_selection.x2 = p->xMin;
+ }
+ child_selection.y1 = p->yMin;
+ child_selection.y2 = p->yMax;
+ if (style == selectionStyleLine) {
+ if (p == best_line[start]) {
+ child_selection.x1 = 0;
+ child_selection.y1 = 0;
+ }
+ if (p == best_line[stop]) {
+ child_selection.x2 = page->pageWidth;
+ child_selection.y2 = page->pageHeight;
+ }
} else {
- child_selection.x2 = page->pageWidth;
- child_selection.y2 = page->pageHeight;
+ if (p == best_line[start]) {
+ child_selection.x1 = fmax(p->xMin, fmin(p->xMax, x[start]));
+ child_selection.y1 = fmax(p->yMin, fmin(p->yMax, y[start]));
+ }
+ if (p == best_line[stop]) {
+ child_selection.x2 = fmax(p->xMin, fmin(p->xMax, x[stop]));
+ child_selection.y2 = fmax(p->yMin, fmin(p->yMax, y[stop]));
+ }
}
-
p->visitSelection(visitor, &child_selection, style);
+ if (p == best_line[stop]) {
+ return;
+ }
}
}
@@ -3935,73 +4429,122 @@ void TextPage::visitSelection(TextSelectionVisitor *visitor,
PDFRectangle *selection,
SelectionStyle style)
{
- int i, begin, end;
PDFRectangle child_selection;
- double start_x, start_y, stop_x, stop_y;
- TextBlock *b;
+ double x[2], y[2], d, best_d[2];
+ double xMin, yMin, xMax, yMax;
+ TextFlow *flow, *best_flow[2];
+ TextBlock *blk, *best_block[2];
+ int i, count = 0, best_count[2], start, stop;
- begin = nBlocks;
- end = 0;
- start_x = selection->x1;
- start_y = selection->y1;
- stop_x = selection->x2;
- stop_y = selection->y2;
+ if (!flows)
+ return;
- for (i = 0; i < nBlocks; i++) {
- b = blocks[i];
-
- if (selection->x1 < b->xMax && selection->y1 < b->yMax &&
- selection->x2 < b->xMax && selection->y2 < b->yMax && i < begin) {
- begin = i;
- if (selection->y1 < selection->y2) {
- start_x = selection->x1;
- start_y = selection->y1;
- stop_x = selection->x2;
- stop_y = selection->y2;
- } else {
- start_x = selection->x2;
- start_y = selection->y2;
- stop_x = selection->x1;
- stop_y = selection->y1;
- }
- } else if (selection->x1 < b->xMax && selection->y1 < b->yMax && i < begin) {
- begin = i;
- start_x = selection->x1;
- start_y = selection->y1;
- stop_x = selection->x2;
- stop_y = selection->y2;
- } else if (selection->x2 < b->xMax && selection->y2 < b->yMax && i < begin) {
- begin = i;
- start_x = selection->x2;
- start_y = selection->y2;
- stop_x = selection->x1;
- stop_y = selection->y1;
- }
-
- if ((selection->x1 > b->xMin && selection->y1 > b->yMin) ||
- (selection->x2 > b->xMin && selection->y2 > b->yMin))
- end = i + 1;
+ x[0] = selection->x1;
+ y[0] = selection->y1;
+ x[1] = selection->x2;
+ y[1] = selection->y2;
+
+ xMin = pageWidth;
+ yMin = pageHeight;
+ xMax = 0.0;
+ yMax = 0.0;
+
+ for (i = 0; i < 2; i++) {
+ best_block[i] = NULL;
+ best_flow[i] = NULL;
+ best_count[i] = 0;
+ best_d[i] = 0;
}
- for (i = begin; i < end; i++) {
- if (blocks[i]->xMin < start_x && start_x < blocks[i]->xMax &&
- blocks[i]->yMin < start_y && start_y < blocks[i]->yMax) {
- child_selection.x1 = start_x;
- child_selection.y1 = start_y;
- } else {
- child_selection.x1 = 0;
- child_selection.y1 = 0;
+ // find the nearest blocks to the selection points
+ // using the manhattan distance.
+ for (flow = flows; flow; flow = flow->next) {
+ for (blk = flow->blocks; blk; blk = blk->next) {
+ count++;
+ // the first/last blocks in reading order are
+ // often not the closest to the page corners;
+ // track the corners, force those blocks to
+ // be selected if the selection runs across
+ // multiple pages.
+ xMin = fmin(xMin, blk->xMin);
+ yMin = fmin(yMin, blk->yMin);
+ xMax = fmax(xMax, blk->xMax);
+ yMax = fmax(yMax, blk->yMax);
+ for (i = 0; i < 2; i++) {
+ d = fmax(blk->xMin - x[i], 0.0) +
+ fmax(x[i] - blk->xMax, 0.0) +
+ fmax(blk->yMin - y[i], 0.0) +
+ fmax(y[i] - blk->yMax, 0.0);
+ if (!best_block[i] ||
+ d < best_d[i] ||
+ (!blk->next && !flow->next &&
+ x[i] > xMax && y[i] > yMax)) {
+ best_block[i] = blk;
+ best_flow[i] = flow;
+ best_count[i] = count;
+ best_d[i] = d;
+ }
+ }
}
- if (blocks[i]->xMin < stop_x && stop_x < blocks[i]->xMax &&
- blocks[i]->yMin < stop_y && stop_y < blocks[i]->yMax) {
- child_selection.x2 = stop_x;
- child_selection.y2 = stop_y;
+ }
+ for (i = 0; i < 2; i++) {
+ if (primaryLR) {
+ if (x[i] < xMin && y[i] < yMin) {
+ best_block[i] = flows->blocks;
+ best_flow[i] = flows;
+ best_count[i] = 1;
+ }
} else {
- child_selection.x2 = pageWidth;
- child_selection.y2 = pageHeight;
+ if (x[i] > xMax && y[i] < yMin) {
+ best_block[i] = flows->blocks;
+ best_flow[i] = flows;
+ best_count[i] = 1;
+ }
}
+ }
+ // assert: best is always set.
+ if (!best_block[0] || !best_block[1]) {
+ return;
+ }
- blocks[i]->visitSelection(visitor, &child_selection, style);
+ // Now decide which point was first.
+ if (best_count[0] < best_count[1] ||
+ (best_count[0] == best_count[1] && y[0] < y[1])) {
+ start = 0;
+ stop = 1;
+ } else {
+ start = 1;
+ stop = 0;
+ }
+
+ for (flow = best_flow[start]; flow; flow = flow->next) {
+ if (flow == best_flow[start]) {
+ blk = best_block[start];
+ } else {
+ blk = flow->blocks;
+ }
+ for (; blk; blk = blk->next) {
+ if (primaryLR) {
+ child_selection.x1 = blk->xMin;
+ child_selection.x2 = blk->xMax;
+ } else {
+ child_selection.x1 = blk->xMax;
+ child_selection.x2 = blk->xMin;
+ }
+ child_selection.y1 = blk->yMin;
+ child_selection.y2 = blk->yMax;
+ if (blk == best_block[start]) {
+ child_selection.x1 = fmax(blk->xMin, fmin(blk->xMax, x[start]));
+ child_selection.y1 = fmax(blk->yMin, fmin(blk->yMax, y[start]));
+ }
+ if (blk == best_block[stop]) {
+ child_selection.x2 = fmax(blk->xMin, fmin(blk->xMax, x[stop]));
+ child_selection.y2 = fmax(blk->yMin, fmin(blk->yMax, y[stop]));
+ blk->visitSelection(visitor, &child_selection, style);
+ return;
+ }
+ blk->visitSelection(visitor, &child_selection, style);
+ }
}
}
@@ -4286,24 +4829,13 @@ void TextPage::dump(void *outputStream, TextOutputFunc outputFunc,
dumpFragment(line->text, n, uMap, s);
(*outputFunc)(outputStream, s->getCString(), s->getLength());
delete s;
- if (!line->hyphenated) {
- if (line->next) {
- (*outputFunc)(outputStream, space, spaceLen);
- } else if (blk->next) {
- //~ this is a bit of a kludge - we should really do a more
- //~ intelligent determination of paragraphs
- if (blk->next->lines->words->fontSize ==
- blk->lines->words->fontSize) {
- (*outputFunc)(outputStream, space, spaceLen);
- } else {
- (*outputFunc)(outputStream, eol, eolLen);
- }
- }
+ // output a newline when a hyphen is not suppressed
+ if (n == line->len) {
+ (*outputFunc)(outputStream, eol, eolLen);
}
}
}
(*outputFunc)(outputStream, eol, eolLen);
- (*outputFunc)(outputStream, eol, eolLen);
}
}
@@ -4548,7 +5080,7 @@ void ActualText::beginMC(Dict *properties) {
}
Object obj;
- if (properties->lookup("ActualText", &obj)) {
+ if (properties && properties->lookup("ActualText", &obj)) {
if (obj.isString()) {
actualText = obj.getString();
actualTextBMCLevel = 1;
@@ -4641,6 +5173,7 @@ TextOutputDev::TextOutputDev(char *fileName, GBool physLayoutA,
} else {
error(-1, "Couldn't open text file '%s'", fileName);
ok = gFalse;
+ actualText = NULL;
return;
}
outputFunc = &TextOutputDev_outputToFile;
@@ -4818,7 +5351,7 @@ void TextOutputDev::eoFill(GfxState *state) {
fill(state);
}
-void TextOutputDev::processLink(Link *link, Catalog * /*catalog*/) {
+void TextOutputDev::processLink(AnnotLink *link, Catalog * /*catalog*/) {
double x1, y1, x2, y2;
int xMin, yMin, xMax, yMax, x, y;
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/TextOutputDev.h
index d3ae2f9a696..63f3670e427 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/TextOutputDev.h
@@ -10,11 +10,15 @@
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
// Copyright (C) 2005-2007 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2006 Ed Catmur <ed@catmur.co.uk>
-// Copyright (C) 2007-2008 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007, 2008, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2007 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010 Brian Ewins <brian.ewins@gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -41,7 +45,7 @@ class Gfx;
class GfxFont;
class GfxState;
class UnicodeMap;
-class Link;
+class AnnotLink;
class TextWord;
class TextPool;
@@ -74,6 +78,7 @@ public:
~TextFontInfo();
GBool matches(GfxState *state);
+ GBool matches(TextFontInfo *fontInfo);
#if TEXTOUT_WORD_LIST
// Get the font name (which may be NULL).
@@ -159,7 +164,7 @@ public:
GBool getSpaceAfter() { return spaceAfter; }
#endif
GBool isUnderlined() { return underlined; }
- Link *getLink() { return link; }
+ AnnotLink *getLink() { return link; }
double getEdge(int i) { return edge[i]; }
double getBaseline () { return base; }
GBool hasSpaceAfter () { return spaceAfter; }
@@ -193,7 +198,7 @@ private:
#endif
GBool underlined;
- Link *link;
+ AnnotLink *link;
friend class TextPool;
friend class TextLine;
@@ -361,11 +366,23 @@ public:
private:
+ GBool isBeforeByRule1(TextBlock *blk1);
+ GBool isBeforeByRepeatedRule1(TextBlock *blkList, TextBlock *blk1);
+ GBool isBeforeByRule2(TextBlock *blk1);
+
+ int visitDepthFirst(TextBlock *blkList, int pos1,
+ TextBlock **sorted, int sortPos,
+ GBool* visited);
+
TextPage *page; // the parent page
int rot; // text rotation
double xMin, xMax; // bounding box x coordinates
double yMin, yMax; // bounding box y coordinates
double priMin, priMax; // whitespace bounding box along primary axis
+ double ExMin, ExMax; // extended bounding box x coordinates
+ double EyMin, EyMax; // extended bounding box y coordinates
+ int tableId; // id of table to which this block belongs
+ GBool tableEnd; // is this block at end of line of actual table
TextPool *pool; // pool of words (used only until lines
// are built)
@@ -385,6 +402,7 @@ private:
friend class TextWordList;
friend class TextPage;
friend class TextSelectionPainter;
+ friend class TextSelectionDumper;
};
//------------------------------------------------------------------------
@@ -496,7 +514,7 @@ public:
void addUnderline(double x0, double y0, double x1, double y1);
// Add a hyperlink.
- void addLink(int xMin, int yMin, int xMax, int yMax, Link *link);
+ void addLink(int xMin, int yMin, int xMax, int yMax, AnnotLink *link);
// Coalesce strings that look like parts of the same line.
void coalesce(GBool physLayout, GBool doHTML);
@@ -565,7 +583,7 @@ private:
~TextPage();
void clear();
- void assignColumns(TextLineFrag *frags, int nFrags, int rot);
+ void assignColumns(TextLineFrag *frags, int nFrags, GBool rot);
int dumpFragment(Unicode *text, int len, UnicodeMap *uMap, GooString *s);
GBool rawOrder; // keep text in content stream order
@@ -713,7 +731,7 @@ public:
virtual void eoFill(GfxState *state);
//----- link borders
- virtual void processLink(Link *link, Catalog *catalog);
+ virtual void processLink(AnnotLink *link, Catalog *catalog);
//----- special access
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMap.cc
index 381e4ca1fce..fda0758bc00 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMap.cc
@@ -6,6 +6,20 @@
//
//========================================================================
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2010 Jakub Wilk <ubanus@users.sf.net>
+//
+// 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
+//
+//========================================================================
+
#include <config.h>
#ifdef USE_GCC_PRAGMAS
@@ -43,6 +57,7 @@ UnicodeMap *UnicodeMap::parse(GooString *encodingNameA) {
char buf[256];
int line, nBytes, i, x;
char *tok1, *tok2, *tok3;
+ char *tokptr;
if (!(f = globalParams->getUnicodeMapFile(encodingNameA))) {
error(-1, "Couldn't find unicodeMap file for the '%s' encoding",
@@ -58,9 +73,9 @@ UnicodeMap *UnicodeMap::parse(GooString *encodingNameA) {
line = 1;
while (getLine(buf, sizeof(buf), f)) {
- if ((tok1 = strtok(buf, " \t\r\n")) &&
- (tok2 = strtok(NULL, " \t\r\n"))) {
- if (!(tok3 = strtok(NULL, " \t\r\n"))) {
+ if ((tok1 = strtok_r(buf, " \t\r\n", &tokptr)) &&
+ (tok2 = strtok_r(NULL, " \t\r\n", &tokptr))) {
+ if (!(tok3 = strtok_r(NULL, " \t\r\n", &tokptr))) {
tok3 = tok2;
tok2 = tok1;
}
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMap.h
index 6f031634e03..6f031634e03 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMapTables.h
index 9c510346164..9c510346164 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeTypeTable.cc
index c0483a5ef61..f18930f38de 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeTypeTable.cc
@@ -10,6 +10,9 @@
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
// Copyright (C) 2006, 2007 Ed Catmur <ed@catmur.co.uk>
// Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeTypeTable.h
index 939e9160f58..19cd75d17f2 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/UnicodeTypeTable.h
@@ -10,6 +10,9 @@
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
// Copyright (C) 2006 Ed Catmur <ed@catmur.co.uk>
//
// To see a description of the changes please see the Changelog file that
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.cc
new file mode 100644
index 00000000000..cba8d0ac512
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.cc
@@ -0,0 +1,117 @@
+//========================================================================
+//
+// ViewerPreferences.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2011 Pino Toscano <pino@kde.org>
+//
+//========================================================================
+
+#include <config.h>
+
+#include "ViewerPreferences.h"
+
+#include "Object.h"
+#include "Dict.h"
+
+ViewerPreferences::ViewerPreferences(Dict *prefDict)
+{
+ init();
+
+ Object obj;
+
+ if (prefDict->lookup("HideToolbar", &obj)->isBool()) {
+ hideToolbar = obj.getBool();
+ }
+ obj.free();
+
+ if (prefDict->lookup("HideMenubar", &obj)->isBool()) {
+ hideMenubar = obj.getBool();
+ }
+ obj.free();
+
+ if (prefDict->lookup("HideWindowUI", &obj)->isBool()) {
+ hideWindowUI = obj.getBool();
+ }
+ obj.free();
+
+ if (prefDict->lookup("FitWindow", &obj)->isBool()) {
+ fitWindow = obj.getBool();
+ }
+ obj.free();
+
+ if (prefDict->lookup("CenterWindow", &obj)->isBool()) {
+ centerWindow = obj.getBool();
+ }
+ obj.free();
+
+ if (prefDict->lookup("DisplayDocTitle", &obj)->isBool()) {
+ displayDocTitle = obj.getBool();
+ }
+ obj.free();
+
+ if (prefDict->lookup("NonFullScreenPageMode", &obj)->isName()) {
+ const char *mode = obj.getName();
+ if (!strcmp(mode, "UseNone")) {
+ nonFullScreenPageMode = nfpmUseNone;
+ } else if (!strcmp(mode, "UseOutlines")) {
+ nonFullScreenPageMode = nfpmUseOutlines;
+ } else if (!strcmp(mode, "UseThumbs")) {
+ nonFullScreenPageMode = nfpmUseThumbs;
+ } else if (!strcmp(mode, "UseOC")) {
+ nonFullScreenPageMode = nfpmUseOC;
+ }
+ }
+ obj.free();
+
+ if (prefDict->lookup("Direction", &obj)->isName()) {
+ const char *dir = obj.getName();
+ if (!strcmp(dir, "L2R")) {
+ direction = directionL2R;
+ } else if (!strcmp(dir, "R2L")) {
+ direction = directionR2L;
+ }
+ }
+ obj.free();
+
+ if (prefDict->lookup("PrintScaling", &obj)->isName()) {
+ const char *ps = obj.getName();
+ if (!strcmp(ps, "None")) {
+ printScaling = printScalingNone;
+ } else if (!strcmp(ps, "AppDefault")) {
+ printScaling = printScalingAppDefault;
+ }
+ }
+ obj.free();
+
+ if (prefDict->lookup("Duplex", &obj)->isName()) {
+ const char *d = obj.getName();
+ if (!strcmp(d, "Simplex")) {
+ duplex = duplexSimplex;
+ } else if (!strcmp(d, "DuplexFlipShortEdge")) {
+ duplex = duplexDuplexFlipShortEdge;
+ } else if (!strcmp(d, "DuplexFlipLongEdge")) {
+ duplex = duplexDuplexFlipLongEdge;
+ }
+ }
+ obj.free();
+}
+
+ViewerPreferences::~ViewerPreferences()
+{
+}
+
+void ViewerPreferences::init()
+{
+ hideToolbar = gFalse;
+ hideMenubar = gFalse;
+ hideWindowUI = gFalse;
+ fitWindow = gFalse;
+ centerWindow = gFalse;
+ displayDocTitle = gFalse;
+ nonFullScreenPageMode = nfpmUseNone;
+ direction = directionL2R;
+ printScaling = printScalingAppDefault;
+ duplex = duplexNone;
+}
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.h
new file mode 100644
index 00000000000..8cdc4d40a73
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/ViewerPreferences.h
@@ -0,0 +1,76 @@
+//========================================================================
+//
+// ViewerPreferences.h
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2011 Pino Toscano <pino@kde.org>
+//
+//========================================================================
+
+#ifndef VIEWERPREFERENCES_H
+#define VIEWERPREFERENCES_H
+
+#include "goo/gtypes.h"
+
+class Dict;
+
+//------------------------------------------------------------------------
+// ViewerPreferences
+//------------------------------------------------------------------------
+
+class ViewerPreferences {
+public:
+
+ enum NonFullScreenPageMode {
+ nfpmUseNone,
+ nfpmUseOutlines,
+ nfpmUseThumbs,
+ nfpmUseOC
+ };
+ enum Direction {
+ directionL2R,
+ directionR2L
+ };
+ enum PrintScaling {
+ printScalingNone,
+ printScalingAppDefault
+ };
+ enum Duplex {
+ duplexNone,
+ duplexSimplex,
+ duplexDuplexFlipShortEdge,
+ duplexDuplexFlipLongEdge
+ };
+
+ ViewerPreferences(Dict *prefDict);
+ ~ViewerPreferences();
+
+ GBool getHideToolbar() const { return hideToolbar; }
+ GBool getHideMenubar() const { return hideMenubar; }
+ GBool getHideWindowUI() const { return hideWindowUI; }
+ GBool getFitWindow() const { return fitWindow; }
+ GBool getCenterWindow() const { return centerWindow; }
+ GBool getDisplayDocTitle() const { return displayDocTitle; }
+ NonFullScreenPageMode getNonFullScreenPageMode() const { return nonFullScreenPageMode; }
+ Direction getDirection() const { return direction; }
+ PrintScaling getPrintScaling() const { return printScaling; }
+ Duplex getDuplex() const { return duplex; }
+
+private:
+
+ void init();
+
+ GBool hideToolbar;
+ GBool hideMenubar;
+ GBool hideWindowUI;
+ GBool fitWindow;
+ GBool centerWindow;
+ GBool displayDocTitle;
+ NonFullScreenPageMode nonFullScreenPageMode;
+ Direction direction;
+ PrintScaling printScaling;
+ Duplex duplex;
+};
+
+#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/XRef.cc
index 3ab23d9b88a..970a00bf25a 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/XRef.cc
@@ -15,10 +15,11 @@
//
// Copyright (C) 2005 Dan Sheridan <dan.sheridan@postman.org.uk>
// Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2006, 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2008, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
+// Copyright (C) 2009, 2010 Ilya Gorenbein <igorenbein@finjan.com>
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
//
// 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
@@ -45,11 +46,7 @@
#include "Error.h"
#include "ErrorCodes.h"
#include "XRef.h"
-
-//------------------------------------------------------------------------
-
-#define xrefSearchSize 1024 // read this many bytes at end of file
- // to look for 'startxref'
+#include "PopplerCache.h"
//------------------------------------------------------------------------
// Permission bits
@@ -97,6 +94,37 @@ private:
GBool ok;
};
+class ObjectStreamKey : public PopplerCacheKey
+{
+ public:
+ ObjectStreamKey(int num) : objStrNum(num)
+ {
+ }
+
+ bool operator==(const PopplerCacheKey &key) const
+ {
+ const ObjectStreamKey *k = static_cast<const ObjectStreamKey*>(&key);
+ return objStrNum == k->objStrNum;
+ }
+
+ const int objStrNum;
+};
+
+class ObjectStreamItem : public PopplerCacheItem
+{
+ public:
+ ObjectStreamItem(ObjectStream *objStr) : objStream(objStr)
+ {
+ }
+
+ ~ObjectStreamItem()
+ {
+ delete objStream;
+ }
+
+ ObjectStream *objStream;
+};
+
ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
Stream *str;
Parser *parser;
@@ -226,27 +254,28 @@ Object *ObjectStream::getObject(int objIdx, int objNum, Object *obj) {
// XRef
//------------------------------------------------------------------------
-XRef::XRef() {
+void XRef::init() {
ok = gTrue;
errCode = errNone;
entries = NULL;
+ capacity = 0;
size = 0;
streamEnds = NULL;
streamEndsLen = 0;
- objStr = NULL;
+ objStrs = new PopplerCache(5);
+ mainXRefEntriesOffset = 0;
+ xRefStream = gFalse;
}
-XRef::XRef(BaseStream *strA) {
- Guint pos;
+XRef::XRef() {
+ init();
+}
+
+XRef::XRef(BaseStream *strA, Guint pos, Guint mainXRefEntriesOffsetA, GBool *wasReconstructed, GBool reconstruct) {
Object obj;
- ok = gTrue;
- errCode = errNone;
- size = 0;
- entries = NULL;
- streamEnds = NULL;
- streamEndsLen = 0;
- objStr = NULL;
+ init();
+ mainXRefEntriesOffset = mainXRefEntriesOffsetA;
encrypted = gFalse;
permFlags = defPermFlags;
@@ -255,44 +284,69 @@ XRef::XRef(BaseStream *strA) {
// read the trailer
str = strA;
start = str->getStart();
- pos = getStartXref();
-
- // if there was a problem with the 'startxref' position, try to
- // reconstruct the xref table
- if (pos == 0) {
- if (!(ok = constructXRef())) {
- errCode = errDamaged;
- return;
- }
+ prevXRefOffset = pos;
- // read the xref table
- } else {
- while (readXRef(&pos)) ;
+ if (reconstruct && !(ok = constructXRef(wasReconstructed)))
+ {
+ errCode = errDamaged;
+ return;
+ }
+ else
+ {
+ // if there was a problem with the 'startxref' position, try to
+ // reconstruct the xref table
+ if (prevXRefOffset == 0) {
+ if (!(ok = constructXRef(wasReconstructed))) {
+ errCode = errDamaged;
+ return;
+ }
- // if there was a problem with the xref table,
- // try to reconstruct it
- if (!ok) {
- if (!(ok = constructXRef())) {
- errCode = errDamaged;
- return;
+ // read the xref table
+ } else {
+ std::vector<Guint> followedXRefStm;
+ readXRef(&prevXRefOffset, &followedXRefStm);
+
+ // if there was a problem with the xref table,
+ // try to reconstruct it
+ if (!ok) {
+ if (!(ok = constructXRef(wasReconstructed))) {
+ errCode = errDamaged;
+ return;
+ }
}
}
- }
- // get the root dictionary (catalog) object
- trailerDict.dictLookupNF("Root", &obj);
- if (obj.isRef()) {
- rootNum = obj.getRefNum();
- rootGen = obj.getRefGen();
- obj.free();
- } else {
+ // set size to (at least) the size specified in trailer dict
+ trailerDict.dictLookupNF("Size", &obj);
+ if (!obj.isInt()) {
+ error(-1, "No valid XRef size in trailer");
+ } else {
+ if (obj.getInt() > size) {
+ if (resize(obj.getInt()) != obj.getInt()) {
+ if (!(ok = constructXRef(wasReconstructed))) {
+ obj.free();
+ errCode = errDamaged;
+ return;
+ }
+ }
+ }
+ }
obj.free();
- if (!(ok = constructXRef())) {
- errCode = errDamaged;
- return;
+
+ // get the root dictionary (catalog) object
+ trailerDict.dictLookupNF("Root", &obj);
+ if (obj.isRef()) {
+ rootNum = obj.getRefNum();
+ rootGen = obj.getRefGen();
+ obj.free();
+ } else {
+ obj.free();
+ if (!(ok = constructXRef(wasReconstructed))) {
+ errCode = errDamaged;
+ return;
+ }
}
}
-
// now set the trailer dictionary's xref pointer so we can fetch
// indirect objects from it
trailerDict.getDict()->setXRef(this);
@@ -308,45 +362,64 @@ XRef::~XRef() {
if (streamEnds) {
gfree(streamEnds);
}
- if (objStr) {
- delete objStr;
+ if (objStrs) {
+ delete objStrs;
}
}
-// Read the 'startxref' position.
-Guint XRef::getStartXref() {
- char buf[xrefSearchSize+1];
- char *p;
- int c, n, i;
+int XRef::reserve(int newSize)
+{
+ if (newSize > capacity) {
+
+ int realNewSize;
+ for (realNewSize = capacity ? 2 * capacity : 1024;
+ newSize > realNewSize && realNewSize > 0;
+ realNewSize <<= 1) ;
+ if ((realNewSize < 0) ||
+ (realNewSize >= INT_MAX / (int)sizeof(XRefEntry))) {
+ return 0;
+ }
- // read last xrefSearchSize bytes
- str->setPos(xrefSearchSize, -1);
- for (n = 0; n < xrefSearchSize; ++n) {
- if ((c = str->getChar()) == EOF) {
- break;
+ void *p = greallocn_checkoverflow(entries, realNewSize, sizeof(XRefEntry));
+ if (p == NULL) {
+ return 0;
}
- buf[n] = c;
+
+ entries = (XRefEntry *) p;
+ capacity = realNewSize;
+
}
- buf[n] = '\0';
- // find startxref
- for (i = n - 9; i >= 0; --i) {
- if (!strncmp(&buf[i], "startxref", 9)) {
- break;
+ return capacity;
+}
+
+int XRef::resize(int newSize)
+{
+ if (newSize > size) {
+
+ if (reserve(newSize) < newSize) return size;
+
+ for (int i = size; i < newSize; ++i) {
+ entries[i].offset = 0xffffffff;
+ entries[i].type = xrefEntryNone;
+ entries[i].obj.initNull ();
+ entries[i].updated = false;
+ entries[i].gen = 0;
+ }
+ } else {
+ for (int i = newSize; i < size; i++) {
+ entries[i].obj.free ();
}
}
- if (i < 0) {
- return 0;
- }
- for (p = &buf[i+9]; isspace(*p); ++p) ;
- lastXRefPos = strToUnsigned(p);
- return lastXRefPos;
+ size = newSize;
+
+ return size;
}
// Read one xref table section. Also reads the associated trailer
// dictionary, and returns the prev pointer (if any).
-GBool XRef::readXRef(Guint *pos) {
+GBool XRef::readXRef(Guint *pos, std::vector<Guint> *followedXRefStm) {
Parser *parser;
Object obj;
GBool more;
@@ -362,7 +435,7 @@ GBool XRef::readXRef(Guint *pos) {
// parse an old-style xref table
if (obj.isCmd("xref")) {
obj.free();
- more = readXRefTable(parser, pos);
+ more = readXRefTable(parser, pos, followedXRefStm);
// parse an xref stream
} else if (obj.isInt()) {
@@ -378,6 +451,9 @@ GBool XRef::readXRef(Guint *pos) {
if (!parser->getObj(&obj)->isStream()) {
goto err1;
}
+ if (trailerDict.isNone()) {
+ xRefStream = gTrue;
+ }
more = readXRefStream(obj.getStream(), pos);
obj.free();
@@ -395,12 +471,12 @@ GBool XRef::readXRef(Guint *pos) {
return gFalse;
}
-GBool XRef::readXRefTable(Parser *parser, Guint *pos) {
+GBool XRef::readXRefTable(Parser *parser, Guint *pos, std::vector<Guint> *followedXRefStm) {
XRefEntry entry;
GBool more;
Object obj, obj2;
Guint pos2;
- int first, n, newSize, i;
+ int first, n, i;
while (1) {
parser->getObj(&obj);
@@ -419,29 +495,13 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos) {
n = obj.getInt();
obj.free();
if (first < 0 || n < 0 || first + n < 0) {
- goto err1;
+ goto err0;
}
if (first + n > size) {
- for (newSize = size ? 2 * size : 1024;
- first + n > newSize && newSize > 0;
- newSize <<= 1) ;
- if (newSize < 0) {
- goto err1;
- }
- if (newSize >= INT_MAX / (int)sizeof(XRefEntry)) {
+ if (resize(first + n) != first + n) {
error(-1, "Invalid 'obj' parameters'");
- goto err1;
+ goto err0;
}
-
- entries = (XRefEntry *)greallocn(entries, newSize, sizeof(XRefEntry));
- for (i = size; i < newSize; ++i) {
- entries[i].offset = 0xffffffff;
- entries[i].type = xrefEntryFree;
- entries[i].obj.initNull ();
- entries[i].updated = false;
- entries[i].gen = 0;
- }
- size = newSize;
}
for (i = first; i < first + n; ++i) {
if (!parser->getObj(&obj)->isInt()) {
@@ -509,7 +569,15 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos) {
// check for an 'XRefStm' key
if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) {
pos2 = (Guint)obj2.getInt();
- readXRef(&pos2);
+ for (size_t i = 0; ok == gTrue && i < followedXRefStm->size(); ++i) {
+ if (followedXRefStm->at(i) == pos2) {
+ ok = gFalse;
+ }
+ }
+ if (ok) {
+ followedXRefStm->push_back(pos2);
+ readXRef(&pos2, followedXRefStm);
+ }
if (!ok) {
obj2.free();
goto err1;
@@ -522,6 +590,7 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos) {
err1:
obj.free();
+ err0:
ok = gFalse;
return gFalse;
}
@@ -544,19 +613,10 @@ GBool XRef::readXRefStream(Stream *xrefStr, Guint *pos) {
goto err1;
}
if (newSize > size) {
- if (newSize >= INT_MAX / (int)sizeof(XRefEntry)) {
- error(-1, "Invalid 'size' parameter.");
- return gFalse;
- }
- entries = (XRefEntry *)greallocn(entries, newSize, sizeof(XRefEntry));
- for (i = size; i < newSize; ++i) {
- entries[i].offset = 0xffffffff;
- entries[i].type = xrefEntryFree;
- entries[i].obj.initNull ();
- entries[i].updated = false;
- entries[i].gen = 0;
+ if (resize(newSize) != newSize) {
+ error(-1, "Invalid 'size' parameter");
+ goto err0;
}
- size = newSize;
}
if (!dict->lookupNF("W", &obj)->isArray() ||
@@ -629,31 +689,16 @@ GBool XRef::readXRefStream(Stream *xrefStr, Guint *pos) {
GBool XRef::readXRefStreamSection(Stream *xrefStr, int *w, int first, int n) {
Guint offset;
- int type, gen, c, newSize, i, j;
+ int type, gen, c, i, j;
if (first + n < 0) {
return gFalse;
}
if (first + n > size) {
- for (newSize = size ? 2 * size : 1024;
- first + n > newSize && newSize > 0;
- newSize <<= 1) ;
- if (newSize < 0) {
+ if (resize(first + n) != size) {
+ error(-1, "Invalid 'size' inside xref table");
return gFalse;
}
- if (newSize >= INT_MAX / (int)sizeof(XRefEntry)) {
- error(-1, "Invalid 'size' inside xref table.");
- return gFalse;
- }
- entries = (XRefEntry *)greallocn(entries, newSize, sizeof(XRefEntry));
- for (i = size; i < newSize; ++i) {
- entries[i].offset = 0xffffffff;
- entries[i].type = xrefEntryFree;
- entries[i].obj.initNull ();
- entries[i].updated = false;
- entries[i].gen = 0;
- }
- size = newSize;
}
for (i = first; i < first + n; ++i) {
if (w[0] == 0) {
@@ -705,7 +750,7 @@ GBool XRef::readXRefStreamSection(Stream *xrefStr, int *w, int first, int n) {
}
// Attempt to construct an xref table for a damaged file.
-GBool XRef::constructXRef() {
+GBool XRef::constructXRef(GBool *wasReconstructed) {
Parser *parser;
Object newTrailerDict, obj;
char buf[256];
@@ -714,13 +759,13 @@ GBool XRef::constructXRef() {
int newSize;
int streamEndsSize;
char *p;
- int i;
GBool gotRoot;
char* token = NULL;
bool oneCycle = true;
int offset = 0;
gfree(entries);
+ capacity = 0;
size = 0;
entries = NULL;
@@ -728,6 +773,11 @@ GBool XRef::constructXRef() {
gotRoot = gFalse;
streamEndsLen = streamEndsSize = 0;
+ if (wasReconstructed)
+ {
+ *wasReconstructed = true;
+ }
+
str->reset();
while (1) {
pos = str->getPos();
@@ -802,19 +852,10 @@ GBool XRef::constructXRef() {
error(-1, "Bad object number");
return gFalse;
}
- if (newSize >= INT_MAX / (int)sizeof(XRefEntry)) {
- error(-1, "Invalid 'obj' parameters.");
+ if (resize(newSize) != newSize) {
+ error(-1, "Invalid 'obj' parameters");
return gFalse;
}
- entries = (XRefEntry *)
- greallocn(entries, newSize, sizeof(XRefEntry));
- for (i = size; i < newSize; ++i) {
- entries[i].offset = 0xffffffff;
- entries[i].type = xrefEntryFree;
- entries[i].obj.initNull ();
- entries[i].updated = false;
- }
- size = newSize;
}
if (entries[num].type == xrefEntryFree ||
gen >= entries[num].gen) {
@@ -888,13 +929,17 @@ GBool XRef::okToPrint(GBool ignoreOwnerPW) {
// 2 (and we are allowed to print at all), or with security handler rev
// 3 and we are allowed to print, and bit 12 is set.
GBool XRef::okToPrintHighRes(GBool ignoreOwnerPW) {
- if (2 == encRevision) {
- return (okToPrint(ignoreOwnerPW));
- } else if (encRevision >= 3) {
- return (okToPrint(ignoreOwnerPW) && (permFlags & permHighResPrint));
+ if (encrypted) {
+ if (2 == encRevision) {
+ return (okToPrint(ignoreOwnerPW));
+ } else if (encRevision >= 3) {
+ return (okToPrint(ignoreOwnerPW) && (permFlags & permHighResPrint));
+ } else {
+ // something weird - unknown security handler version
+ return gFalse;
+ }
} else {
- // something weird - unknown security handler version
- return gFalse;
+ return gTrue;
}
}
@@ -922,21 +967,30 @@ GBool XRef::okToAssemble(GBool ignoreOwnerPW) {
return (!ignoreOwnerPW && ownerPasswordOk) || (permFlags & permAssemble);
}
-Object *XRef::fetch(int num, int gen, Object *obj) {
+Object *XRef::fetch(int num, int gen, Object *obj, std::set<int> *fetchOriginatorNums) {
XRefEntry *e;
Parser *parser;
Object obj1, obj2, obj3;
+ bool deleteFetchOriginatorNums = false;
+ std::pair<std::set<int>::iterator, bool> fetchInsertResult;
// check for bogus ref - this can happen in corrupted PDF files
- if (num < 0 || num >= size) {
- goto err;
+ if (num < 0 || num >= size || (fetchOriginatorNums != NULL && fetchOriginatorNums->find(num) != fetchOriginatorNums->end())) {
+ goto err2;
}
- e = &entries[num];
+ e = getEntry(num);
if(!e->obj.isNull ()) { //check for updated object
obj = e->obj.copy(obj);
return obj;
}
+
+ if (fetchOriginatorNums == NULL) {
+ fetchOriginatorNums = new std::set<int>();
+ deleteFetchOriginatorNums = true;
+ }
+ fetchInsertResult = fetchOriginatorNums->insert(num);
+
switch (e->type) {
case xrefEntryUncompressed:
@@ -948,9 +1002,9 @@ Object *XRef::fetch(int num, int gen, Object *obj) {
new Lexer(this,
str->makeSubStream(start + e->offset, gFalse, 0, &obj1)),
gTrue);
- parser->getObj(&obj1);
- parser->getObj(&obj2);
- parser->getObj(&obj3);
+ parser->getObj(&obj1, fetchOriginatorNums);
+ parser->getObj(&obj2, fetchOriginatorNums);
+ parser->getObj(&obj3, fetchOriginatorNums);
if (!obj1.isInt() || obj1.getInt() != num ||
!obj2.isInt() || obj2.getInt() != gen ||
!obj3.isCmd("obj")) {
@@ -985,7 +1039,7 @@ Object *XRef::fetch(int num, int gen, Object *obj) {
goto err;
}
parser->getObj(obj, encrypted ? fileKey : (Guchar *)NULL,
- encAlgorithm, keyLength, num, gen);
+ encAlgorithm, keyLength, num, gen, fetchOriginatorNums);
obj1.free();
obj2.free();
obj3.free();
@@ -993,30 +1047,53 @@ Object *XRef::fetch(int num, int gen, Object *obj) {
break;
case xrefEntryCompressed:
+ {
if (gen != 0) {
goto err;
}
- if (!objStr || objStr->getObjStrNum() != (int)e->offset) {
- if (objStr) {
- delete objStr;
- }
+
+ ObjectStream *objStr = NULL;
+ ObjectStreamKey key(e->offset);
+ PopplerCacheItem *item = objStrs->lookup(key);
+ if (item) {
+ ObjectStreamItem *it = static_cast<ObjectStreamItem *>(item);
+ objStr = it->objStream;
+ }
+
+ if (!objStr) {
objStr = new ObjectStream(this, e->offset);
if (!objStr->isOk()) {
delete objStr;
objStr = NULL;
goto err;
+ } else {
+ ObjectStreamKey *newkey = new ObjectStreamKey(e->offset);
+ ObjectStreamItem *newitem = new ObjectStreamItem(objStr);
+ objStrs->put(newkey, newitem);
}
}
objStr->getObject(e->gen, num, obj);
- break;
+ }
+ break;
default:
goto err;
}
-
+
+ if (deleteFetchOriginatorNums) {
+ delete fetchOriginatorNums;
+ } else {
+ fetchOriginatorNums->erase(fetchInsertResult.first);
+ }
return obj;
err:
+ if (deleteFetchOriginatorNums) {
+ delete fetchOriginatorNums;
+ } else {
+ fetchOriginatorNums->erase(fetchInsertResult.first);
+ }
+ err2:
return obj->initNull();
}
@@ -1052,20 +1129,20 @@ GBool XRef::getStreamEnd(Guint streamStart, Guint *streamEnd) {
return gTrue;
}
-int XRef::getNumEntry(Guint offset) const
+int XRef::getNumEntry(Guint offset)
{
if (size > 0)
{
int res = 0;
- Guint resOffset = entries[0].offset;
- XRefEntry e;
+ Guint resOffset = getEntry(0)->offset;
+ XRefEntry *e;
for (int i = 1; i < size; ++i)
{
- e = entries[i];
- if (e.offset < offset && e.offset >= resOffset)
+ e = getEntry(i);
+ if (e->offset < offset && e->offset >= resOffset)
{
res = i;
- resOffset = e.offset;
+ resOffset = e->offset;
}
}
return res;
@@ -1073,21 +1150,12 @@ int XRef::getNumEntry(Guint offset) const
else return -1;
}
-Guint XRef::strToUnsigned(char *s) {
- Guint x;
- char *p;
- int i;
-
- x = 0;
- for (p = s, i = 0; *p && isdigit(*p) && i < 10; ++p, ++i) {
- x = 10 * x + (*p - '0');
- }
- return x;
-}
-
void XRef::add(int num, int gen, Guint offs, GBool used) {
if (num >= size) {
- entries = (XRefEntry *)greallocn(entries, num + 1, sizeof(XRefEntry));
+ if (num >= capacity) {
+ entries = (XRefEntry *)greallocn(entries, num + 1, sizeof(XRefEntry));
+ capacity = num + 1;
+ }
for (int i = size; i < num + 1; ++i) {
entries[i].offset = 0xffffffff;
entries[i].type = xrefEntryFree;
@@ -1097,7 +1165,7 @@ void XRef::add(int num, int gen, Guint offs, GBool used) {
}
size = num + 1;
}
- XRefEntry *e = &entries[num];
+ XRefEntry *e = getEntry(num);
e->gen = gen;
e->obj.initNull ();
e->updated = false;
@@ -1115,27 +1183,26 @@ void XRef::setModifiedObject (Object* o, Ref r) {
error(-1,"XRef::setModifiedObject on unknown ref: %i, %i\n", r.num, r.gen);
return;
}
- entries[r.num].obj.free();
- o->copy(&entries[r.num].obj);
- entries[r.num].updated = true;
+ XRefEntry *e = getEntry(r.num);
+ e->obj.free();
+ o->copy(&(e->obj));
+ e->updated = true;
}
Ref XRef::addIndirectObject (Object* o) {
int entryIndexToUse = -1;
for (int i = 1; entryIndexToUse == -1 && i < size; ++i) {
- if (entries[i].type == xrefEntryFree) entryIndexToUse = i;
+ if (getEntry(i)->type == xrefEntryFree) entryIndexToUse = i;
}
XRefEntry *e;
if (entryIndexToUse == -1) {
entryIndexToUse = size;
- size++;
- entries = (XRefEntry *)greallocn(entries, size, sizeof(XRefEntry));
- e = &entries[entryIndexToUse];
- e->gen = 0;
+ add(entryIndexToUse, 0, 0, gFalse);
+ e = getEntry(entryIndexToUse);
} else {
//reuse a free entry
- e = &entries[entryIndexToUse];
+ e = getEntry(entryIndexToUse);
//we don't touch gen number, because it should have been
//incremented when the object was deleted
}
@@ -1151,13 +1218,13 @@ Ref XRef::addIndirectObject (Object* o) {
void XRef::writeToFile(OutStream* outStr, GBool writeAllEntries) {
//create free entries linked-list
- if (entries[0].gen != 65535) {
+ if (getEntry(0)->gen != 65535) {
error(-1, "XRef::writeToFile, entry 0 of the XRef is invalid (gen != 65535)\n");
}
int lastFreeEntry = 0;
for (int i=0; i<size; i++) {
- if (entries[i].type == xrefEntryFree) {
- entries[lastFreeEntry].offset = i;
+ if (getEntry(i)->type == xrefEntryFree) {
+ getEntry(lastFreeEntry)->offset = i;
lastFreeEntry = i;
}
}
@@ -1167,10 +1234,10 @@ void XRef::writeToFile(OutStream* outStr, GBool writeAllEntries) {
outStr->printf("xref\r\n");
outStr->printf("%i %i\r\n", 0, size);
for (int i=0; i<size; i++) {
- XRefEntry &e = entries[i];
+ XRefEntry *e = getEntry(i);
- if(e.gen > 65535) e.gen = 65535; //cap generation number to 65535 (required by PDFReference)
- outStr->printf("%010i %05i %c\r\n", e.offset, e.gen, (e.type==xrefEntryFree)?'f':'n');
+ if(e->gen > 65535) e->gen = 65535; //cap generation number to 65535 (required by PDFReference)
+ outStr->printf("%010i %05i %c\r\n", e->offset, e->gen, (e->type==xrefEntryFree)?'f':'n');
}
} else {
//write the new xref
@@ -1179,16 +1246,16 @@ void XRef::writeToFile(OutStream* outStr, GBool writeAllEntries) {
while (i < size) {
int j;
for(j=i; j<size; j++) { //look for consecutive entries
- if ((entries[j].type == xrefEntryFree) && (entries[j].gen == 0))
+ if ((getEntry(j)->type == xrefEntryFree) && (getEntry(j)->gen == 0))
break;
}
if (j-i != 0)
{
outStr->printf("%i %i\r\n", i, j-i);
for (int k=i; k<j; k++) {
- XRefEntry &e = entries[k];
- if(e.gen > 65535) e.gen = 65535; //cap generation number to 65535 (required by PDFReference)
- outStr->printf("%010i %05i %c\r\n", e.offset, e.gen, (e.type==xrefEntryFree)?'f':'n');
+ XRefEntry *e = getEntry(k);
+ if(e->gen > 65535) e->gen = 65535; //cap generation number to 65535 (required by PDFReference)
+ outStr->printf("%010i %05i %c\r\n", e->offset, e->gen, (e->type==xrefEntryFree)?'f':'n');
}
i = j;
}
@@ -1197,3 +1264,88 @@ void XRef::writeToFile(OutStream* outStr, GBool writeAllEntries) {
}
}
+GBool XRef::parseEntry(Guint offset, XRefEntry *entry)
+{
+ GBool r;
+
+ Object obj;
+ obj.initNull();
+ Parser parser = Parser(NULL, new Lexer(NULL,
+ str->makeSubStream(offset, gFalse, 20, &obj)), gTrue);
+
+ Object obj1, obj2, obj3;
+ if ((parser.getObj(&obj1)->isInt()) &&
+ (parser.getObj(&obj2)->isInt()) &&
+ (parser.getObj(&obj3)->isCmd("n") || obj3.isCmd("f"))) {
+ entry->offset = (Guint) obj1.getInt();
+ entry->gen = obj2.getInt();
+ entry->type = obj3.isCmd("n") ? xrefEntryUncompressed : xrefEntryFree;
+ entry->obj.initNull ();
+ entry->updated = false;
+ r = gTrue;
+ } else {
+ r = gFalse;
+ }
+ obj1.free();
+ obj2.free();
+ obj3.free();
+
+ return r;
+}
+
+XRefEntry *XRef::getEntry(int i)
+{
+ if (entries[i].type == xrefEntryNone) {
+
+ if ((!xRefStream) && mainXRefEntriesOffset) {
+ if (!parseEntry(mainXRefEntriesOffset + 20*i, &entries[i])) {
+ error(-1, "Failed to parse XRef entry [%d].", i);
+ }
+ } else {
+ std::vector<Guint> followedPrev;
+ while (prevXRefOffset && entries[i].type == xrefEntryNone) {
+ bool followed = false;
+ for (size_t j = 0; j < followedPrev.size(); j++) {
+ if (followedPrev.at(j) == prevXRefOffset) {
+ followed = true;
+ break;
+ }
+ }
+ if (followed) {
+ error(-1, "Circular XRef");
+ if (!(ok = constructXRef(NULL))) {
+ errCode = errDamaged;
+ }
+ break;
+ }
+
+ followedPrev.push_back (prevXRefOffset);
+
+ std::vector<Guint> followedXRefStm;
+ if (!readXRef(&prevXRefOffset, &followedXRefStm)) {
+ prevXRefOffset = 0;
+ }
+
+ // if there was a problem with the xref table,
+ // try to reconstruct it
+ if (!ok) {
+ GBool wasReconstructed = false;
+ if (!(ok = constructXRef(&wasReconstructed))) {
+ errCode = errDamaged;
+ break;
+ }
+ break;
+ }
+ }
+
+ if (entries[i].type == xrefEntryNone) {
+ error(-1, "Invalid XRef entry");
+ entries[i].type = xrefEntryFree;
+ }
+ }
+ }
+
+ return &entries[i];
+}
+
+
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/XRef.h
index 2dbd469b94c..8b77b6c0be1 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/XRef.h
@@ -14,9 +14,11 @@
// under GPL version 2 or later
//
// Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2006, 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2008, 2010, 2011 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org>
// Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2010 Ilya Gorenbein <igorenbein@finjan.com>
+// Copyright 2010 Hib Eris <hib@hiberis.nl>
//
// 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
@@ -33,10 +35,12 @@
#include "goo/gtypes.h"
#include "Object.h"
+#include <vector>
+
class Dict;
class Stream;
class Parser;
-class ObjectStream;
+class PopplerCache;
//------------------------------------------------------------------------
// XRef
@@ -45,7 +49,8 @@ class ObjectStream;
enum XRefEntryType {
xrefEntryFree,
xrefEntryUncompressed,
- xrefEntryCompressed
+ xrefEntryCompressed,
+ xrefEntryNone
};
struct XRefEntry {
@@ -62,7 +67,7 @@ public:
// Constructor, create an empty XRef, used for PDF writing
XRef();
// Constructor. Read xref table from stream.
- XRef(BaseStream *strA);
+ XRef(BaseStream *strA, Guint pos, Guint mainXRefEntriesOffsetA = 0, GBool *wasReconstructed = NULL, GBool reconstruct = false);
// Destructor.
~XRef();
@@ -96,7 +101,7 @@ public:
Object *getCatalog(Object *obj) { return fetch(rootNum, rootGen, obj); }
// Fetch an indirect reference.
- Object *fetch(int num, int gen, Object *obj);
+ Object *fetch(int num, int gen, Object *obj, std::set<int> *fetchOriginatorNums = NULL);
// Return the document's Info dictionary (if any).
Object *getDocInfo(Object *obj);
@@ -105,9 +110,6 @@ public:
// Return the number of objects in the xref table.
int getNumObjects() { return size; }
- // Return the offset of the last xref table.
- Guint getLastXRefPos() { return lastXRefPos; }
-
// Return the catalog object reference.
int getRootNum() { return rootNum; }
int getRootGen() { return rootGen; }
@@ -117,11 +119,11 @@ public:
GBool getStreamEnd(Guint streamStart, Guint *streamEnd);
// Retuns the entry that belongs to the offset
- int getNumEntry(Guint offset) const;
+ int getNumEntry(Guint offset);
// Direct access.
int getSize() { return size; }
- XRefEntry *getEntry(int i) { return &entries[i]; }
+ XRefEntry *getEntry(int i);
Object *getTrailerDict() { return &trailerDict; }
// Write access
@@ -136,16 +138,16 @@ private:
Guint start; // offset in file (to allow for garbage
// at beginning of file)
XRefEntry *entries; // xref entries
- int size; // size of <entries> array
+ int capacity; // size of <entries> array
+ int size; // number of entries
int rootNum, rootGen; // catalog dict
GBool ok; // true if xref table is valid
int errCode; // error code (if <ok> is false)
Object trailerDict; // trailer dictionary
- Guint lastXRefPos; // offset of last xref table
Guint *streamEnds; // 'endstream' positions - only used in
// damaged files
int streamEndsLen; // number of valid entries in streamEnds
- ObjectStream *objStr; // cached object stream
+ PopplerCache *objStrs; // cached object streams
GBool encrypted; // true if file is encrypted
int encRevision;
int encVersion; // encryption algorithm
@@ -154,14 +156,21 @@ private:
int permFlags; // permission bits
Guchar fileKey[16]; // file decryption key
GBool ownerPasswordOk; // true if owner password is correct
+ Guint prevXRefOffset; // position of prev XRef section (= next to read)
+ Guint mainXRefEntriesOffset; // offset of entries in main XRef table
+ GBool xRefStream; // true if last XRef section is a stream
+ void init();
+ int reserve(int newSize);
+ int resize(int newSize);
Guint getStartXref();
- GBool readXRef(Guint *pos);
- GBool readXRefTable(Parser *parser, Guint *pos);
+ GBool readXRef(Guint *pos, std::vector<Guint> *followedXRefStm);
+ GBool readXRefTable(Parser *parser, Guint *pos, std::vector<Guint> *followedXRefStm);
GBool readXRefStreamSection(Stream *xrefStr, int *w, int first, int n);
GBool readXRefStream(Stream *xrefStr, Guint *pos);
- GBool constructXRef();
- Guint strToUnsigned(char *s);
+ GBool constructXRef(GBool *wasReconstructed);
+ GBool parseEntry(Guint offset, XRefEntry *entry);
+
};
#endif
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.18.0/poppler/XpdfPluginAPI.cc
index 94d2851fedd..a4e0f0e7799 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/XpdfPluginAPI.cc
@@ -10,6 +10,9 @@
//
// Modified under the Poppler project - http://poppler.freedesktop.org
//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
//
// To see a description of the changes please see the Changelog file that
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.18.0/poppler/XpdfPluginAPI.h
index 22540f728bd..22540f728bd 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.18.0/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.cmake
new file mode 100644
index 00000000000..ca4de776a33
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.cmake
@@ -0,0 +1,178 @@
+//================================================= -*- mode: c++ -*- ====
+//
+// poppler-config.h
+//
+// Copyright 1996-2004 Glyph & Cog, LLC
+//
+//========================================================================
+
+#ifndef POPPLER_CONFIG_H
+#define POPPLER_CONFIG_H
+
+// We duplicate some of the config.h #define's here since they are
+// used in some of the header files we install. The #ifndef/#endif
+// around #undef look odd, but it's to silence warnings about
+// redefining those symbols.
+
+/* Enable multithreading support. */
+#ifndef MULTITHREADED
+#cmakedefine MULTITHREADED 1
+#endif
+
+/* Use fixedpoint. */
+#ifndef USE_FIXEDPOINT
+#cmakedefine USE_FIXEDPOINT 1
+#endif
+
+/* Use single precision arithmetic in the Splash backend */
+#ifndef USE_FLOAT
+#cmakedefine USE_FLOAT 1
+#endif
+
+/* Include support for OPI comments. */
+#ifndef OPI_SUPPORT
+#cmakedefine OPI_SUPPORT 1
+#endif
+
+/* Enable word list support. */
+#ifndef TEXTOUT_WORD_LIST
+#cmakedefine TEXTOUT_WORD_LIST 1
+#endif
+
+/* Use fontconfig font configuration backend */
+#ifndef WITH_FONTCONFIGURATION_FONTCONFIG
+#cmakedefine WITH_FONTCONFIGURATION_FONTCONFIG 1
+#endif
+
+/* Use win32 font configuration backend */
+#ifndef WITH_FONTCONFIGURATION_WIN32
+#cmakedefine WITH_FONTCONFIGURATION_WIN32 1
+#endif
+
+/* Support for curl is compiled in. */
+#ifndef POPPLER_HAS_CURL_SUPPORT
+#cmakedefine POPPLER_HAS_CURL_SUPPORT 1
+#endif
+
+/* Use libjpeg instead of builtin jpeg decoder. */
+#ifndef ENABLE_LIBJPEG
+#cmakedefine ENABLE_LIBJPEG 1
+#endif
+
+/* Build against libtiff. */
+#ifndef ENABLE_LIBTIFF
+#cmakedefine ENABLE_LIBTIFF 1
+#endif
+
+/* Build against libpng. */
+#ifndef ENABLE_LIBPNG
+#cmakedefine ENABLE_LIBPNG 1
+#endif
+
+/* Use zlib instead of builtin zlib decoder. */
+#ifndef ENABLE_ZLIB
+#cmakedefine ENABLE_ZLIB 1
+#endif
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#ifndef HAVE_DIRENT_H
+#cmakedefine HAVE_DIRENT_H 1
+#endif
+
+/* Defines if gettimeofday is available on your system */
+#ifndef HAVE_GETTIMEOFDAY
+#cmakedefine HAVE_GETTIMEOFDAY 1
+#endif
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#ifndef HAVE_NDIR_H
+#cmakedefine HAVE_NDIR_H 1
+#endif
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
+#ifndef HAVE_SYS_DIR_H
+#cmakedefine HAVE_SYS_DIR_H 1
+#endif
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
+#ifndef HAVE_SYS_NDIR_H
+#cmakedefine HAVE_SYS_NDIR_H 1
+#endif
+
+/* Have FreeType2 include files */
+#ifndef HAVE_FREETYPE_H
+#cmakedefine HAVE_FREETYPE_H 1
+#endif
+
+/* Defines if use cms */
+#ifndef USE_CMS
+#cmakedefine USE_CMS 1
+#endif
+
+// Also, there are preprocessor symbols in the header files
+// that are used but never defined when building poppler using configure
+// or cmake: DISABLE_OUTLINE, DEBUG_MEM, SPLASH_CMYK, HAVE_T1LIB_H,
+// ENABLE_PLUGINS, DEBUG_FORMS, HAVE_FREETYPE_FREETYPE_H
+
+//------------------------------------------------------------------------
+// version
+//------------------------------------------------------------------------
+
+// copyright notice
+#define popplerCopyright "Copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org"
+#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
+
+//------------------------------------------------------------------------
+// popen
+//------------------------------------------------------------------------
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+#define popen _popen
+#define pclose _pclose
+#endif
+
+#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS)
+#define POPEN_READ_MODE "rb"
+#else
+#define POPEN_READ_MODE "r"
+#endif
+
+//------------------------------------------------------------------------
+// Win32 stuff
+//------------------------------------------------------------------------
+
+#if defined(_WIN32) && !defined(_MSC_VER)
+#include <windef.h>
+#else
+#define CDECL
+#endif
+
+#if defined(_WIN32)
+#ifdef _MSC_VER
+#define strtok_r strtok_s
+#elif __MINGW32__
+char * strtok_r (char *s, const char *delim, char **save_ptr);
+#endif
+#endif
+
+//------------------------------------------------------------------------
+// Compiler
+//------------------------------------------------------------------------
+
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#define GCC_PRINTF_FORMAT(fmt_index, va_index) \
+ __attribute__((__format__(__printf__, fmt_index, va_index)))
+#else
+#define GCC_PRINTF_FORMAT(fmt_index, va_index)
+#endif
+
+#if defined(_MSC_VER)
+#define fmax(a, b) max(a, b)
+#define fmin(a, b) min(a, b)
+#endif
+
+
+#endif /* POPPLER_CONFIG_H */
diff --git a/Build/source/libs/poppler/poppler-0.12.4/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.in
index 147c8b0a1aa..0b43e0a6a0f 100644
--- a/Build/source/libs/poppler/poppler-0.12.4/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/poppler-config.h.in
@@ -19,16 +19,16 @@
#undef MULTITHREADED
#endif
-/* Enable exceptions. */
-#ifndef USE_EXCEPTIONS
-#undef USE_EXCEPTIONS
-#endif
-
/* Use fixedpoint. */
#ifndef USE_FIXEDPOINT
#undef USE_FIXEDPOINT
#endif
+/* Use single precision arithmetic in the Splash backend */
+#ifndef USE_FLOAT
+#undef USE_FLOAT
+#endif
+
/* Include support for OPI comments. */
#ifndef OPI_SUPPORT
#undef OPI_SUPPORT
@@ -39,15 +39,90 @@
#undef TEXTOUT_WORD_LIST
#endif
-// Also, there's a couple of preprocessor symbols in the header files
-// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and
+/* Use fontconfig font configuration backend */
+#ifndef WITH_FONTCONFIGURATION_FONTCONFIG
+#undef WITH_FONTCONFIGURATION_FONTCONFIG
+#endif
+
+/* Use win32 font configuration backend */
+#ifndef WITH_FONTCONFIGURATION_WIN32
+#undef WITH_FONTCONFIGURATION_WIN32
+#endif
+
+/* Support for curl is compiled in. */
+#ifndef POPPLER_HAS_CURL_SUPPORT
+#undef POPPLER_HAS_CURL_SUPPORT
+#endif
+
+/* Use libjpeg instead of builtin jpeg decoder. */
+#ifndef ENABLE_LIBJPEG
+#undef ENABLE_LIBJPEG
+#endif
+
+/* Build against libtiff. */
+#ifndef ENABLE_LIBTIFF
+#undef ENABLE_LIBTIFF
+#endif
+
+/* Build against libpng. */
+#ifndef ENABLE_LIBPNG
+#undef ENABLE_LIBPNG
+#endif
+
+/* Use zlib instead of builtin zlib decoder. */
+#ifndef ENABLE_ZLIB
+#undef ENABLE_ZLIB
+#endif
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#ifndef HAVE_DIRENT_H
+#undef HAVE_DIRENT_H
+#endif
+
+/* Defines if gettimeofday is available on your system */
+#ifndef HAVE_GETTIMEOFDAY
+#undef HAVE_GETTIMEOFDAY
+#endif
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#ifndef HAVE_NDIR_H
+#undef HAVE_NDIR_H
+#endif
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
+#ifndef HAVE_SYS_DIR_H
+#undef HAVE_SYS_DIR_H
+#endif
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
+#ifndef HAVE_SYS_NDIR_H
+#undef HAVE_SYS_NDIR_H
+#endif
+
+/* Have FreeType2 include files */
+#ifndef HAVE_FREETYPE_H
+#undef HAVE_FREETYPE_H
+#endif
+
+/* Defines if use cms */
+#ifndef USE_CMS
+#undef USE_CMS
+#endif
+
+// Also, there are preprocessor symbols in the header files
+// that are used but never defined when building poppler using configure
+// or cmake: DISABLE_OUTLINE, DEBUG_MEM, SPLASH_CMYK, HAVE_T1LIB_H,
+// ENABLE_PLUGINS, DEBUG_FORMS, HAVE_FREETYPE_FREETYPE_H
//------------------------------------------------------------------------
// version
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
/* Define to the version of this package. */
@@ -78,6 +153,14 @@
#define CDECL
#endif
+#if defined(_WIN32)
+#ifdef _MSC_VER
+#define strtok_r strtok_s
+#elif __MINGW32__
+char * strtok_r (char *s, const char *delim, char **save_ptr);
+#endif
+#endif
+
//------------------------------------------------------------------------
// Compiler
//------------------------------------------------------------------------
@@ -89,5 +172,10 @@
#define GCC_PRINTF_FORMAT(fmt_index, va_index)
#endif
+#if defined(_MSC_VER)
+#define fmax(a, b) max(a, b)
+#define fmin(a, b) min(a, b)
+#endif
+
#endif /* POPPLER_CONFIG_H */
diff --git a/Build/source/libs/poppler/poppler-0.18.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.18.0/poppler/strtok_r.cpp
new file mode 100644
index 00000000000..30e2196aa13
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.0/poppler/strtok_r.cpp
@@ -0,0 +1,77 @@
+/* Reentrant string tokenizer. Generic version.
+ Copyright (C) 1991,1996-1999,2001,2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+/* Copyright (C) 1991,93,96,97,99,2000,2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
+ with help from Dan Sahlin (dan@sics.se) and
+ commentary by Jim Blandy (jimb@ai.mit.edu);
+ adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
+ and implemented by Roland McGrath (roland@ai.mit.edu).
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifdef __MINGW32__
+#include <string.h>
+
+#define __rawmemchr strchr
+
+char * strtok_r (char *s, const char *delim, char **save_ptr)
+{
+ char *token;
+
+ if (s == NULL)
+ s = *save_ptr;
+
+ /* Scan leading delimiters. */
+ s += strspn (s, delim);
+ if (*s == '\0')
+ {
+ *save_ptr = s;
+ return NULL;
+ }
+
+ /* Find the end of the token. */
+ token = s;
+ s = strpbrk (token, delim);
+ if (s == NULL)
+ /* This token finishes the string. */
+ *save_ptr = __rawmemchr (token, '\0');
+ else
+ {
+ /* Terminate the token and make *SAVE_PTR point past it. */
+ *s = '\0';
+ *save_ptr = s + 1;
+ }
+ return token;
+}
+#endif
diff --git a/Build/source/libs/poppler/poppler/Makefile.in b/Build/source/libs/poppler/poppler/Makefile.in
index fa9a540f86c..b642e96453a 100644
--- a/Build/source/libs/poppler/poppler/Makefile.in
+++ b/Build/source/libs/poppler/poppler/Makefile.in
@@ -33,13 +33,13 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/hdrs.am \
- $(top_srcdir)/poppler-0.12.4/poppler/poppler-config.h.in
+ $(top_srcdir)/poppler-0.18.0/poppler/poppler-config.h.in
subdir = poppler
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -191,10 +191,10 @@ poppler-config.h: stamp-h2
$(MAKE) $(AM_MAKEFLAGS) stamp-h2; \
else :; fi
-stamp-h2: $(top_srcdir)/poppler-0.12.4/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.18.0/poppler/poppler-config.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status poppler/poppler-config.h
-$(top_srcdir)/poppler-0.12.4/poppler/poppler-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/poppler-0.18.0/poppler/poppler-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h2
touch $@
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
new file mode 100644
index 00000000000..77978a97930
--- /dev/null
+++ b/Build/source/libs/poppler/version.ac
@@ -0,0 +1,11 @@
+dnl
+dnl Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl This file is free software; the copyright holder
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl --------------------------------------------------------
+dnl
+dnl m4-include this file to define the current poppler version
+m4_define([poppler_version], [0.18.0])
diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure
index d544f2f3518..ebf38ebe297 100755
--- a/Build/source/libs/teckit/configure
+++ b/Build/source/libs/teckit/configure
@@ -5693,9 +5693,6 @@ fi
done
-$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
-
-
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
@@ -5703,6 +5700,10 @@ LIBS=$kpse_save_LIBS
echo timestamp >config.force
fi
+
+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+
+
TECKIT_TREE=TECkit-2.5.1
diff --git a/Build/source/libs/teckit/configure.ac b/Build/source/libs/teckit/configure.ac
index 42f9bb17f49..ba9f5fe6482 100644
--- a/Build/source/libs/teckit/configure.ac
+++ b/Build/source/libs/teckit/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -44,15 +44,15 @@ KPSE_ADD_FLAGS([zlib])
AC_CHECK_FUNC([compress], , [AC_ERROR([zlib not found])])
AC_CHECK_HEADERS([zlib.h], , [AC_ERROR([zlib not found])])
-AC_DEFINE([HAVE_LIBZ], 1, [Define if you have zlib.])
KPSE_RESTORE_FLAGS
echo timestamp >config.force
fi
-TECKIT_TREE=TECkit-[]TECkit_version
-AC_SUBST([TECKIT_TREE])
+AC_DEFINE([HAVE_LIBZ], 1, [Define if you have zlib.])
+
+AC_SUBST([TECKIT_TREE], [TECkit-]TECkit_version)
AC_CONFIG_FILES([Makefile include/teckit/Makefile])
diff --git a/Build/source/texk/dvipdfmx/configure b/Build/source/texk/dvipdfmx/configure
index d18b2ae8f08..834bad18ccf 100755
--- a/Build/source/texk/dvipdfmx/configure
+++ b/Build/source/texk/dvipdfmx/configure
@@ -15210,9 +15210,6 @@ fi
-$as_echo "#define __TDS_VERSION__ 0x200406L" >>confdefs.h
-
-
eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\"
eval LIBS=\"$ZLIB_LIBS \$LIBS\"
@@ -15325,6 +15322,10 @@ LIBS=$kpse_save_LIBS
echo timestamp >config.force
fi
+
+$as_echo "#define __TDS_VERSION__ 0x200406L" >>confdefs.h
+
+
DVIPDFMX_TREE=dvipdfmx-20110311
diff --git a/Build/source/texk/dvipdfmx/configure.ac b/Build/source/texk/dvipdfmx/configure.ac
index 52e0374ca95..36645fdb7e3 100644
--- a/Build/source/texk/dvipdfmx/configure.ac
+++ b/Build/source/texk/dvipdfmx/configure.ac
@@ -60,8 +60,6 @@ if test "x$enable_build" != xno || test -f config.force; then
KPSE_ADD_FLAGS([kpathsea])
AC_CHECK_HEADER([kpathsea/version.h], [],
[AC_MSG_ERROR([Sorry, kpathsea too old])])
-AC_DEFINE([__TDS_VERSION__], [0x200406L],
- [Define to 0x200406L if your libkpathsea supports enc formats.])
KPSE_ADD_FLAGS([zlib])
CHO_CHECK_ZLIB
@@ -74,6 +72,9 @@ KPSE_RESTORE_FLAGS
echo timestamp >config.force
fi
+AC_DEFINE([__TDS_VERSION__], [0x200406L],
+ [Define to 0x200406L if your libkpathsea supports enc formats.])
+
AC_SUBST([DVIPDFMX_TREE], [dvipdfmx-]dvipdfmx_version)
KPSE_CHECK_WIN32